Take care of some warnings from issue 688
authorunc0rr
Fri, 16 Aug 2013 14:15:00 +0400
changeset 9393 094a176dd623
parent 9391 2af25494f3bb
child 9395 2659192d5af9
Take care of some warnings from issue #688
QTfrontend/HWApplication.cpp
QTfrontend/hwform.cpp
QTfrontend/ui/widget/feedbackdialog.cpp
--- a/QTfrontend/HWApplication.cpp	Fri Aug 16 13:43:08 2013 +0400
+++ b/QTfrontend/HWApplication.cpp	Fri Aug 16 14:15:00 2013 +0400
@@ -38,6 +38,8 @@
 HWApplication::HWApplication(int &argc, char **argv) :
     QApplication(argc, argv)
 {
+    form = 0;
+
 #if !defined(Q_OS_WIN)
     signal(SIGINT, &terminateFrontend);
 #endif
--- a/QTfrontend/hwform.cpp	Fri Aug 16 13:43:08 2013 +0400
+++ b/QTfrontend/hwform.cpp	Fri Aug 16 14:15:00 2013 +0400
@@ -165,14 +165,13 @@
 #endif
 
 #ifdef __APPLE__
-    AutoUpdater* updater = NULL;
     if (config->isAutoUpdateEnabled())
     {
-#ifdef __APPLE__
+        AutoUpdater* updater = NULL;
+
 #ifdef SPARKLE_ENABLED
         updater = new SparkleAutoUpdater();
 #endif
-#endif
         if (updater)
         {
             updater->checkForUpdates();
@@ -658,7 +657,7 @@
         }
 
         QList<HWTeam> teamsList;
-        for (QStringList::iterator it = tmNames.begin(); it != tmNames.end(); it++)
+        for (QStringList::iterator it = tmNames.begin(); it != tmNames.end(); ++it)
         {
             HWTeam team(*it);
             team.loadFromFile();
@@ -704,7 +703,7 @@
 
 void HWForm::GoToPage(int id)
 {
-    bool stopAnim = false;
+    //bool stopAnim = false;
 
     int lastid = ui.Pages->currentIndex();
     PagesStack.push(ui.Pages->currentIndex());
@@ -721,7 +720,7 @@
 
 
 #if (QT_VERSION >= 0x040600)
-    if (!stopAnim)
+    //if (!stopAnim)
     {
         /**Start animation :**/
         int coeff = 1;
@@ -817,7 +816,7 @@
         stopAnim = true; */
 
     if ((!hwnet) || (!hwnet->isInRoom()))
-        if (id == ID_PAGE_NETGAME || id == ID_PAGE_NETGAME)
+        if (id == ID_PAGE_NETGAME)
         {
             stopAnim = true;
             GoBack();
--- a/QTfrontend/ui/widget/feedbackdialog.cpp	Fri Aug 16 13:43:08 2013 +0400
+++ b/QTfrontend/ui/widget/feedbackdialog.cpp	Fri Aug 16 14:15:00 2013 +0400
@@ -429,7 +429,7 @@
 
 void FeedbackDialog::finishedSlot(QNetworkReply* reply)
 {
-    if (reply && reply->error() == QNetworkReply::NoError)
+    if (reply->error() == QNetworkReply::NoError)
     {
             QMessageBox infoMsg(this);
             infoMsg.setIcon(QMessageBox::Information);