Rename kwin to twin (part 1 of 2)

7 files changed, 37 insertions, 37 deletions

diff --git a/superkaramba/src/karamba.cpp b/superkaramba/src/karamba.cpp
index 5965355..e7d95db 100644
--- a/superkaramba/src/karamba.cpp
+++ b/superkaramba/src/karamba.cpp
@@ -35,7 +35,7 @@
 #include <kmessagebox.h>
 #include <krun.h>
 #include <klocale.h>
-#include <kwin.h>
+#include <twin.h>
 #include <kdeversion.h>
 #include <kdirwatch.h>
 
diff --git a/superkaramba/src/karamba.h b/superkaramba/src/karamba.h
index a8088ff..9eac2fc 100644
--- a/superkaramba/src/karamba.h
+++ b/superkaramba/src/karamba.h
@@ -31,8 +31,8 @@
 #include <tqwidget.h>
 #include <kapplication.h>
 
-#include <kwinmodule.h>
-#include <kwin.h>
+#include <twinmodule.h>
+#include <twin.h>
 
 #include <tqfile.h>
 #include <kfile.h>
diff --git a/superkaramba/src/showdesktop.cpp b/superkaramba/src/showdesktop.cpp
index 159ccae..16a04b8 100644
--- a/superkaramba/src/showdesktop.cpp
+++ b/superkaramba/src/showdesktop.cpp
@@ -18,9 +18,9 @@
  *  along with SuperKaramba; if not, write to the Free Software
  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  ****************************************************************************/
-#include <kwinmodule.h>
+#include <twinmodule.h>
 #include <netwm.h>
-#include <kwin.h>
+#include <twin.h>
 
 #include "karambaapp.h"
 #include "showdesktop.h"
@@ -62,7 +62,7 @@ void ShowDesktop::slotWindowChanged(WId w, unsigned int dirty)
   if (!showingDesktop)
     return;
 
