Use QgsApplication::themPath() to determin where icons are

timlinux · timlinux · commit 7be8fd66e68d · 2006-01-10T07:41:20.000Z
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@4634 c8812cc2-4d05-0410-92ff-de0c093fc19c
diff --git a/src/composer/qgscomposer.cpp b/src/composer/qgscomposer.cpp
@@ -17,6 +17,7 @@
 #include "qgscomposer.h"
 
 #include "qgisapp.h"
+#include "qgsapplication.h"
 #include "qgscomposerview.h"
 #include "qgscomposition.h"
 #include "qgsexception.h"
@@ -84,14 +85,7 @@ QgsComposer::~QgsComposer()
 void QgsComposer::setupTheme()
 {
   //calculate the active theme path
-  QSettings mySettings;
-#if defined(WIN32) || defined(Q_OS_MACX)
-  QString myAppDir = qApp->applicationDirPath();
-#else
-  QString myAppDir = PREFIX;
-#endif
-  QString myThemeName = mySettings.readEntry("/Themes","default");
-  QString myThemePath= myAppDir + "/share/qgis/themes/" + myThemeName;
+  QString myThemePath= QgsApplication::themePath();
   
 
   //now set all the icons
