1 files changed, 20 insertions, 20 deletions

diff --git a/src/komposetaskmanager.cpp b/src/komposetaskmanager.cpp
index 93e79aa..bf8971e 100644
--- a/src/komposetaskmanager.cpp
+++ b/src/komposetaskmanager.cpp
@@ -32,11 +32,11 @@
 #include <tqpixmap.h>
 #include <tqwidget.h>
 
-#include <kapplication.h>
-#include <kwinmodule.h>
+#include <tdeapplication.h>
+#include <twinmodule.h>
 #include <netwm.h>
-#include <kwin.h>
-#include <kapplication.h>
+#include <twin.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 
 #ifdef COMPOSITE
@@ -69,32 +69,32 @@ KomposeTaskManager::KomposeTaskManager()
     : TQObject()
 {
   taskManagerInstance = this;
-  kwin_module = new KWinModule();
+  twin_module = new KWinModule();
   numDesks = KWin::numberOfDesktops();
 
   callCompositeRedirect();
 
   // Listeners for KWinmodule signals
-  connect( kwin_module, SIGNAL(windowAdded(WId)), this, SLOT(slotWindowAdded(WId)) );
-  connect( kwin_module, SIGNAL(windowRemoved(WId)), this, SLOT(slotWindowRemoved(WId)) );
-  connect( kwin_module, SIGNAL(numberOfDesktopsChanged(int)), this, SLOT(slotDesktopCountChanged(int)) );
-  connect( kwin_module, SIGNAL(currentDesktopChanged(int)), this, SLOT(slotCurrentDesktopChanged(int)) );
+  connect( twin_module, SIGNAL(windowAdded(WId)), this, SLOT(slotWindowAdded(WId)) );
+  connect( twin_module, SIGNAL(windowRemoved(WId)), this, SLOT(slotWindowRemoved(WId)) );
+  connect( twin_module, SIGNAL(numberOfDesktopsChanged(int)), this, SLOT(slotDesktopCountChanged(int)) );
+  connect( twin_module, SIGNAL(currentDesktopChanged(int)), this, SLOT(slotCurrentDesktopChanged(int)) );
 
   connect( KomposeSettings::instance(), SIGNAL(settingsChanged()), this, SLOT(slotStartWindowListeners()) );
   connect( KomposeSettings::instance(), SIGNAL(settingsChanged()), this, SLOT(callCompositeRedirect()) );
 
   // register existing windows
-  const TQValueList<WId> windows = kwin_module->windows();
+  const TQValueList<WId> windows = twin_module->windows();
   for (TQValueList<WId>::ConstIterator it = windows.begin(); it != windows.end(); ++it )
     slotWindowAdded(*it);
 
-  connect( kwin_module, SIGNAL(activeWindowChanged(WId)), this, SLOT(slotTaskActivated(WId)) );
+  connect( twin_module, SIGNAL(activeWindowChanged(WId)), this, SLOT(slotTaskActivated(WId)) );
   slotStartWindowListeners();
 }
 
 KomposeTaskManager::~KomposeTaskManager()
 {
-  delete kwin_module;
+  delete twin_module;
 }
 
 /**
@@ -137,9 +137,9 @@ KomposeTask* KomposeTaskManager::findTask(WId w, bool wmFrameIds )
 
 void KomposeTaskManager::slotStartWindowListeners()
 {
-  disconnect( kwin_module, SIGNAL(windowChanged( WId, unsigned int )), this,
+  disconnect( twin_module, SIGNAL(windowChanged( WId, unsigned int )), this,
               SLOT(slotWindowChanged( WId, unsigned int )) );
-  connect( kwin_module, SIGNAL(windowChanged( WId, unsigned int )), this,
+  connect( twin_module, SIGNAL(windowChanged( WId, unsigned int )), this,
            SLOT(slotWindowChanged( WId, unsigned int )) );
 }
 
@@ -220,7 +220,7 @@ void KomposeTaskManager::slotWindowAdded(WId w )
     return;
 
   kdDebug() << "KomposeTaskManager::slotWindowAdded(WId " << w <<" ) - Adding KomposeTask" << endl;
-  KomposeTask* t = new KomposeTask(w, kwin_module, this);
+  KomposeTask* t = new KomposeTask(w, twin_module, this);
   tasklist.append(t);
 
   emit newTask( t );
@@ -261,7 +261,7 @@ void KomposeTaskManager::slotUpdateScreenshots( bool switchDesktops )
 void KomposeTaskManager::simulatePasvScreenshotEvent()
 {
   kdDebug() << "KomposeTaskManager::simulatePasvScreenshotEvent()" << endl;
-  slotTaskActivated( kwin_module->activeWindow() );
+  slotTaskActivated( twin_module->activeWindow() );
 }
 
 /**
@@ -293,8 +293,8 @@ bool KomposeTaskManager::isOnTop(const KomposeTask* task)
 {
   if(!task) return false;
 
-  for (TQValueList<WId>::ConstIterator it = kwin_module->stackingOrder().fromLast();
-       it != kwin_module->stackingOrder().end(); --it )
+  for (TQValueList<WId>::ConstIterator it = twin_module->stackingOrder().fromLast();
+       it != twin_module->stackingOrder().end(); --it )
   {
     for (KomposeTask* t = tasklist.first(); t != 0; t = tasklist.next() )
     {
@@ -313,7 +313,7 @@ bool KomposeTaskManager::isOnTop(const KomposeTask* task)
 
 TQString KomposeTaskManager::getDesktopName(int desk) const
 {
-  return kwin_module->desktopName(desk);
+  return twin_module->desktopName(desk);
 }
 
 
@@ -381,7 +381,7 @@ void KomposeTaskManager::slotCurrentDesktopChanged(int d)
 
 int KomposeTaskManager::getCurrentDesktopNum()
 {
-  return kwin_module->currentDesktop();
+  return twin_module->currentDesktop();
 }
 
 #include "komposetaskmanager.moc"