diff options
Diffstat (limited to 'tools/repocompare')
-rw-r--r-- | tools/repocompare/main.cpp | 2 | ||||
-rw-r--r-- | tools/repocompare/mainwindow.cpp | 10 | ||||
-rw-r--r-- | tools/repocompare/mainwindow.h | 3 | ||||
-rw-r--r-- | tools/repocompare/repositorymanager.cpp | 11 |
4 files changed, 15 insertions, 11 deletions
diff --git a/tools/repocompare/main.cpp b/tools/repocompare/main.cpp index af17b05ac..972c7916c 100644 --- a/tools/repocompare/main.cpp +++ b/tools/repocompare/main.cpp @@ -51,7 +51,7 @@ int main(int argc, char *argv[]) RepositoryManager manager; manager.setProductionRepository(productionRepo); manager.setUpdateRepository(updateRepo); - a.connect(&manager, SIGNAL(repositoriesCompared()), &a, SLOT(quit())); + a.connect(&manager, &RepositoryManager::repositoriesCompared, &a, &QApplication::quit); qDebug() << "Waiting for server reply..."; a.exec(); qDebug() << "Writing into " << outputFile; diff --git a/tools/repocompare/mainwindow.cpp b/tools/repocompare/mainwindow.cpp index 8217d769a..27608f0e4 100644 --- a/tools/repocompare/mainwindow.cpp +++ b/tools/repocompare/mainwindow.cpp @@ -77,11 +77,11 @@ MainWindow::MainWindow(QWidget *parent) : ui->productionRepo->insertItems(0, settings.value(productionIdentifier).toStringList()); ui->updateRepo->insertItems(0, settings.value(updateIdentifier).toStringList()); - connect(ui->actionExit, SIGNAL(triggered()), this, SLOT(close())); - connect(ui->productionButton, SIGNAL(clicked()), this, SLOT(getProductionRepository())); - connect(ui->updateButton, SIGNAL(clicked()), this, SLOT(getUpdateRepository())); - connect(ui->exportButton, SIGNAL(clicked()), this, SLOT(createExportFile())); - connect(&manager, SIGNAL(repositoriesCompared()), this, SLOT(displayRepositories())); + connect(ui->actionExit, &QAction::triggered, this, &QWidget::close); + connect(ui->productionButton, &QAbstractButton::clicked, this, &MainWindow::getProductionRepository); + connect(ui->updateButton, &QAbstractButton::clicked, this, &MainWindow::getUpdateRepository); + connect(ui->exportButton, &QAbstractButton::clicked, this, &MainWindow::createExportFile); + connect(&manager, &RepositoryManager::repositoriesCompared, this, &MainWindow::displayRepositories); } MainWindow::~MainWindow() diff --git a/tools/repocompare/mainwindow.h b/tools/repocompare/mainwindow.h index ecba780dc..ac155b0bd 100644 --- a/tools/repocompare/mainwindow.h +++ b/tools/repocompare/mainwindow.h @@ -42,10 +42,11 @@ #include <QMainWindow> #include <QNetworkAccessManager> +QT_BEGIN_NAMESPACE namespace Ui { class MainWindow; } - +QT_END_NAMESPACE class MainWindow : public QMainWindow { diff --git a/tools/repocompare/repositorymanager.cpp b/tools/repocompare/repositorymanager.cpp index 125749882..68faaf124 100644 --- a/tools/repocompare/repositorymanager.cpp +++ b/tools/repocompare/repositorymanager.cpp @@ -33,6 +33,7 @@ #include "repositorymanager.h" #include <QDebug> +#include <QDir> #include <QFile> #include <QStringList> #include <QUrl> @@ -66,7 +67,7 @@ RepositoryManager::RepositoryManager(QObject *parent) : QObject(parent) { manager = new QNetworkAccessManager(this); - connect(manager, SIGNAL(finished(QNetworkReply*)), this, SLOT(receiveRepository(QNetworkReply*))); + connect(manager, &QNetworkAccessManager::finished, this, &RepositoryManager::receiveRepository); productionMap.clear(); updateMap.clear(); } @@ -185,13 +186,15 @@ void RepositoryManager::writeUpdateFile(const QString &fileName) { QFile file(fileName); if (!file.open(QIODevice::ReadWrite | QIODevice::Truncate)) { - QMessageBox::critical(0, QLatin1String("Error"), QLatin1String("Could not open File for saving")); + QMessageBox::critical(0, QLatin1String("Error"), + QString::fromLatin1("Cannot open file \"%1\" for writing: %2").arg( + QDir::toNativeSeparators(fileName), file.errorString())); return; } QStringList items; - for (QMap<QString, ComponentDescription>::const_iterator it = updateMap.begin(); it != updateMap.end(); - ++it) { + for (QMap<QString, ComponentDescription>::const_iterator it = updateMap.constBegin(); + it != updateMap.constEnd(); ++it) { if (it.value().update) items.append(it.key()); } |