[Marble-commits] KDE/kdeedu/marble/src

[Dennis Nienhüser]

SVN commit 1160020 by nienhueser:

Normalize qt includes. Please use <module/class> instead of <class> to include qt headers.

 M  +1 -1      lib/MarbleWidgetInputHandler.cpp  
 M  +0 -2      lib/MathHelper.cpp  
 M  +1 -1      lib/MathHelper.h  
 M  +1 -1      lib/ServerLayout.h  
 M  +1 -1      plugins/render/aprs/AprsFile.cpp  
 M  +2 -2      plugins/render/aprs/posix_qextserialport.cpp  
 M  +5 -5      plugins/render/aprs/qextserialport.h  
 M  +1 -1      plugins/render/routing/RoutingPlugin.h  


--- trunk/KDE/kdeedu/marble/src/lib/MarbleWidgetInputHandler.cpp #1160019:1160020
@@ -25,7 +25,7 @@
 #include <QtGui/QToolTip>
 
 #if QT_VERSION >= 0x40600
-  #include <QTouchEvent>
+  #include <QtGui/QTouchEvent>
 #endif
 
 #include "global.h"
--- trunk/KDE/kdeedu/marble/src/lib/MathHelper.cpp #1160019:1160020
@@ -21,8 +21,6 @@
 
 #include "MathHelper.h"
 
-#include <qglobal.h>
-
 #ifdef Q_CC_MSVC
 #include <float.h>
 
--- trunk/KDE/kdeedu/marble/src/lib/MathHelper.h #1160019:1160020
@@ -22,7 +22,7 @@
 #ifndef MATHHELPER_H
 #define MATHHELPER_H
 
-#include <qglobal.h>
+#include <QtCore/qglobal.h>
 
 #ifdef Q_CC_MSVC
 #include <math.h>
--- trunk/KDE/kdeedu/marble/src/lib/ServerLayout.h #1160019:1160020
@@ -11,7 +11,7 @@
 #ifndef MARBLE_SERVERLAYOUT_H
 #define MARBLE_SERVERLAYOUT_H
 
-#include <QUrl>
+#include <QtCore/QUrl>
 
 namespace Marble
 {
--- trunk/KDE/kdeedu/marble/src/plugins/render/aprs/AprsFile.cpp #1160019:1160020
@@ -10,7 +10,7 @@
 
 #include "AprsFile.h"
 
-#include <qfile.h>
+#include <QtCore/QFile>
 
 #include "MarbleDebug.h"
 
--- trunk/KDE/kdeedu/marble/src/plugins/render/aprs/posix_qextserialport.cpp #1160019:1160020
@@ -9,8 +9,8 @@
 #include <fcntl.h>
 #include <stdio.h>
 #include "qextserialport.h"
-#include <QMutexLocker>
-#include <QDebug>
+#include <QtCore/QMutexLocker>
+#include <QtCore/QDebug>
 #ifdef HAVE_SYS_FILIO_H
 #include <sys/filio.h>
 #endif /* HAVE_SYS_FILIO_H */
--- trunk/KDE/kdeedu/marble/src/plugins/render/aprs/qextserialport.h #1160019:1160020
@@ -126,8 +126,8 @@
     long Timeout_Millisec;
 };
 
-#include <QIODevice>
-#include <QMutex>
+#include <QtCore/QIODevice>
+#include <QtCore/QMutex>
 #ifdef Q_OS_UNIX
 #include <stdio.h>
 #include <termios.h>
@@ -136,11 +136,11 @@
 #include <sys/time.h>
 #include <sys/ioctl.h>
 #include <sys/select.h>
-#include <QSocketNotifier>
+#include <QtCore/QSocketNotifier>
 #elif (defined Q_OS_WIN)
 #include <windows.h>
-#include <QThread>
-#include <QReadWriteLock>
+#include <QtCore/QThread>
+#include <QtCore/QReadWriteLock>
 #endif
 
 /*!
--- trunk/KDE/kdeedu/marble/src/plugins/render/routing/RoutingPlugin.h #1160019:1160020
@@ -16,7 +16,7 @@
 #include "AbstractFloatItem.h"
 #include "GeoDataCoordinates.h"
 
-#include <QObject>
+#include <QtCore/QObject>
 
 namespace Ui
 {