diff --git a/tools/triage/main.cpp b/tools/triage/main.cpp index b48f94ec8..a37d92c68 100644 --- a/tools/triage/main.cpp +++ b/tools/triage/main.cpp @@ -7,5 +7,5 @@ int main(int argc, char *argv[]) MainWindow w; w.show(); - return a.exec(); + return QApplication::exec(); } diff --git a/tools/triage/mainwindow.cpp b/tools/triage/mainwindow.cpp index 753e87606..056d7b4c6 100644 --- a/tools/triage/mainwindow.cpp +++ b/tools/triage/mainwindow.cpp @@ -118,12 +118,12 @@ bool MainWindow::runProcess(const QString &programName, const QStringList &argum return success; } -bool MainWindow::wget(const QString url) +bool MainWindow::wget(const QString &url) { return runProcess("wget", QStringList() << url); } -bool MainWindow::unpackArchive(const QString archiveName) +bool MainWindow::unpackArchive(const QString &archiveName) { // Unpack archive QStringList args; @@ -164,14 +164,14 @@ void MainWindow::showResult(QListWidgetItem *item) const int pos1 = msg.indexOf(":"); const int pos2 = msg.indexOf(":", pos1+1); const QString fileName = WORK_FOLDER + '/' + msg.left(msg.indexOf(":")); - const int lineNumber = msg.mid(pos1+1,pos2-pos1-1).toInt(); + const int lineNumber = msg.midRef(pos1+1,pos2-pos1-1).toInt(); - if (!QFileInfo(fileName).exists()) { - if (QFileInfo(DACA2_PACKAGES + '/' + archiveName.mid(0,archiveName.indexOf(".tar.")) + ".tar.xz").exists()) { + if (!QFileInfo::exists(fileName)) { + if (QFileInfo::exists(DACA2_PACKAGES + '/' + archiveName.mid(0,archiveName.indexOf(".tar.")) + ".tar.xz")) { if (!unpackArchive(DACA2_PACKAGES + '/' + archiveName.mid(0,archiveName.indexOf(".tar.")) + ".tar.xz")) return; } else { - if (!QFileInfo(WORK_FOLDER + '/' + archiveName).exists()) { + if (!QFileInfo::exists(WORK_FOLDER + '/' + archiveName)) { // Download archive if (!wget(url)) return; @@ -186,7 +186,7 @@ void MainWindow::showResult(QListWidgetItem *item) QFile f(fileName); if (!f.open(QIODevice::ReadOnly | QIODevice::Text)) { const QString errorMsg = - QString("Opening file %1 failed: %2").arg(f.fileName()).arg(f.errorString()); + QString("Opening file %1 failed: %2").arg(f.fileName(), f.errorString()); ui->statusBar->showMessage(errorMsg); } else { QTextStream textStream(&f); diff --git a/tools/triage/mainwindow.h b/tools/triage/mainwindow.h index acd6e1ff1..e382c229c 100644 --- a/tools/triage/mainwindow.h +++ b/tools/triage/mainwindow.h @@ -29,8 +29,8 @@ private: void load(QTextStream &textStream); bool runProcess(const QString &programName, const QStringList & arguments); - bool wget(const QString url); - bool unpackArchive(const QString archiveName); + bool wget(const QString &url); + bool unpackArchive(const QString &archiveName); }; #endif // MAINWINDOW_H