Move to using QgsApplication

g_j_m · g_j_m · commit a62b4cb3bf7d · 2006-01-04T09:34:45.000Z
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@4467 c8812cc2-4d05-0410-92ff-de0c093fc19c
diff --git a/plugins/north_arrow/plugin.cpp b/plugins/north_arrow/plugin.cpp
@@ -27,6 +27,7 @@ email                : tim@linfiniti.com
 #include "plugin.h"
 #include "qgsproject.h"
 #include "qgsmapcanvas.h"
+#include "../../src/qgsapplication.h"
 
 // qt includes
 #include <QPainter>
@@ -161,11 +162,10 @@ void QgsNorthArrowPlugin::renderNorthArrow(QPainter * theQPainter)
   if (mEnable)
   {
     QPixmap myQPixmap; //to store the north arrow image in
-#if defined(WIN32) || defined(Q_OS_MACX)
-    QString PKGDATAPATH = qApp->applicationDirPath() + "/share/qgis";
-#endif
-    QString myFileNameQString = QString(PKGDATAPATH) +
-                                QString("/images/north_arrows/default.png");
+
+    QString myFileNameQString = QgsApplication::pkgDataPath() +
+                                "/images/north_arrows/default.png";
+
     //std::cout << "Trying to load " << myFileNameQString << std::cout;
     if (myQPixmap.load(myFileNameQString))
     {
diff --git a/plugins/north_arrow/plugingui.cpp b/plugins/north_arrow/plugingui.cpp
@@ -10,6 +10,7 @@
  *   (at your option) any later version.                                   *
  ***************************************************************************/
 #include "plugingui.h"
+#include "../../src/qgsapplication.h"
 
 #include <QPainter>
 #include <cmath>
@@ -95,10 +96,7 @@ void QgsNorthArrowPluginGui::on_sliderRotation_valueChanged( int theInt)
 void QgsNorthArrowPluginGui::rotatePixmap(int theRotationInt)
 {
   QPixmap myQPixmap;
-#if defined(WIN32) || defined(Q_OS_MACX)
-  QString PKGDATAPATH = qApp->applicationDirPath() + "/share/qgis";
-#endif
-  QString myFileNameQString = QString(PKGDATAPATH) + QString("/images/north_arrows/default.png");
+  QString myFileNameQString = QgsApplication::pkgDataPath() + "/images/north_arrows/default.png";
   //std::cout << "Trying to load " << myFileNameQString << std::cout;
   if (myQPixmap.load(myFileNameQString))
   {
