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

[Jens-Michael Hoffmann]

SVN commit 1070908 by jmhoffmann:

Order include directives and forward declarations alphabetically.

 M  +10 -10    MarbleWidget.cpp  
 M  +12 -15    MarbleWidget.h  


--- trunk/KDE/kdeedu/marble/src/lib/MarbleWidget.cpp #1070907:1070908
@@ -13,15 +13,15 @@
 
 #include <cmath>
 
+#include <QtCore/QAbstractItemModel>
 #include <QtCore/QHash>
 #include <QtCore/QSettings>
 #include <QtCore/QTime>
 #include <QtCore/QTimer>
-#include <QtCore/QAbstractItemModel>
 #include <QtGui/QItemSelectionModel>
-#include <QtGui/QSizePolicy>
 #include <QtGui/QPaintEvent>
 #include <QtGui/QRegion>
+#include <QtGui/QSizePolicy>
 #include <QtNetwork/QNetworkProxy>
 
 #ifdef MARBLE_DBUS
@@ -29,24 +29,24 @@
 #endif
 
 #include "AbstractProjection.h"
+#include "FileViewModel.h"
+#include "GeoPainter.h"
+#include "MarbleDebug.h"
 #include "MarbleDirs.h"
-#include "MarbleDebug.h"
 #include "MarbleMap.h"
+#include "MarbleMap_p.h" // FIXME: remove this
 #include "MarbleModel.h"
-#include "ViewParams.h"
-#include "GeoPainter.h"
-#include "FileViewModel.h"
 #include "MarblePhysics.h"
 #include "MarblePlacemarkModel.h"
 #include "MarbleWidgetInputHandler.h"
-#include "TileCreatorDialog.h"
-#include "gps/GpsLayer.h"
+#include "MergedLayerDecorator.h"
 #include "RenderPlugin.h"
 #include "SunLocator.h"
-#include "MergedLayerDecorator.h"
+#include "TileCreatorDialog.h"
+#include "ViewParams.h"
 #include "ViewportParams.h"
+#include "gps/GpsLayer.h"
 
-#include "MarbleMap_p.h" // FIXME: remove this
 
 namespace Marble
 {
--- trunk/KDE/kdeedu/marble/src/lib/MarbleWidget.h #1070907:1070908
@@ -21,13 +21,13 @@
  * @author Inge Wallin  <inge at lysator.liu.se>
  */
 
-#include <QtGui/QWidget>
 #include <QtGui/QPixmap>
+#include <QtGui/QWidget>
 
-#include "marble_export.h"
-#include "GeoDataCoordinates.h"       // In geodata/data/
+#include "GeoDataCoordinates.h"
 #include "Quaternion.h"
 #include "global.h"             // types needed in all of marble.
+#include "marble_export.h"
 
 // Qt
 class QAbstractItemModel;
@@ -38,22 +38,19 @@
 namespace Marble
 {
 
-// MarbleWidget 
-class MarbleWidgetInputHandler;
-class MarbleWidgetPrivate;
-
-// Marble
-class MarbleMap;
-class MarbleModel;
-class TileCreator;
-class SunLocator;
-class GpxFileModel;
+class AbstractFloatItem;
 class FileViewModel;
 class GeoDataLatLonBox;
 class GeoPainter;
-class RenderPlugin;
-class AbstractFloatItem;
 class GeoSceneDocument;
+class GpxFileModel;
+class MarbleMap;
+class MarbleModel;
+class MarbleWidgetInputHandler;
+class MarbleWidgetPrivate;
+class RenderPlugin;
+class SunLocator;
+class TileCreator;
 
 /**
  * @short A widget class that displays a view of the earth.