[QGIS Commit] r8602 - trunk/qgis/src/core

[svn_qgis at osgeo.org]

Author: mhugent
Date: 2008-06-06 07:33:19 -0400 (Fri, 06 Jun 2008)
New Revision: 8602

Modified:
   trunk/qgis/src/core/qgsdistancearea.cpp
   trunk/qgis/src/core/qgsvectorlayer.cpp
Log:
changed some debug statements to use QgsDebugMsg

Modified: trunk/qgis/src/core/qgsdistancearea.cpp
===================================================================
--- trunk/qgis/src/core/qgsdistancearea.cpp	2008-06-06 06:41:11 UTC (rev 8601)
+++ trunk/qgis/src/core/qgsdistancearea.cpp	2008-06-06 11:33:19 UTC (rev 8602)
@@ -114,9 +114,7 @@
   // row for this ellipsoid wasn't found?
   if (radius.isEmpty() || parameter2.isEmpty())
   {
-#ifdef QGISDEBUG
-    std::cout << "setEllipsoid: no row in tbl_ellipsoid for acronym '" << ellipsoid.toLocal8Bit().data() << "'" << std::endl;
-#endif
+    QgsDebugMsg(QString("setEllipsoid: no row in tbl_ellipsoid for acronym '") + ellipsoid.toLocal8Bit().data() + "'")
     return false;
   }
   
@@ -125,9 +123,7 @@
     mSemiMajor = radius.mid(2).toDouble();
   else
   {
-#ifdef QGISDEBUG
-    std::cout << "setEllipsoid: wrong format of radius field: '" << radius.toLocal8Bit().data() << "'" << std::endl;
-#endif
+    QgsDebugMsg(QString("setEllipsoid: wrong format of radius field: '") + radius.toLocal8Bit().data() + "'")
     return false;
   }
   
@@ -146,15 +142,11 @@
   }
   else
   {
-#ifdef QGISDEBUG
-    std::cout << "setEllipsoid: wrong format of parameter2 field: '" << parameter2.toLocal8Bit().data() << "'" << std::endl;
-#endif
+    QgsDebugMsg(QString("setEllipsoid: wrong format of parameter2 field: '") + parameter2.toLocal8Bit().data() + "'")
     return false;
   }
   
-#ifdef QGISDEBUG
-    std::cout << "setEllipsoid: a=" << mSemiMajor << ", b=" << mSemiMinor << ", 1/f=" << mInvFlattening << std::endl;
-#endif
+  QgsDebugMsg(QString("setEllipsoid: a=") + mSemiMajor + ", b=" + mSemiMinor + ", 1/f=" + mInvFlattening)
 
 
   // get spatial ref system for ellipsoid

Modified: trunk/qgis/src/core/qgsvectorlayer.cpp
===================================================================
--- trunk/qgis/src/core/qgsvectorlayer.cpp	2008-06-06 06:41:11 UTC (rev 8601)
+++ trunk/qgis/src/core/qgsvectorlayer.cpp	2008-06-06 11:33:19 UTC (rev 8602)
@@ -2009,9 +2009,8 @@
   
 bool QgsVectorLayer::readXML_( QDomNode & layer_node )
 {
-#ifdef QGISDEBUG
-  std::cerr << "Datasource in QgsVectorLayer::readXML_: " << mDataSource.toLocal8Bit().data() << std::endl;
-#endif
+  QgsDebugMsg(QString("Datasource in QgsVectorLayer::readXML_: ") + mDataSource.toLocal8Bit().data());
+
   // process the attribute actions
   mActions->readXML(layer_node);
 
@@ -2131,17 +2130,14 @@
     setLabelOn(true);
   }
 
-#ifdef QGISDEBUG
-  std::cout << "Testing if qgsvectorlayer can call label readXML routine" << std::endl;
-#endif
+  QgsDebugMsg("Testing if qgsvectorlayer can call label readXML routine")
 
+
   QDomNode labelattributesnode = layer_node.namedItem("labelattributes");
 
   if(!labelattributesnode.isNull())
   {
-#ifdef QGISDEBUG
-    std::cout << "qgsvectorlayer calling label readXML routine" << std::endl;
-#endif
+    QgsDebugMsg("qgsvectorlayer calling label readXML routine")
     mLabel->readXML(labelattributesnode);
   }