Rename kwin to twin (part 1 of 2)

10 files changed, 44 insertions, 44 deletions

diff --git a/kdesktop/bgmanager.cc b/kdesktop/bgmanager.cc
index a3f58c2eb..a643905eb 100644
--- a/kdesktop/bgmanager.cc
+++ b/kdesktop/bgmanager.cc
@@ -23,12 +23,12 @@
 
 #include <kiconloader.h>
 #include <kconfig.h>
-#include <kwin.h>
+#include <twin.h>
 #include <kapplication.h>
 #include <kdebug.h>
 #include <kipc.h>
 #include <kpopupmenu.h>
-#include <kwinmodule.h>
+#include <twinmodule.h>
 #include <krootpixmap.h>
 
 #include <X11/X.h>
@@ -59,7 +59,7 @@ extern KDesktopApp *myApp;
 
 /**** KBackgroundManager ****/
 
-KBackgroundManager::KBackgroundManager(TQWidget *desktop, KWinModule* kwinModule)
+KBackgroundManager::KBackgroundManager(TQWidget *desktop, KWinModule* twinModule)
     : KBackgroundIface()
 {
     if( !properties_inited )
@@ -80,7 +80,7 @@ KBackgroundManager::KBackgroundManager(TQWidget *desktop, KWinModule* kwinModule
     m_Serial = 0; m_Hash = 0;
     m_pConfig = KGlobal::config();
     m_bExport = m_bCommon = m_bInit = false;
-    m_pKwinmodule = kwinModule;
+    m_pKwinmodule = twinModule;
     m_pPixmapServer = new KPixmapServer();
     m_xrootpmap = None;
 
diff --git a/kdesktop/bgmanager.h b/kdesktop/bgmanager.h
index 080c5a614..529944700 100644
--- a/kdesktop/bgmanager.h
+++ b/kdesktop/bgmanager.h
@@ -57,7 +57,7 @@ class KBackgroundManager
     TQ_OBJECT
 
 public:
-    KBackgroundManager(TQWidget *desktop, KWinModule* kwinModule);
+    KBackgroundManager(TQWidget *desktop, KWinModule* twinModule);
     ~KBackgroundManager();
 
     void configure();
diff --git a/kdesktop/desktop.cc b/kdesktop/desktop.cc
index 2f6e3831f..c6edea06f 100644
--- a/kdesktop/desktop.cc
+++ b/kdesktop/desktop.cc
@@ -55,9 +55,9 @@
 #include <ktempfile.h>
 #include <kmessagebox.h>
 #include <kglobalaccel.h>
-#include <kwinmodule.h>
+#include <twinmodule.h>
 #include <krun.h>
-#include <kwin.h>
+#include <twin.h>
 #include <kglobalsettings.h>
 #include <kpopupmenu.h>
 #include <kapplication.h>
@@ -67,7 +67,7 @@
 //#include <kaccelbase.h>
 
 extern int kdesktop_screen_number;
-extern TQCString kdesktop_name, kicker_name, kwin_name;
+extern TQCString kdesktop_name, kicker_name, twin_name;
 
 KRootWidget::KRootWidget() : TQObject()
 {
@@ -168,7 +168,7 @@ KDesktop::KDesktop( bool x_root_hack, bool wait_for_kded ) :
   if ( x_root_hack )
   {
     // this is a ugly hack to make Dnd work
-    // Matthias told me that it won't be necessary with kwin
+    // Matthias told me that it won't be necessary with twin
     // actually my first try with ICCCM (Dirk) :-)
     unsigned long data[2];
     data[0] = (unsigned long) 1;
@@ -318,7 +318,7 @@ KDesktop::initRoot()
           }
           else  // we are not called from the ctor, so kicker should already run
           {
-            area = kwinModule()->workArea(kwinModule()->currentDesktop());
+            area = twinModule()->workArea(twinModule()->currentDesktop());
             m_pIconView->updateWorkArea(area);
           }
      }
@@ -346,7 +346,7 @@ void KDesktop::slotNoKicker()
     kdDebug(1204) << "KDesktop::slotNoKicker ... kicker did not respond" << endl;
     // up till now, we got no desktopIconsArea from kicker - probably
     // it's not running, so use the area from KWinModule
-    m_pIconView->updateWorkArea(kwinModule()->workArea(kwinModule()->currentDesktop()));
+    m_pIconView->updateWorkArea(twinModule()->workArea(twinModule()->currentDesktop()));
 }
 
 void
@@ -516,7 +516,7 @@ void KDesktop::popupExecuteCommand(const TQString& command)
 
   // Move minicli to the current desktop
   NETWinInfo info( qt_xdisplay(), m_miniCli->winId(), qt_xrootwin(), NET::WMDesktop );
-  int currentDesktop = kwinModule()->currentDesktop();
+  int currentDesktop = twinModule()->currentDesktop();
   if ( info.desktop() != currentDesktop )
       info.setDesktop( currentDesktop );
 
@@ -614,10 +614,10 @@ void KDesktop::setShowDesktop( bool b )
 
     if (b)
     {
-        m_activeWindow = kwinModule()->activeWindow();
+        m_activeWindow = twinModule()->activeWindow();
         m_iconifiedList.clear();
 
-        const TQValueList<WId> windows = kwinModule()->windows();
+        const TQValueList<WId> windows = twinModule()->windows();
         for (TQValueList<WId>::ConstIterator it = windows.begin();
              it != windows.end();
              ++it)
@@ -629,7 +629,7 @@ void KDesktop::setShowDesktop( bool b )
 
             if (info.mappingState() == NET::Visible &&
                 (info.desktop() == NETWinInfo::OnAllDesktops ||
-                 info.desktop() == (int)kwinModule()->currentDesktop()))
+                 info.desktop() == (int)twinModule()->currentDesktop()))
             {
                 m_iconifiedList.append( w );
             }
