Got rid of some compiler warnings

Further conversion to qgsapplication::themePath in qgisapp git-svn-id: http://svn.osgeo.org/qgis/trunk@4483 c8812cc2-4d05-0410-92ff-de0c093fc19c
qgis · Jan 6, 2006 · dbfec83 · dbfec83
1 parent b9a1c6c
commit dbfec83
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 6 deletions.
diff --git a/src/qgisapp.cpp b/src/qgisapp.cpp
@@ -2475,6 +2475,7 @@ void QgisApp::newVectorLayer()
   //try to create the new layer with OGRProvider instead of QgsVectorFileWriter
   QgsProviderRegistry * pReg = QgsProviderRegistry::instance();
   QString ogrlib = pReg->library("ogr");
+  // This var is not used...remove? TS FIXME
   const char *cOgrLib = (const char *) ogrlib;
   // load the data provider
   QLibrary* myLib = new QLibrary((const char *) ogrlib);
@@ -4901,7 +4902,7 @@ int QgisApp::addPluginMenu(QString menuText, QMenu *menu)
 
 QMenu* QgisApp::getPluginMenu(QString menuName)
 {
-  for (int i = 0; i < mPluginMenu->count(); ++i)
+  for (unsigned int i = 0; i < mPluginMenu->count(); ++i)
     if (mPluginMenu->text(mPluginMenu->idAt(i)) == menuName)
     {
       QMenuItem* item = mPluginMenu->findItem(mPluginMenu->idAt(i));
@@ -4943,7 +4944,7 @@ void QgisApp::removePluginToolBarIcon(QAction *qAction)
 
 void QgisApp::projectionsEnabled(bool theFlag)
 {
-  QString myIconPath = mAppDir +"/share/qgis/themes/" + mThemeName;
+  QString myIconPath = QgsApplication::themePath();
   if (theFlag)
   {
     QPixmap myProjPixmap;

diff --git a/src/qgsapplication.h b/src/qgsapplication.h
@@ -4,7 +4,7 @@
     Date                 : 02-Jan-2006
     Copyright            : (C) 2006 by Tom Elwertowski
     Email                : telwertowski at users dot sourceforge dot net
-/***************************************************************************
+ ***************************************************************************
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *

diff --git a/src/qgsattributeaction.h b/src/qgsattributeaction.h
@@ -111,7 +111,7 @@ class QgsAttributeAction
     { return mActions.end(); }
 
   //! Returns the number of stored actions
-  int size() const { mActions.size(); }
+  int size() const { return mActions.size(); }
 
   //! Expands the given action, replacing all %'s with the value as
   // given.  

diff --git a/src/qgsmaptopixel.h b/src/qgsmaptopixel.h
@@ -168,7 +168,7 @@ inline void QgsMapToPixel::transformInPlace(std::vector<double>& x,
 					    std::vector<double>& y)
 {
   assert(x.size() == y.size());
-  for (int i = 0; i < x.size(); ++i)
+  for (unsigned int i = 0; i < x.size(); ++i)
     transformInPlace(x[i], y[i]);
 }
 #endif // QGSMAPTOPIXEL
diff --git a/src/qgsproviderregistry.h b/src/qgsproviderregistry.h
@@ -41,6 +41,9 @@ class QgsProviderRegistry
     /** means of accessing canonical single instance
      */
     static QgsProviderRegistry* instance(QString pluginPath = QString::null);
+
+    /** Virtual dtor */
+    virtual ~QgsProviderRegistry() {};
 
     QString library(QString const & providerKey) const;
 

diff --git a/src/qgsrenderer.h b/src/qgsrenderer.h
@@ -46,6 +46,8 @@ class QgsRenderer
  public:
     /** Default ctor sets up selection colour from project properties */
     QgsRenderer();
+    /** Virtual destructor because we have virtual methods... */
+    virtual ~QgsRenderer() {};
     /**A vector layer passes features to a renderer object to change the brush and pen of the qpainter
      @param p the painter storing brush and pen
      @param f a pointer to the feature to be rendered

diff --git a/src/qgsrenderitem.h b/src/qgsrenderitem.h
@@ -43,7 +43,7 @@ class QgsRenderItem {
     */
     QgsRenderItem(QgsSymbol* symbol, QString _value, QString _label);
     /**Destructor*/
-    ~QgsRenderItem();
+    virtual ~QgsRenderItem();
     /** Gets the symbol associated with this render item
      * @return QgsSymbol pointer
      */