summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFriedrich W. H. Kossebau <kossebau@kde.org>2016-08-07 17:10:04 (GMT)
committerFriedrich W. H. Kossebau <kossebau@kde.org>2016-08-07 17:10:04 (GMT)
commit56615a95a71cd9140cfe06aa2b420a91bdeb98f1 (patch)
tree61d633de4a1cb7583a4e1c35b0f8bbc83b9c0cf6
parentac08536d260454f952dba2e0d1bd726855c4c655 (diff)
Use -DQT_USE_QSTRINGBUILDER
QT_USE_FAST_CONCATENATION & QT_USE_FAST_OPERATOR_PLUS are outdated since Qt 4.8
-rw-r--r--CMakeLists.txt3
-rw-r--r--tools/osm-sisyphus/job.cpp8
-rw-r--r--tools/osm-sisyphus/upload.cpp6
3 files changed, 8 insertions, 9 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9656573..ac36819 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -218,8 +218,7 @@ if(WIN32)
endif(WIN32)
add_definitions(
- -DQT_USE_FAST_CONCATENATION
- -DQT_USE_FAST_OPERATOR_PLUS
+ -DQT_USE_QSTRINGBUILDER
-DQT_NO_SIGNALS_SLOTS_KEYWORDS
-DQT_NO_URL_CAST_FROM_STRING
-DQT_STRICT_ITERATORS
diff --git a/tools/osm-sisyphus/job.cpp b/tools/osm-sisyphus/job.cpp
index 09ee4e0..b9ac7fb 100644
--- a/tools/osm-sisyphus/job.cpp
+++ b/tools/osm-sisyphus/job.cpp
@@ -119,7 +119,7 @@ bool Job::download()
} else {
qDebug() << "Failed to download " << url;
QFile::remove(osmFile().absoluteFilePath());
- changeStatus(Error, "Error downloading .osm.pbf file: " + wget.readAllStandardError());
+ changeStatus(Error, QLatin1String("Error downloading .osm.pbf file: ") + wget.readAllStandardError());
return false;
}
}
@@ -168,7 +168,7 @@ bool Job::monav()
qDebug() << "Processed osm file for monav";
} else {
qDebug() << "monav exiting with status " << monav.exitCode();
- changeStatus(Error, "Routing map conversion failed: " + monav.readAllStandardError());
+ changeStatus(Error, QLatin1String("Routing map conversion failed: ") + monav.readAllStandardError());
return false;
}
@@ -235,7 +235,7 @@ bool Job::search()
return true;
} else {
qDebug() << "osm-addresses exiting with status " << osmAddresses.exitCode();
- changeStatus(Error, "Error creating search database: " + osmAddresses.readAllStandardError());
+ changeStatus(Error, QLatin1String("Error creating search database: ") + osmAddresses.readAllStandardError());
return false;
}
}
@@ -253,7 +253,7 @@ bool Job::package()
qDebug() << "Packaged tar file";
return true;
} else {
- changeStatus(Error, "Packaging failed: " + tar.readAllStandardError());
+ changeStatus(Error, QLatin1String("Packaging failed: ") + tar.readAllStandardError());
return false;
}
}
diff --git a/tools/osm-sisyphus/upload.cpp b/tools/osm-sisyphus/upload.cpp
index 2e10915..8de9f6f 100644
--- a/tools/osm-sisyphus/upload.cpp
+++ b/tools/osm-sisyphus/upload.cpp
@@ -64,7 +64,7 @@ bool Upload::upload(const Package &package)
ssh.waitForFinished(1000 * 60 * 10); // wait up to 10 minutes for mkdir to complete
if (ssh.exitStatus() != QProcess::NormalExit || ssh.exitCode() != 0) {
qDebug() << "Failed to create remote directory " << remoteDir;
- changeStatus( package, "error", "Failed to create remote directory: " + ssh.readAllStandardError());
+ changeStatus(package, "error", QLatin1String("Failed to create remote directory: ") + ssh.readAllStandardError());
return false;
}
@@ -77,7 +77,7 @@ bool Upload::upload(const Package &package)
scp.waitForFinished(1000 * 60 * 60 * 12); // wait up to 12 hours for upload to complete
if (scp.exitStatus() != QProcess::NormalExit || scp.exitCode() != 0) {
qDebug() << "Failed to upload " << target;
- changeStatus( package, "error", "Failed to upload file: " + scp.readAllStandardError());
+ changeStatus(package, "error", QLatin1String("Failed to upload file: ") + scp.readAllStandardError());
return false;
}
@@ -105,7 +105,7 @@ bool Upload::adjustNewstuffFile(const Package &package)
wget.waitForFinished(1000 * 60 * 60 * 12); // wait up to 12 hours for download to complete
if (wget.exitStatus() != QProcess::NormalExit || wget.exitCode() != 0) {
qDebug() << "Failed to download newstuff file from filesmaster.kde.org";
- changeStatus( package, "error", "Failed to sync newstuff file: " + wget.readAllStandardError());
+ changeStatus( package, "error", QLatin1String("Failed to sync newstuff file: ") + wget.readAllStandardError());
return false;
}