cleanup: remove QgsApplication::msexportAppPath() and app/qgshelpviewer*

jef · jef · commit e7dbc5a1c2d3 · 2011-02-28T23:06:46.000Z
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@15293 c8812cc2-4d05-0410-92ff-de0c093fc19c
diff --git a/python/core/qgsapplication.sip b/python/core/qgsapplication.sip
@@ -130,9 +130,6 @@ static void qtgui_UpdatePyArgv(PyObject *argvlist, int argc, char **argv)
     //! Returns the path to the help application.
     static const QString helpAppPath();
 
-    //! Returns the path to the mapserver export application.
-    static const QString msexportAppPath();
-
     //! Returns the path to the translation directory.
     static const QString i18nPath();
 
diff --git a/src/app/CMakeLists.txt b/src/app/CMakeLists.txt
@@ -25,7 +25,6 @@ SET(QGIS_APP_SRCS
   qgsfieldcalculator.cpp
   qgsnewvectorlayerdialog.cpp
   qgsgraduatedsymboldialog.cpp
-  qgshelpviewer.cpp
   qgsidentifyresults.cpp
   qgsfeatureaction.cpp
   qgslabeldialog.cpp
@@ -164,7 +163,6 @@ SET (QGIS_APP_MOC_HDRS
   qgsfieldcalculator.h
   qgsformannotationdialog.h
   qgsgraduatedsymboldialog.h
-  qgshelpviewer.h
   qgsidentifyresults.h
   qgslabeldialog.h
   qgslabelengineconfigdialog.h
diff --git a/src/app/qgisapp.cpp b/src/app/qgisapp.cpp
@@ -119,7 +119,6 @@
 #include "qgsformannotationitem.h"
 #include "qgsgenericprojectionselector.h"
 #include "qgsgpsinformationwidget.h"
-#include "qgshelpviewer.h"
 #include "qgslabelinggui.h"
 #include "qgslegend.h"
 #include "qgslegendlayer.h"
diff --git a/src/app/qgisapp.h b/src/app/qgisapp.h
@@ -44,7 +44,6 @@ class QgsClipboard;
 class QgsComposer;
 class QgsComposerView;
 class QgsGeometry;
-class QgsHelpViewer;
 class QgsFeature;
 
 class QgsLegend;
@@ -1161,8 +1160,6 @@ class QgisApp : public QMainWindow
     QTcpSocket *mSocket;
     QString mVersionMessage;
     QSplashScreen *mSplash;
-    //! help viewer
-    QgsHelpViewer *mHelpViewer;
     //! list of recently opened/saved project files
     QStringList mRecentProjectPaths;
     //! Print composers of this project, accessible by id string
diff --git a/src/app/qgshelpviewer.cpp b/src/app/qgshelpviewer.cpp
diff --git a/src/app/qgshelpviewer.h b/src/app/qgshelpviewer.h
diff --git a/src/core/qgsapplication.cpp b/src/core/qgsapplication.cpp
@@ -241,26 +241,15 @@ const QString QgsApplication::developerPath()
 */
 const QString QgsApplication::helpAppPath()
 {
-  QString helpAppPath = applicationDirPath();
+  QString helpAppPath;
 #ifdef Q_OS_MACX
-  helpAppPath += "/bin/qgis_help.app/Contents/MacOS";
+  helpAppPath = applicationDirPath() + "/bin/qgis_help.app/Contents/MacOS";
+#else
+  helpAppPath = prefixPath() + "/" QGIS_LIBEXEC_SUBDIR;
 #endif
   helpAppPath += "/qgis_help";
   return helpAppPath;
 }
-/*!
-  Returns the path to the mapserverexport application.
-*/
-const QString QgsApplication::msexportAppPath()
-{
-  QString msexportAppPath = applicationDirPath();
-#ifdef Q_OS_MACX
-  msexportAppPath += "/bin/msexport.app/Contents/MacOS";
-#endif
-  msexportAppPath += "/msexport";
-  return msexportAppPath;
-}
-
 /*!
   Returns the path to the translation directory.
 */
diff --git a/src/core/qgsapplication.h b/src/core/qgsapplication.h
@@ -83,9 +83,6 @@ class CORE_EXPORT QgsApplication: public QApplication
     //! Returns the path to the help application.
     static const QString helpAppPath();
 
-    //! Returns the path to the mapserver export application.
-    static const QString msexportAppPath();
-
     //! Returns the path to the translation directory.
     static const QString i18nPath();
 
