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

[Dennis Nienhüser]

SVN commit 1108859 by nienhueser:

Cleanup of #include directives.

 M  +1 -1      OrsRoutingProvider.cpp  
 M  +2 -2      RoutingInputWidget.cpp  
 M  +4 -4      RoutingLayer.cpp  
 M  +1 -1      RoutingLayer.h  
 M  +3 -3      RoutingManager.cpp  
 M  +1 -1      RoutingManager.h  
 M  +1 -7      RoutingModel.cpp  
 M  +2 -3      RoutingWidget.cpp  
 M  +3 -3      RoutingWidget.h  
 M  +1 -1      YoursRoutingProvider.cpp  


--- trunk/KDE/kdeedu/marble/src/lib/routing/OrsRoutingProvider.cpp #1108858:1108859
@@ -12,8 +12,8 @@
 
 #include "MarbleDebug.h"
 #include "MarbleDirs.h"
+#include "MarbleLocale.h"
 #include "RouteSkeleton.h"
-#include "MarbleLocale.h"
 
 #include <QtNetwork/QNetworkAccessManager>
 #include <QtNetwork/QNetworkReply>
--- trunk/KDE/kdeedu/marble/src/lib/routing/RoutingInputWidget.cpp #1108858:1108859
@@ -13,11 +13,12 @@
 #include "MarbleRunnerManager.h"
 #include "MarblePlacemarkModel.h"
 #include "MarbleDebug.h"
+#include "MarbleLocale.h"
 #include "RouteSkeleton.h"
 #include "TinyWebBrowser.h"
-#include "MarbleLocale.h"
 
 #include <QtCore/QTimer>
+#include <QtCore/QUrl>
 #include <QtGui/QLineEdit>
 #include <QtGui/QHBoxLayout>
 #include <QtGui/QPushButton>
@@ -26,7 +27,6 @@
 #include <QtXml/QDomDocument>
 #include <QtNetwork/QNetworkAccessManager>
 #include <QtNetwork/QNetworkReply>
-#include <QtCore/QUrl>
 
 namespace Marble {
 
--- trunk/KDE/kdeedu/marble/src/lib/routing/RoutingLayer.cpp #1108858:1108859
@@ -10,13 +10,13 @@
 
 #include "RoutingLayer.h"
 
+#include "GeoDataCoordinates.h"
+#include "GeoDataLineString.h"
+#include "GeoPainter.h"
+#include "MarblePlacemarkModel.h"
 #include "MarbleWidget.h"
 #include "RoutingModel.h"
 #include "RouteSkeleton.h"
-#include "MarblePlacemarkModel.h"
-#include "GeoDataCoordinates.h"
-#include "GeoDataLineString.h"
-#include "GeoPainter.h"
 
 #include <QtCore/QMap>
 #include <QtCore/QDebug>
--- trunk/KDE/kdeedu/marble/src/lib/routing/RoutingLayer.h #1108858:1108859
@@ -11,8 +11,8 @@
 #ifndef MARBLE_ROUTING_LAYER_H
 #define MARBLE_ROUTING_LAYER_H
 
+#include "GeoDataCoordinates.h"
 #include "LayerInterface.h"
-#include "GeoDataCoordinates.h"
 
 #include <QtCore/QModelIndex>
 
--- trunk/KDE/kdeedu/marble/src/lib/routing/RoutingManager.cpp #1108858:1108859
@@ -10,11 +10,11 @@
 
 #include "RoutingManager.h"
 
+#include "MarbleDebug.h"
+#include "MarbleWidget.h"
+#include "OrsRoutingProvider.h"
 #include "RoutingModel.h"
 #include "RouteSkeleton.h"
-#include "MarbleDebug.h"
-#include "OrsRoutingProvider.h"
-#include "MarbleWidget.h"
 
 namespace Marble {
 
--- trunk/KDE/kdeedu/marble/src/lib/routing/RoutingManager.h #1108858:1108859
@@ -11,8 +11,8 @@
 #ifndef MARBLE_ROUTING_MANAGER_H
 #define MARBLE_ROUTING_MANAGER_H
 
+#include "AbstractRoutingProvider.h"
 #include "GeoDataCoordinates.h"
-#include "routing/AbstractRoutingProvider.h"
 
 #include <QtCore/QAbstractItemModel>
 
--- trunk/KDE/kdeedu/marble/src/lib/routing/RoutingModel.cpp #1108858:1108859
@@ -12,19 +12,13 @@
 
 #include "MarbleDebug.h"
 #include "MarbleDirs.h"
-#include "gps/GpxFile.h"
-#include "gps/RouteContainer.h"
-#include "gps/WaypointContainer.h"
-#include "gps/Waypoint.h"
-#include "gps/Route.h"
-#include "gps/TrackPoint.h"
 #include "GeoDataCoordinates.h"
-#include "FileLoader.h"
 #include "GeoDataDocument.h"
 #include "GeoDataPlacemark.h"
 #include "GeoDataParser.h"
 
 #include <QtCore/QVector>
+#include <QtCore/QTime>
 #include <QtCore/QBuffer>
 #include <QtCore/QRegExp>
 #include <QtGui/QPixmap>
--- trunk/KDE/kdeedu/marble/src/lib/routing/RoutingWidget.cpp #1108858:1108859
@@ -11,14 +11,13 @@
 #include "RoutingWidget.h"
 
 #include "GeoDataLineString.h"
-#include "RoutingModel.h"
 #include "MarblePlacemarkModel.h"
 #include "MarbleWidget.h"
 #include "MarbleMap.h"
 #include "MarbleModel.h"
 #include "MarbleDebug.h"
 #include "MarbleWidgetInputHandler.h"
-
+#include "RoutingModel.h"
 #include "RoutingManager.h"
 #include "RoutingLayer.h"
 #include "RoutingModel.h"
@@ -26,8 +25,8 @@
 #include "RoutingInputWidget.h"
 #include "RouteSkeleton.h"
 
-#include <QtGui/QSortFilterProxyModel>
 #include <QtCore/QTime>
+#include <QtGui/QSortFilterProxyModel>
 
 #include "ui_RoutingWidget.h"
 
--- trunk/KDE/kdeedu/marble/src/lib/routing/RoutingWidget.h #1108858:1108859
@@ -11,12 +11,12 @@
 #ifndef MARBLE_ROUTING_WIDGET_H
 #define MARBLE_ROUTING_WIDGET_H
 
-#include <GeoDataCoordinates.h>
-#include <GeoDataLineString.h>
+#include "GeoDataCoordinates.h"
+#include "GeoDataLineString.h"
 #include "RoutingManager.h"
 
+#include <QtCore/QModelIndex>
 #include <QtGui/QWidget>
-#include <QtCore/QModelIndex>
 
 namespace Marble
 {
--- trunk/KDE/kdeedu/marble/src/lib/routing/YoursRoutingProvider.cpp #1108858:1108859
@@ -10,9 +10,9 @@
 
 #include "YoursRoutingProvider.h"
 
-#include "RouteSkeleton.h"
 #include "MarbleDebug.h"
 #include "MarbleDirs.h"
+#include "RouteSkeleton.h"
 
 #include <QtNetwork/QNetworkAccessManager>
 #include <QtNetwork/QNetworkReply>