Commit 8787d751 authored by Luigi Toscano's avatar Luigi Toscano

Clean kapplication.h and KDE4 include dirs

- clean unneeded include variables/directories for KDE4 and Qt,
  adding the proper target to the libraries to be linked;
- remove occurrences of kapplication.h, adding QApplication
  headers and instances when needed.
parent 36064e18
......@@ -19,14 +19,14 @@ include(ECMAddAppIcon)
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 GlobalAccel
find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS CoreAddons Completion Config GlobalAccel
I18n IconThemes DocTools TextWidgets XmlGui Wallet
WidgetsAddons WindowSystem KDELibs4Support)
find_package(Phonon4Qt5 4.6.60 REQUIRED NO_MODULE)
find_package(Taglib 1.6 REQUIRED)
include_directories(${CMAKE_BINARY_DIR} ${PHONON_INCLUDES} ${KDE4_INCLUDES} ${QT_INCLUDES} )
include_directories(${CMAKE_BINARY_DIR} ${PHONON_INCLUDES})
add_subdirectory( doc )
add_subdirectory( tests )
......@@ -164,9 +164,9 @@ if(NOT MSVC AND NOT ( WIN32 AND "${CMAKE_CXX_COMPILER_ID}" STREQUAL "Intel" ) )
endif()
target_link_libraries(juk ${LIBMATH} Qt5::Gui Qt5::Svg Qt5::Widgets
Qt5::Network KF5::CoreAddons KF5::Completion KF5::GlobalAccel
Qt5::Network KF5::ConfigCore KF5::CoreAddons KF5::Completion KF5::GlobalAccel
KF5::I18n KF5::IconThemes KF5::TextWidgets KF5::XmlGui KF5::WindowSystem
KF5::WidgetsAddons KF5::Wallet KF5::KDELibs4Support ${PHONON_LIBRARY} ${TAGLIB_LIBRARIES})
KF5::WidgetsAddons KF5::Wallet KF5::KDELibs4Support Phonon::phonon4qt5 ${TAGLIB_LIBRARIES})
if(TUNEPIMP_FOUND)
target_link_libraries(juk ${TUNEPIMP_LIBRARIES})
endif(TUNEPIMP_FOUND)
......
......@@ -18,7 +18,6 @@
#include "coverdialog.h"
#include <kiconloader.h>
#include <kapplication.h>
#include <kmenu.h>
#include <klocale.h>
......
......@@ -18,8 +18,8 @@
#include "coverinfo.h"
#include <kglobal.h>
#include <kapplication.h>
#include <QApplication>
#include <QRegExp>
#include <QLabel>
#include <QCursor>
......
......@@ -32,7 +32,6 @@
#include <kglobal.h>
#include <klineedit.h>
#include <klocale.h>
#include <kapplication.h>
#include <kmessagebox.h>
#include <kvbox.h>
......
......@@ -27,7 +27,6 @@
#include <QIcon>
#include <QAction>
#include <kconfiggroup.h>
#include <kapplication.h>
#include <kglobal.h>
#include <kglobalaccel.h>
#include <ktoolbarpopupaction.h>
......@@ -557,7 +556,7 @@ void JuK::slotQuit()
{
m_shuttingDown = true;
kapp->quit();
qApp->quit();
}
////////////////////////////////////////////////////////////////////////////////
......
......@@ -19,7 +19,6 @@
#include "juk-exception.h"
#include <kconfig.h>
#include <kapplication.h>
#include <kmessagebox.h>
#include <kiconloader.h>
#include <klineedit.h>
......
......@@ -19,7 +19,6 @@
#include <kurl.h>
#include <kiconloader.h>
#include <kapplication.h>
#include <kinputdialog.h>
#include <kmessagebox.h>
#include <kfiledialog.h>
......
......@@ -17,7 +17,6 @@
#include "splashscreen.h"
#include "juk_debug.h"
#include <kapplication.h>
#include <kiconloader.h>
#include <klocale.h>
#include <kstandarddirs.h>
......
......@@ -29,7 +29,6 @@
#include <klineedit.h>
#include <knuminput.h>
#include <ktextedit.h>
#include <kapplication.h>
#include <kmessagebox.h>
#include <kconfig.h>
#include <klocale.h>
......
......@@ -17,12 +17,11 @@
#include "tagguesser.h"
#include "juk_debug.h"
#include <kapplication.h>
#include <kconfig.h>
#include <kglobal.h>
#include <kmacroexpander.h>
#include <qhash.h>
#include <kconfiggroup.h>
#include <KSharedConfig>
FileNameScheme::FileNameScheme(const QString &s)
: m_regExp(),
......
......@@ -20,7 +20,6 @@
#include <QIcon>
#include <klocale.h>
#include <klineedit.h>
#include <kapplication.h>
#include <QKeyEvent>
#include <QStringListModel>
......
......@@ -18,9 +18,9 @@
#include <klocale.h>
#include <kmessagebox.h>
#include <QAction>
#include <kapplication.h>
#include <QAction>
#include <QApplication>
#include <QFileInfo>
#include <QDir>
......@@ -194,7 +194,7 @@ bool TagTransactionManager::processChangeList(bool undo)
errorItems.append(str);
}
kapp->processEvents();
qApp->processEvents();
}
undo ? m_undoList.clear() : m_list.clear();
......
......@@ -12,4 +12,4 @@ add_executable(tagguessertest ${tagguessertest_SRCS})
add_test(tagguesser tagguessertest)
ecm_mark_as_test(tagguessertest)
target_link_libraries(tagguessertest ${KDE4_KDECORE_LIBS} Qt5::Test)
target_link_libraries(tagguessertest Qt5::Test KF5::ConfigCore KF5::CoreAddons)
......@@ -17,7 +17,6 @@
#include "tracksequenceiterator.h"
#include <QAction>
#include <kapplication.h>
#include <krandom.h>
#include <ktoggleaction.h>
......
......@@ -16,7 +16,6 @@
#include "treeviewitemplaylist.h"
#include <kapplication.h>
#include <kmessagebox.h>
#include <klocale.h>
......
......@@ -17,7 +17,6 @@
#include "upcomingplaylist.h"
#include "juk-exception.h"
#include <kapplication.h>
#include <QAction>
#include "playlistitem.h"
......
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