# HG changeset patch # User unc0rr # Date 1376648100 -14400 # Node ID 094a176dd623b92b3227c4377c8e3ff10f7d4c52 # Parent 2af25494f3bbc48d4aeac6d015b990b2833707f3 Take care of some warnings from issue 688 diff -r 2af25494f3bb -r 094a176dd623 QTfrontend/HWApplication.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 diff -r 2af25494f3bb -r 094a176dd623 QTfrontend/hwform.cpp --- 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 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(); diff -r 2af25494f3bb -r 094a176dd623 QTfrontend/ui/widget/feedbackdialog.cpp --- 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);