From: Manuel Nickschas Date: Fri, 2 Jan 2015 23:14:49 +0000 (+0100) Subject: Rename HAVE_KDE define to HAVE_KDE4 X-Git-Tag: 0.12-beta1~45 X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=commitdiff_plain;h=c52a94cb937654bf06d5074bf0736a52ec94a52d Rename HAVE_KDE define to HAVE_KDE4 The build system now sets HAVE_KDE regardless if we're building with KDE4 or KF5, and in addition adds HAVE_KDE4 and HAVE_KF5. As many of the frameworks are source compatible with the old kdelibs, this will allow switching HAVE_KDE4 back to HAVE_KDE later where possible, without having to check for two defines everywhere. --- diff --git a/CMakeLists.txt b/CMakeLists.txt index e2d5f48b..e30facfd 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -430,8 +430,8 @@ if (KDE4_FOUND) set(EMBED_DATA OFF) # Better have the compile flags global, even for the core, to avoid problems with linking the mono client - add_definitions(-DHAVE_KDE ${KDE4_DEFINITIONS}) - set(HAVE_KDE4 TRUE) + add_definitions(-DHAVE_KDE -DHAVE_KDE4 ${KDE4_DEFINITIONS}) + set(WITH_KDE4 TRUE) endif() if (USE_QT5 AND WITH_KDE) @@ -442,8 +442,8 @@ if (USE_QT5 AND WITH_KDE) include(KDECompilerSettings) include(KDECMakeSettings) - add_definitions(-DHAVE_KF5) - set(HAVE_KF5 TRUE) + add_definitions(-DHAVE_KDE -DHAVE_KF5) + set(WITH_KF5 TRUE) endif() # This needs to come after setting up KDE integration, so we can use KDE-specific paths diff --git a/cmake/QuasselInstallDirs.cmake b/cmake/QuasselInstallDirs.cmake index b6786434..9075a808 100644 --- a/cmake/QuasselInstallDirs.cmake +++ b/cmake/QuasselInstallDirs.cmake @@ -44,7 +44,7 @@ if (NOT WITH_KDE) endif() endif() else() - if (HAVE_KDE4) + if (WITH_KDE4) # FindKDE4Internal.cmake sets its own set of variables, however with deprecated names if (NOT DEFINED CMAKE_INSTALL_BINDIR) set(CMAKE_INSTALL_BINDIR "${BIN_INSTALL_DIR}" CACHE PATH "Install path for binaries") diff --git a/src/client/clientsettings.cpp b/src/client/clientsettings.cpp index fd8446b8..c27e03a3 100644 --- a/src/client/clientsettings.cpp +++ b/src/client/clientsettings.cpp @@ -249,7 +249,7 @@ void CoreConnectionSettings::setNetworkDetectionMode(NetworkDetectionMode mode) CoreConnectionSettings::NetworkDetectionMode CoreConnectionSettings::networkDetectionMode() { -#ifdef HAVE_KDE +#ifdef HAVE_KDE4 NetworkDetectionMode def = UseSolid; #else NetworkDetectionMode def = UsePingTimeout; diff --git a/src/client/coreconnection.cpp b/src/client/coreconnection.cpp index c08151b5..a4e24e02 100644 --- a/src/client/coreconnection.cpp +++ b/src/client/coreconnection.cpp @@ -57,7 +57,7 @@ void CoreConnection::init() _reconnectTimer.setSingleShot(true); connect(&_reconnectTimer, SIGNAL(timeout()), SLOT(reconnectTimeout())); -#ifdef HAVE_KDE +#ifdef HAVE_KDE4 connect(Solid::Networking::notifier(), SIGNAL(statusChanged(Solid::Networking::Status)), SLOT(solidNetworkStatusChanged(Solid::Networking::Status))); #endif @@ -127,7 +127,7 @@ void CoreConnection::reconnectTimeout() if (!_peer) { CoreConnectionSettings s; if (_wantReconnect && s.autoReconnect()) { -#ifdef HAVE_KDE +#ifdef HAVE_KDE4 // If using Solid, we don't want to reconnect if we're offline if (s.networkDetectionMode() == CoreConnectionSettings::UseSolid) { if (Solid::Networking::status() != Solid::Networking::Connected @@ -135,7 +135,7 @@ void CoreConnection::reconnectTimeout() return; } } -#endif /* HAVE_KDE */ +#endif /* HAVE_KDE4 */ reconnectToCore(); } @@ -169,7 +169,7 @@ void CoreConnection::reconnectIntervalChanged(const QVariant &interval) } -#ifdef HAVE_KDE +#ifdef HAVE_KDE4 void CoreConnection::solidNetworkStatusChanged(Solid::Networking::Status status) { diff --git a/src/client/coreconnection.h b/src/client/coreconnection.h index 9d3f353a..c6b2e261 100644 --- a/src/client/coreconnection.h +++ b/src/client/coreconnection.h @@ -30,7 +30,7 @@ # include #endif -#ifdef HAVE_KDE +#ifdef HAVE_KDE4 # include #endif @@ -148,7 +148,7 @@ private slots: void reconnectIntervalChanged(const QVariant &interval); void reconnectTimeout(); -#ifdef HAVE_KDE +#ifdef HAVE_KDE4 void solidNetworkStatusChanged(Solid::Networking::Status status); #endif diff --git a/src/common/main.cpp b/src/common/main.cpp index 9bf99cf2..65525984 100644 --- a/src/common/main.cpp +++ b/src/common/main.cpp @@ -32,11 +32,11 @@ #endif // We don't want quasselcore to depend on KDE -#if defined HAVE_KDE && defined BUILD_CORE -# undef HAVE_KDE +#if defined HAVE_KDE4 && defined BUILD_CORE +# undef HAVE_KDE4 #endif -#ifdef HAVE_KDE +#ifdef HAVE_KDE4 # include # include "kcmdlinewrapper.h" #endif @@ -83,7 +83,7 @@ int main(int argc, char **argv) AbstractCliParser *cliParser; -#ifdef HAVE_KDE +#ifdef HAVE_KDE4 // We need to init KCmdLineArgs first // TODO: build an AboutData compat class to replace our aboutDlg strings KAboutData aboutData("quassel", "kdelibs4", ki18n("Quassel IRC"), Quassel::buildInfo().plainVersionString.toUtf8(), @@ -143,7 +143,7 @@ int main(int argc, char **argv) cliParser->addSwitch("enable-experimental-dcc", 0, "Enable highly experimental and unfinished support for CTCP DCC (DANGEROUS)"); #endif -#ifdef HAVE_KDE +#ifdef HAVE_KDE4 // the KDE version needs this extra call to parse argc/argv before app is instantiated if (!cliParser->init()) { cliParser->usage(); @@ -159,7 +159,7 @@ int main(int argc, char **argv) MonolithicApplication app(argc, argv); # endif -#ifndef HAVE_KDE +#ifndef HAVE_KDE4 // the non-KDE version parses after app has been instantiated if (!cliParser->init(app.arguments())) { cliParser->usage(); diff --git a/src/qtui/chatscene.cpp b/src/qtui/chatscene.cpp index 1d9d94e0..a0d9be3b 100644 --- a/src/qtui/chatscene.cpp +++ b/src/qtui/chatscene.cpp @@ -30,7 +30,7 @@ #include #include -#ifdef HAVE_KDE +#ifdef HAVE_KDE4 # include #else # include diff --git a/src/qtui/inputwidget.cpp b/src/qtui/inputwidget.cpp index 7d3b3e0a..1ac3db05 100644 --- a/src/qtui/inputwidget.cpp +++ b/src/qtui/inputwidget.cpp @@ -101,7 +101,7 @@ InputWidget::InputWidget(QWidget *parent) UiSettings s("InputWidget"); -#ifdef HAVE_KDE +#ifdef HAVE_KDE4 s.notify("EnableSpellCheck", this, SLOT(setEnableSpellCheck(QVariant))); setEnableSpellCheck(s.value("EnableSpellCheck", false)); #endif @@ -505,7 +505,7 @@ void InputWidget::onTextEntered(const QString &text) fmt.clearBackground(); inputLine()->setCurrentCharFormat(fmt); -#ifdef HAVE_KDE +#ifdef HAVE_KDE4 // Set highlighter back to active in case it was deactivated by too many errors. if (ui.inputEdit->highlighter()) ui.inputEdit->highlighter()->setActive(true); diff --git a/src/qtui/legacysystemtray.cpp b/src/qtui/legacysystemtray.cpp index c425c3e8..16700d60 100644 --- a/src/qtui/legacysystemtray.cpp +++ b/src/qtui/legacysystemtray.cpp @@ -29,7 +29,7 @@ LegacySystemTray::LegacySystemTray(QWidget *parent) _blinkState(false), _lastMessageId(0) { -#ifndef HAVE_KDE +#ifndef HAVE_KDE4 _trayIcon = new QSystemTrayIcon(associatedWidget()); #else _trayIcon = new KSystemTrayIcon(associatedWidget()); diff --git a/src/qtui/legacysystemtray.h b/src/qtui/legacysystemtray.h index a81d0f69..f366fbda 100644 --- a/src/qtui/legacysystemtray.h +++ b/src/qtui/legacysystemtray.h @@ -23,7 +23,7 @@ #ifndef QT_NO_SYSTEMTRAYICON -#ifdef HAVE_KDE +#ifdef HAVE_KDE4 # include #else # include @@ -70,7 +70,7 @@ private: bool _blinkState; uint _lastMessageId; -#ifdef HAVE_KDE +#ifdef HAVE_KDE4 KSystemTrayIcon *_trayIcon; #else QSystemTrayIcon *_trayIcon; diff --git a/src/qtui/mainwin.cpp b/src/qtui/mainwin.cpp index b6bdcf0a..cd4a5fe1 100644 --- a/src/qtui/mainwin.cpp +++ b/src/qtui/mainwin.cpp @@ -26,7 +26,7 @@ #include #include -#ifdef HAVE_KDE +#ifdef HAVE_KDE4 # include # include # include @@ -93,7 +93,7 @@ #include "topicwidget.h" #include "verticaldock.h" -#ifndef HAVE_KDE +#ifndef HAVE_KDE4 # ifdef HAVE_PHONON # include "phononnotificationbackend.h" # endif @@ -102,9 +102,9 @@ # endif # include "systraynotificationbackend.h" # include "taskbarnotificationbackend.h" -#else /* HAVE_KDE */ +#else /* HAVE_KDE4 */ # include "knotificationbackend.h" -#endif /* HAVE_KDE */ +#endif /* HAVE_KDE4 */ #ifdef HAVE_SSL # include "sslinfodlg.h" @@ -140,12 +140,12 @@ #include "settingspages/notificationssettingspage.h" #include "settingspages/topicwidgetsettingspage.h" -#ifndef HAVE_KDE +#ifndef HAVE_KDE4 # include "settingspages/shortcutssettingspage.h" #endif MainWin::MainWin(QWidget *parent) -#ifdef HAVE_KDE +#ifdef HAVE_KDE4 : KMainWindow(parent), _kHelpMenu(new KHelpMenu(this, KGlobal::mainComponent().aboutData())), #else @@ -214,7 +214,7 @@ void MainWin::init() setupTitleSetter(); setupHotList(); -#ifndef HAVE_KDE +#ifndef HAVE_KDE4 # ifdef HAVE_PHONON QtUi::registerNotificationBackend(new PhononNotificationBackend(this)); # endif @@ -226,9 +226,9 @@ void MainWin::init() QtUi::registerNotificationBackend(new TaskbarNotificationBackend(this)); -#else /* HAVE_KDE */ +#else /* HAVE_KDE4 */ QtUi::registerNotificationBackend(new KNotificationBackend(this)); -#endif /* HAVE_KDE */ +#endif /* HAVE_KDE4 */ #ifdef HAVE_INDICATEQT QtUi::registerNotificationBackend(new IndicatorNotificationBackend(this)); @@ -249,7 +249,7 @@ void MainWin::init() setDisconnectedState(); // Disable menus and stuff -#ifdef HAVE_KDE +#ifdef HAVE_KDE4 setAutoSaveSettings(); #endif @@ -295,7 +295,7 @@ void MainWin::saveStateToSettings(UiSettings &s) if (lastBufId.isValid()) s.setValue("LastUsedBufferId", lastBufId.toInt()); -#ifdef HAVE_KDE +#ifdef HAVE_KDE4 saveAutoSaveSettings(); #endif } @@ -307,7 +307,7 @@ void MainWin::restoreStateFromSettings(UiSettings &s) _normalPos = s.value("MainWinPos", pos()).toPoint(); bool maximized = s.value("MainWinMaximized", false).toBool(); -#ifndef HAVE_KDE +#ifndef HAVE_KDE4 restoreGeometry(s.value("MainWinGeometry").toByteArray()); if (maximized) { @@ -381,7 +381,7 @@ void MainWin::setupActions() coll->addAction("ToggleStatusBar", new Action(tr("Show Status &Bar"), coll, 0, 0))->setCheckable(true); -#ifdef HAVE_KDE +#ifdef HAVE_KDE4 QAction *fullScreenAct = KStandardAction::fullScreen(this, SLOT(onFullScreenToggled()), this, coll); #else QAction *fullScreenAct = new Action(QIcon::fromTheme("view-fullscreen"), tr("&Full Screen Mode"), coll, @@ -542,7 +542,7 @@ void MainWin::setupMenus() _viewMenu->addAction(coll->action("LockLayout")); _settingsMenu = menuBar()->addMenu(tr("&Settings")); -#ifdef HAVE_KDE +#ifdef HAVE_KDE4 _settingsMenu->addAction(KStandardAction::configureNotifications(this, SLOT(showNotificationsDlg()), this)); _settingsMenu->addAction(KStandardAction::keyBindings(this, SLOT(showShortcutsDlg()), this)); #else @@ -552,7 +552,7 @@ void MainWin::setupMenus() _helpMenu = menuBar()->addMenu(tr("&Help")); _helpMenu->addAction(coll->action("AboutQuassel")); -#ifndef HAVE_KDE +#ifndef HAVE_KDE4 _helpMenu->addAction(coll->action("AboutQt")); #else _helpMenu->addAction(KStandardAction::aboutKDE(_kHelpMenu, SLOT(aboutKDE()), this)); @@ -998,7 +998,7 @@ void MainWin::setupToolBars() setUnifiedTitleAndToolBarOnMac(true); #endif -#ifdef HAVE_KDE +#ifdef HAVE_KDE4 _mainToolBar = new KToolBar("MainToolBar", this, Qt::TopToolBarArea, false, true, true); #else _mainToolBar = new QToolBar(this); @@ -1363,7 +1363,7 @@ void MainWin::showAboutDlg() void MainWin::showShortcutsDlg() { -#ifdef HAVE_KDE +#ifdef HAVE_KDE4 KShortcutsDialog dlg(KShortcutsEditor::AllActions, KShortcutsEditor::LetterShortcutsDisallowed, this); foreach(KActionCollection *coll, QtUi::actionCollections()) dlg.addCollection(coll, coll->property("Category").toString()); @@ -1391,7 +1391,7 @@ void MainWin::onFullScreenToggled() if (!action) return; -#ifdef HAVE_KDE +#ifdef HAVE_KDE4 KToggleFullScreenAction *kAct = static_cast(action); kAct->setFullScreen(this, kAct->isChecked()); #else diff --git a/src/qtui/mainwin.h b/src/qtui/mainwin.h index dc79f104..30e57269 100644 --- a/src/qtui/mainwin.h +++ b/src/qtui/mainwin.h @@ -21,7 +21,7 @@ #ifndef MAINWIN_H_ #define MAINWIN_H_ -#ifdef HAVE_KDE +#ifdef HAVE_KDE4 # include #else # include @@ -56,7 +56,7 @@ class KHelpMenu; //!\brief The main window of Quassel's QtUi. class MainWin -#ifdef HAVE_KDE +#ifdef HAVE_KDE4 : public KMainWindow { #else @@ -169,7 +169,7 @@ signals: void disconnectFromCore(); private: -#ifdef HAVE_KDE +#ifdef HAVE_KDE4 KHelpMenu *_kHelpMenu; #endif diff --git a/src/qtui/monoapplication.cpp b/src/qtui/monoapplication.cpp index 8d1b04ba..a0ddbc0c 100644 --- a/src/qtui/monoapplication.cpp +++ b/src/qtui/monoapplication.cpp @@ -31,9 +31,9 @@ MonolithicApplication::MonolithicApplication(int &argc, char **argv) _internalInitDone(false) { _internal = new CoreApplicationInternal(); // needed for parser options -#if defined(HAVE_KDE) || defined(Q_OS_MAC) +#if defined(HAVE_KDE4) || defined(Q_OS_MAC) disableCrashhandler(); -#endif /* HAVE_KDE || Q_OS_MAC */ +#endif /* HAVE_KDE4 || Q_OS_MAC */ setRunMode(Quassel::Monolithic); } diff --git a/src/qtui/qtuiapplication.cpp b/src/qtui/qtuiapplication.cpp index e484fecc..a279442b 100644 --- a/src/qtui/qtuiapplication.cpp +++ b/src/qtui/qtuiapplication.cpp @@ -23,7 +23,7 @@ #include #include -#ifdef HAVE_KDE +#ifdef HAVE_KDE4 # include #endif @@ -34,7 +34,7 @@ #include "qtuisettings.h" QtUiApplication::QtUiApplication(int &argc, char **argv) -#ifdef HAVE_KDE +#ifdef HAVE_KDE4 : KApplication(), #else : QApplication(argc, argv), @@ -42,7 +42,7 @@ QtUiApplication::QtUiApplication(int &argc, char **argv) Quassel(), _aboutToQuit(false) { -#ifdef HAVE_KDE +#ifdef HAVE_KDE4 Q_UNUSED(argc); Q_UNUSED(argv); // We need to setup KDE's data dirs @@ -52,15 +52,15 @@ QtUiApplication::QtUiApplication(int &argc, char **argv) dataDirs.append(":/data/"); setDataDirPaths(dataDirs); -#else /* HAVE_KDE */ +#else /* HAVE_KDE4 */ setDataDirPaths(findDataDirPaths()); -#endif /* HAVE_KDE */ +#endif /* HAVE_KDE4 */ -#if defined(HAVE_KDE) || defined(Q_OS_MAC) +#if defined(HAVE_KDE4) || defined(Q_OS_MAC) disableCrashhandler(); -#endif /* HAVE_KDE || Q_OS_MAC */ +#endif /* HAVE_KDE4 || Q_OS_MAC */ setRunMode(Quassel::ClientOnly); #if QT_VERSION < 0x050000 diff --git a/src/qtui/qtuiapplication.h b/src/qtui/qtuiapplication.h index fd87d6a3..567d4827 100644 --- a/src/qtui/qtuiapplication.h +++ b/src/qtui/qtuiapplication.h @@ -21,7 +21,7 @@ #ifndef QTUIAPPLICATION_H_ #define QTUIAPPLICATION_H_ -#ifdef HAVE_KDE +#ifdef HAVE_KDE4 # include #else # include @@ -34,7 +34,7 @@ class QtUi; -#ifdef HAVE_KDE +#ifdef HAVE_KDE4 class QtUiApplication : public KApplication, public Quassel { #else diff --git a/src/qtui/settingspages/coreconnectionsettingspage.cpp b/src/qtui/settingspages/coreconnectionsettingspage.cpp index efcb6dfd..a9d0bca7 100644 --- a/src/qtui/settingspages/coreconnectionsettingspage.cpp +++ b/src/qtui/settingspages/coreconnectionsettingspage.cpp @@ -24,7 +24,7 @@ CoreConnectionSettingsPage::CoreConnectionSettingsPage(QWidget *parent) : SettingsPage(tr("Remote Cores"), tr("Connection"), parent) { ui.setupUi(this); -#ifndef HAVE_KDE +#ifndef HAVE_KDE4 ui.useSolid->hide(); #endif @@ -49,7 +49,7 @@ void CoreConnectionSettingsPage::widgetHasChanged() void CoreConnectionSettingsPage::defaults() { -#ifdef HAVE_KDE +#ifdef HAVE_KDE4 setRadioButtons(CoreConnectionSettings::UseSolid); #else setRadioButtons(CoreConnectionSettings::UsePingTimeout); @@ -80,7 +80,7 @@ void CoreConnectionSettingsPage::save() void CoreConnectionSettingsPage::setRadioButtons(CoreConnectionSettings::NetworkDetectionMode mode) { switch (mode) { -#ifdef HAVE_KDE +#ifdef HAVE_KDE4 case CoreConnectionSettings::UseSolid: ui.useSolid->setChecked(true); break; @@ -96,7 +96,7 @@ void CoreConnectionSettingsPage::setRadioButtons(CoreConnectionSettings::Network CoreConnectionSettings::NetworkDetectionMode CoreConnectionSettingsPage::modeFromRadioButtons() const { -#ifdef HAVE_KDE +#ifdef HAVE_KDE4 if (ui.useSolid->isChecked()) return CoreConnectionSettings::UseSolid; #endif diff --git a/src/qtui/settingspages/inputwidgetsettingspage.cpp b/src/qtui/settingspages/inputwidgetsettingspage.cpp index dfe75d59..20bcff30 100644 --- a/src/qtui/settingspages/inputwidgetsettingspage.cpp +++ b/src/qtui/settingspages/inputwidgetsettingspage.cpp @@ -25,7 +25,7 @@ InputWidgetSettingsPage::InputWidgetSettingsPage(QWidget *parent) { ui.setupUi(this); -#ifndef HAVE_KDE +#ifndef HAVE_KDE4 ui.enableSpellCheck->hide(); #endif diff --git a/src/qtui/statusnotifieritem.cpp b/src/qtui/statusnotifieritem.cpp index f630efb4..a1d2916a 100644 --- a/src/qtui/statusnotifieritem.cpp +++ b/src/qtui/statusnotifieritem.cpp @@ -293,7 +293,7 @@ bool StatusNotifierItem::eventFilter(QObject *watched, QEvent *event) { if (mode() == StatusNotifier) { //FIXME: ugly ugly workaround to weird QMenu's focus problems -#ifdef HAVE_KDE +#ifdef HAVE_KDE4 if (watched == trayMenu() && (event->type() == QEvent::WindowDeactivate || (event->type() == QEvent::MouseButtonRelease && static_cast(event)->button() == Qt::LeftButton))) { // put at the back of event queue to let the action activate anyways diff --git a/src/qtui/statusnotifieritemdbus.cpp b/src/qtui/statusnotifieritemdbus.cpp index 2d5e2d21..2be23283 100644 --- a/src/qtui/statusnotifieritemdbus.cpp +++ b/src/qtui/statusnotifieritemdbus.cpp @@ -31,7 +31,7 @@ #include #include -#ifdef HAVE_KDE +#ifdef HAVE_KDE4 # include # include #endif @@ -328,11 +328,11 @@ void StatusNotifierItemDBus::ContextMenu(int x, int y) //TODO: nicer placement, possible? if (!m_statusNotifierItem->trayMenu()->isVisible()) { -#ifdef HAVE_KDE +#ifdef HAVE_KDE4 m_statusNotifierItem->trayMenu()->setWindowFlags(Qt::Window|Qt::FramelessWindowHint); #endif m_statusNotifierItem->trayMenu()->popup(QPoint(x, y)); -#ifdef HAVE_KDE +#ifdef HAVE_KDE4 KWindowSystem::setState(m_statusNotifierItem->trayMenu()->winId(), NET::SkipTaskbar|NET::SkipPager|NET::KeepAbove); KWindowSystem::setType(m_statusNotifierItem->trayMenu()->winId(), NET::PopupMenu); KWindowSystem::forceActiveWindow(m_statusNotifierItem->trayMenu()->winId()); diff --git a/src/qtui/systemtray.cpp b/src/qtui/systemtray.cpp index 948e48db..df148699 100644 --- a/src/qtui/systemtray.cpp +++ b/src/qtui/systemtray.cpp @@ -28,7 +28,7 @@ #include "client.h" #include "qtui.h" -#ifdef HAVE_KDE +#ifdef HAVE_KDE4 # include # include # include @@ -66,7 +66,7 @@ void SystemTray::init() ActionCollection *coll = QtUi::actionCollection("General"); _minimizeRestoreAction = new Action(tr("&Minimize"), this, this, SLOT(minimizeRestore())); -#ifdef HAVE_KDE +#ifdef HAVE_KDE4 KMenu *kmenu; _trayMenu = kmenu = new KMenu(); kmenu->addTitle(_activeIcon, "Quassel IRC"); @@ -76,7 +76,7 @@ void SystemTray::init() _trayMenu->setTitle("Quassel IRC"); -#ifndef HAVE_KDE +#ifndef HAVE_KDE4 _trayMenu->setAttribute(Qt::WA_Hover); #endif @@ -107,7 +107,7 @@ void SystemTray::setMode(Mode mode_) { if (mode_ != _mode) { _mode = mode_; -#ifdef HAVE_KDE +#ifdef HAVE_KDE4 if (_trayMenu) { if (_mode == Legacy) { _trayMenu->setWindowFlags(Qt::Popup); diff --git a/src/uisupport/action.cpp b/src/uisupport/action.cpp index ab9217cb..c222dc19 100644 --- a/src/uisupport/action.cpp +++ b/src/uisupport/action.cpp @@ -25,7 +25,7 @@ #include Action::Action(QObject *parent) -#ifdef HAVE_KDE +#ifdef HAVE_KDE4 : KAction(parent) #else : QWidgetAction(parent) @@ -36,7 +36,7 @@ Action::Action(QObject *parent) Action::Action(const QString &text, QObject *parent, const QObject *receiver, const char *slot, const QKeySequence &shortcut) -#ifdef HAVE_KDE +#ifdef HAVE_KDE4 : KAction(parent) #else : QWidgetAction(parent) @@ -51,7 +51,7 @@ Action::Action(const QString &text, QObject *parent, const QObject *receiver, co Action::Action(const QIcon &icon, const QString &text, QObject *parent, const QObject *receiver, const char *slot, const QKeySequence &shortcut) -#ifdef HAVE_KDE +#ifdef HAVE_KDE4 : KAction(parent) #else : QWidgetAction(parent) @@ -66,7 +66,7 @@ Action::Action(const QIcon &icon, const QString &text, QObject *parent, const QO } -#ifdef HAVE_KDE +#ifdef HAVE_KDE4 void Action::init() {} #else void Action::init() @@ -124,4 +124,4 @@ void Action::setShortcut(const QKeySequence &key, ShortcutTypes type) } -#endif /* HAVE_KDE */ +#endif /* HAVE_KDE4 */ diff --git a/src/uisupport/action.h b/src/uisupport/action.h index 851e900e..dbef28cb 100644 --- a/src/uisupport/action.h +++ b/src/uisupport/action.h @@ -23,7 +23,7 @@ #ifndef ACTION_H_ #define ACTION_H_ -#ifndef HAVE_KDE +#ifndef HAVE_KDE4 #include #include @@ -71,7 +71,7 @@ private slots: Q_DECLARE_OPERATORS_FOR_FLAGS(Action::ShortcutTypes) -#else /* HAVE_KDE */ +#else /* HAVE_KDE4 */ #include class Action : public KAction diff --git a/src/uisupport/actioncollection.cpp b/src/uisupport/actioncollection.cpp index 593b236e..b862ae85 100644 --- a/src/uisupport/actioncollection.cpp +++ b/src/uisupport/actioncollection.cpp @@ -20,7 +20,7 @@ * Parts of this implementation are based on KDE's KActionCollection. * ***************************************************************************/ -#ifndef HAVE_KDE +#ifndef HAVE_KDE4 #include #include @@ -305,4 +305,4 @@ bool ActionCollection::unlistAction(QAction *action) } -#endif /* HAVE_KDE */ +#endif /* HAVE_KDE4 */ diff --git a/src/uisupport/actioncollection.h b/src/uisupport/actioncollection.h index feb36e84..a76fc04a 100644 --- a/src/uisupport/actioncollection.h +++ b/src/uisupport/actioncollection.h @@ -23,7 +23,7 @@ #ifndef ACTIONCOLLECTION_H_ #define ACTIONCOLLECTION_H_ -#ifndef HAVE_KDE +#ifndef HAVE_KDE4 #include #include @@ -123,7 +123,7 @@ private: int ActionCollection::count() const { return actions().count(); } bool ActionCollection::isEmpty() const { return actions().count(); } -#else /* HAVE_KDE */ +#else /* HAVE_KDE4 */ #include diff --git a/src/uisupport/colorbutton.cpp b/src/uisupport/colorbutton.cpp index 52e8e16f..fae61703 100644 --- a/src/uisupport/colorbutton.cpp +++ b/src/uisupport/colorbutton.cpp @@ -24,7 +24,7 @@ #include #include -#ifdef HAVE_KDE +#ifdef HAVE_KDE4 # include #else # include @@ -56,7 +56,7 @@ QColor ColorButton::color() const void ColorButton::chooseColor() { -#ifdef HAVE_KDE +#ifdef HAVE_KDE4 QColor c = color(); KColorDialog::getColor(c, this); #else diff --git a/src/uisupport/graphicalui.cpp b/src/uisupport/graphicalui.cpp index d2045efd..0fb34b04 100644 --- a/src/uisupport/graphicalui.cpp +++ b/src/uisupport/graphicalui.cpp @@ -31,7 +31,7 @@ #ifdef Q_WS_X11 # include #endif -#ifdef HAVE_KDE +#ifdef HAVE_KDE4 # include # include #endif @@ -166,7 +166,7 @@ bool GraphicalUi::checkMainWidgetVisibility(bool perform) return true; } -#elif defined(HAVE_KDE) && defined(Q_WS_X11) +#elif defined(HAVE_KDE4) && defined(Q_WS_X11) KWindowInfo info1 = KWindowSystem::windowInfo(mainWidget()->winId(), NET::XAWMState | NET::WMState | NET::WMDesktop); // mapped = visible (but possibly obscured) bool mapped = (info1.mappingState() == NET::Visible) && !info1.isMinimized(); @@ -261,7 +261,7 @@ void GraphicalUi::minimizeRestore(bool show) void GraphicalUi::activateMainWidget() { -#ifdef HAVE_KDE +#ifdef HAVE_KDE4 # ifdef Q_WS_X11 KWindowInfo info = KWindowSystem::windowInfo(mainWidget()->winId(), NET::WMDesktop | NET::WMFrameExtents); if (_onAllDesktops) { @@ -282,7 +282,7 @@ void GraphicalUi::activateMainWidget() KWindowSystem::forceActiveWindow(mainWidget()->winId()); # endif -#else /* HAVE_KDE */ +#else /* HAVE_KDE4 */ #ifdef Q_WS_X11 // Bypass focus stealing prevention @@ -300,13 +300,13 @@ void GraphicalUi::activateMainWidget() mainWidget()->raise(); mainWidget()->activateWindow(); -#endif /* HAVE_KDE */ +#endif /* HAVE_KDE4 */ } void GraphicalUi::hideMainWidget() { -#if defined(HAVE_KDE) && defined(Q_WS_X11) +#if defined(HAVE_KDE4) && defined(Q_WS_X11) KWindowInfo info = KWindowSystem::windowInfo(mainWidget()->winId(), NET::WMDesktop | NET::WMFrameExtents); _onAllDesktops = info.onAllDesktops(); #endif diff --git a/src/uisupport/multilineedit.cpp b/src/uisupport/multilineedit.cpp index b2158651..e29ef205 100644 --- a/src/uisupport/multilineedit.cpp +++ b/src/uisupport/multilineedit.cpp @@ -48,7 +48,7 @@ MultiLineEdit::MultiLineEdit(QWidget *parent) #endif setAcceptRichText(false); -#ifdef HAVE_KDE +#ifdef HAVE_KDE4 enableFindReplace(false); #endif @@ -206,7 +206,7 @@ void MultiLineEdit::setEmacsMode(bool enable) void MultiLineEdit::setSpellCheckEnabled(bool enable) { -#ifdef HAVE_KDE +#ifdef HAVE_KDE4 setCheckSpellingEnabled(enable); #else Q_UNUSED(enable) @@ -470,7 +470,7 @@ void MultiLineEdit::keyPressEvent(QKeyEvent *event) } } -#ifdef HAVE_KDE +#ifdef HAVE_KDE4 KTextEdit::keyPressEvent(event); #else QTextEdit::keyPressEvent(event); diff --git a/src/uisupport/multilineedit.h b/src/uisupport/multilineedit.h index ae8abd22..2abb0554 100644 --- a/src/uisupport/multilineedit.h +++ b/src/uisupport/multilineedit.h @@ -24,7 +24,7 @@ #include #include -#ifdef HAVE_KDE +#ifdef HAVE_KDE4 # include # define MultiLineEditParent KTextEdit #else