diff --git a/gui/gui.pro b/gui/gui.pro index d57a237d4..0cbaebf16 100644 --- a/gui/gui.pro +++ b/gui/gui.pro @@ -9,7 +9,6 @@ INCLUDEPATH += . \ ../lib QT += widgets QT += printsupport -QT += network contains(LINKCORE, [yY][eE][sS]) { LIBS += -l../bin/cppcheck-core @@ -122,8 +121,7 @@ HEADERS += aboutdialog.h \ cppchecklibrarydata.h \ libraryaddfunctiondialog.h \ libraryeditargdialog.h \ - newsuppressiondialog.h \ - networkinfo.h + newsuppressiondialog.h SOURCES += aboutdialog.cpp \ application.cpp \ @@ -163,8 +161,7 @@ SOURCES += aboutdialog.cpp \ cppchecklibrarydata.cpp \ libraryaddfunctiondialog.cpp \ libraryeditargdialog.cpp \ - newsuppressiondialog.cpp \ - networkinfo.cpp + newsuppressiondialog.cpp win32 { RC_FILE = cppcheck-gui.rc diff --git a/gui/mainwindow.cpp b/gui/mainwindow.cpp index eb22394a6..3b6ad7efd 100644 --- a/gui/mainwindow.cpp +++ b/gui/mainwindow.cpp @@ -30,13 +30,11 @@ #include "mainwindow.h" #include "cppcheck.h" -#include "version.h" #include "applicationlist.h" #include "aboutdialog.h" #include "common.h" #include "threadhandler.h" -#include "networkinfo.h" #include "fileviewdialog.h" #include "projectfile.h" #include "projectfiledialog.h" @@ -78,11 +76,6 @@ MainWindow::MainWindow(TranslationHandler* th, QSettings* settings) : mThread->setDataDir(getDataDir(settings)); mUI.mResults->initialize(mSettings, mApplications, mThread); - mUI.mLabelUpgradeCppcheck->setVisible(false); - NetworkInfo *networkInfo = new NetworkInfo(this); - connect(networkInfo, SIGNAL(cppcheckVersion(QString)), this, SLOT(networkCppcheckVersion(QString))); - networkInfo->start(); - // Filter timer to delay filtering results slightly while typing mFilterTimer = new QTimer(this); mFilterTimer->setInterval(500); @@ -1769,20 +1762,3 @@ void MainWindow::suppressIds(QStringList ids) mProjectFile->setSuppressions(suppressions); mProjectFile->write(); } - -void MainWindow::networkCppcheckVersion(QString version) -{ - qDebug() << "MainWindow::networkCppcheckVersion:" << version; - if (!QRegExp("Cppcheck [0-9]\\.[0-9][0-9]").exactMatch(version)) { - mUI.mLabelUpgradeCppcheck->setVisible(false); - return; - } - - version = version.mid(9,4); - if (version <= CPPCHECK_VERSION_STRING) - mUI.mLabelUpgradeCppcheck->setVisible(false); - else { - mUI.mLabelUpgradeCppcheck->setVisible(true); - mUI.mLabelUpgradeCppcheck->setText(tr("Newer Cppcheck version is available: %1").arg(version)); - } -} diff --git a/gui/mainwindow.h b/gui/mainwindow.h index d5bef5bb4..6812b17c8 100644 --- a/gui/mainwindow.h +++ b/gui/mainwindow.h @@ -225,9 +225,6 @@ protected slots: /** Suppress error ids */ void suppressIds(QStringList ids); - /** Cppcheck version received from network */ - void networkCppcheckVersion(QString version); - private: /** Get filename for last results */ diff --git a/gui/mainwindow.ui b/gui/mainwindow.ui index 17c91e6d1..a34a3b4eb 100644 --- a/gui/mainwindow.ui +++ b/gui/mainwindow.ui @@ -50,29 +50,10 @@ 16777215 - + - - - - - 0 - 0 - - - - false - - - QLabel { background-color : rgb(239, 242, 172); } - - - This is not latest Cppcheck version. Latest Cppcheck version is 999.999 - - - diff --git a/gui/networkinfo.cpp b/gui/networkinfo.cpp deleted file mode 100644 index 915524a6f..000000000 --- a/gui/networkinfo.cpp +++ /dev/null @@ -1,31 +0,0 @@ -#include "networkinfo.h" -#include -#include - -NetworkInfo::NetworkInfo(QObject *parent) : QObject(parent) -{ - mManager = new QNetworkAccessManager; - connect(mManager, SIGNAL(finished(QNetworkReply*)), - this, SLOT(managerFinished(QNetworkReply*))); -} - -NetworkInfo::~NetworkInfo() -{ - delete mManager; -} - -void NetworkInfo::start() -{ - //QNetworkRequest request; - request.setUrl(QUrl("http://cppcheck.sourceforge.net/version.txt")); - mManager->get(request); -} - -void NetworkInfo::managerFinished(QNetworkReply *reply) { - if (reply->error()) { - qDebug() << reply->errorString(); - return; - } - - emit cppcheckVersion(reply->readAll().trimmed()); -} diff --git a/gui/networkinfo.h b/gui/networkinfo.h deleted file mode 100644 index 8242f98c8..000000000 --- a/gui/networkinfo.h +++ /dev/null @@ -1,33 +0,0 @@ -#ifndef NETWORKINFO_H -#define NETWORKINFO_H - -#include -#include -#include -#include - -/// @addtogroup GUI -/// @{ - - -/** - * Network communications with cppcheck website to get current version etc - */ -class NetworkInfo : public QObject -{ - Q_OBJECT -public: - NetworkInfo(QObject *parent); - ~NetworkInfo(); - - void start(); -signals: - void cppcheckVersion(QString version); -private slots: - void managerFinished(QNetworkReply *reply); -private: - QNetworkAccessManager *mManager; - QNetworkRequest request; -}; -/// @} -#endif // NETWORKINFO_H