-  // SELI this needs checking for kwin_iii (_NET_SHOWING_DESKTOP)
+  // SELI this needs checking for twin_iii (_NET_SHOWING_DESKTOP)
   if ( dirty & NET::XAWMState )
   {
     NETWinInfo inf(qt_xdisplay(), w, qt_xrootwin(),
diff --git a/superkaramba/src/systemtray.cpp b/superkaramba/src/systemtray.cpp
index fbd4625..3e0d4ba 100644
--- a/superkaramba/src/systemtray.cpp
+++ b/superkaramba/src/systemtray.cpp
@@ -22,10 +22,10 @@
 #include <tqobject.h>
 #include <kiconloader.h>
 #include <klocale.h>
-#include <kwinmodule.h>
+#include <twinmodule.h>
 #include <kmessagebox.h>
 #include <kdebug.h>
-#include <kwin.h>
+#include <twin.h>
 
 #include <tqpopupmenu.h>
 #include <tqdragobject.h>
@@ -51,7 +51,7 @@ Systemtray::~Systemtray()
 
 int Systemtray::getTraySize() {
 
-	return (int) kwin_module->systemTrayWindows().size();
+	return (int) twin_module->systemTrayWindows().size();
 }
 
 void Systemtray::updateBackgroundPixmap ( const TQPixmap & pixmap) {
@@ -82,8 +82,8 @@ void Systemtray::initSystray( void )
   Display *display = qt_xdisplay();
   no_of_systray_windows = 0;
 
-  kwin_module = new KWinModule();
-  systemTrayWindows = kwin_module->systemTrayWindows();
+  twin_module = new KWinModule();
+  systemTrayWindows = twin_module->systemTrayWindows();
   TQValueList<WId>::ConstIterator end(systemTrayWindows.end());
   for (TQValueList<WId>::ConstIterator it = systemTrayWindows.begin(); it!=end; ++it)
   {
@@ -107,8 +107,8 @@ void Systemtray::initSystray( void )
 
   updateTrayWindows();
 
-  connect(kwin_module, TQT_SIGNAL(systemTrayWindowAdded(WId)), TQT_SLOT(systemTrayWindowAdded(WId)));
-  connect(kwin_module, TQT_SIGNAL(systemTrayWindowRemoved(WId)), TQT_SLOT(systemTrayWindowRemoved(WId)));
+  connect(twin_module, TQT_SIGNAL(systemTrayWindowAdded(WId)), TQT_SLOT(systemTrayWindowAdded(WId)));
+  connect(twin_module, TQT_SIGNAL(systemTrayWindowRemoved(WId)), TQT_SLOT(systemTrayWindowRemoved(WId)));
 
   TQCString screenstr;
   screenstr.setNum(qt_xscreen());
@@ -153,7 +153,7 @@ void Systemtray::updateTrayWindows( void )
   while ((emb = m_Wins.current()) != 0L)
   {
     WId wid = emb->embeddedWinId();
-    if ((wid == 0) || !kwin_module->systemTrayWindows().contains(wid) )
+    if ((wid == 0) || !twin_module->systemTrayWindows().contains(wid) )
       m_Wins.remove(emb);
     else
       m_Wins.next();
diff --git a/superkaramba/src/systemtray.h b/superkaramba/src/systemtray.h
index 7ff60ac..ba8d1e8 100644
--- a/superkaramba/src/systemtray.h
+++ b/superkaramba/src/systemtray.h
@@ -56,7 +56,7 @@ signals:
     void updated();
 
 private:
-    KWinModule *kwin_module;
+    KWinModule *twin_module;
     TQValueList<WId> systemTrayWindows;
 
     TQPtrList<QXEmbed> m_Wins;
diff --git a/superkaramba/src/taskmanager.cpp b/superkaramba/src/taskmanager.cpp
index 26a417e..79ef9a9 100644
--- a/superkaramba/src/taskmanager.cpp
+++ b/superkaramba/src/taskmanager.cpp
@@ -26,7 +26,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <kdebug.h>
 #include <kconfig.h>
 #include <kiconloader.h>
-#include <kwinmodule.h>
+#include <twinmodule.h>
 #include <netwm.h>
 #include <tqtimer.h>
 #include <tqimage.h>
@@ -46,29 +46,29 @@ template class TQPtrList<Task>;
 // variable without changing Task, which also uses it.
 // So, we'll leak a little memory, but it's better than crashing.
 // The real problem is that KWinModule should be a singleton.
-KWinModule* kwin_module = 0;
+KWinModule* twin_module = 0;
 
 TaskManager::TaskManager(TQObject *parent, const char *name)
     : TQObject(parent, name), _active(0), _startup_info( NULL )
 {
 
-    kwin_module = new KWinModule();
+    twin_module = new KWinModule();
 
 //    KGlobal::locale()->insertCatalogue("libtaskmanager");
-    connect(kwin_module, TQT_SIGNAL(windowAdded(WId)), TQT_SLOT(windowAdded(WId)));
-    connect(kwin_module, TQT_SIGNAL(windowRemoved(WId)), TQT_SLOT(windowRemoved(WId)));
-    connect(kwin_module, TQT_SIGNAL(activeWindowChanged(WId)), TQT_SLOT(activeWindowChanged(WId)));
-    connect(kwin_module, TQT_SIGNAL(currentDesktopChanged(int)), TQT_SLOT(currentDesktopChanged(int)));
-    connect(kwin_module, TQT_SIGNAL(windowChanged(WId,unsigned int)), TQT_SLOT(windowChanged(WId,unsigned int)));
+    connect(twin_module, TQT_SIGNAL(windowAdded(WId)), TQT_SLOT(windowAdded(WId)));
+    connect(twin_module, TQT_SIGNAL(windowRemoved(WId)), TQT_SLOT(windowRemoved(WId)));
+    connect(twin_module, TQT_SIGNAL(activeWindowChanged(WId)), TQT_SLOT(activeWindowChanged(WId)));
+    connect(twin_module, TQT_SIGNAL(currentDesktopChanged(int)), TQT_SLOT(currentDesktopChanged(int)));
+    connect(twin_module, TQT_SIGNAL(windowChanged(WId,unsigned int)), TQT_SLOT(windowChanged(WId,unsigned int)));
 
     // register existing windows
-    const TQValueList<WId> windows = kwin_module->windows();
+    const TQValueList<WId> windows = twin_module->windows();
     TQValueList<WId>::ConstIterator end( windows.end() );
     for (TQValueList<WId>::ConstIterator it = windows.begin(); it != end; ++it )
   windowAdded(*it);
 
     // set active window
-    WId win = kwin_module->activeWindow();
+    WId win = twin_module->activeWindow();
     activeWindowChanged(win);
 
     configure_startup();
@@ -300,20 +300,20 @@ void TaskManager::killStartup(Startup* s)
 
 TQString TaskManager::desktopName(int desk) const
 {
-    return kwin_module->desktopName(desk);
+    return twin_module->desktopName(desk);
 }
 
 int TaskManager::numberOfDesktops() const
 {
-    return kwin_module->numberOfDesktops();
+    return twin_module->numberOfDesktops();
 }
 
 bool TaskManager::isOnTop(const Task* 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 (Task* t = _tasks.first(); t != 0; t = _tasks.next() ) {
       if ( (*it) == t->window() ) {
     if ( t == task )
@@ -435,9 +435,9 @@ bool Task::isShaded() const
 bool Task::isOnCurrentDesktop() const
 {
 #ifdef KDE_3_2
-  return (_info.onAllDesktops() || _info.desktop() == kwin_module->currentDesktop());
+  return (_info.onAllDesktops() || _info.desktop() == twin_module->currentDesktop());
 #else
-  return (_info.onAllDesktops || _info.desktop == kwin_module->currentDesktop());
+  return (_info.onAllDesktops || _info.desktop == twin_module->currentDesktop());
 #endif
 }
 
@@ -692,13 +692,13 @@ void Task::toDesktop(int desk)
 #ifdef KDE_3_2
     if (_info.onAllDesktops())
     {
-        ni.setDesktop(kwin_module->currentDesktop());
+        ni.setDesktop(twin_module->currentDesktop());
         KWin::forceActiveWindow(_win);
     }
 #else
     if (_info.onAllDesktops)
     {
-        ni.setDesktop(kwin_module->currentDesktop());
+        ni.setDesktop(twin_module->currentDesktop());
         KWin::setActiveWindow(_win);
     }
 #endif
@@ -707,7 +707,7 @@ void Task::toDesktop(int desk)
     return;
   }
   ni.setDesktop(desk);
-  if (desk == kwin_module->currentDesktop())
+  if (desk == twin_module->currentDesktop())
 #ifdef KDE_3_2
     KWin::forceActiveWindow(_win);
 #else
@@ -717,7 +717,7 @@ void Task::toDesktop(int desk)
 
 void Task::toCurrentDesktop()
 {
-    toDesktop(kwin_module->currentDesktop());
+    toDesktop(twin_module->currentDesktop());
 }
 
 void Task::setAlwaysOnTop(bool stay)
@@ -821,5 +821,5 @@ void Startup::update( const KStartupInfoData& data )
 
 int TaskManager::currentDesktop() const
 {
-    return kwin_module->currentDesktop();
+    return twin_module->currentDesktop();
 }
diff --git a/superkaramba/src/taskmanager.h b/superkaramba/src/taskmanager.h
index 0daac31..7313ea5 100644
--- a/superkaramba/src/taskmanager.h
+++ b/superkaramba/src/taskmanager.h
@@ -34,7 +34,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <tqpixmap.h>
 
 #include <dcopobject.h>
-#include <kwin.h>
+#include <twin.h>
 #include <kstartupinfo.h>
 #include "karambaapp.h"