@@ -645,20 +645,20 @@ void KDesktop::setShowDesktop( bool b )
         }
 
         // on desktop changes or when a window is deiconified, we abort the show desktop mode
-        connect(kwinModule(), TQT_SIGNAL(currentDesktopChanged(int)),
+        connect(twinModule(), TQT_SIGNAL(currentDesktopChanged(int)),
                 TQT_SLOT(slotCurrentDesktopChanged(int)));
-        connect(kwinModule(), TQT_SIGNAL(windowChanged(WId,unsigned int)),
+        connect(twinModule(), TQT_SIGNAL(windowChanged(WId,unsigned int)),
                 TQT_SLOT(slotWindowChanged(WId,unsigned int)));
-        connect(kwinModule(), TQT_SIGNAL(windowAdded(WId)),
+        connect(twinModule(), TQT_SIGNAL(windowAdded(WId)),
                 TQT_SLOT(slotWindowAdded(WId)));
     }
     else
     {
-        disconnect(kwinModule(), TQT_SIGNAL(currentDesktopChanged(int)),
+        disconnect(twinModule(), TQT_SIGNAL(currentDesktopChanged(int)),
                    this, TQT_SLOT(slotCurrentDesktopChanged(int)));
-        disconnect(kwinModule(), TQT_SIGNAL(windowChanged(WId,unsigned int)),
+        disconnect(twinModule(), TQT_SIGNAL(windowChanged(WId,unsigned int)),
                    this, TQT_SLOT(slotWindowChanged(WId,unsigned int)));
-        disconnect(kwinModule(), TQT_SIGNAL(windowAdded(WId)),
+        disconnect(twinModule(), TQT_SIGNAL(windowAdded(WId)),
                    this, TQT_SLOT(slotWindowAdded(WId)));
 
         for (TQValueVector<WId>::ConstIterator it = m_iconifiedList.begin();
@@ -696,9 +696,9 @@ void KDesktop::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;
@@ -740,7 +740,7 @@ void KDesktop::slotWindowChanged(WId w, unsigned int dirty)
 
 bool KDesktop::showDesktopState()
 {
-    return kwinModule()->showingDesktop();
+    return twinModule()->showingDesktop();
 }
 
 void KDesktop::toggleShowDesktop()
@@ -836,7 +836,7 @@ void KDesktop::refresh()
   m_bNeedRepaint |= 1;
   updateWorkArea();
 #endif
-  kapp->dcopClient()->send( kwin_name, "", "refresh()", TQString(""));
+  kapp->dcopClient()->send( twin_name, "", "refresh()", TQString(""));
   refreshIcons();
 }
 
@@ -1120,7 +1120,7 @@ void KDesktop::desktopResized()
             res >> area;
         }
         else
-            area = kwinModule()->workArea(kwinModule()->currentDesktop());
+            area = twinModule()->workArea(twinModule()->currentDesktop());
 
         m_pIconView->updateWorkArea(area);
         m_pIconView->startDirLister();
diff --git a/kdesktop/desktop.h b/kdesktop/desktop.h
index 4d3a81750..cad822fc2 100644
--- a/kdesktop/desktop.h
+++ b/kdesktop/desktop.h
@@ -96,7 +96,7 @@ public:
 
   void logout( KApplication::ShutdownConfirm confirm, KApplication::ShutdownType sdtype );
 
-  KWinModule* kwinModule() const { return m_pKwinmodule; }
+  KWinModule* twinModule() const { return m_pKwinmodule; }
 
   // The action collection of the active widget
   KActionCollection *actionCollection();
@@ -153,7 +153,7 @@ private slots:
   /** Connected to KDIconView and KRootWidget  */
   void slotSwitchDesktops(int delta);
 
-  // when there seems to be no kicker, we have to get desktopIconsArea from kwinModule
+  // when there seems to be no kicker, we have to get desktopIconsArea from twinModule
   void slotNoKicker();
 
   /** Used for desktop show/hide functionality */
diff --git a/kdesktop/init/Templates/linkURL.desktop b/kdesktop/init/Templates/linkURL.desktop
index df71e95c2..1af2d73bb 100644
--- a/kdesktop/init/Templates/linkURL.desktop
+++ b/kdesktop/init/Templates/linkURL.desktop
@@ -144,7 +144,7 @@ Comment[uz@cyrillic]=Мавзуга боғни (URL) киритинг:
 Comment[ven]=Dzhenisani vhukwamani kha fhethu (URL):
 Comment[vi]=Nhập liên kết tới trang mạng:
 Comment[wa]=Novea loyén viè ene plaece (URL):
-Comment[xh]=Ngenisa ikhonkco kwindawo ekuyo (URL):
+Comment[xh]=Ngenisa ikhonkco twindawo ekuyo (URL):
 Comment[zh_CN]=输入到位置(URL)的链接：
 Comment[zh_TW]=輸入到位置的連結(URL)：
 Comment[zu]=Ngenisa isixhumanisi esiya endaweni (URL):
diff --git a/kdesktop/kdiconview.cc b/kdesktop/kdiconview.cc
index 7bfe4844f..edbaa339e 100644
--- a/kdesktop/kdiconview.cc
+++ b/kdesktop/kdiconview.cc
@@ -43,8 +43,8 @@
 #include <kstdaction.h>
 #include <kstandarddirs.h>
 #include <kurldrag.h>
-#include <kwin.h>
-#include <kwinmodule.h>
+#include <twin.h>
+#include <twinmodule.h>
 
 #include <fixx11h.h>
 
diff --git a/kdesktop/krootwm.cc b/kdesktop/krootwm.cc
index 3805e5c81..0292e0e07 100644
--- a/kdesktop/krootwm.cc
+++ b/kdesktop/krootwm.cc
@@ -46,8 +46,8 @@
 #include <dcopref.h>
 #include <khelpmenu.h>
 #include <kdebug.h>
-#include <kwindowlistmenu.h>
-#include <kwin.h>
+#include <twindowlistmenu.h>
+#include <twin.h>
 #include <kmenubar.h>
 #include <kmessagebox.h>
 #include <kuser.h>
@@ -67,7 +67,7 @@
 
 KRootWm * KRootWm::s_rootWm = 0;
 
-extern TQCString kdesktop_name, kicker_name, kwin_name;
+extern TQCString kdesktop_name, kicker_name, twin_name;
 
 KRootWm::KRootWm(KDesktop* _desktop) : TQObject(_desktop), startup(FALSE)
 {
@@ -804,18 +804,18 @@ void KRootWm::slotToggleDesktopMenu()
     // for the standalone menubar setting
     kapp->dcopClient()->send( "menuapplet*", "menuapplet", "configure()", data );
     kapp->dcopClient()->send( kicker_name, kicker_name, "configureMenubar()", data );
-    kapp->dcopClient()->send( "kwin*", "", "reconfigure()", data );
+    kapp->dcopClient()->send( "twin*", "", "reconfigure()", data );
 }
 
 
 void KRootWm::slotUnclutterWindows()
 {
-    kapp->dcopClient()->send(kwin_name, "KWinInterface", "unclutterDesktop()", TQString(""));
+    kapp->dcopClient()->send(twin_name, "KWinInterface", "unclutterDesktop()", TQString(""));
 }
 
 
 void KRootWm::slotCascadeWindows() {
-    kapp->dcopClient()->send(kwin_name, "KWinInterface", "cascadeDesktop()", TQString(""));
+    kapp->dcopClient()->send(twin_name, "KWinInterface", "cascadeDesktop()", TQString(""));
 }
 
 
diff --git a/kdesktop/lock/lockprocess.cc b/kdesktop/lock/lockprocess.cc
index 4552d082b..0a45bbb76 100644
--- a/kdesktop/lock/lockprocess.cc
+++ b/kdesktop/lock/lockprocess.cc
@@ -42,8 +42,8 @@
 #include <kstdguiitem.h>
 #include <kpixmapeffect.h>
 #include <kpixmap.h>
-#include <kwin.h>
-#include <kwinmodule.h>
+#include <twin.h>
+#include <twinmodule.h>
 #include <kdialog.h>
 
 #include <tqframe.h>
diff --git a/kdesktop/main.cc b/kdesktop/main.cc
index 695392165..9e5dea4ae 100644
--- a/kdesktop/main.cc
+++ b/kdesktop/main.cc
@@ -76,7 +76,7 @@ KDesktopApp *myApp = NULL;
 // -----------------------------------------------------------------------------
 
 int kdesktop_screen_number = 0;
-TQCString kdesktop_name, kicker_name, kwin_name;
+TQCString kdesktop_name, kicker_name, twin_name;
 
 static void crashHandler(int sigId)
 {
@@ -161,11 +161,11 @@ extern "C" KDE_EXPORT int kdemain( int argc, char **argv )
     if (kdesktop_screen_number == 0) {
         kdesktop_name = "kdesktop";
         kicker_name = "kicker";
-        kwin_name = "kwin";
+        twin_name = "twin";
     } else {
         kdesktop_name.sprintf("kdesktop-screen-%d", kdesktop_screen_number);
         kicker_name.sprintf("kicker-screen-%d", kdesktop_screen_number);
-        kwin_name.sprintf("kwin-screen-%d", kdesktop_screen_number);
+        twin_name.sprintf("twin-screen-%d", kdesktop_screen_number);
     }
 
     KAboutData aboutData( kdesktop_name, I18N_NOOP("KDesktop"),
diff --git a/kdesktop/minicli.cpp b/kdesktop/minicli.cpp
index 542c2b7e7..51a8959ce 100644
--- a/kdesktop/minicli.cpp
+++ b/kdesktop/minicli.cpp
@@ -57,7 +57,7 @@
 #include <kdebug.h>
 #include <kpassdlg.h>
 #include <krun.h>
-#include <kwin.h>
+#include <twin.h>
 #include <tdesu/su.h>
 #include <kstandarddirs.h>
 #include <kconfig.h>