diff options
| author |  Anton Lundin <glance@acc.umu.se> | 2014-12-30 16:37:02 +0100 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2014-12-30 07:55:45 -0800 |
| commit | fc63dd90cdc50e265e432bd79eea2a8713bb476f (patch) | |
| tree | 07d6dac23295d679217c2cf1f4983ea948313516 /qt-ui/mainwindow.cpp | |
| parent | 04ac309725952e65a5aa1fbd13f5b28e56cf4d84 (diff) | |
| download | subsurface-fc63dd90cdc50e265e432bd79eea2a8713bb476f.tar.gz | |
Remove NO_USERSURVEY
Back in 71dbcdc0d625 ("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>
Diffstat (limited to 'qt-ui/mainwindow.cpp')
| -rw-r--r-- | qt-ui/mainwindow.cpp | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/qt-ui/mainwindow.cpp b/qt-ui/mainwindow.cpp index 72ece9ace..8343f624b 100644 --- a/qt-ui/mainwindow.cpp +++ b/qt-ui/mainwindow.cpp @@ -55,9 +55,6 @@ #ifndef NO_USERMANUAL #include "usermanual.h" #endif -#ifndef NO_USERSURVEY -#include "usersurvey.h" -#endif #include <QNetworkProxy> MainWindow *MainWindow::m_Instance = NULL; @@ -121,10 +118,6 @@ MainWindow::MainWindow() : QMainWindow(), #ifdef NO_USERMANUAL ui.menuHelp->removeAction(ui.actionUserManual); #endif -#ifdef NO_USERSURVEY - ui.menuHelp->removeAction(ui.actionUserSurvey); -#endif - #ifdef NO_PRINTING ui.menuFile->removeAction(ui.actionPrint); #endif @@ -754,12 +747,10 @@ void MainWindow::on_actionUserManual_triggered() void MainWindow::on_actionUserSurvey_triggered() { -#ifndef NO_USERSURVEY if(!survey) { survey = new UserSurvey(); } survey->show(); -#endif } QString MainWindow::filter() @@ -964,14 +955,10 @@ void MainWindow::closeEvent(QCloseEvent *event) } #endif - -#ifndef NO_USERSURVEY if (survey && survey->isVisible()) { survey->close(); survey->deleteLater(); } -#endif - if (unsaved_changes() && (askSaveChanges() == false)) { event->ignore(); |