From 623c86b1446b5eb9b48096a410bc9d448bdc63fc Mon Sep 17 00:00:00 2001 From: jef Date: Sat, 28 Jun 2008 21:20:54 +0000 Subject: [PATCH] fix some lupdate warnings git-svn-id: http://svn.osgeo.org/qgis/trunk@8682 c8812cc2-4d05-0410-92ff-de0c093fc19c --- src/app/CMakeLists.txt | 4 ++++ src/app/qgsdbtablemodel.h | 1 + src/app/qgsmaptoolsplitfeatures.h | 1 + src/app/qgsmaptoolvertexedit.h | 2 ++ src/app/qgsmeasuretool.h | 1 + src/core/raster/qgsrasterlayer.h | 4 ++-- src/providers/delimitedtext/CMakeLists.txt | 3 +++ src/providers/delimitedtext/qgsdelimitedtextprovider.h | 2 ++ src/providers/gpx/CMakeLists.txt | 8 ++++++-- src/providers/gpx/qgsgpxprovider.h | 1 + 10 files changed, 23 insertions(+), 4 deletions(-) diff --git a/src/app/CMakeLists.txt b/src/app/CMakeLists.txt index 2f045988646a..1a019e6d5cea 100644 --- a/src/app/CMakeLists.txt +++ b/src/app/CMakeLists.txt @@ -100,6 +100,9 @@ SET (QGIS_APP_MOC_HDRS qgsludialog.h qgsmaplayerinterface.h qgsmaptoolidentify.h + qgsmaptoolsplitfeatures.h + qgsmaptoolvertexedit.h + qgsmeasuretool.h qgsmeasuredialog.h qgsnewhttpconnection.h qgsoptions.h @@ -114,6 +117,7 @@ SET (QGIS_APP_MOC_HDRS qgssnappingdialog.h qgsuniquevaluedialog.h qgsvectorlayerproperties.h + qgsdbtablemodel.h composer/qgscomposer.h composer/qgscomposerlabel.h diff --git a/src/app/qgsdbtablemodel.h b/src/app/qgsdbtablemodel.h index b0827092eb71..7f2003511156 100644 --- a/src/app/qgsdbtablemodel.h +++ b/src/app/qgsdbtablemodel.h @@ -23,6 +23,7 @@ schemas are the root elements that contain the individual tables as children. The tables have the following columns: Type, Schema, Tablename, Geometry Column, Sql*/ class QgsDbTableModel: public QStandardItemModel { + Q_OBJECT; public: QgsDbTableModel(); ~QgsDbTableModel(); diff --git a/src/app/qgsmaptoolsplitfeatures.h b/src/app/qgsmaptoolsplitfeatures.h index 6bb7b8bcbd60..c671e399a38f 100644 --- a/src/app/qgsmaptoolsplitfeatures.h +++ b/src/app/qgsmaptoolsplitfeatures.h @@ -22,6 +22,7 @@ /**A map tool that draws a line and splits the features cut by the line*/ class QgsMapToolSplitFeatures: public QgsMapToolCapture { + Q_OBJECT; public: QgsMapToolSplitFeatures(QgsMapCanvas* canvas); virtual ~QgsMapToolSplitFeatures(); diff --git a/src/app/qgsmaptoolvertexedit.h b/src/app/qgsmaptoolvertexedit.h index 08baf54f360c..fff116c66e7c 100644 --- a/src/app/qgsmaptoolvertexedit.h +++ b/src/app/qgsmaptoolvertexedit.h @@ -26,6 +26,8 @@ QgsMapToolDeleteVertex*/ class QgsMapToolVertexEdit: public QgsMapToolEdit { + Q_OBJECT; + public: QgsMapToolVertexEdit(QgsMapCanvas* canvas); diff --git a/src/app/qgsmeasuretool.h b/src/app/qgsmeasuretool.h index 6f0039866f18..91ed2bd8f32e 100644 --- a/src/app/qgsmeasuretool.h +++ b/src/app/qgsmeasuretool.h @@ -29,6 +29,7 @@ class QgsRubberBand; class QgsMeasureTool : public QgsMapTool { + Q_OBJECT; public: diff --git a/src/core/raster/qgsrasterlayer.h b/src/core/raster/qgsrasterlayer.h index 9b4cd4e430fe..026d8b8a6f0f 100644 --- a/src/core/raster/qgsrasterlayer.h +++ b/src/core/raster/qgsrasterlayer.h @@ -101,14 +101,14 @@ * myRasterLayer->setDrawingStyle(QgsRasterLayer::SINGLE_BAND_PSEUDO_COLOR); * } * - * Raster layers can also have an arbitary level of transparency defined, and have their + * Raster layers can also have an arbitrary level of transparency defined, and have their * color palettes inverted using the setTransparency and setInvertHistogramFlag methods. * * Pseudocolor images can have their output adjusted to a given number of standard * deviations using the setStdDevsToPlot method. * * The final area of functionality you may be interested in is band mapping. Band mapping - * allows you to choose arbitary band -> color mappings and is applicable only to PALETTE + * allows you to choose arbitrary band -> color mappings and is applicable only to PALETTE * and MULTIBAND rasters, There are four mappings that can be made: red, green, blue and gray. * Mappings are non-exclusive. That is a given band can be assigned to no, some or all * color mappings. The constructor sets sensible defaults for band mappings but these can be diff --git a/src/providers/delimitedtext/CMakeLists.txt b/src/providers/delimitedtext/CMakeLists.txt index 45bbec59f6ab..3687a621a0cd 100644 --- a/src/providers/delimitedtext/CMakeLists.txt +++ b/src/providers/delimitedtext/CMakeLists.txt @@ -4,6 +4,9 @@ SET (DTEXT_SRCS qgsdelimitedtextprovider.cpp) +SET (DTEXT_MOC_HDRS + qgsdelimitedtextprovider.h +) ######################################################## # Build diff --git a/src/providers/delimitedtext/qgsdelimitedtextprovider.h b/src/providers/delimitedtext/qgsdelimitedtextprovider.h index 2a1393eae9ba..523c609a8822 100644 --- a/src/providers/delimitedtext/qgsdelimitedtextprovider.h +++ b/src/providers/delimitedtext/qgsdelimitedtextprovider.h @@ -42,6 +42,8 @@ class QTextStream; */ class QgsDelimitedTextProvider : public QgsVectorDataProvider { + Q_OBJECT; + public: QgsDelimitedTextProvider(QString uri = QString()); diff --git a/src/providers/gpx/CMakeLists.txt b/src/providers/gpx/CMakeLists.txt index 81b29d385598..e1eb1501abe4 100644 --- a/src/providers/gpx/CMakeLists.txt +++ b/src/providers/gpx/CMakeLists.txt @@ -2,7 +2,11 @@ ######################################################## # Files -SET (OGR_SRCS qgsgpxprovider.cpp gpsdata.cpp) +SET (GPX_SRCS qgsgpxprovider.cpp gpsdata.cpp) + +SET (GPX_MOC_HDRS + qgsgpxprovider.h +) ######################################################## @@ -14,7 +18,7 @@ INCLUDE_DIRECTORIES( ${EXPAT_INCLUDE_DIR} ) -ADD_LIBRARY(gpxprovider MODULE ${OGR_SRCS}) +ADD_LIBRARY(gpxprovider MODULE ${GPX_SRCS}) TARGET_LINK_LIBRARIES(gpxprovider ${QT_QTCORE_LIBRARY} diff --git a/src/providers/gpx/qgsgpxprovider.h b/src/providers/gpx/qgsgpxprovider.h index dcdfcd9c2229..c771e9719ace 100644 --- a/src/providers/gpx/qgsgpxprovider.h +++ b/src/providers/gpx/qgsgpxprovider.h @@ -37,6 +37,7 @@ class GPSData; */ class QgsGPXProvider : public QgsVectorDataProvider { + Q_OBJECT; public: