Fix some clang -weverything warnings

qgis · Jan 13, 2016 · 76f3bc1 · 76f3bc1
1 parent a30a735
commit 76f3bc1
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 8 deletions.
diff --git a/src/plugins/grass/CMakeLists.txt b/src/plugins/grass/CMakeLists.txt
@@ -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
 )
 
 

diff --git a/src/providers/grass/qgsgrassdatafile.h b/src/providers/grass/qgsgrassdatafile.h
@@ -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

diff --git a/src/providers/grass/qgsgrassimport.h b/src/providers/grass/qgsgrassimport.h
@@ -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

diff --git a/src/providers/grass/qgsgrassrasterprovider.cpp b/src/providers/grass/qgsgrassrasterprovider.cpp
@@ -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;
 }

diff --git a/src/providers/grass/qgsgrasswin.cpp b/src/providers/grass/qgsgrasswin.cpp
@@ -75,4 +75,5 @@ void QgsGrassWin::hideWindow( int pid )
   // Unfortunately the window opens first for a moment
   ShowWindow( hWnd, SW_HIDE );
 #endif
-}
+}
+
diff --git a/src/providers/grass/qgsgrasswin.h b/src/providers/grass/qgsgrasswin.h
@@ -24,4 +24,5 @@ class GRASS_LIB_EXPORT QgsGrassWin
     static void hideWindow( int pid );
 };
 
-#endif // QGSGRASSWIN_H
+#endif // QGSGRASSWIN_H
+