Commit 1e3b90b8 authored by Michael Pyne's avatar Michael Pyne
Browse files

Remove Kdelibs4Support.

This required a wide assortment of fixes, including deleting
needless #include <koldfoo.h> headers, some minor additional porting
tasks, and adding in includes that were previously only implicitly
included.
parent 4e13f805
......@@ -20,8 +20,8 @@ include(ECMQtDeclareLoggingCategory)
find_package(Qt5 ${QT_MIN_VERSION} REQUIRED COMPONENTS Gui Svg Network Test Widgets)
find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS CoreAddons Completion Config GlobalAccel
I18n IconThemes DocTools TextWidgets XmlGui Wallet
WidgetsAddons WindowSystem KDELibs4Support)
I18n IconThemes DocTools KIO JobWidgets Notifications TextWidgets XmlGui Wallet
WidgetsAddons WindowSystem)
find_package(Phonon4Qt5 4.6.60 REQUIRED NO_MODULE)
find_package(Taglib 1.6 REQUIRED)
......@@ -165,8 +165,9 @@ endif()
target_link_libraries(juk ${LIBMATH} Qt5::Gui Qt5::Svg Qt5::Widgets
Qt5::Network KF5::ConfigCore KF5::CoreAddons KF5::Completion KF5::GlobalAccel
KF5::KIOCore KF5::KIOWidgets KF5::KIOFileWidgets KF5::JobWidgets KF5::Notifications
KF5::I18n KF5::IconThemes KF5::TextWidgets KF5::XmlGui KF5::WindowSystem
KF5::WidgetsAddons KF5::Wallet KF5::KDELibs4Support Phonon::phonon4qt5 ${TAGLIB_LIBRARIES})
KF5::WidgetsAddons KF5::Wallet Phonon::phonon4qt5 ${TAGLIB_LIBRARIES})
if(TUNEPIMP_FOUND)
target_link_libraries(juk ${TUNEPIMP_LIBRARIES})
endif(TUNEPIMP_FOUND)
......
......@@ -18,8 +18,7 @@
#include "advancedsearchdialog.h"
#include <kcombobox.h>
#include <klocale.h>
#include <kvbox.h>
#include <KLocalizedString>
#include <KStandardGuiItem>
#include <QDialogButtonBox>
......
......@@ -18,12 +18,10 @@
#include "cache.h"
#include "juk-exception.h"
#include <kstandarddirs.h>
#include <kmessagebox.h>
#include <kconfig.h>
#include <klocale.h>
#include <ktoggleaction.h>
#include <kglobal.h>
#include <KLocalizedString>
#include <QDir>
#include <QBuffer>
......
......@@ -16,15 +16,13 @@
#include "collectionlist.h"
#include <klocale.h>
#include <kmessagebox.h>
#include <kmenu.h>
#include <kconfig.h>
#include <kconfiggroup.h>
#include <KConfigGroup>
#include <KSharedConfig>
#include <kactioncollection.h>
#include <kstandarddirs.h>
#include <ktoolbarpopupaction.h>
#include <kdirwatch.h>
#include <KLocalizedString>
#include <QList>
#include <QDragMoveEvent>
......@@ -32,6 +30,7 @@
#include <QApplication>
#include <QTimer>
#include <QTime>
#include <QMenu>
#include <QClipboard>
#include <QFileInfo>
#include <QHeaderView>
......
......@@ -17,8 +17,8 @@
#include "coverdialog.h"
#include <KLocalizedString>
#include <kiconloader.h>
#include <klocale.h>
#include <QTimer>
#include <QMenu>
......
......@@ -17,8 +17,6 @@
#include "coverinfo.h"
#include <kglobal.h>
#include <QApplication>
#include <QRegExp>
#include <QLabel>
......
......@@ -32,7 +32,6 @@
#include <QStandardPaths>
#include <QUrl>
#include <kdemacros.h>
#include <kio/job.h>
#include "juk.h"
......@@ -275,7 +274,7 @@ void CoverManagerPrivate::loadCovers()
// don't do so again. Possible due to a coding error during 3.5
// development.
if(KDE_ISLIKELY(!tracks.contains(path))) {
if(Q_LIKELY(!tracks.contains(path))) {
++covers[(coverKey) id].refCount; // Another track using this.
tracks.insert(path, id);
}
......
......@@ -17,8 +17,6 @@
#ifndef JUK_COVERMANAGER_H
#define JUK_COVERMANAGER_H
#include <ksharedptr.h>
#include <QObject>
#include <QMimeData>
#include <QString>
......
......@@ -17,8 +17,8 @@
#ifndef DBUS_COLLECTION_PROXY_H
#define DBUS_COLLECTION_PROXY_H
#include <QtCore/QObject>
#include <QtCore/QStringList> // Required for Q_CLASSINFO ?
#include <QObject>
#include <QStringList> // Required for Q_CLASSINFO ?
class PlaylistCollection;
......
......@@ -18,11 +18,11 @@
#include "ui_deletedialogbase.h"
#include <KStandardGuiItem>
#include <klocale.h>
#include <kiconloader.h>
#include <kconfig.h>
#include <kconfiggroup.h>
#include <kglobal.h>
#include <KLocalizedString>
#include <KIconLoader>
#include <KConfig>
#include <KConfigGroup>
#include <KSharedConfig>
#include <QDialogButtonBox>
#include <QStringList>
......
......@@ -24,7 +24,6 @@
#include <QFileDialog>
#include <QStandardPaths>
#include <klocale.h>
#include "juk_debug.h"
////////////////////////////////////////////////////////////////////////////////
......
......@@ -21,7 +21,7 @@
#include <QShowEvent>
#include <QVBoxLayout>
#include <klocale.h>
#include <KLocalizedString>
ExampleOptions::ExampleOptions(QWidget *parent) :
QWidget(parent)
......
......@@ -258,7 +258,7 @@ QStringList FileHandle::properties() // static
QString FileHandle::property(const QString &name) const
{
return FileHandleProperties::property(*this, name.toAscii());
return FileHandleProperties::property(*this, name.toUtf8());
}
const FileHandle &FileHandle::null() // static
......
......@@ -20,16 +20,14 @@
#include <algorithm>
#include <kurlrequester.h>
#include <KUrlRequester>
#include <kiconloader.h>
#include <knuminput.h>
#include <KLocalizedString>
#include <kio/job.h>
#include <kio/netaccess.h>
#include <kdesktopfile.h>
#include <kconfiggroup.h>
#include <kglobal.h>
#include <KSharedConfig>
#include <klineedit.h>
#include <klocale.h>
#include <kmessagebox.h>
#include <QFile>
......@@ -947,7 +945,7 @@ bool FileRenamer::moveFile(const QString &src, const QString &dest)
// Move the file.
KIO::Job *job = KIO::file_move(srcURL, dstURL);
return KIO::NetAccess::synchronousRun(job, 0);
return job->exec();
}
void FileRenamer::setFolderIcon(const QUrl &dstURL, const PlaylistItem *item)
......
......@@ -260,12 +260,12 @@
<customwidget>
<class>KUrlRequester</class>
<extends>QFrame</extends>
<header>kurlrequester.h</header>
<header>KUrlRequester</header>
</customwidget>
<customwidget>
<class>KComboBox</class>
<extends>QComboBox</extends>
<header>kcombobox.h</header>
<header>KComboBox</header>
</customwidget>
</customwidgets>
<tabstops>
......
......@@ -18,7 +18,7 @@
#include "filerenamerconfigdlg.h"
#include "filerenamer.h"
#include <klocale.h>
#include <KLocalizedString>
FileRenamerConfigDlg::FileRenamerConfigDlg(QWidget *parent)
: QDialog(parent)
......
......@@ -16,8 +16,7 @@
#include "filerenameroptions.h"
#include <klocale.h>
#include <knuminput.h>
#include <KLocalizedString>
#include "juk_debug.h"
......
......@@ -18,7 +18,7 @@
#include <QTimer>
#include <KLocale>
#include <KLocalizedString>
#include "collectionlist.h"
#include "playermanager.h"
......
......@@ -17,18 +17,16 @@
#include "juk.h"
#include <kstatusbar.h>
#include <kmessagebox.h>
#include <kactioncollection.h>
#include <kstandardaction.h>
#include <ktoggleaction.h>
#include <kactionmenu.h>
#include <kconfiggroup.h>
#include <kglobal.h>
#include <KSharedConfig>
#include <kglobalaccel.h>
#include <ktoolbarpopupaction.h>
#include <knotification.h>
#include <kdeversion.h>
#include <QIcon>
#include <QAction>
......@@ -39,6 +37,7 @@
#include <QTime>
#include <QTimer>
#include <QDesktopWidget>
#include <QStatusBar>
#include "slideraction.h"
#include "statuslabel.h"
......
......@@ -18,12 +18,12 @@
#include "keydialog.h"
#include "actioncollection.h"
#include <kconfig.h>
#include <klocale.h>
#include <kshortcutseditor.h>
#include <kglobal.h>
#include <kconfiggroup.h>
#include <KConfig>
#include <KShortcutsEditor>
#include <KConfigGroup>
#include <KSharedConfig>
#include <KGlobalAccel>
#include <KLocalizedString>
#include <QAction>
#include <QKeySequence>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment