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

[Patrick Spendrin]

SVN commit 1049551 by sengels:

- replace QDebug with MarbleDebug.h
- add option --debug-info

 M  +1 -2      KdeMainWindow.cpp  
 M  +1 -1      MarbleTest.cpp  
 M  +1 -1      QtMainWindow.cpp  
 M  +8 -1      kdemain.cpp  
 M  +5 -0      qtmain.cpp  


--- trunk/KDE/kdeedu/marble/src/KdeMainWindow.cpp #1049550:1049551
@@ -21,13 +21,12 @@
 #include <kparts/part.h>
 #include <kparts/componentfactory.h>
 
-#include <QtCore/QDebug>
-
 // GeoData
 #include <GeoSceneDocument.h>
 #include <GeoSceneHead.h>
 
 // Local dir
+#include "MarbleDebug.h"
 #include "ControlView.h"
 #include "marble_part.h"
 
--- trunk/KDE/kdeedu/marble/src/MarbleTest.cpp #1049550:1049551
@@ -12,12 +12,12 @@
 #include "MarbleTest.h"
 
 #include <QtCore/QCoreApplication>
-#include <QtCore/QDebug>
 #include <QtCore/QTime>
 #include <QtGui/QMessageBox>
 #include <QtGui/QFileDialog>
 
 #include <global.h>
+#include <MarbleDebug.h>
 #include <MarbleWidget.h>
 #include <MarbleModel.h>
 
--- trunk/KDE/kdeedu/marble/src/QtMainWindow.cpp #1049550:1049551
@@ -11,7 +11,7 @@
 
 #include "QtMainWindow.h"
 
-#include <QtCore/QDebug>
+#include "MarbleDebug.h"
 #include <QtCore/QList>
 #include <QtCore/QSettings>
 #include <QtCore/QUrl>
--- trunk/KDE/kdeedu/marble/src/kdemain.cpp #1049550:1049551
@@ -19,10 +19,10 @@
 #include <KGlobal>
 
 #include <QtCore/QFile>
-#include <QtCore/QDebug>
  
 #include "ControlView.h"
 #include "KdeMainWindow.h"
+#include "MarbleDebug.h"
 
 #include "MarbleTest.h"
 
@@ -218,6 +218,7 @@
 
     
     KCmdLineOptions  options;
+    options.add( "debug-info", ki18n( "Enable debug output") );
     options.add( "timedemo", ki18n( "Make a time measurement to check performance" ) );
     options.add( "gpsdemo", ki18n( "Check speed of gps drawing" ) );
     options.add( "fps", ki18n( "Show frame rate" ) );
@@ -241,6 +242,12 @@
         }
     }
 
+    if ( args->isSet( "debug-info" ) ) {
+        MarbleDebug::enable = true;
+    } else {
+        MarbleDebug::enable = false;
+    }
+    
     MainWindow *window = new MainWindow();
     window->setAttribute( Qt::WA_DeleteOnClose, true );
     window->show();
--- trunk/KDE/kdeedu/marble/src/qtmain.cpp #1049550:1049551
@@ -19,6 +19,7 @@
 #include "QtMainWindow.h"
 
 #include "MarbleDirs.h"
+#include "MarbleDebug.h"
 #include "MarbleTest.h"
 
 #ifdef STATIC_BUILD
@@ -87,6 +88,10 @@
     int dataPathIndex=0;
 
     for ( int i = 1; i < argc - 1; ++i ) {
+        if ( strcmp( argv[ i ], "--debug-info" ) == 0 )
+        {
+            MarbleDebug::enable = true;
+        }
         if ( strcmp( argv[ i ], "--marbleDataPath" ) == 0 )
         {
             dataPathIndex = i + 1;