- removed legacy macro QgsDebug and changed remaining occurences of it to QgsDebugMsg

- moved #include "qgsconfig.h" from qgis.h to qgis.cpp so it doesn't spit many warnings when building bindings because of redefined PREFIX


git-svn-id: http://svn.osgeo.org/qgis/trunk@6730 c8812cc2-4d05-0410-92ff-de0c093fc19c

Author: wonder

src/app/qgsvectorlayerproperties.cpp

@@ -18,18 +18,21 @@
  /* $Id$ */
 
 #include "qgsvectorlayerproperties.h"
+
 #include "qgsattributeactiondialog.h"
+#include "qgscontexthelp.h"
 #include "qgscontinuouscolordialog.h"
 #include "qgscoordinatetransform.h"
 #include "qgsgraduatedsymboldialog.h"
 #include "qgslabel.h"
 #include "qgslabeldialog.h"
 #include "qgslayerprojectionselector.h"
+#include "qgslogger.h"
 #include "qgssinglesymboldialog.h"
 #include "qgsuniquevaluedialog.h"
 #include "qgsvectordataprovider.h"
 #include "qgsvectorlayer.h"
-#include "qgscontexthelp.h"
+
 #ifdef HAVE_POSTGRESQL
 #include "qgspgquerybuilder.h"
 #include "../providers/postgres/qgspostgresprovider.h"
@@ -407,7 +410,7 @@ QString QgsVectorLayerProperties::getMetadata()
 
   if ( vectorType < 0 || vectorType > QGis::Polygon )
   {
-      QgsDebug( "Invalid vector type" );
+      QgsDebugMsg( "Invalid vector type" );
   }
   else
   {
@@ -496,7 +499,7 @@ QString QgsVectorLayerProperties::getMetadata()
   }
   catch(QgsCsException &cse)
   {
-    QgsDebug( cse.what() );
+    QgsDebugMsg( cse.what() );
 
     myMetadataQString += "<tr><td bgcolor=\"white\">";
     myMetadataQString += tr("In project spatial reference system units : ");

src/core/qgis.cpp

@@ -3,6 +3,9 @@
 #ifndef QGSSVNVERSION
 #include "qgssvnversion.h"
 #endif
+
+#include "qgsconfig.h"
+
 // Version constants
 //
 

src/core/qgis.h

@@ -28,7 +28,6 @@
 *
 * This API documentation provides information about all classes that make up QGIS.
 */
-#include "qgsconfig.h"
 
 #include <qevent.h>
 
@@ -132,22 +131,4 @@ class CORE_EXPORT QGis
   const int USER_PROJECTION_START_ID=100000;
 
 
-
-/** debugging convenience function
-
-  Wrapper round qDebug() that's only embedded if QGISDEBUG set, thus
-  elminating large blocks of #ifdef/#endif text.  Also uses GNU g++
-  __FUNCTION__ extension if that compiler used.
-
-*/
-#ifdef QGISDEBUG
-#ifdef __GNUG__
-#define QgsDebug(str) qDebug("%s:%d %s, %s", __FILE__, __LINE__, __FUNCTION__, str)
-#else
-#define QgsDebug(str) qDebug("%s:%d %s", __FILE__, __LINE__, str)
-#endif
-#else
-#define QgsDebug(str)
-#endif
-
 #endif

src/core/qgsproject.cpp

@@ -324,7 +324,7 @@ QgsProject * QgsProject::theProject_;
       */ 
      void clear()
      {
-         QgsDebug( "Clearing project properties Impl->clear();" );
+         QgsDebugMsg( "Clearing project properties Impl->clear();" );
 
          properties_.clearKeys();
          title = "";
@@ -582,7 +582,7 @@ static QString _getVersion(QDomDocument const &doc)
 
     if (!nl.count())
     {
-        QgsDebug(" unable to find qgis element in project file");
+        QgsDebugMsg(" unable to find qgis element in project file");
         return "";
     }
 

src/core/qgsvectorlayer.cpp

@@ -1724,7 +1724,7 @@ bool QgsVectorLayer::setDataProvider( QString const & provider )
   }
   else
   {
-    QgsDebug( " unable to get data provider" );
+    QgsDebugMsg( " unable to get data provider" );
 
     return false;
   }