Use qgsapplication themepath instead of pkgdatapath for images

timlinux · timlinux · commit 996b44751aa7 · 2006-01-11T22:09:32.000Z
git-svn-id: http://svn.osgeo.org/qgis/trunk@4651 c8812cc2-4d05-0410-92ff-de0c093fc19c
diff --git a/src/gui/qgsmaplayer.cpp b/src/gui/qgsmaplayer.cpp
@@ -21,7 +21,7 @@
 #include <limits>
 #include <cmath>
 
-#include <qapplication.h>
+#include <qgsapplication.h>
 #include <qdatetime.h>
 #include <qdom.h>
 #include <qfileinfo.h>
@@ -80,14 +80,10 @@ QgsMapLayer::QgsMapLayer(int type,
     ID = lyrname + dt.toString("yyyyMMddhhmmsszzz");
     ID.replace(" ", "_");
 
-#if defined(WIN32) || defined(Q_OS_MACX)
-
-    QString PKGDATAPATH = qApp->applicationDirPath() + "/share/qgis";
-#endif
-
-    mInOverviewPixmap.load(QString(PKGDATAPATH) + QString("/images/icons/inoverview.png"));
-    mEditablePixmap.load(QString(PKGDATAPATH) + QString("/images/icons/editable.png"));
-    mProjectionErrorPixmap.load(QString(PKGDATAPATH) + QString("/images/icons/icon_projection_problem.png"));
+    QString myThemePath = QgsApplication::themePath();
+    mInOverviewPixmap.load(myThemePath + "/mActionInOverview.png");
+    mEditablePixmap.load(myThemePath + "/mIconEditable.png");
+    mProjectionErrorPixmap.load(myThemePath + "/mIconProjectionProblem.png");
     //mActionInOverview = new QAction( "in Overview", "Ctrl+O", this );
 
     //set some generous  defaults for scale based visibility
