Skip to content

Commit 27f65c2

Browse files
committed
fix doxygen and 'unused' warnings
1 parent cae6d66 commit 27f65c2

File tree

3 files changed

+18
-21
lines changed

3 files changed

+18
-21
lines changed

cmake_templates/Doxyfile.in

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -596,8 +596,6 @@ INPUT = @CMAKE_SOURCE_DIR@/doc \
596596
@CMAKE_SOURCE_DIR@/src/core \
597597
@CMAKE_SOURCE_DIR@/src/core/composer \
598598
@CMAKE_SOURCE_DIR@/src/core/raster \
599-
@CMAKE_SOURCE_DIR@/src/core/renderer \
600-
@CMAKE_SOURCE_DIR@/src/core/symbology \
601599
@CMAKE_SOURCE_DIR@/src/core/symbology-ng \
602600
@CMAKE_SOURCE_DIR@/src/core/gps \
603601
@CMAKE_SOURCE_DIR@/src/gui \

src/app/qgisapp.cpp

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -3532,17 +3532,6 @@ bool QgisApp::addProject( QString projectFile )
35323532
mMapCanvas->setCanvasColor( myColor ); //this is fill color before rendering starts
35333533
QgsDebugMsg( "Canvas background color restored..." );
35343534

3535-
//set the color for selections
3536-
QSettings settings;
3537-
int defaultRed = settings.value( "/qgis/default_selection_color_red", 255 ).toInt();
3538-
int defaultGreen = settings.value( "/qgis/default_selection_color_green", 255 ).toInt();
3539-
int defaultBlue = settings.value( "/qgis/default_selection_color_blue", 0 ).toInt();
3540-
int defaultAlpha = settings.value( "/qgis/default_selection_color_alpha", 255 ).toInt();
3541-
int myRed = QgsProject::instance()->readNumEntry( "Gui", "/SelectionColorRedPart", defaultRed );
3542-
int myGreen = QgsProject::instance()->readNumEntry( "Gui", "/SelectionColorGreenPart", defaultGreen );
3543-
int myBlue = QgsProject::instance()->readNumEntry( "Gui", "/SelectionColorBluePart", defaultBlue );
3544-
int myAlpha = QgsProject::instance()->readNumEntry( "Gui", "/SelectionColorAlphaPart", defaultAlpha );
3545-
35463535
//load project scales
35473536
bool projectScales = QgsProject::instance()->readBoolEntry( "Scales", "/useProjectScales" );
35483537
if ( projectScales )
@@ -3553,6 +3542,8 @@ bool QgisApp::addProject( QString projectFile )
35533542
mMapCanvas->updateScale();
35543543
QgsDebugMsg( "Scale restored..." );
35553544

3545+
QSettings settings;
3546+
35563547
// does the project have any macros?
35573548
if ( mPythonUtils && mPythonUtils->isEnabled() )
35583549
{

src/core/raster/qgsrasterinterface.h

Lines changed: 16 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -136,31 +136,39 @@ class CORE_EXPORT QgsRasterInterface
136136
* @return No data value */
137137
//virtual double noDataValue( int bandNo ) const { Q_UNUSED( bandNo ); return std::numeric_limits<double>::quiet_NaN(); }
138138

139+
#if 0
139140
/** Test if value is nodata for specific band
140141
* @param bandNo band number
141142
* @param value tested value
142143
* @return true if value is nodata */
143-
//virtual bool isNoDataValue( int bandNo, double value ) const;
144+
virtual bool isNoDataValue( int bandNo, double value ) const;
145+
#endif
144146

145147
/** Read block of data using given extent and size.
146148
* Returns pointer to data.
147149
* Caller is responsible to free the memory returned.
150+
* @param bandNo band number
151+
* @param extent extent of block
152+
* @param width pixel width of block
153+
* @param height pixel height of block
148154
*/
149-
//void *block( int bandNo, const QgsRectangle &extent, int width, int height );
150155
virtual QgsRasterBlock *block( int bandNo, const QgsRectangle &extent, int width, int height ) = 0;
156+
//void *block( int bandNo, const QgsRectangle &extent, int width, int height );
151157

158+
#if 0
152159
/** Read block of data using given extent and size.
153160
* Method to be implemented by subclasses.
154161
* Returns pointer to data.
155162
* Caller is responsible to free the memory returned.
156163
*/
157-
//virtual void *readBlock( int bandNo, const QgsRectangle &extent, int width, int height )
158-
//virtual QgsRasterBlock *readBlock( int bandNo, const QgsRectangle &extent, int width, int height ) const = 0;
164+
virtual void *readBlock( int bandNo, const QgsRectangle &extent, int width, int height )
165+
virtual QgsRasterBlock *readBlock( int bandNo, const QgsRectangle &extent, int width, int height ) const = 0;
159166

160-
//{
161-
// Q_UNUSED( bandNo ); Q_UNUSED( extent ); Q_UNUSED( width ); Q_UNUSED( height );
162-
// return new QgsRasterBlock();
163-
//}
167+
{
168+
Q_UNUSED( bandNo ); Q_UNUSED( extent ); Q_UNUSED( width ); Q_UNUSED( height );
169+
return new QgsRasterBlock();
170+
}
171+
#endif
164172

165173
/** Set input.
166174
* Returns true if set correctly, false if cannot use that input */

0 commit comments

Comments
 (0)