summaryrefslogtreecommitdiff
path: root/platform/default
diff options
context:
space:
mode:
authorKonstantin Käfer <mail@kkaefer.com>2015-12-01 16:45:39 +0100
committerKonstantin Käfer <mail@kkaefer.com>2015-12-03 15:38:36 +0100
commitdc620f48de48d500298044d8da0ba946b3b0c566 (patch)
tree60110336706627dea9f18821f5d8fc6e9713210a /platform/default
parente12cd6aef4858b09c8ca449e779a58d15e878932 (diff)
downloadqtlocation-mapboxgl-dc620f48de48d500298044d8da0ba946b3b0c566.tar.gz
[core] Fix std::move() misuse that disables copy elision
Diffstat (limited to 'platform/default')
-rw-r--r--platform/default/headless_view.cpp2
-rw-r--r--platform/default/sqlite3.cpp2
-rw-r--r--platform/default/sqlite_cache.cpp4
3 files changed, 4 insertions, 4 deletions
diff --git a/platform/default/headless_view.cpp b/platform/default/headless_view.cpp
index d6fd892700..98d3a38ee7 100644
--- a/platform/default/headless_view.cpp
+++ b/platform/default/headless_view.cpp
@@ -185,7 +185,7 @@ PremultipliedImage HeadlessView::readStillImage() {
std::memcpy(rgba + j * stride, tmp.get(), stride);
}
- return std::move(image);
+ return image;
}
void HeadlessView::clearBuffers() {
diff --git a/platform/default/sqlite3.cpp b/platform/default/sqlite3.cpp
index 41e5814a70..196839bea4 100644
--- a/platform/default/sqlite3.cpp
+++ b/platform/default/sqlite3.cpp
@@ -69,7 +69,7 @@ void Database::exec(const std::string &sql) {
Statement Database::prepare(const char *query) {
assert(db);
- return std::move(Statement(db, query));
+ return Statement(db, query);
}
Statement::Statement(sqlite3 *db, const char *sql) {
diff --git a/platform/default/sqlite_cache.cpp b/platform/default/sqlite_cache.cpp
index 1ca278b8f5..45fab70aa1 100644
--- a/platform/default/sqlite_cache.cpp
+++ b/platform/default/sqlite_cache.cpp
@@ -121,9 +121,9 @@ void SQLiteCache::Impl::get(const Resource &resource, Callback callback) {
response->modified = Seconds(getStmt->get<Seconds::rep>(1));
response->etag = getStmt->get<std::string>(2);
response->expires = Seconds(getStmt->get<Seconds::rep>(3));
- response->data = std::make_shared<std::string>(std::move(getStmt->get<std::string>(4)));
+ response->data = std::make_shared<std::string>(getStmt->get<std::string>(4));
if (getStmt->get<int>(5)) { // == compressed
- response->data = std::make_shared<std::string>(std::move(util::decompress(*response->data)));
+ response->data = std::make_shared<std::string>(util::decompress(*response->data));
}
callback(std::move(response));
} else {