Skip to content
Permalink
Browse files

Fix some clang -weverything warnings

  • Loading branch information
nyalldawson committed Jan 13, 2016
1 parent a30a735 commit 76f3bc1ad5739ff6589a0a9bd21e55b031709213
@@ -163,13 +163,13 @@ INCLUDE_DIRECTORIES(
../../gui/layertree
../../providers/grass
${CMAKE_CURRENT_BINARY_DIR}/../../ui
qtermwidget
)
INCLUDE_DIRECTORIES(SYSTEM
${GDAL_INCLUDE_DIR}
${PROJ_INCLUDE_DIR}
${GEOS_INCLUDE_DIR}
${POSTGRES_INCLUDE_DIR}
qtermwidget
)


@@ -35,7 +35,7 @@ class GRASS_LIB_EXPORT QgsGrassDataFile : public QFile
{
public:
explicit QgsGrassDataFile( QObject *parent = 0 );
virtual ~QgsGrassDataFile() {};
virtual ~QgsGrassDataFile() {}
// We need FILE* to be able to test feof but QFile::open(FILE *, OpenMode) is not virtual
bool open( FILE * fh );
// Block until all data are read
@@ -32,7 +32,7 @@ class GRASS_LIB_EXPORT QgsGrassImportIcon : public QgsAnimatedIcon
public:
static QgsGrassImportIcon *instance();
QgsGrassImportIcon();
virtual ~QgsGrassImportIcon() {};
virtual ~QgsGrassImportIcon() {}
};

// QgsGrassImport items live on the main thread but mProcess, when importInThread() is used, lives on another
@@ -531,13 +531,10 @@ QGis::DataType QgsGrassRasterProvider::srcDataType( int bandNo ) const
{
case CELL_TYPE:
return QGis::Int32;
break;
case FCELL_TYPE:
return QGis::Float32;
break;
case DCELL_TYPE:
return QGis::Float64;
break;
}
return QGis::UnknownDataType;
}
@@ -75,4 +75,5 @@ void QgsGrassWin::hideWindow( int pid )
// Unfortunately the window opens first for a moment
ShowWindow( hWnd, SW_HIDE );
#endif
}
}

@@ -24,4 +24,5 @@ class GRASS_LIB_EXPORT QgsGrassWin
static void hideWindow( int pid );
};

#endif // QGSGRASSWIN_H
#endif // QGSGRASSWIN_H

0 comments on commit 76f3bc1

Please sign in to comment.
You can’t perform that action at this time.