[PATCH 1/3] Remove NO_USERSURVEY

[Anton Lundin]

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 at gmail.com>
Signed-off-by: Anton Lundin <glance at acc.umu.se>
---
 qt-ui/mainwindow.cpp | 13 -------------
 1 file changed, 13 deletions(-)

diff --git a/qt-ui/mainwindow.cpp b/qt-ui/mainwindow.cpp
index 72ece9a..8343f62 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();
-- 
2.1.0