File 0002-Revert-replace-obsolete-qSort-function.patch of Package digikam

Overview Repositories Revisions Requests Users Attributes Meta

File 0002-Revert-replace-obsolete-qSort-function.patch of Package digikam (Revision 94030d1c19d3aac5ee1fef47282cdff4)

Currently displaying revision 94030d1c19d3aac5ee1fef47282cdff4 , Show latest

From d19d149b55c3f25c3c7f1c69c0b777acf0c83024 Mon Sep 17 00:00:00 2001
From: Wolfgang Bauer <wbauer@tmo.at>
Date: Sun, 14 Jan 2018 01:47:45 +0100
Subject: [PATCH] Revert "replace obsolete qSort() function"

This reverts commit 734b9d685f458e5f4dadc61216fbf12f9dc59ca6.
It breaks compilation with GCC 4.8.
---
 facebook/fbtalker.cpp        | 3 ++-
 flashexport/simpleviewer.cpp | 2 +-
 googleservices/gdtalker.cpp  | 2 +-
 googleservices/gptalker.cpp  | 2 +-
 piwigo/piwigotalker.cpp      | 2 +-
 smug/smugtalker.cpp          | 2 +-
 6 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/extra/kipi-plugins/facebook/fbtalker.cpp b/extra/kipi-plugins/facebook/fbtalker.cpp
index 24d8b9723..71d704ee0 100644
--- a/extra/kipi-plugins/facebook/fbtalker.cpp
+++ b/extra/kipi-plugins/facebook/fbtalker.cpp
@@ -43,6 +43,7 @@
 #include <QPlainTextEdit>
 #include <QList>
 #include <QDesktopServices>
+#include <QDebug>
 #include <QApplication>
 #include <QPushButton>
 #include <QDialog>
@@ -863,7 +864,7 @@ void FbTalker::parseResponseListAlbums(const QByteArray& data)
         errMsg  = obj[QString::fromLatin1("message")].toString();
     }
 
-    std::sort(albumsList.begin(), albumsList.end());
+    qSort(albumsList.begin(), albumsList.end());
 
     emit signalBusy(false);
     emit signalListAlbumsDone(errCode, errorToText(errCode, errMsg),
diff --git a/extra/kipi-plugins/flashexport/simpleviewer.cpp b/extra/kipi-plugins/flashexport/simpleviewer.cpp
index 618f1b30a..b60f7fdda 100644
--- a/extra/kipi-plugins/flashexport/simpleviewer.cpp
+++ b/extra/kipi-plugins/flashexport/simpleviewer.cpp
@@ -530,7 +530,7 @@ void SimpleViewer::processQUrlList(QList<QUrl>& images, QDomDocument& xmlDoc,
     QUrl imagesDir = QUrl::fromLocalFile(d->tempDir->path());
     imagesDir.setPath(imagesDir.path() + QLatin1String("/images/"));
 
-    std::sort(images.begin(), images.end(), cmpUrl);
+    qSort(images.begin(), images.end(), cmpUrl);
 
     for (QList<QUrl>::ConstIterator it = images.constBegin();
          !d->canceled && (it != images.constEnd()) ; ++it)
diff --git a/extra/kipi-plugins/googleservices/gdtalker.cpp b/extra/kipi-plugins/googleservices/gdtalker.cpp
index b7ba5295f..d719089f1 100644
--- a/extra/kipi-plugins/googleservices/gdtalker.cpp
+++ b/extra/kipi-plugins/googleservices/gdtalker.cpp
@@ -355,7 +355,7 @@ void GDTalker::parseResponseListFolders(const QByteArray& data)
         albumList.append(fps);
     }
 
-    std::sort(albumList.begin(), albumList.end(), gdriveLessThan);
+    qSort(albumList.begin(), albumList.end(), gdriveLessThan);
     emit signalBusy(false);
     emit signalListAlbumsDone(1,QString(),albumList);
 }
diff --git a/extra/kipi-plugins/googleservices/gptalker.cpp b/extra/kipi-plugins/googleservices/gptalker.cpp
index fe839a7d2..264acfa79 100644
--- a/extra/kipi-plugins/googleservices/gptalker.cpp
+++ b/extra/kipi-plugins/googleservices/gptalker.cpp
@@ -745,7 +745,7 @@ void GPTalker::parseResponseListAlbums(const QByteArray& data)
         node = node.nextSibling();
     }
 
-    std::sort(albumList.begin(), albumList.end(), gphotoLessThan);
+    qSort(albumList.begin(), albumList.end(), gphotoLessThan);
     emit signalListAlbumsDone(1, QString::fromLatin1(""), albumList);
 }
 
diff --git a/extra/kipi-plugins/piwigo/piwigotalker.cpp b/extra/kipi-plugins/piwigo/piwigotalker.cpp
index 3fbfbec66..81c8368e0 100644
--- a/extra/kipi-plugins/piwigo/piwigotalker.cpp
+++ b/extra/kipi-plugins/piwigo/piwigotalker.cpp
@@ -569,7 +569,7 @@ void PiwigoTalker::parseResponseListAlbums(const QByteArray& data)
     }
 
     // We need parent albums to come first for rest of the code to work
-    std::sort(albumList.begin(), albumList.end());
+    qSort(albumList);
 
     emit signalAlbums(albumList);
 }
diff --git a/extra/kipi-plugins/smug/smugtalker.cpp b/extra/kipi-plugins/smug/smugtalker.cpp
index 873a1f061..9349be00f 100644
--- a/extra/kipi-plugins/smug/smugtalker.cpp
+++ b/extra/kipi-plugins/smug/smugtalker.cpp
@@ -846,7 +846,7 @@ void SmugTalker::parseResponseListAlbums(const QByteArray& data)
     if (errCode == 15)  // 15: empty list
         errCode = 0;
 
-    std::sort(albumsList.begin(), albumsList.end(), SmugAlbum::lessThan);
+    qSort(albumsList.begin(), albumsList.end(), SmugAlbum::lessThan);
 
     emit signalBusy(false);
     emit signalListAlbumsDone(errCode, errorToText(errCode, errMsg), albumsList);
-- 
2.13.6

Places

File 0002-Revert-replace-obsolete-qSort-function.patch of Package digikam (Revision 94030d1c19d3aac5ee1fef47282cdff4)

Places