[QGIS Commit] r14768 - in trunk/qgis/src: app plugins/offline_editing

[svn_qgis at osgeo.org]

Author: jef
Date: 2010-11-25 14:36:26 -0800 (Thu, 25 Nov 2010)
New Revision: 14768

Modified:
   trunk/qgis/src/app/CMakeLists.txt
   trunk/qgis/src/app/qgsmaptoolchangelabelproperties.h
   trunk/qgis/src/app/qgsmaptoolmovelabel.h
   trunk/qgis/src/app/qgsmaptoolrotatelabel.h
   trunk/qgis/src/app/qgsnewspatialitelayerdialog.cpp
   trunk/qgis/src/plugins/offline_editing/offline_editing.cpp
Log:
fix warnings

Modified: trunk/qgis/src/app/CMakeLists.txt
===================================================================
--- trunk/qgis/src/app/CMakeLists.txt	2010-11-25 22:06:16 UTC (rev 14767)
+++ trunk/qgis/src/app/CMakeLists.txt	2010-11-25 22:36:26 UTC (rev 14768)
@@ -189,8 +189,10 @@
   qgsmaptooladdisland.h
   qgsmaptooladdring.h
   qgsmaptoolmovefeature.h
+  qgsmaptoolmovelabel.h
   qgsmaptoolnodetool.h
   qgsmaptoolreshape.h
+  qgsmaptoolrotatelabel.h
   qgsmaptoolrotatepointsymbols.h
   qgsmaptoolselect.h
   qgsmaptoolselectrectangle.h
@@ -198,6 +200,7 @@
   qgsmaptoolselectpolygon.h
   qgsmaptoolselectradius.h
   qgsmaptooladdvertex.h
+  qgsmaptoolchangelabelproperties.h
   qgsmaptooldeletering.h
   qgsmaptooldeletepart.h
   qgsmaptooldeletevertex.h

Modified: trunk/qgis/src/app/qgsmaptoolchangelabelproperties.h
===================================================================
--- trunk/qgis/src/app/qgsmaptoolchangelabelproperties.h	2010-11-25 22:06:16 UTC (rev 14767)
+++ trunk/qgis/src/app/qgsmaptoolchangelabelproperties.h	2010-11-25 22:36:26 UTC (rev 14768)
@@ -22,6 +22,8 @@
 
 class QgsMapToolChangeLabelProperties: public QgsMapToolLabel
 {
+    Q_OBJECT
+
   public:
     QgsMapToolChangeLabelProperties( QgsMapCanvas* canvas );
     ~QgsMapToolChangeLabelProperties();

Modified: trunk/qgis/src/app/qgsmaptoolmovelabel.h
===================================================================
--- trunk/qgis/src/app/qgsmaptoolmovelabel.h	2010-11-25 22:06:16 UTC (rev 14767)
+++ trunk/qgis/src/app/qgsmaptoolmovelabel.h	2010-11-25 22:36:26 UTC (rev 14768)
@@ -23,6 +23,8 @@
 /**A map tool for dragging label positions*/
 class QgsMapToolMoveLabel: public QgsMapToolLabel
 {
+    Q_OBJECT
+
   public:
     QgsMapToolMoveLabel( QgsMapCanvas* canvas );
     ~QgsMapToolMoveLabel();

Modified: trunk/qgis/src/app/qgsmaptoolrotatelabel.h
===================================================================
--- trunk/qgis/src/app/qgsmaptoolrotatelabel.h	2010-11-25 22:06:16 UTC (rev 14767)
+++ trunk/qgis/src/app/qgsmaptoolrotatelabel.h	2010-11-25 22:36:26 UTC (rev 14768)
@@ -23,6 +23,8 @@
 
 class QgsMapToolRotateLabel: public QgsMapToolLabel
 {
+    Q_OBJECT
+
   public:
     QgsMapToolRotateLabel( QgsMapCanvas* canvas );
     ~QgsMapToolRotateLabel();

Modified: trunk/qgis/src/app/qgsnewspatialitelayerdialog.cpp
===================================================================
--- trunk/qgis/src/app/qgsnewspatialitelayerdialog.cpp	2010-11-25 22:06:16 UTC (rev 14767)
+++ trunk/qgis/src/app/qgsnewspatialitelayerdialog.cpp	2010-11-25 22:36:26 UTC (rev 14768)
@@ -223,7 +223,7 @@
   ret = sqlite3_exec( sqlite_handle, sql, NULL, NULL, &errMsg );
   if ( ret != SQLITE_OK )
   {
-    QString errCause = tr( "Unable to initialize SpatialMetedata:\n" );
+    QString errCause = tr( "Unable to initialize SpatialMetadata:\n" );
     errCause += QString::fromUtf8( errMsg );
     QMessageBox::warning( 0, tr( "SpatiaLite Database" ), errCause );
     sqlite3_free( errMsg );

Modified: trunk/qgis/src/plugins/offline_editing/offline_editing.cpp
===================================================================
--- trunk/qgis/src/plugins/offline_editing/offline_editing.cpp	2010-11-25 22:06:16 UTC (rev 14767)
+++ trunk/qgis/src/plugins/offline_editing/offline_editing.cpp	2010-11-25 22:36:26 UTC (rev 14768)
@@ -289,7 +289,7 @@
   ret = sqlite3_exec( sqlite_handle, sql, NULL, NULL, &errMsg );
   if ( ret != SQLITE_OK )
   {
-    QString errCause = tr( "Unable to initialize SpatialMetedata:\n" );
+    QString errCause = tr( "Unable to initialize SpatialMetadata:\n" );
     errCause += QString::fromUtf8( errMsg );
     showWarning( errCause );
     sqlite3_free( errMsg );