From 3e5506b29bb8d45ab067d3a4623af70a56abb990 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sat, 2 Feb 2013 20:57:25 -0600 Subject: Rename kdisplay for enhanced compatibility with KDE4 --- kicker/applets/clock/clock.cpp | 2 +- kicker/extensions/taskbar/taskbarextension.cpp | 2 +- kicker/kicker/core/container_extension.cpp | 2 +- kicker/kicker/core/containerarea.cpp | 2 +- kicker/kicker/core/extensionmanager.cpp | 2 +- kicker/kicker/core/kicker.cpp | 4 ++-- kicker/kicker/ui/k_mnu.cpp | 4 ++-- kicker/kicker/ui/k_new_mnu.cpp | 4 ++-- kicker/menuext/tom/tom.cc | 2 +- 9 files changed, 12 insertions(+), 12 deletions(-) (limited to 'kicker') diff --git a/kicker/applets/clock/clock.cpp b/kicker/applets/clock/clock.cpp index 58f6d9da1..2c4083443 100644 --- a/kicker/applets/clock/clock.cpp +++ b/kicker/applets/clock/clock.cpp @@ -919,7 +919,7 @@ ClockApplet::ClockApplet(const TQString& configFile, Type t, int actions, connect(m_layoutTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(fixupLayout())); connect(_timer, TQT_SIGNAL(timeout()), TQT_SLOT(slotUpdate())); - connect(kapp, TQT_SIGNAL(kdisplayPaletteChanged()), TQT_SLOT(globalPaletteChange())); + connect(kapp, TQT_SIGNAL(tdedisplayPaletteChanged()), TQT_SLOT(globalPaletteChange())); reconfigure(); // initialize clock widget slotUpdate(); diff --git a/kicker/extensions/taskbar/taskbarextension.cpp b/kicker/extensions/taskbar/taskbarextension.cpp index 2b2d65217..f5b26b94b 100644 --- a/kicker/extensions/taskbar/taskbarextension.cpp +++ b/kicker/extensions/taskbar/taskbarextension.cpp @@ -70,7 +70,7 @@ TaskBarExtension::TaskBarExtension(const TQString& configFile, Type type, connectDCOPSignal("kicker", "kicker", "configurationChanged()", "configure()", false); - connect(kapp, TQT_SIGNAL(kdisplayPaletteChanged()), + connect(kapp, TQT_SIGNAL(tdedisplayPaletteChanged()), TQT_SLOT(setBackgroundTheme())); TQTimer::singleShot(0, this, TQT_SLOT(setBackgroundTheme())); diff --git a/kicker/kicker/core/container_extension.cpp b/kicker/kicker/core/container_extension.cpp index 769f8408d..4b8683bbb 100644 --- a/kicker/kicker/core/container_extension.cpp +++ b/kicker/kicker/core/container_extension.cpp @@ -168,7 +168,7 @@ void ExtensionContainer::init() installEventFilter(this); // for mouse event handling - connect(Kicker::the(), TQT_SIGNAL(kdisplayPaletteChanged()), this, TQT_SLOT(updateHighlightColor())); + connect(Kicker::the(), TQT_SIGNAL(tdedisplayPaletteChanged()), this, TQT_SLOT(updateHighlightColor())); updateHighlightColor(); // if we were hidden when kicker quit, let's start out hidden as well! diff --git a/kicker/kicker/core/containerarea.cpp b/kicker/kicker/core/containerarea.cpp index 32a5cdfa5..fa4af2ea6 100644 --- a/kicker/kicker/core/containerarea.cpp +++ b/kicker/kicker/core/containerarea.cpp @@ -104,7 +104,7 @@ ContainerArea::ContainerArea(TDEConfig* _c, setBackground(); connect(&_autoScrollTimer, TQT_SIGNAL(timeout()), TQT_SLOT(autoScroll())); - connect(kapp, TQT_SIGNAL(kdisplayPaletteChanged()), TQT_SLOT(setBackground())); + connect(kapp, TQT_SIGNAL(tdedisplayPaletteChanged()), TQT_SLOT(setBackground())); connect(Kicker::the(), TQT_SIGNAL(immutabilityChanged(bool)), TQT_SLOT(immutabilityChanged(bool))); connect(this, TQT_SIGNAL(contentsMoving(int, int)), TQT_SLOT(setBackground())); diff --git a/kicker/kicker/core/extensionmanager.cpp b/kicker/kicker/core/extensionmanager.cpp index 893cb1665..022bcd180 100644 --- a/kicker/kicker/core/extensionmanager.cpp +++ b/kicker/kicker/core/extensionmanager.cpp @@ -211,7 +211,7 @@ void ExtensionManager::configureMenubar(bool duringInit) updateMenubar(); m_menubarPanel->show(); - connect(kapp, TQT_SIGNAL(kdisplayFontChanged()), TQT_SLOT(updateMenubar())); + connect(kapp, TQT_SIGNAL(tdedisplayFontChanged()), TQT_SLOT(updateMenubar())); } else if (m_menubarPanel) { diff --git a/kicker/kicker/core/kicker.cpp b/kicker/kicker/core/kicker.cpp index c39f9a775..316f1a625 100644 --- a/kicker/kicker/core/kicker.cpp +++ b/kicker/kicker/core/kicker.cpp @@ -125,8 +125,8 @@ Kicker::Kicker() configure(); connect(this, TQT_SIGNAL(settingsChanged(int)), TQT_SLOT(slotSettingsChanged(int))); - connect(this, TQT_SIGNAL(kdisplayPaletteChanged()), TQT_SLOT(paletteChanged())); - connect(this, TQT_SIGNAL(kdisplayStyleChanged()), TQT_SLOT(slotStyleChanged())); + connect(this, TQT_SIGNAL(tdedisplayPaletteChanged()), TQT_SLOT(paletteChanged())); + connect(this, TQT_SIGNAL(tdedisplayStyleChanged()), TQT_SLOT(slotStyleChanged())); #if (TQT_VERSION-0 >= 0x030200) // XRANDR support connect(desktop(), TQT_SIGNAL(resized(int)), TQT_SLOT(slotDesktopResized())); diff --git a/kicker/kicker/ui/k_mnu.cpp b/kicker/kicker/ui/k_mnu.cpp index 46d66b099..123125b21 100644 --- a/kicker/kicker/ui/k_mnu.cpp +++ b/kicker/kicker/ui/k_mnu.cpp @@ -247,9 +247,9 @@ void PanelKMenu::initialize() if (loadSidePixmap()) { // in case we've been through here before, let's disconnect - disconnect(kapp, TQT_SIGNAL(kdisplayPaletteChanged()), + disconnect(kapp, TQT_SIGNAL(tdedisplayPaletteChanged()), this, TQT_SLOT(paletteChanged())); - connect(kapp, TQT_SIGNAL(kdisplayPaletteChanged()), + connect(kapp, TQT_SIGNAL(tdedisplayPaletteChanged()), this, TQT_SLOT(paletteChanged())); } else diff --git a/kicker/kicker/ui/k_new_mnu.cpp b/kicker/kicker/ui/k_new_mnu.cpp index f8e3eaef5..81907b0ae 100644 --- a/kicker/kicker/ui/k_new_mnu.cpp +++ b/kicker/kicker/ui/k_new_mnu.cpp @@ -1198,9 +1198,9 @@ void KMenu::initialize() kdDebug(1210) << "KMenu::initialize()" << endl; // in case we've been through here before, let's disconnect - disconnect(kapp, TQT_SIGNAL(kdisplayPaletteChanged()), + disconnect(kapp, TQT_SIGNAL(tdedisplayPaletteChanged()), this, TQT_SLOT(paletteChanged())); - connect(kapp, TQT_SIGNAL(kdisplayPaletteChanged()), + connect(kapp, TQT_SIGNAL(tdedisplayPaletteChanged()), this, TQT_SLOT(paletteChanged())); /* diff --git a/kicker/menuext/tom/tom.cc b/kicker/menuext/tom/tom.cc index 00a4b1a59..4f3aa169a 100644 --- a/kicker/menuext/tom/tom.cc +++ b/kicker/menuext/tom/tom.cc @@ -432,7 +432,7 @@ void TOM::initialize() } else { - connect(kapp, TQT_SIGNAL(kdisplayPaletteChanged()), TQT_SLOT(paletteChanged())); + connect(kapp, TQT_SIGNAL(tdedisplayPaletteChanged()), TQT_SLOT(paletteChanged())); }*/ // TASKS -- cgit v1.2.1