Commit ad73de76 authored by Nicolas Fella's avatar Nicolas Fella
Browse files

Partly port away from KIconThemes

Instead of passing a pixmap to the notification jsut pass the icon name.
That's better anyway.

Remove includes and linkage where possible
parent bb455273
......@@ -317,7 +317,7 @@ ki18n_wrap_ui(kget_SRCS
add_executable(kget ${kget_SRCS})
target_link_libraries(kget Qt5::Core Qt5::Widgets Qt5::Sql Qt5::Network Qt5::DBus KF5::Crash KF5::Wallet KF5::DBusAddons KF5::I18n KF5::Completion KF5::CoreAddons KF5::IconThemes KF5::ItemViews KF5::KCMUtils KF5::NotifyConfig KF5::WindowSystem KF5::KDELibs4Support kgetcore)
target_link_libraries(kget Qt5::Core Qt5::Widgets Qt5::Sql Qt5::Network Qt5::DBus KF5::Crash KF5::Wallet KF5::DBusAddons KF5::I18n KF5::Completion KF5::CoreAddons KF5::ItemViews KF5::KCMUtils KF5::NotifyConfig KF5::WindowSystem KF5::KDELibs4Support kgetcore)
if(Qca_FOUND)
target_link_libraries(kget qca)
endif()
......
......@@ -36,7 +36,6 @@
#include <KMessageBox>
#include <KLocalizedString>
#include <KIconLoader>
#include <KActionCollection>
#include <KIO/RenameDialog>
#include <KIO/DeleteJob>
......@@ -1278,7 +1277,7 @@ bool KGet::safeDeleteFile( const QUrl& url )
KNotification *KGet::showNotification(QWidget *parent, const QString &eventType,
const QString &text, const QString &icon, const QString &title, const KNotification::NotificationFlags &flags)
{
return KNotification::event(eventType, title, text, QIcon::fromTheme(icon).pixmap(KIconLoader::SizeMedium), parent, flags);
return KNotification::event(eventType, title, text, icon, parent, flags);
}
GenericObserver::GenericObserver(QObject *parent)
......
......@@ -8,7 +8,7 @@ QT5_ADD_DBUS_INTERFACE(kget_browser_integration_SRCS ../../dbus/org.kde.kget.mai
add_library(kget_browser_integration MODULE ${kget_browser_integration_SRCS})
target_link_libraries(kget_browser_integration KF5::CoreAddons KF5::IconThemes KF5::Parts)
target_link_libraries(kget_browser_integration KF5::CoreAddons KF5::Parts)
install(TARGETS kget_browser_integration DESTINATION ${KDE_INSTALL_PLUGINDIR})
......
......@@ -24,7 +24,6 @@
#include <KActionMenu>
#include <KDialogJobUiDelegate>
#include <KFileItem>
#include <KIconLoader>
#include <KIO/CommandLauncherJob>
#include <KLocalizedString>
#include <KMessageBox>
......@@ -37,7 +36,6 @@
#include <KParts/ReadOnlyPart>
#include <KParts/SelectorInterface>
#include <KToggleAction>
#include <KToolInvocation>
#define QL1S(x) QLatin1String(x)
......
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