From 85e9ab3e792e2c33001679ba790dce28e45a5fbf Mon Sep 17 00:00:00 2001 From: ABBAPOH Date: Sun, 1 Apr 2012 22:01:50 +0400 Subject: Remove extra lines in mimetypes Change-Id: Ic7ec295b2a0b23a21f44f880f29df13503f8ef3a Reviewed-by: David Faure --- src/corelib/mimetypes/qmimedatabase.h | 1 - src/corelib/mimetypes/qmimedatabase_p.h | 1 - src/corelib/mimetypes/qmimemagicrule_p.h | 1 - src/corelib/mimetypes/qmimemagicrulematcher.cpp | 1 - src/corelib/mimetypes/qmimemagicrulematcher_p.h | 1 - src/corelib/mimetypes/qmimetype.cpp | 1 - src/corelib/mimetypes/qmimetype.h | 1 - src/corelib/mimetypes/qmimetype_p.h | 1 - src/corelib/mimetypes/qmimetypeparser.cpp | 2 -- 9 files changed, 10 deletions(-) (limited to 'src') diff --git a/src/corelib/mimetypes/qmimedatabase.h b/src/corelib/mimetypes/qmimedatabase.h index cfd1cfe33d..5652fb7e7f 100644 --- a/src/corelib/mimetypes/qmimedatabase.h +++ b/src/corelib/mimetypes/qmimedatabase.h @@ -39,7 +39,6 @@ ** ****************************************************************************/ - #ifndef QMIMEDATABASE_H #define QMIMEDATABASE_H diff --git a/src/corelib/mimetypes/qmimedatabase_p.h b/src/corelib/mimetypes/qmimedatabase_p.h index 7e98548a35..8f2db32513 100644 --- a/src/corelib/mimetypes/qmimedatabase_p.h +++ b/src/corelib/mimetypes/qmimedatabase_p.h @@ -39,7 +39,6 @@ ** ****************************************************************************/ - #ifndef QMIMEDATABASE_P_H #define QMIMEDATABASE_P_H diff --git a/src/corelib/mimetypes/qmimemagicrule_p.h b/src/corelib/mimetypes/qmimemagicrule_p.h index e35c1923f9..44f7d8f8f4 100644 --- a/src/corelib/mimetypes/qmimemagicrule_p.h +++ b/src/corelib/mimetypes/qmimemagicrule_p.h @@ -39,7 +39,6 @@ ** ****************************************************************************/ - #ifndef QMIMEMAGICRULE_P_H #define QMIMEMAGICRULE_P_H diff --git a/src/corelib/mimetypes/qmimemagicrulematcher.cpp b/src/corelib/mimetypes/qmimemagicrulematcher.cpp index 8579d02b00..255ecba8e8 100644 --- a/src/corelib/mimetypes/qmimemagicrulematcher.cpp +++ b/src/corelib/mimetypes/qmimemagicrulematcher.cpp @@ -39,7 +39,6 @@ ** ****************************************************************************/ - #define QT_NO_CAST_FROM_ASCII #include "qmimemagicrulematcher_p.h" diff --git a/src/corelib/mimetypes/qmimemagicrulematcher_p.h b/src/corelib/mimetypes/qmimemagicrulematcher_p.h index 299f447a4c..b2bb287207 100644 --- a/src/corelib/mimetypes/qmimemagicrulematcher_p.h +++ b/src/corelib/mimetypes/qmimemagicrulematcher_p.h @@ -39,7 +39,6 @@ ** ****************************************************************************/ - #ifndef QMIMEMAGICRULEMATCHER_P_H #define QMIMEMAGICRULEMATCHER_P_H diff --git a/src/corelib/mimetypes/qmimetype.cpp b/src/corelib/mimetypes/qmimetype.cpp index ea10cbe70a..5ee70e83b1 100644 --- a/src/corelib/mimetypes/qmimetype.cpp +++ b/src/corelib/mimetypes/qmimetype.cpp @@ -39,7 +39,6 @@ ** ****************************************************************************/ - #include "qmimetype.h" #include "qmimetype_p.h" diff --git a/src/corelib/mimetypes/qmimetype.h b/src/corelib/mimetypes/qmimetype.h index 172973e77a..0b94977a03 100644 --- a/src/corelib/mimetypes/qmimetype.h +++ b/src/corelib/mimetypes/qmimetype.h @@ -39,7 +39,6 @@ ** ****************************************************************************/ - #ifndef QMIMETYPE_H #define QMIMETYPE_H diff --git a/src/corelib/mimetypes/qmimetype_p.h b/src/corelib/mimetypes/qmimetype_p.h index d8aadccf50..f2c7f966ff 100644 --- a/src/corelib/mimetypes/qmimetype_p.h +++ b/src/corelib/mimetypes/qmimetype_p.h @@ -39,7 +39,6 @@ ** ****************************************************************************/ - #ifndef QMIMETYPE_P_H #define QMIMETYPE_P_H diff --git a/src/corelib/mimetypes/qmimetypeparser.cpp b/src/corelib/mimetypes/qmimetypeparser.cpp index ba2292de53..cc03600cf1 100644 --- a/src/corelib/mimetypes/qmimetypeparser.cpp +++ b/src/corelib/mimetypes/qmimetypeparser.cpp @@ -39,7 +39,6 @@ ** ****************************************************************************/ - #define QT_NO_CAST_FROM_ASCII #include "qmimetypeparser_p.h" @@ -93,7 +92,6 @@ static const char matchMaskAttributeC[] = "mask"; \sa QMimeTypeParser */ - /*! \class QMimeTypeParserBase \internal -- cgit v1.2.3