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

[Dennis Nienhüser]

SVN commit 1121200 by nienhueser:

Improve #include order. Exchange qWarning() with mDebug() to avoid termination when warnings are treated fatal.

 M  +1 -1      AbstractRoutingProvider.h  
 M  +1 -1      OrsRoutingProvider.cpp  
 M  +6 -6      RoutingInputWidget.cpp  
 M  +5 -6      RoutingLayer.cpp  
 M  +1 -2      RoutingManager.cpp  
 M  +6 -6      RoutingModel.cpp  
 M  +0 -2      RoutingProxyModel.cpp  
 M  +7 -8      RoutingWidget.cpp  
 M  +1 -1      YoursRoutingProvider.cpp  


--- trunk/KDE/kdeedu/marble/src/lib/routing/AbstractRoutingProvider.h #1121199:1121200
@@ -13,8 +13,8 @@
 
 #include "GeoDataLineString.h"
 
+#include <QtCore/QByteArray>
 #include <QtCore/QObject>
-#include <QtCore/QByteArray>
 
 namespace Marble {
 
--- trunk/KDE/kdeedu/marble/src/lib/routing/OrsRoutingProvider.cpp #1121199:1121200
@@ -93,7 +93,7 @@
 
 void OrsRoutingProvider::handleError( QNetworkReply::NetworkError error )
 {
-    qWarning() << " Error when retrieving openrouteservice.org route: " << error;
+    mDebug() << " Error when retrieving openrouteservice.org route: " << error;
 }
 
 QString OrsRoutingProvider::xmlHeader() const
--- trunk/KDE/kdeedu/marble/src/lib/routing/RoutingInputWidget.cpp #1121199:1121200
@@ -10,23 +10,23 @@
 
 #include "RoutingInputWidget.h"
 
-#include "MarbleRunnerManager.h"
-#include "MarblePlacemarkModel.h"
 #include "MarbleDebug.h"
 #include "MarbleLocale.h"
+#include "MarblePlacemarkModel.h"
+#include "MarbleRunnerManager.h"
 #include "RouteSkeleton.h"
 #include "TinyWebBrowser.h"
 
 #include <QtCore/QTimer>
 #include <QtCore/QUrl>
+#include <QtGui/QHBoxLayout>
+#include <QtGui/QIcon>
 #include <QtGui/QLineEdit>
-#include <QtGui/QHBoxLayout>
 #include <QtGui/QPushButton>
 #include <QtGui/QMovie>
-#include <QtGui/QIcon>
-#include <QtXml/QDomDocument>
 #include <QtNetwork/QNetworkAccessManager>
 #include <QtNetwork/QNetworkReply>
+#include <QtXml/QDomDocument>
 
 namespace Marble {
 
@@ -307,7 +307,7 @@
 
     QDomDocument xml;
     if ( !xml.setContent( reply->readAll() ) ) {
-        qWarning() << "Cannot parse osm nominatim result " << xml.toString();
+        mDebug() << "Cannot parse osm nominatim result " << xml.toString();
         return;
     }
 
--- trunk/KDE/kdeedu/marble/src/lib/routing/RoutingLayer.cpp #1121199:1121200
@@ -20,14 +20,13 @@
 #include "RouteSkeleton.h"
 
 #include <QtCore/QMap>
-#include <QtCore/QDebug>
-#include <QtGui/QPixmap>
-#include <QtGui/QMenu>
-#include <QtGui/QIcon>
-#include <QtGui/QMouseEvent>
-#include <QtGui/QKeyEvent>
 #include <QtGui/QAbstractProxyModel>
+#include <QtGui/QIcon>
 #include <QtGui/QItemSelectionModel>
+#include <QtGui/QKeyEvent>
+#include <QtGui/QMenu>
+#include <QtGui/QMouseEvent>
+#include <QtGui/QPixmap>
 
 namespace Marble {
 
--- trunk/KDE/kdeedu/marble/src/lib/routing/RoutingManager.cpp #1121199:1121200
@@ -10,11 +10,10 @@
 
 #include "RoutingManager.h"
 
-#include "MarbleDebug.h"
 #include "MarbleWidget.h"
 #include "OrsRoutingProvider.h"
-#include "RoutingModel.h"
 #include "RouteSkeleton.h"
+#include "RoutingModel.h"
 
 namespace Marble {
 
--- trunk/KDE/kdeedu/marble/src/lib/routing/RoutingModel.cpp #1121199:1121200
@@ -14,13 +14,13 @@
 #include "MarbleDirs.h"
 #include "GeoDataCoordinates.h"
 #include "GeoDataDocument.h"
+#include "GeoDataParser.h"
 #include "GeoDataPlacemark.h"
-#include "GeoDataParser.h"
 
-#include <QtCore/QVector>
-#include <QtCore/QTime>
 #include <QtCore/QBuffer>
 #include <QtCore/QRegExp>
+#include <QtCore/QTime>
+#include <QtCore/QVector>
 #include <QtGui/QPixmap>
 #include <QtXml/QDomDocument>
 
@@ -134,7 +134,7 @@
 
         QDomDocument xml;
         if ( !xml.setContent( content ) ) {
-            qWarning() << "Cannot parse xml file with routing instructions.";
+            mDebug() << "Cannot parse xml file with routing instructions.";
             return;
         }
 
@@ -160,7 +160,7 @@
                   seconds = regexp.cap( matches.size()-1 ).toInt();
                   break;
                 default:
-                  qWarning() << "Unable to parse time string " << time.item( 0 ).toElement().text();
+                  mDebug() << "Unable to parse time string " << time.item( 0 ).toElement().text();
                 }
 
                 d->m_totalTime = QTime( hours, minutes, seconds, 0 );
@@ -170,7 +170,7 @@
                   d->m_totalDistance *= METER2KM;
                 }
                 else if ( unit != "KM" ) {
-                  qWarning() << "Cannot parse distance unit " << unit << ", treated as km.";
+                  mDebug() << "Cannot parse distance unit " << unit << ", treated as km.";
                 }
               }
             }
