mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Remove NO_USERSURVEY

Browse source 
Back in 71dbcdc0d6 ("Added the option of opening User Survey form
explicitly") a define for not adding the user-survey was created.

This is quite unnecessary and this removes that option.

Based-on-patch-by: Nikhil Bharadwaj Gosala <nikhil.gosala@gmail.com>
Signed-off-by: Anton Lundin <glance@acc.umu.se>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Anton Lundin 2014-12-30 16:37:02 +01:00 • committed by Dirk Hohndel
parent 04ac309725
commit fc63dd90cd
1 changed files with 0 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
qt-ui/mainwindow.cpp
View file

@ -55,9 +55,6 @@
#ifndef NO_USERMANUAL #ifndef NO_USERMANUAL
#include "usermanual.h" #include "usermanual.h"
#endif #endif
#ifndef NO_USERSURVEY
#include "usersurvey.h"
#endif
#include <QNetworkProxy> #include <QNetworkProxy>
MainWindow *MainWindow::m_Instance = NULL; MainWindow *MainWindow::m_Instance = NULL;
@ -121,10 +118,6 @@ MainWindow::MainWindow() : QMainWindow(),
#ifdef NO_USERMANUAL #ifdef NO_USERMANUAL
ui.menuHelp->removeAction(ui.actionUserManual); ui.menuHelp->removeAction(ui.actionUserManual);
#endif #endif
#ifdef NO_USERSURVEY
ui.menuHelp->removeAction(ui.actionUserSurvey);
#endif
#ifdef NO_PRINTING #ifdef NO_PRINTING
ui.menuFile->removeAction(ui.actionPrint); ui.menuFile->removeAction(ui.actionPrint);
#endif #endif
@ -754,12 +747,10 @@ void MainWindow::on_actionUserManual_triggered()
void MainWindow::on_actionUserSurvey_triggered() void MainWindow::on_actionUserSurvey_triggered()
{ {
#ifndef NO_USERSURVEY
if(!survey) { if(!survey) {
survey = new UserSurvey(); survey = new UserSurvey();
} }
survey->show(); survey->show();
#endif
} }
QString MainWindow::filter() QString MainWindow::filter()
@ -964,14 +955,10 @@ void MainWindow::closeEvent(QCloseEvent *event)
} }
#endif #endif
#ifndef NO_USERSURVEY
if (survey && survey->isVisible()) { if (survey && survey->isVisible()) {
survey->close(); survey->close();
survey->deleteLater(); survey->deleteLater();
} }
#endif
if (unsaved_changes() && (askSaveChanges() == false)) { if (unsaved_changes() && (askSaveChanges() == false)) {
event->ignore(); event->ignore();