fix doxygen and 'unused' warnings

qgis · Apr 13, 2013 · 27f65c2355ef51ba026b4da505ca96f6d78fdfde · 27f65c2
1 parent cae6d66
commit 27f65c2355ef51ba026b4da505ca96f6d78fdfde
Unified Split

Showing with 18 additions and 21 deletions.

+0 −2 cmake_templates/Doxyfile.in

+2 −11 src/app/qgisapp.cpp

+16 −8 src/core/raster/qgsrasterinterface.h
diff --git a/cmake_templates/Doxyfile.in b/cmake_templates/Doxyfile.in
@@ -596,8 +596,6 @@ INPUT                  = @CMAKE_SOURCE_DIR@/doc \
                          @CMAKE_SOURCE_DIR@/src/core \
                          @CMAKE_SOURCE_DIR@/src/core/composer \
                          @CMAKE_SOURCE_DIR@/src/core/raster \
-                         @CMAKE_SOURCE_DIR@/src/core/renderer \
-                         @CMAKE_SOURCE_DIR@/src/core/symbology \
                          @CMAKE_SOURCE_DIR@/src/core/symbology-ng \
                          @CMAKE_SOURCE_DIR@/src/core/gps \
                          @CMAKE_SOURCE_DIR@/src/gui \

diff --git a/src/app/qgisapp.cpp b/src/app/qgisapp.cpp
@@ -3532,17 +3532,6 @@ bool QgisApp::addProject( QString projectFile )
   mMapCanvas->setCanvasColor( myColor ); //this is fill color before rendering starts
   QgsDebugMsg( "Canvas background color restored..." );
 
-  //set the color for selections
-  QSettings settings;
-  int defaultRed = settings.value( "/qgis/default_selection_color_red", 255 ).toInt();
-  int defaultGreen = settings.value( "/qgis/default_selection_color_green", 255 ).toInt();
-  int defaultBlue = settings.value( "/qgis/default_selection_color_blue", 0 ).toInt();
-  int defaultAlpha = settings.value( "/qgis/default_selection_color_alpha", 255 ).toInt();
-  int myRed = QgsProject::instance()->readNumEntry( "Gui", "/SelectionColorRedPart", defaultRed );
-  int myGreen = QgsProject::instance()->readNumEntry( "Gui", "/SelectionColorGreenPart", defaultGreen );
-  int myBlue = QgsProject::instance()->readNumEntry( "Gui", "/SelectionColorBluePart", defaultBlue );
-  int myAlpha = QgsProject::instance()->readNumEntry( "Gui", "/SelectionColorAlphaPart", defaultAlpha );
-
   //load project scales
   bool projectScales = QgsProject::instance()->readBoolEntry( "Scales", "/useProjectScales" );
   if ( projectScales )
@@ -3553,6 +3542,8 @@ bool QgisApp::addProject( QString projectFile )
   mMapCanvas->updateScale();
   QgsDebugMsg( "Scale restored..." );
 
+  QSettings settings;
+
   // does the project have any macros?
   if ( mPythonUtils && mPythonUtils->isEnabled() )
   {

diff --git a/src/core/raster/qgsrasterinterface.h b/src/core/raster/qgsrasterinterface.h
@@ -136,31 +136,39 @@ class CORE_EXPORT QgsRasterInterface
      * @return No data value */
     //virtual double noDataValue( int bandNo ) const { Q_UNUSED( bandNo ); return std::numeric_limits<double>::quiet_NaN(); }
 
+#if 0
     /** Test if value is nodata for specific band
      * @param bandNo band number
      * @param value tested value
      * @return true if value is nodata */
-    //virtual bool isNoDataValue( int bandNo, double value ) const;
+    virtual bool isNoDataValue( int bandNo, double value ) const;
+#endif
 
     /** Read block of data using given extent and size.
      *  Returns pointer to data.
      *  Caller is responsible to free the memory returned.
+     * @param bandNo band number
+     * @param extent extent of block
+     * @param width pixel width of block
+     * @param height pixel height of block
      */
-    //void *block( int bandNo, const QgsRectangle &extent, int width, int height );
     virtual QgsRasterBlock *block( int bandNo, const QgsRectangle &extent, int width, int height ) = 0;
+    //void *block( int bandNo, const QgsRectangle &extent, int width, int height );
 
+#if 0
     /** Read block of data using given extent and size.
      *  Method to be implemented by subclasses.
      *  Returns pointer to data.
      *  Caller is responsible to free the memory returned.
      */
-    //virtual void *readBlock( int bandNo, const QgsRectangle &extent, int width, int height )
-    //virtual QgsRasterBlock *readBlock( int bandNo, const QgsRectangle &extent, int width, int height ) const = 0;
+    virtual void *readBlock( int bandNo, const QgsRectangle &extent, int width, int height )
+    virtual QgsRasterBlock *readBlock( int bandNo, const QgsRectangle &extent, int width, int height ) const = 0;
 
-    //{
-    //  Q_UNUSED( bandNo ); Q_UNUSED( extent ); Q_UNUSED( width ); Q_UNUSED( height );
-    //  return new QgsRasterBlock();
-    //}
+    {
+      Q_UNUSED( bandNo ); Q_UNUSED( extent ); Q_UNUSED( width ); Q_UNUSED( height );
+      return new QgsRasterBlock();
+    }
+#endif
 
     /** Set input.
       * Returns true if set correctly, false if cannot use that input */