--- trunk/KDE/kdeedu/marble/src/lib/routing/RoutingProxyModel.cpp #1121199:1121200
@@ -12,8 +12,6 @@
 
 #include "RoutingModel.h"
 
-#include <QtCore/QDebug>
-
 namespace Marble {
 
 RoutingProxyModel::RoutingProxyModel( QObject *parent ) :
--- trunk/KDE/kdeedu/marble/src/lib/routing/RoutingWidget.cpp #1121199:1121200
@@ -11,22 +11,21 @@
 #include "RoutingWidget.h"
 
 #include "GeoDataLineString.h"
-#include "MarblePlacemarkModel.h"
-#include "MarbleWidget.h"
 #include "MarbleMap.h"
 #include "MarbleModel.h"
-#include "MarbleDebug.h"
+#include "MarblePlacemarkModel.h"
+#include "MarbleWidget.h"
 #include "MarbleWidgetInputHandler.h"
-#include "RoutingModel.h"
-#include "RoutingManager.h"
+#include "RouteSkeleton.h"
+#include "RoutingInputWidget.h"
 #include "RoutingLayer.h"
+#include "RoutingManager.h"
+#include "RoutingModel.h"
 #include "RoutingProxyModel.h"
-#include "RoutingInputWidget.h"
-#include "RouteSkeleton.h"
 
 #include <QtCore/QTime>
-#include <QtGui/QSortFilterProxyModel>
 #include <QtGui/QFileDialog>
+#include <QtGui/QSortFilterProxyModel>
 
 #include "ui_RoutingWidget.h"
 
--- trunk/KDE/kdeedu/marble/src/lib/routing/YoursRoutingProvider.cpp #1121199:1121200
@@ -64,7 +64,7 @@
 
 void YoursRoutingProvider::handleError( QNetworkReply::NetworkError error )
 {
-    qWarning() << " Error when retrieving yournavigation.org route: " << error;
+    mDebug() << " Error when retrieving yournavigation.org route: " << error;
 }
 
 } // namespace Marble