Git commit f5c2d693675320c91b6ad8226ed3e7837933fc14 by Montel Laurent.
Committed on 31/10/2014 at 22:02.
Pushed by mlaurent into branch 'kf5_port'.

Port to kf5

M  +1    -1    ui/history/rangetreewidget.cpp
M  +5    -4    ui/history/transferhistory.cpp
M  +1    -1    ui/history/transferhistorycategorizedview.cpp
M  +1    -1    ui/history/transferhistoryitemdelegate.cpp

http://commits.kde.org/kget/f5c2d693675320c91b6ad8226ed3e7837933fc14

diff --git a/ui/history/rangetreewidget.cpp b/ui/history/rangetreewidget.cpp
index 7b8e32e..ecfb7ea 100644
--- a/ui/history/rangetreewidget.cpp
+++ b/ui/history/rangetreewidget.cpp
@@ -11,7 +11,7 @@
 #include "rangetreewidget.h"
 #include "settings.h"
 =

-#include <KDebug>
+#include <QDebug>
 =

 #include <QApplication>
 #include <QFont>
diff --git a/ui/history/transferhistory.cpp b/ui/history/transferhistory.cpp
index 8d8d14f..7be753f 100644
--- a/ui/history/transferhistory.cpp
+++ b/ui/history/transferhistory.cpp
@@ -29,8 +29,8 @@
 #include <QVariant>
 #include <QStandardItem>
 =

-#include <KDebug>
-#include <KStandardDirs>
+#include <QDebug>
+
 #include <KTreeWidgetSearchLine>
 #include <KRun>
 #include <kio/global.h>
@@ -39,6 +39,7 @@
 #include <QIcon>
 #include <KLocalizedString>
 #include <QFontDatabase>
+#include <QStandardPaths>
 =

 TransferHistory::TransferHistory(QWidget *parent)
     : KGetSaveSizeDialog("TransferHistory", parent),
@@ -92,7 +93,7 @@ TransferHistory::TransferHistory(QWidget *parent)
     layout()->addWidget(mainWidget);
 =

     watcher =3D new QFileSystemWatcher();
-    watcher->addPath(KStandardDirs::locateLocal("appdata", QString()));
+    watcher->addPath(QStandardPaths::writableLocation(QStandardPaths::Data=
Location) + QLatin1Char('/') + QString());
     qCDebug(KGET_DEBUG) << watcher->directories();
 =

     m_store =3D TransferHistoryStore::getStore();
@@ -203,7 +204,7 @@ void TransferHistory::slotOpenFile(const QModelIndex &i=
ndex)
         file =3D categorized_view->data(index, TransferHistoryCategorizedD=
elegate::RoleDest).toString();
     }
 =

-    kDebug() << "Try to open the file : " << file;
+    //qDebug() << "Try to open the file : " << file;
     if (!file.isEmpty()) {
         new KRun(file, this, true, false);
     }
diff --git a/ui/history/transferhistorycategorizedview.cpp b/ui/history/tra=
nsferhistorycategorizedview.cpp
index 8d44c6f..f72bcdf 100644
--- a/ui/history/transferhistorycategorizedview.cpp
+++ b/ui/history/transferhistorycategorizedview.cpp
@@ -13,7 +13,7 @@
 #include <kcategorizedsortfilterproxymodel.h>
 #include <kcategorizedview.h>
 #include <kcategorydrawer.h>
-#include <KDebug>
+#include <QDebug>
 =

 #include <QGridLayout>
 #include <QModelIndex>
diff --git a/ui/history/transferhistoryitemdelegate.cpp b/ui/history/transf=
erhistoryitemdelegate.cpp
index 3bfa484..6a8f8a0 100644
--- a/ui/history/transferhistoryitemdelegate.cpp
+++ b/ui/history/transferhistoryitemdelegate.cpp
@@ -23,7 +23,7 @@
 #include <QPainter>
 #include <QDate>
 =

-#include <KDebug>
+#include <QDebug>
 #include <kio/netaccess.h>
 #include <kio/global.h>
 #include <KIconLoader>