summaryrefslogtreecommitdiffstats
path: root/kicker/kicker
diff options
context:
space:
mode:
Diffstat (limited to 'kicker/kicker')
-rw-r--r--kicker/kicker/buttons/windowlistbutton.cpp2
-rw-r--r--kicker/kicker/core/container_applet.h2
-rw-r--r--kicker/kicker/core/container_extension.cpp8
-rw-r--r--kicker/kicker/core/extensionmanager.cpp8
-rw-r--r--kicker/kicker/core/kicker.cpp14
-rw-r--r--kicker/kicker/core/kicker.h4
-rw-r--r--kicker/kicker/core/showdesktop.cpp32
-rw-r--r--kicker/kicker/ui/itemview.cpp2
-rw-r--r--kicker/kicker/ui/k_mnu.cpp2
-rw-r--r--kicker/kicker/ui/k_new_mnu.cpp2
10 files changed, 38 insertions, 38 deletions
diff --git a/kicker/kicker/buttons/windowlistbutton.cpp b/kicker/kicker/buttons/windowlistbutton.cpp
index 0b413d880..789911167 100644
--- a/kicker/kicker/buttons/windowlistbutton.cpp
+++ b/kicker/kicker/buttons/windowlistbutton.cpp
@@ -23,7 +23,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <tqtooltip.h>
-#include <kwindowlistmenu.h>
+#include <twindowlistmenu.h>
#include <klocale.h>
#include "windowlistbutton.h"
diff --git a/kicker/kicker/core/container_applet.h b/kicker/kicker/core/container_applet.h
index 019e52c96..18ce050d5 100644
--- a/kicker/kicker/core/container_applet.h
+++ b/kicker/kicker/core/container_applet.h
@@ -26,7 +26,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <kpanelapplet.h>
#include <dcopobject.h>
-#include <kwin.h>
+#include <twin.h>
#include "appletinfo.h"
#include "container_base.h"
diff --git a/kicker/kicker/core/container_extension.cpp b/kicker/kicker/core/container_extension.cpp
index 5b30dbad5..51a9904d7 100644
--- a/kicker/kicker/core/container_extension.cpp
+++ b/kicker/kicker/core/container_extension.cpp
@@ -44,13 +44,13 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <kglobal.h>
#include <kicker.h>
#include <kstandarddirs.h>
-#include <kwin.h>
+#include <twin.h>
#include <klocale.h>
#include <kglobalsettings.h>
#include <kapplication.h>
#include <netwm.h>
#include <fixx11h.h>
-#include <kwinmodule.h>
+#include <twinmodule.h>
#include "container_base.h"
#include "extensionmanager.h"
@@ -136,8 +136,8 @@ void ExtensionContainer::init()
KWin::setState(winId(), NET::Sticky);
KWin::setOnAllDesktops(winId(), true);
- connect(Kicker::the()->kwinModule(), TQT_SIGNAL(strutChanged()), this, TQT_SLOT(strutChanged()));
- connect(Kicker::the()->kwinModule(), TQT_SIGNAL(currentDesktopChanged(int)),
+ connect(Kicker::the()->twinModule(), TQT_SIGNAL(strutChanged()), this, TQT_SLOT(strutChanged()));
+ connect(Kicker::the()->twinModule(), TQT_SIGNAL(currentDesktopChanged(int)),
this, TQT_SLOT( currentDesktopChanged(int)));
setBackgroundOrigin(AncestorOrigin);
diff --git a/kicker/kicker/core/extensionmanager.cpp b/kicker/kicker/core/extensionmanager.cpp
index 03e039ee0..d3ec91e2c 100644
--- a/kicker/kicker/core/extensionmanager.cpp
+++ b/kicker/kicker/core/extensionmanager.cpp
@@ -35,7 +35,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <kmenubar.h>
#include <kmessagebox.h>
#include <kstandarddirs.h>
-#include <kwinmodule.h>
+#include <twinmodule.h>
#include <dcopref.h>
#include "container_extension.h"
@@ -625,7 +625,7 @@ TQRect ExtensionManager::workArea(int XineramaScreen, const ExtensionContainer*
{
if (!extension)
{
- return Kicker::the()->kwinModule()->workArea(XineramaScreen);
+ return Kicker::the()->twinModule()->workArea(XineramaScreen);
}
TQValueList<WId> list;
@@ -676,11 +676,11 @@ TQRect ExtensionManager::workArea(int XineramaScreen, const ExtensionContainer*
if ((XineramaScreen == XineramaAllScreens) || (kapp->desktop()->numScreens() < 2))
{
/* special value for all screens */
- workArea = Kicker::the()->kwinModule()->workArea(list);
+ workArea = Kicker::the()->twinModule()->workArea(list);
}
else
{
- workArea = Kicker::the()->kwinModule()->workArea(list, XineramaScreen)
+ workArea = Kicker::the()->twinModule()->workArea(list, XineramaScreen)
.intersect(TQApplication::desktop()->screenGeometry(XineramaScreen));
}
diff --git a/kicker/kicker/core/kicker.cpp b/kicker/kicker/core/kicker.cpp
index 7ba06c61c..f4d0edc40 100644
--- a/kicker/kicker/core/kicker.cpp
+++ b/kicker/kicker/core/kicker.cpp
@@ -42,8 +42,8 @@
#include <klocale.h>
#include <kmessagebox.h>
#include <kstandarddirs.h>
-#include <kwin.h>
-#include <kwinmodule.h>
+#include <twin.h>
+#include <twinmodule.h>
#include "extensionmanager.h"
#include "pluginmanager.h"
@@ -64,7 +64,7 @@ Kicker* Kicker::the() { return static_cast<Kicker*>(kapp); }
Kicker::Kicker()
: KUniqueApplication(),
keys(0),
- m_kwinModule(0),
+ m_twinModule(0),
m_configDialog(0),
m_canAddContainers(true)
{
@@ -379,14 +379,14 @@ void Kicker::clearQuickStartMenu()
MenuManager::the()->kmenu()->clearRecentMenuItems();
}
-KWinModule* Kicker::kwinModule()
+KWinModule* Kicker::twinModule()
{
- if (!m_kwinModule)
+ if (!m_twinModule)
{
- m_kwinModule = new KWinModule();
+ m_twinModule = new KWinModule();
}
- return m_kwinModule;
+ return m_twinModule;
}
TQRect Kicker::desktopIconsArea(int screen) const
diff --git a/kicker/kicker/core/kicker.h b/kicker/kicker/core/kicker.h
index 6bb071007..bc00e1915 100644
--- a/kicker/kicker/core/kicker.h
+++ b/kicker/kicker/core/kicker.h
@@ -69,7 +69,7 @@ k_dcop_signals:
public:
static Kicker* the();
KDirWatch* fileWatcher();
- KWinModule* kwinModule();
+ KWinModule* twinModule();
bool isImmutable() const;
bool isKioskImmutable() const;
@@ -122,7 +122,7 @@ private:
static void crashHandler(int signal);
KGlobalAccel* keys;
- KWinModule* m_kwinModule;
+ KWinModule* m_twinModule;
KCMultiDialog* m_configDialog;
bool m_canAddContainers;
TQPoint m_insertionPoint;
diff --git a/kicker/kicker/core/showdesktop.cpp b/kicker/kicker/core/showdesktop.cpp
index 7f75ba1b9..e41ddb549 100644
--- a/kicker/kicker/core/showdesktop.cpp
+++ b/kicker/kicker/core/showdesktop.cpp
@@ -26,8 +26,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include "kicker.h"
#include "kickerSettings.h"
-#include <kwin.h>
-#include <kwinmodule.h>
+#include <twin.h>
+#include <twinmodule.h>
#include <netwm.h>
#include "showdesktop.h"
@@ -49,9 +49,9 @@ ShowDesktop::ShowDesktop()
m_wmSupport = i.isSupported( NET::WM2ShowingDesktop );
if( m_wmSupport )
{
- connect( Kicker::the()->kwinModule(), TQT_SIGNAL( showingDesktopChanged( bool )),
+ connect( Kicker::the()->twinModule(), TQT_SIGNAL( showingDesktopChanged( bool )),
TQT_SLOT( showingDesktopChanged( bool )));
- showingDesktopChanged( m_showingDesktop = Kicker::the()->kwinModule()->showingDesktop());
+ showingDesktopChanged( m_showingDesktop = Kicker::the()->twinModule()->showingDesktop());
}
}
@@ -74,9 +74,9 @@ void ShowDesktop::slotWindowAdded(WId w)
if ((windowType == NET::Normal || windowType == NET::Unknown) &&
inf.mappingState() == NET::Visible)
{
- KConfig kwincfg( "kwinrc", true ); // see in kwin
- kwincfg.setGroup( "Windows" );
- if( kwincfg.readBoolEntry( "ShowDesktopIsMinimizeAll", false ))
+ KConfig twincfg( "twinrc", true ); // see in twin
+ twincfg.setGroup( "Windows" );
+ if( twincfg.readBoolEntry( "ShowDesktopIsMinimizeAll", false ))
{
m_iconifiedList.clear();
m_showingDesktop = false;
@@ -130,10 +130,10 @@ void ShowDesktop::showDesktop( bool b )
if (b)
{
- m_activeWindow = Kicker::the()->kwinModule()->activeWindow();
+ m_activeWindow = Kicker::the()->twinModule()->activeWindow();
m_iconifiedList.clear();
- const TQValueList<WId> windows = Kicker::the()->kwinModule()->windows();
+ const TQValueList<WId> windows = Kicker::the()->twinModule()->windows();
for (TQValueList<WId>::ConstIterator it = windows.begin();
it != windows.end();
++it)
@@ -145,7 +145,7 @@ void ShowDesktop::showDesktop( bool b )
if (info.mappingState() == NET::Visible &&
(info.desktop() == NETWinInfo::OnAllDesktops ||
- info.desktop() == (int)Kicker::the()->kwinModule()->currentDesktop()))
+ info.desktop() == (int)Kicker::the()->twinModule()->currentDesktop()))
{
m_iconifiedList.append( w );
}
@@ -161,20 +161,20 @@ void ShowDesktop::showDesktop( bool b )
}
// on desktop changes or when a window is deiconified, we abort the show desktop mode
- connect(Kicker::the()->kwinModule(), TQT_SIGNAL(currentDesktopChanged(int)),
+ connect(Kicker::the()->twinModule(), TQT_SIGNAL(currentDesktopChanged(int)),
TQT_SLOT(slotCurrentDesktopChanged(int)));
- connect(Kicker::the()->kwinModule(), TQT_SIGNAL(windowChanged(WId,unsigned int)),
+ connect(Kicker::the()->twinModule(), TQT_SIGNAL(windowChanged(WId,unsigned int)),
TQT_SLOT(slotWindowChanged(WId,unsigned int)));
- connect(Kicker::the()->kwinModule(), TQT_SIGNAL(windowAdded(WId)),
+ connect(Kicker::the()->twinModule(), TQT_SIGNAL(windowAdded(WId)),
TQT_SLOT(slotWindowAdded(WId)));
}
else
{
- disconnect(Kicker::the()->kwinModule(), TQT_SIGNAL(currentDesktopChanged(int)),
+ disconnect(Kicker::the()->twinModule(), TQT_SIGNAL(currentDesktopChanged(int)),
this, TQT_SLOT(slotCurrentDesktopChanged(int)));
- disconnect(Kicker::the()->kwinModule(), TQT_SIGNAL(windowChanged(WId,unsigned int)),
+ disconnect(Kicker::the()->twinModule(), TQT_SIGNAL(windowChanged(WId,unsigned int)),
this, TQT_SLOT(slotWindowChanged(WId,unsigned int)));
- disconnect(Kicker::the()->kwinModule(), TQT_SIGNAL(windowAdded(WId)),
+ disconnect(Kicker::the()->twinModule(), TQT_SIGNAL(windowAdded(WId)),
this, TQT_SLOT(slotWindowAdded(WId)));
for (TQValueVector<WId>::ConstIterator it = m_iconifiedList.begin();
diff --git a/kicker/kicker/ui/itemview.cpp b/kicker/kicker/ui/itemview.cpp
index 36a7bef7d..f9ab06006 100644
--- a/kicker/kicker/ui/itemview.cpp
+++ b/kicker/kicker/ui/itemview.cpp
@@ -59,7 +59,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <kmessagebox.h>
#include <kstandarddirs.h>
#include <kcombobox.h>
-#include <kwin.h>
+#include <twin.h>
#include <kdebug.h>
#include <kmimetype.h>
#include <kmultipledrag.h>
diff --git a/kicker/kicker/ui/k_mnu.cpp b/kicker/kicker/ui/k_mnu.cpp
index d6d130a02..6953143c9 100644
--- a/kicker/kicker/ui/k_mnu.cpp
+++ b/kicker/kicker/ui/k_mnu.cpp
@@ -50,7 +50,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <kmessagebox.h>
#include <kstandarddirs.h>
#include <ktoolbarbutton.h>
-#include <kwin.h>
+#include <twin.h>
#include "client_mnu.h"
#include "container_base.h"
diff --git a/kicker/kicker/ui/k_new_mnu.cpp b/kicker/kicker/ui/k_new_mnu.cpp
index 1a87b163d..e27f47d88 100644
--- a/kicker/kicker/ui/k_new_mnu.cpp
+++ b/kicker/kicker/ui/k_new_mnu.cpp
@@ -58,7 +58,7 @@
#include <kmessagebox.h>
#include <kstandarddirs.h>
#include <kcombobox.h>
-#include <kwin.h>
+#include <twin.h>
#include <kdebug.h>
#include <kuser.h>
#include <kurllabel.h>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-20 11:40:26 +0000