From 7221eaa1f33518e76394ac80ef62f9d7b9105d8b Mon Sep 17 00:00:00 2001
From: "Juergen E. Fischer" <jef@norbit.de>
Date: Tue, 17 Apr 2012 22:44:47 +0200
Subject: [PATCH] fix dbmanager resource dependency and some other warnings

---
 python/plugins/db_manager/CMakeLists.txt            | 6 +++---
 python/plugins/db_manager/db_plugins/CMakeLists.txt | 6 +++---
 src/core/composer/qgscomposerscalebar.cpp           | 9 +++++++--
 src/core/qgsbrowsermodel.cpp                        | 1 -
 src/core/raster/qgsrasterlayer.cpp                  | 2 --
 src/ui/qgsoptionsbase.ui                            | 8 ++++----
 6 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/python/plugins/db_manager/CMakeLists.txt b/python/plugins/db_manager/CMakeLists.txt
index db19de7c2b0..1eb569650c4 100644
--- a/python/plugins/db_manager/CMakeLists.txt
+++ b/python/plugins/db_manager/CMakeLists.txt
@@ -1,5 +1,8 @@
 SET (DB_MANAGER_PLUGIN_DIR ${QGIS_DATA_DIR}/python/plugins/db_manager)
 
+ADD_SUBDIRECTORY(db_plugins)
+ADD_SUBDIRECTORY(icons)
+
 FILE(GLOB OTHER_FILES LICENCE README TODO)
 FILE(GLOB PY_FILES *.py)
 
@@ -12,6 +15,3 @@ INSTALL(FILES ${OTHER_FILES} DESTINATION ${DB_MANAGER_PLUGIN_DIR})
 INSTALL(FILES ${PY_FILES} DESTINATION ${DB_MANAGER_PLUGIN_DIR})
 INSTALL(FILES ui/__init__.py ${PYUI_FILES} DESTINATION ${DB_MANAGER_PLUGIN_DIR}/ui)
 INSTALL(FILES ${PYRC_FILES} DESTINATION ${DB_MANAGER_PLUGIN_DIR})
-
-ADD_SUBDIRECTORY(db_plugins)
-ADD_SUBDIRECTORY(icons)
diff --git a/python/plugins/db_manager/db_plugins/CMakeLists.txt b/python/plugins/db_manager/db_plugins/CMakeLists.txt
index 3d44c33439f..865bb13df1a 100644
--- a/python/plugins/db_manager/db_plugins/CMakeLists.txt
+++ b/python/plugins/db_manager/db_plugins/CMakeLists.txt
@@ -1,5 +1,5 @@
-FILE(GLOB PY_FILES *.py)
-INSTALL(FILES ${PY_FILES} DESTINATION ${DB_MANAGER_PLUGIN_DIR}/db_plugins)
-
 ADD_SUBDIRECTORY(postgis)
 ADD_SUBDIRECTORY(spatialite)
+
+FILE(GLOB PY_FILES *.py)
+INSTALL(FILES ${PY_FILES} DESTINATION ${DB_MANAGER_PLUGIN_DIR}/db_plugins)
diff --git a/src/core/composer/qgscomposerscalebar.cpp b/src/core/composer/qgscomposerscalebar.cpp
index 5c6ed8f845a..4c7ec97e4d6 100644
--- a/src/core/composer/qgscomposerscalebar.cpp
+++ b/src/core/composer/qgscomposerscalebar.cpp
@@ -28,8 +28,13 @@
 #include <QPainter>
 #include <cmath>
 
-QgsComposerScaleBar::QgsComposerScaleBar( QgsComposition* composition ): QgsComposerItem( composition ), mComposerMap( 0 ), mStyle( 0 ),
-    mNumUnitsPerSegment( 0 ), mSegmentMillimeters( 0.0 ), mAlignment( Left )
+QgsComposerScaleBar::QgsComposerScaleBar( QgsComposition* composition )
+  : QgsComposerItem( composition )
+  , mComposerMap( 0 )
+  , mNumUnitsPerSegment( 0 )
+  , mStyle( 0 )
+  , mSegmentMillimeters( 0.0 )
+  , mAlignment( Left )
 {
   applyDefaultSettings();
   applyDefaultSize();
diff --git a/src/core/qgsbrowsermodel.cpp b/src/core/qgsbrowsermodel.cpp
index 0cdc397d0f5..df1f1706f2f 100644
--- a/src/core/qgsbrowsermodel.cpp
+++ b/src/core/qgsbrowsermodel.cpp
@@ -113,7 +113,6 @@ Qt::ItemFlags QgsBrowserModel::flags( const QModelIndex & index ) const
   QgsDataItem* ptr = ( QgsDataItem* ) index.internalPointer();
   if ( ptr->type() == QgsDataItem::Layer )
   {
-    QgsLayerItem *layer = ( QgsLayerItem* ) ptr;
     flags |= Qt::ItemIsDragEnabled;
   }
   if ( ptr->acceptDrop() )
diff --git a/src/core/raster/qgsrasterlayer.cpp b/src/core/raster/qgsrasterlayer.cpp
index bd0a4481084..c3ac2452b2e 100644
--- a/src/core/raster/qgsrasterlayer.cpp
+++ b/src/core/raster/qgsrasterlayer.cpp
@@ -3261,8 +3261,6 @@ bool QgsRasterLayer::writeSymbology( QDomNode & layer_node, QDomDocument & docum
   QStringList sl = subLayers();
   QStringList sls = mDataProvider->subLayerStyles();
 
-  QStringList::const_iterator layerStyle = sls.begin();
-
   // <mDrawingStyle>
   QDomElement drawStyleElement = document.createElement( "mDrawingStyle" );
   QDomText    drawStyleText    = document.createTextNode( drawingStyleAsString() );
diff --git a/src/ui/qgsoptionsbase.ui b/src/ui/qgsoptionsbase.ui
index 4802fef2ff9..5367d7e464f 100644
--- a/src/ui/qgsoptionsbase.ui
+++ b/src/ui/qgsoptionsbase.ui
@@ -1615,7 +1615,7 @@
              <property name="title">
               <string>Other settings</string>
              </property>
-             <layout class="QGridLayout" name="gridLayout_12">
+             <layout class="QGridLayout" name="gridLayout_28">
               <item row="0" column="0">
                <widget class="QCheckBox" name="chkDisableAttributeValuesDlg">
                 <property name="text">
@@ -1647,7 +1647,7 @@
                <widget class="QComboBox" name="mValidateGeometries"/>
               </item>
               <item row="3" column="0">
-               <widget class="QLabel" name="label_21">
+               <widget class="QLabel" name="label_26">
                 <property name="text">
                  <string>Join style for curve offset</string>
                 </property>
@@ -1657,7 +1657,7 @@
                <widget class="QComboBox" name="mOffsetJoinStyleComboBox"/>
               </item>
               <item row="4" column="0">
-               <widget class="QLabel" name="label_22">
+               <widget class="QLabel" name="label_27">
                 <property name="text">
                  <string>Quadrantsegments for curve offset</string>
                 </property>
@@ -1667,7 +1667,7 @@
                <widget class="QSpinBox" name="mOffsetQuadSegSpinBox"/>
               </item>
               <item row="5" column="0">
-               <widget class="QLabel" name="label_23">
+               <widget class="QLabel" name="label_28">
                 <property name="text">
                  <string>Miter limit for curve offset</string>
                 </property>