<div dir="ltr"><div><div>Anton, <br></div>Hope this is what you meant.<br><br></div>Nikhil Bharadwaj<br></div><div class="gmail_extra"><br><div class="gmail_quote">On Thu, Dec 18, 2014 at 3:02 PM, Nikhil Bharadwaj <span dir="ltr"><<a href="mailto:nikhil.gosala@gmail.com" target="_blank">nikhil.gosala@gmail.com</a>></span> wrote:<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><div dir="ltr"><div><div><div>Anton,<span class=""><br><br>>Squash it togeather with the previous one, forming one patch on top of<br>
>current master. I see no reason keeping them separate.<br><br></span></div>I didnt quite get you here...<span class=""><br><br>>A tip is to take a look at the CodingStyle. No stray newlines =)<br><br></span></div>Point noted Anton.. I'm a newbie to all this. Ill learn...Thank you!!<br><br><br></div>Nikhil Bharadwaj<br></div><div class="gmail_extra"><div><div class="h5"><br><div class="gmail_quote">On Thu, Dec 18, 2014 at 2:55 PM, Anton Lundin <span dir="ltr"><<a href="mailto:glance@acc.umu.se" target="_blank">glance@acc.umu.se</a>></span> wrote:<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><div><div>On 18 December, 2014 - Nikhil Bharadwaj wrote:<br>
<br>
> Removed those bits as well.<br>
> Thanks a lot Anton for pointing out my mistakes.<br>
><br>
> Nikhil Bharadwaj<br>
><br>
> On Thu, Dec 18, 2014 at 2:39 PM, Anton Lundin <<a href="mailto:glance@acc.umu.se" target="_blank">glance@acc.umu.se</a>> wrote:<br>
> ><br>
> > On 18 December, 2014 - Nikhil Bharadwaj wrote:<br>
> ><br>
> > > From 3d0fc13bbd1b86916a90372ad0c80569d64c2b95 Mon Sep 17 00:00:00 2001<br>
> > > From: nikhil <<a href="mailto:nikhil.gosala@gmail.com" target="_blank">nikhil.gosala@gmail.com</a>><br>
> > > Date: Thu, 18 Dec 2014 12:24:18 +0530<br>
> > > Subject: [PATCH 4/4] Added the option of expilicitly opening the<br>
> > user-survey<br>
> > > from help menu<br>
> > ><br>
> > > As per the mistake pointed out by Anton Lundin, I removed the<br>
> > possibility of<br>
> > > disabling bits of code of the User Survey.<br>
> > ><br>
> > > Signed-off-by: Nikhil Bharadwaj Gosala <<a href="mailto:nikhil.gosala@gmail.com" target="_blank">nikhil.gosala@gmail.com</a>><br>
> > > ---<br>
> > > qt-ui/mainwindow.cpp | 6 +-----<br>
> > > 1 file changed, 1 insertion(+), 5 deletions(-)<br>
> > ><br>
> > > diff --git a/qt-ui/mainwindow.cpp b/qt-ui/mainwindow.cpp<br>
> > > index 1765d4c..0e25458 100644<br>
> > > --- a/qt-ui/mainwindow.cpp<br>
> > > +++ b/qt-ui/mainwindow.cpp<br>
> > > @@ -55,9 +55,6 @@<br>
> > > #ifndef NO_USERMANUAL<br>
> > > #include "usermanual.h"<br>
> > > #endif<br>
> > > -#ifndef NO_USERSURVEY<br>
> > > -#include "usersurvey.h"<br>
> > > -#endif<br>
> > > #include <QNetworkProxy><br>
> > ><br>
> > > MainWindow *MainWindow::m_Instance = NULL;<br>
> > > @@ -754,12 +751,11 @@ void MainWindow::on_actionUserManual_triggered()<br>
> > ><br>
> > > void MainWindow::on_actionUserSurvey_triggered()<br>
> > > {<br>
> > > -#ifndef NO_USERSURVEY<br>
> > > +<br>
> ><br>
> > Nitpicking, but no newline here.<br>
> ><br>
> ><br>
> > > if(!survey) {<br>
> > > survey = new UserSurvey();<br>
> > > }<br>
> > > survey->show();<br>
> > > -#endif<br>
> > > }<br>
> > ><br>
> > > QString MainWindow::filter()<br>
> > > --<br>
> > > 2.1.0<br>
> ><br>
> > And there are still a couple more places where NO_USERSURVEY exists. I<br>
> > see no point in keeping them.<br>
> ><br>
> ><br>
> > //Anton<br>
> ><br>
> ><br>
> > --<br>
> > Anton Lundin +46702-161604<br>
> ><br>
><br>
><br>
> --<br>
> Nikhil Bharadwaj<br>
<br>
</div></div>> From 3f69e0e41e106f0e002eea688573c0aeab2a112e Mon Sep 17 00:00:00 2001<br>
> From: nikhil <<a href="mailto:nikhil.gosala@gmail.com" target="_blank">nikhil.gosala@gmail.com</a>><br>
> Date: Thu, 18 Dec 2014 14:43:37 +0530<br>
> Subject: [PATCH 5/5] Added the option of explicitly opening the User Survey<br>
> from the help menu<br>
<span>><br>
> As per the mistake pointed out by Anton Lundin, I removed the possibility of<br>
</span>> disabling bits of code of the User Survey. Removed all the instances of<br>
> NO_USERSURVEY which is not needed.<br>
<span>><br>
> Signed-off-by: Nikhil Bharadwaj Gosala <<a href="mailto:nikhil.gosala@gmail.com" target="_blank">nikhil.gosala@gmail.com</a>><br>
> ---<br>
</span>> qt-ui/mainwindow.cpp | 8 ++++----<br>
> 1 file changed, 4 insertions(+), 4 deletions(-)<br>
><br>
> diff --git a/qt-ui/mainwindow.cpp b/qt-ui/mainwindow.cpp<br>
> index 0e25458..d6c90e3 100644<br>
> --- a/qt-ui/mainwindow.cpp<br>
> +++ b/qt-ui/mainwindow.cpp<br>
> @@ -118,9 +118,9 @@ MainWindow::MainWindow() : QMainWindow(),<br>
<span>> #ifdef NO_USERMANUAL<br>
> ui.menuHelp->removeAction(ui.actionUserManual);<br>
> #endif<br>
</span>> -#ifdef NO_USERSURVEY<br>
> +<br>
> ui.menuHelp->removeAction(ui.actionUserSurvey);<br>
> -#endif<br>
> +<br>
<br>
Why are you adding blank lines here?<br>
<br>
><br>
> #ifdef NO_PRINTING<br>
> ui.menuFile->removeAction(ui.actionPrint);<br>
> @@ -959,12 +959,12 @@ void MainWindow::closeEvent(QCloseEvent *event)<br>
> #endif<br>
><br>
><br>
> -#ifndef NO_USERSURVEY<br>
> +<br>
<br>
And here?<br>
<br>
> if (survey && survey->isVisible()) {<br>
> survey->close();<br>
> survey->deleteLater();<br>
> }<br>
> -#endif<br>
> +<br>
><br>
<br>
A tip is to take a look at the CodingStyle. No stray newlines =)<br>
<br>
Squash it togeather with the previous one, forming one patch on top of<br>
current master. I see no reason keeping them separate.<br>
<div><div><br>
<br>
//Anton<br>
<br>
<br>
--<br>
Anton Lundin +46702-161604<br>
</div></div></blockquote></div><br clear="all"><br></div></div><span class="HOEnZb"><font color="#888888">-- <br><div><div dir="ltr">Nikhil Bharadwaj</div></div>
</font></span></div>
</blockquote></div><br clear="all"><br>-- <br><div class="gmail_signature"><div dir="ltr">Nikhil Bharadwaj</div></div>
</div>