[QGIS Commit] r8461 - in trunk/qgis/src: app app/composer core

[svn_qgis at osgeo.org]

Author: timlinux
Date: 2008-05-19 09:14:56 -0400 (Mon, 19 May 2008)
New Revision: 8461

Modified:
   trunk/qgis/src/app/composer/qgscomposition.cpp
   trunk/qgis/src/app/qgsmaptooladdfeature.cpp
   trunk/qgis/src/app/qgsmaptoolcapture.cpp
   trunk/qgis/src/app/qgsvectorlayerproperties.cpp
   trunk/qgis/src/core/qgsdistancearea.cpp
   trunk/qgis/src/core/qgslabel.cpp
   trunk/qgis/src/core/qgsmaprender.cpp
Log:
Use qt Q_UNUSED for unused params rather

Modified: trunk/qgis/src/app/composer/qgscomposition.cpp
===================================================================
--- trunk/qgis/src/app/composer/qgscomposition.cpp	2008-05-19 13:06:03 UTC (rev 8460)
+++ trunk/qgis/src/app/composer/qgscomposition.cpp	2008-05-19 13:14:56 UTC (rev 8461)
@@ -623,7 +623,7 @@
   }
   catch (std::bad_alloc& ba)
   {
-    UNUSED(ba);
+    Q_UNUSED(ba);
     // A better solution here would be to set the canvas back to the
     // original size and carry on, but for the moment this will
     // prevent a crash due to an uncaught exception.

Modified: trunk/qgis/src/app/qgsmaptooladdfeature.cpp
===================================================================
--- trunk/qgis/src/app/qgsmaptooladdfeature.cpp	2008-05-19 13:06:03 UTC (rev 8460)
+++ trunk/qgis/src/app/qgsmaptooladdfeature.cpp	2008-05-19 13:14:56 UTC (rev 8461)
@@ -108,7 +108,7 @@
         }
         catch(QgsCsException &cse)
         {
-          UNUSED(cse);
+          Q_UNUSED(cse);
           QMessageBox::information(0, QObject::tr("Coordinate transform error"), \
                                    QObject::tr("Cannot transform the point to the layers coordinate system"));
           return;

Modified: trunk/qgis/src/app/qgsmaptoolcapture.cpp
===================================================================
--- trunk/qgis/src/app/qgsmaptoolcapture.cpp	2008-05-19 13:06:03 UTC (rev 8460)
+++ trunk/qgis/src/app/qgsmaptoolcapture.cpp	2008-05-19 13:14:56 UTC (rev 8461)
@@ -106,7 +106,7 @@
     }
   catch(QgsCsException &cse)
     {
-		  UNUSED(cse);
+		  Q_UNUSED(cse);
       return 2;
     }
 
@@ -123,7 +123,7 @@
 	}
       catch(QgsCsException &cse)
 	{
-    UNUSED (cse);
+    Q_UNUSED (cse);
 	  return 2;
 	}
       mRubberBand->addPoint(mapPoint);

Modified: trunk/qgis/src/app/qgsvectorlayerproperties.cpp
===================================================================
--- trunk/qgis/src/app/qgsvectorlayerproperties.cpp	2008-05-19 13:06:03 UTC (rev 8460)
+++ trunk/qgis/src/app/qgsvectorlayerproperties.cpp	2008-05-19 13:14:56 UTC (rev 8461)
@@ -526,7 +526,7 @@
   }
   catch(QgsCsException &cse)
   {
-    UNUSED(cse);
+    Q_UNUSED(cse);
     QgsDebugMsg( cse.what() );
 
     myMetedata += "<tr><td>";

Modified: trunk/qgis/src/core/qgsdistancearea.cpp
===================================================================
--- trunk/qgis/src/core/qgsdistancearea.cpp	2008-05-19 13:06:03 UTC (rev 8460)
+++ trunk/qgis/src/core/qgsdistancearea.cpp	2008-05-19 13:14:56 UTC (rev 8461)
@@ -282,7 +282,7 @@
   }
   catch (QgsCsException &cse)
   {
-    UNUSED(cse);
+    Q_UNUSED(cse);
     QgsLogger::warning(QObject::tr("Caught a coordinate system exception while trying to transform a point. Unable to calculate line length."));
     return 0.0;
   }
@@ -307,7 +307,7 @@
   }
   catch (QgsCsException &cse)
   {
-    UNUSED(cse);
+    Q_UNUSED(cse);
     QgsLogger::warning(QObject::tr("Caught a coordinate system exception while trying to transform a point. Unable to calculate line length."));
     return 0.0;
   }
@@ -369,7 +369,7 @@
   }
   catch (QgsCsException &cse)
   {
-    UNUSED(cse);
+    Q_UNUSED(cse);
     QgsLogger::warning(QObject::tr("Caught a coordinate system exception while trying to transform a point. Unable to calculate polygon area."));
   }
   
@@ -398,7 +398,7 @@
   }
   catch (QgsCsException &cse)
   {
-    UNUSED(cse);
+    Q_UNUSED(cse);
     QgsLogger::warning(QObject::tr("Caught a coordinate system exception while trying to transform a point. Unable to calculate polygon area."));
     return 0.0;
   }

Modified: trunk/qgis/src/core/qgslabel.cpp
===================================================================
--- trunk/qgis/src/core/qgslabel.cpp	2008-05-19 13:06:03 UTC (rev 8460)
+++ trunk/qgis/src/core/qgslabel.cpp	2008-05-19 13:14:56 UTC (rev 8461)
@@ -351,7 +351,7 @@
       }
       catch(QgsCsException &cse)
       {
-        UNUSED(cse); // unused otherwise
+        Q_UNUSED(cse); // unused otherwise
         QgsDebugMsg("Caught transform error in QgsLabel::renderLabel(). "
                     "Skipping rendering this label");
         return;

Modified: trunk/qgis/src/core/qgsmaprender.cpp
===================================================================
--- trunk/qgis/src/core/qgsmaprender.cpp	2008-05-19 13:06:03 UTC (rev 8460)
+++ trunk/qgis/src/core/qgsmaprender.cpp	2008-05-19 13:14:56 UTC (rev 8461)
@@ -541,7 +541,7 @@
     }
     catch (QgsCsException &cse)
     {
-      UNUSED(cse);
+      Q_UNUSED(cse);
       QgsLogger::warning("Transform error caught in " + QString(__FILE__) + ", line " + QString::number(__LINE__));
       extent = QgsRect(-DBL_MAX, -DBL_MAX, DBL_MAX, DBL_MAX);
       r2     = QgsRect(-DBL_MAX, -DBL_MAX, DBL_MAX, DBL_MAX);