[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: [k3b] /: Revert "Use KF5KCddb Qt5 style header include."
From: Johannes Obermayr <johannesobermayr () gmx ! de>
Date: 2016-07-28 20:01:59
Message-ID: E1bSrVH-0004MO-Nm () code ! kde ! org
[Download RAW message or body]
Git commit 027c7e30dc1f36429f05a15fb2b8657abf18979d by Johannes Obermayr.
Committed on 28/07/2016 at 20:00.
Pushed by jobermayr into branch 'master'.
Revert "Use KF5KCddb Qt5 style header include."
This reverts commit cbe685c82361836956584d032c88081c41ed091f.
We use official libkcddb repository (https://quickgit.kde.org/?p=libkcddb.git).
Changes must go there before changing dependent projects.
CCMAIL: xiangzhai83@gmail.com
M +2 -2 libk3b/jobs/k3bcdcopyjob.cpp
M +1 -1 libk3b/jobs/k3bcdcopyjob.h
M +1 -1 libk3b/projects/audiocd/k3baudiocdtrackdrag.h
M +1 -1 libk3b/tools/k3bcddb.cpp
M +2 -2 libk3b/tools/k3bcddb.h
M +1 -1 libk3b/tools/k3bmediacache.cpp
M +1 -1 libk3b/tools/k3bmedium.cpp
M +1 -1 libk3b/tools/k3bmedium_p.h
M +1 -1 plugins/project/audioprojectcddb/k3baudioprojectcddbplugin.cpp
M +1 -1 src/k3bdiskinfoview.cpp
M +3 -3 src/rip/k3baudiocdview.cpp
M +1 -1 src/rip/k3baudioprojectconvertingdialog.cpp
M +1 -1 src/rip/k3baudioprojectconvertingjob.cpp
M +1 -1 src/rip/k3baudioripjob.cpp
M +1 -1 src/rip/k3baudiorippingdialog.h
M +1 -1 src/rip/k3baudiotrackmodel.cpp
M +1 -1 src/rip/k3bmassaudioencodingjob.cpp
M +1 -1 src/rip/k3bpatternparser.cpp
http://commits.kde.org/k3b/027c7e30dc1f36429f05a15fb2b8657abf18979d
diff --git a/libk3b/jobs/k3bcdcopyjob.cpp b/libk3b/jobs/k3bcdcopyjob.cpp
index dbd79a5..fc6f15f 100644
--- a/libk3b/jobs/k3bcdcopyjob.cpp
+++ b/libk3b/jobs/k3bcdcopyjob.cpp
@@ -49,8 +49,8 @@
#include <QtCore/QVector>
#include <QtWidgets/QApplication>
-#include <KCddb/Client>
-#include <KCddb/Cdinfo>
+#include <libkcddb/client.h>
+#include <libkcddb/cdinfo.h>
diff --git a/libk3b/jobs/k3bcdcopyjob.h b/libk3b/jobs/k3bcdcopyjob.h
index 63bfe70..d81ad34 100644
--- a/libk3b/jobs/k3bcdcopyjob.h
+++ b/libk3b/jobs/k3bcdcopyjob.h
@@ -21,7 +21,7 @@
#include "k3b_export.h"
#include "k3bglobals.h"
-#include <KCddb/Kcddb>
+#include <libkcddb/kcddb.h>
namespace K3b {
namespace Device {
diff --git a/libk3b/projects/audiocd/k3baudiocdtrackdrag.h \
b/libk3b/projects/audiocd/k3baudiocdtrackdrag.h index 9cc97a1..7807742 100644
--- a/libk3b/projects/audiocd/k3baudiocdtrackdrag.h
+++ b/libk3b/projects/audiocd/k3baudiocdtrackdrag.h
@@ -19,7 +19,7 @@
#include "k3bdevice.h"
#include "k3b_export.h"
-#include <KCddb/Cdinfo>
+#include <libkcddb/cdinfo.h>
class QMimeData;
diff --git a/libk3b/tools/k3bcddb.cpp b/libk3b/tools/k3bcddb.cpp
index 92d4c7e..3815db7 100644
--- a/libk3b/tools/k3bcddb.cpp
+++ b/libk3b/tools/k3bcddb.cpp
@@ -24,7 +24,7 @@
#include <QtWidgets/QListWidget>
#include <QtWidgets/QLabel>
-#include <KCddb/Client>
+#include <libkcddb/client.h>
KCDDB::TrackOffsetList K3b::CDDB::createTrackOffsetList( const K3b::Device::Toc& toc \
)
diff --git a/libk3b/tools/k3bcddb.h b/libk3b/tools/k3bcddb.h
index 25d2642..85380eb 100644
--- a/libk3b/tools/k3bcddb.h
+++ b/libk3b/tools/k3bcddb.h
@@ -17,8 +17,8 @@
#include <KCoreAddons/KJob>
-#include <KCddb/Kcddb>
-#include <KCddb/Cdinfo>
+#include <libkcddb/kcddb.h>
+#include <libkcddb/cdinfo.h>
#include "k3b_export.h"
diff --git a/libk3b/tools/k3bmediacache.cpp b/libk3b/tools/k3bmediacache.cpp
index 7723911..d8db10e 100644
--- a/libk3b/tools/k3bmediacache.cpp
+++ b/libk3b/tools/k3bmediacache.cpp
@@ -29,7 +29,7 @@
#include <QtCore/QMutex>
#include <QtCore/QEvent>
-#include <KCddb/Client>
+#include <libkcddb/client.h>
diff --git a/libk3b/tools/k3bmedium.cpp b/libk3b/tools/k3bmedium.cpp
index 801e0ff..0641768 100644
--- a/libk3b/tools/k3bmedium.cpp
+++ b/libk3b/tools/k3bmedium.cpp
@@ -27,7 +27,7 @@
#include <QtCore/QList>
#include <QtCore/QSharedData>
-#include <KCddb/Cdinfo>
+#include <libkcddb/cdinfo.h>
diff --git a/libk3b/tools/k3bmedium_p.h b/libk3b/tools/k3bmedium_p.h
index 6178968..b09170a 100644
--- a/libk3b/tools/k3bmedium_p.h
+++ b/libk3b/tools/k3bmedium_p.h
@@ -25,7 +25,7 @@
#include <QtCore/QSharedData>
#include <QtCore/QList>
-#include <KCddb/Cdinfo>
+#include <libkcddb/cdinfo.h>
namespace K3b {
diff --git a/plugins/project/audioprojectcddb/k3baudioprojectcddbplugin.cpp \
b/plugins/project/audioprojectcddb/k3baudioprojectcddbplugin.cpp index \
91ba5f9..50fc973 100644
--- a/plugins/project/audioprojectcddb/k3baudioprojectcddbplugin.cpp
+++ b/plugins/project/audioprojectcddb/k3baudioprojectcddbplugin.cpp
@@ -35,7 +35,7 @@
#include <QtCore/QString>
#include <QtWidgets/QProgressDialog>
-#include <KCddb/Cdinfo>
+#include <libkcddb/cdinfo.h>
K3B_EXPORT_PLUGIN( k3baudioprojectcddbplugin, K3bAudioProjectCddbPlugin )
diff --git a/src/k3bdiskinfoview.cpp b/src/k3bdiskinfoview.cpp
index 1005ef8..0f8b06c 100644
--- a/src/k3bdiskinfoview.cpp
+++ b/src/k3bdiskinfoview.cpp
@@ -25,7 +25,7 @@
#include "k3bglobals.h"
#include "k3biso9660.h"
-#include <KCddb/Cdinfo>
+#include <libkcddb/cdinfo.h>
#include <KIconThemes/KIconLoader>
#include <KI18n/KLocalizedString>
diff --git a/src/rip/k3baudiocdview.cpp b/src/rip/k3baudiocdview.cpp
index f2ab698..c1bf705 100644
--- a/src/rip/k3baudiocdview.cpp
+++ b/src/rip/k3baudiocdview.cpp
@@ -62,9 +62,9 @@
#include <QtWidgets/QTreeView>
#include <QtWidgets/QVBoxLayout>
-#include <KCddb/Genres>
-#include <KCddb/Cdinfo>
-#include <KCddb/Client>
+#include <libkcddb/genres.h>
+#include <libkcddb/cdinfo.h>
+#include <libkcddb/client.h>
#include "categories.h"
namespace mu = K3b::ModelUtils;
diff --git a/src/rip/k3baudioprojectconvertingdialog.cpp \
b/src/rip/k3baudioprojectconvertingdialog.cpp index ed789ee..1c31ade 100644
--- a/src/rip/k3baudioprojectconvertingdialog.cpp
+++ b/src/rip/k3baudioprojectconvertingdialog.cpp
@@ -46,7 +46,7 @@
#include <QtWidgets/QTabWidget>
#include <QtWidgets/QTreeWidget>
-#include <KCddb/Cdinfo>
+#include <libkcddb/cdinfo.h>
namespace {
diff --git a/src/rip/k3baudioprojectconvertingjob.cpp \
b/src/rip/k3baudioprojectconvertingjob.cpp index be1dfed..30ebbc4 100644
--- a/src/rip/k3baudioprojectconvertingjob.cpp
+++ b/src/rip/k3baudioprojectconvertingjob.cpp
@@ -20,7 +20,7 @@
#include "k3baudiotrack.h"
#include "k3baudiotrackreader.h"
-#include <KCddb/Cdinfo>
+#include <libkcddb/cdinfo.h>
#include <KI18n/KLocalizedString>
diff --git a/src/rip/k3baudioripjob.cpp b/src/rip/k3baudioripjob.cpp
index 37da03e..8aedab4 100644
--- a/src/rip/k3baudioripjob.cpp
+++ b/src/rip/k3baudioripjob.cpp
@@ -22,7 +22,7 @@
#include "k3btoc.h"
#include "k3btrack.h"
-#include <KCddb/Cdinfo>
+#include <libkcddb/cdinfo.h>
#include <KI18n/KLocalizedString>
diff --git a/src/rip/k3baudiorippingdialog.h b/src/rip/k3baudiorippingdialog.h
index 8b28239..ff0b770 100644
--- a/src/rip/k3baudiorippingdialog.h
+++ b/src/rip/k3baudiorippingdialog.h
@@ -20,7 +20,7 @@
#include "k3btoc.h"
#include "k3bmedium.h"
-#include <KCddb/Cdinfo>
+#include <libkcddb/cdinfo.h>
#include <QtCore/QList>
#include <QtCore/QStringList>
diff --git a/src/rip/k3baudiotrackmodel.cpp b/src/rip/k3baudiotrackmodel.cpp
index 691ff26..a3cca9c 100644
--- a/src/rip/k3baudiotrackmodel.cpp
+++ b/src/rip/k3baudiotrackmodel.cpp
@@ -21,7 +21,7 @@
#include <KI18n/KLocalizedString>
-#include <KCddb/Cdinfo>
+#include <libkcddb/cdinfo.h>
#include <QtCore/QMimeData>
#include <QtGui/QFont>
diff --git a/src/rip/k3bmassaudioencodingjob.cpp \
b/src/rip/k3bmassaudioencodingjob.cpp index 6f33866..5cb7bf7 100644
--- a/src/rip/k3bmassaudioencodingjob.cpp
+++ b/src/rip/k3bmassaudioencodingjob.cpp
@@ -18,7 +18,7 @@
#include "k3bwavefilewriter.h"
#include <KI18n/KLocalizedString>
-#include <KCddb/Cdinfo>
+#include <libkcddb/cdinfo.h>
#include <QtCore/QDebug>
#include <QtCore/QDir>
diff --git a/src/rip/k3bpatternparser.cpp b/src/rip/k3bpatternparser.cpp
index 8d6173e..bf15483 100644
--- a/src/rip/k3bpatternparser.cpp
+++ b/src/rip/k3bpatternparser.cpp
@@ -16,7 +16,7 @@
#include "k3bpatternparser.h"
-#include <KCddb/Cdinfo>
+#include <libkcddb/cdinfo.h>
#include <KI18n/KLocalizedString>
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic