[QGIS Commit] r15293 - in trunk/qgis: python/core src/app src/core
svn_qgis at osgeo.org
svn_qgis at osgeo.org
Mon Feb 28 18:06:46 EST 2011
Author: jef
Date: 2011-02-28 15:06:46 -0800 (Mon, 28 Feb 2011)
New Revision: 15293
Removed:
trunk/qgis/src/app/qgshelpviewer.cpp
trunk/qgis/src/app/qgshelpviewer.h
Modified:
trunk/qgis/python/core/qgsapplication.sip
trunk/qgis/src/app/CMakeLists.txt
trunk/qgis/src/app/qgisapp.cpp
trunk/qgis/src/app/qgisapp.h
trunk/qgis/src/core/qgsapplication.cpp
trunk/qgis/src/core/qgsapplication.h
Log:
cleanup: remove QgsApplication::msexportAppPath() and app/qgshelpviewer*
Modified: trunk/qgis/python/core/qgsapplication.sip
===================================================================
--- trunk/qgis/python/core/qgsapplication.sip 2011-02-28 22:40:23 UTC (rev 15292)
+++ trunk/qgis/python/core/qgsapplication.sip 2011-02-28 23:06:46 UTC (rev 15293)
@@ -130,9 +130,6 @@
//! 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();
Modified: trunk/qgis/src/app/CMakeLists.txt
===================================================================
--- trunk/qgis/src/app/CMakeLists.txt 2011-02-28 22:40:23 UTC (rev 15292)
+++ trunk/qgis/src/app/CMakeLists.txt 2011-02-28 23:06:46 UTC (rev 15293)
@@ -25,7 +25,6 @@
qgsfieldcalculator.cpp
qgsnewvectorlayerdialog.cpp
qgsgraduatedsymboldialog.cpp
- qgshelpviewer.cpp
qgsidentifyresults.cpp
qgsfeatureaction.cpp
qgslabeldialog.cpp
@@ -164,7 +163,6 @@
qgsfieldcalculator.h
qgsformannotationdialog.h
qgsgraduatedsymboldialog.h
- qgshelpviewer.h
qgsidentifyresults.h
qgslabeldialog.h
qgslabelengineconfigdialog.h
Modified: trunk/qgis/src/app/qgisapp.cpp
===================================================================
--- trunk/qgis/src/app/qgisapp.cpp 2011-02-28 22:40:23 UTC (rev 15292)
+++ trunk/qgis/src/app/qgisapp.cpp 2011-02-28 23:06:46 UTC (rev 15293)
@@ -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"
Modified: trunk/qgis/src/app/qgisapp.h
===================================================================
--- trunk/qgis/src/app/qgisapp.h 2011-02-28 22:40:23 UTC (rev 15292)
+++ trunk/qgis/src/app/qgisapp.h 2011-02-28 23:06:46 UTC (rev 15293)
@@ -44,7 +44,6 @@
class QgsComposer;
class QgsComposerView;
class QgsGeometry;
-class QgsHelpViewer;
class QgsFeature;
class QgsLegend;
@@ -1161,8 +1160,6 @@
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
Deleted: trunk/qgis/src/app/qgshelpviewer.cpp
===================================================================
--- trunk/qgis/src/app/qgshelpviewer.cpp 2011-02-28 22:40:23 UTC (rev 15292)
+++ trunk/qgis/src/app/qgshelpviewer.cpp 2011-02-28 23:06:46 UTC (rev 15293)
@@ -1,41 +0,0 @@
-/***************************************************************************
- qgshelpviewer.cpp
- Simple help browser
- -------------------
- begin : 2004-01-28
- copyright : (C) 2004 by Gary E.Sherman
- email : sherman at mrcc.com
-***************************************************************************/
-
-/***************************************************************************
- * *
- * 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 *
- * the Free Software Foundation; either version 2 of the License, or *
- * (at your option) any later version. *
- * *
- ***************************************************************************/
-/* $Id$ */
-
-#include "qgshelpviewer.h"
-
-#include <QString>
-
-QgsHelpViewer::QgsHelpViewer( QWidget * parent, Qt::WFlags fl )
- : QDialog( parent, fl )
-{
- setupUi( this );
-}
-
-/*
- * Destroys the object and frees any allocated resources
- */
-QgsHelpViewer::~QgsHelpViewer()
-{
- // no need to delete child widgets, Qt does it all for us
-}
-void QgsHelpViewer::showContent( QString path, QString doc )
-{
- //textBrowser->mimeSourceFactory()->addFilePath(path);
- //textBrowser->setSource(doc);
-}
Deleted: trunk/qgis/src/app/qgshelpviewer.h
===================================================================
--- trunk/qgis/src/app/qgshelpviewer.h 2011-02-28 22:40:23 UTC (rev 15292)
+++ trunk/qgis/src/app/qgshelpviewer.h 2011-02-28 23:06:46 UTC (rev 15293)
@@ -1,39 +0,0 @@
-/***************************************************************************
- qgshelpviewer.h
- Simple help browser
- -------------------
- begin : 2004-01-28
- copyright : (C) 2004 by Gary E.Sherman
- email : sherman at mrcc.com
-***************************************************************************/
-
-/***************************************************************************
- * *
- * 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 *
- * the Free Software Foundation; either version 2 of the License, or *
- * (at your option) any later version. *
- * *
- ***************************************************************************/
-/* $Id$ */
-
-#ifndef QGSHELPVIEWER_H
-#define QGSHELPVIEWER_H
-
-#include "ui_qgshelpviewerbase.h"
-
-class QString;
-
-class QgsHelpViewer : public QDialog, private Ui::QgsHelpViewerBase
-{
- Q_OBJECT
-
- public:
- QgsHelpViewer( QWidget* parent = 0, Qt::WFlags fl = 0 );
- ~QgsHelpViewer();
- void showContent( QString path, QString doc );
-
-
-};
-
-#endif // QGSHELPVIEWER_H
Modified: trunk/qgis/src/core/qgsapplication.cpp
===================================================================
--- trunk/qgis/src/core/qgsapplication.cpp 2011-02-28 22:40:23 UTC (rev 15292)
+++ trunk/qgis/src/core/qgsapplication.cpp 2011-02-28 23:06:46 UTC (rev 15293)
@@ -241,27 +241,16 @@
*/
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.
*/
const QString QgsApplication::i18nPath()
Modified: trunk/qgis/src/core/qgsapplication.h
===================================================================
--- trunk/qgis/src/core/qgsapplication.h 2011-02-28 22:40:23 UTC (rev 15292)
+++ trunk/qgis/src/core/qgsapplication.h 2011-02-28 23:06:46 UTC (rev 15293)
@@ -83,9 +83,6 @@
//! 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();
More information about the QGIS-commit
mailing list