[PATCH] Added the option of explicitly opening the User Survey form from the help menu

Anton Lundin glance at acc.umu.se
Thu Dec 18 01:09:11 PST 2014


On 18 December, 2014 - Nikhil Bharadwaj wrote:

> From 3d0fc13bbd1b86916a90372ad0c80569d64c2b95 Mon Sep 17 00:00:00 2001
> From: nikhil <nikhil.gosala at gmail.com>
> Date: Thu, 18 Dec 2014 12:24:18 +0530
> Subject: [PATCH 4/4] Added the option of expilicitly opening the user-survey
>  from help menu
> 
> As per the mistake pointed out by Anton Lundin, I removed the possibility of
> disabling bits of code of the User Survey.
> 
> Signed-off-by: Nikhil Bharadwaj Gosala <nikhil.gosala at gmail.com>
> ---
>  qt-ui/mainwindow.cpp | 6 +-----
>  1 file changed, 1 insertion(+), 5 deletions(-)
> 
> diff --git a/qt-ui/mainwindow.cpp b/qt-ui/mainwindow.cpp
> index 1765d4c..0e25458 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;
> @@ -754,12 +751,11 @@ void MainWindow::on_actionUserManual_triggered()
>  
>  void MainWindow::on_actionUserSurvey_triggered()
>  {
> -#ifndef NO_USERSURVEY
> +

Nitpicking, but no newline here.


>  	if(!survey) {
>  		survey = new UserSurvey();
>  	}
>  	survey->show();
> -#endif
>  }
>  
>  QString MainWindow::filter()
> -- 
> 2.1.0

And there are still a couple more places where NO_USERSURVEY exists. I
see no point in keeping them.


//Anton


-- 
Anton Lundin	+46702-161604


More information about the subsurface mailing list