Rename kwin to twin (part 1 of 2)

4 files changed, 16 insertions, 16 deletions

diff --git a/kpager/desktop.cpp b/kpager/desktop.cpp
index bec8271de..c03fd044f 100644
--- a/kpager/desktop.cpp
+++ b/kpager/desktop.cpp
@@ -30,8 +30,8 @@
 #include <kdatastream.h>
 #include <kapplication.h>
 #include <kglobalsettings.h>
-#include <kwinmodule.h>
-#include <kwin.h>
+#include <twinmodule.h>
+#include <twin.h>
 #include <kconfig.h>
 #include <kglobal.h>
 #include <kdebug.h>
@@ -129,7 +129,7 @@ void Desktop::mouseReleaseEvent( TQMouseEvent *ev )
 KWin::WindowInfo *Desktop::windowAtPosition(const TQPoint &p, TQPoint *internalpos)
 {
 	TQRect r;
-	const TQValueList<WId> &list(pager()->kwin()->stackingOrder());
+	const TQValueList<WId> &list(pager()->twin()->stackingOrder());
 	if (list.count() <= 0)
 		return 0L;
 
@@ -476,9 +476,9 @@ void Desktop::paintEvent( TQPaintEvent * )
 
 	// draw text
 	if ( sname && snumber )
-	    txt=TQString("%1. %2").arg(m_desk).arg(pager()->kwin()->desktopName( m_desk ));
+	    txt=TQString("%1. %2").arg(m_desk).arg(pager()->twin()->desktopName( m_desk ));
 	else if ( sname )
-	    txt=pager()->kwin()->desktopName( m_desk );
+	    txt=pager()->twin()->desktopName( m_desk );
 	else if ( snumber )
 	    txt=TQString::number( m_desk );
 	p.drawText(2, 0, width()-4, height(), AlignCenter, txt );
@@ -487,8 +487,8 @@ void Desktop::paintEvent( TQPaintEvent * )
     // paint windows
     if ( KPagerConfigDialog::m_showWindows ) {
 	TQValueList<WId>::ConstIterator it;
-	for ( it = pager()->kwin()->stackingOrder().begin();
-	      it != pager()->kwin()->stackingOrder().end(); ++it ) {
+	for ( it = pager()->twin()->stackingOrder().begin();
+	      it != pager()->twin()->stackingOrder().end(); ++it ) {
 
 	    KWin::WindowInfo* info = pager()->info( *it );
 
@@ -519,7 +519,7 @@ void Desktop::paintWindowPlain(TQPainter &p, const KWin::WindowInfo *info, bool
     if ( !onDesktop )
 	r.moveTopLeft(TQPoint(0,0));
 
-  bool isActive=(pager()->kwin()->activeWindow() == info->win());
+  bool isActive=(pager()->twin()->activeWindow() == info->win());
 
   TQBrush brush;
 
@@ -638,7 +638,7 @@ KPager *Desktop::pager() const
 
 bool Desktop::isCurrent() const
 {
-  return pager()->kwin()->currentDesktop()==m_desk;
+  return pager()->twin()->currentDesktop()==m_desk;
 }
 
 void Desktop::backgroundLoaded(bool b)
diff --git a/kpager/desktop.h b/kpager/desktop.h
index bfaef5baf..56429342c 100644
--- a/kpager/desktop.h
+++ b/kpager/desktop.h
@@ -27,7 +27,7 @@
 
 #include <tqwidget.h>
 #include <tqintdict.h>
-#include <kwin.h>
+#include <twin.h>
 
 class KSharedPixmap;
 class KPopupMenu;
diff --git a/kpager/kpager.cpp b/kpager/kpager.cpp
index b8ecf9ddf..57a960bb7 100644
--- a/kpager/kpager.cpp
+++ b/kpager/kpager.cpp
@@ -50,8 +50,8 @@
 #include <kconfig.h>
 #include <kdebug.h>
 #include <klocale.h>
-#include <kwin.h>
-#include <kwinmodule.h>
+#include <twin.h>
+#include <twinmodule.h>
 #include <netwm.h>
 #include "desktop.h"
 #include <tqpopupmenu.h>
@@ -495,7 +495,7 @@ void KPager::slotDesktopNamesChanged()
     for ( int i=1; i <= (int) m_desktops.count(); ++i)
     {
         TQToolTip::remove(m_desktops[i-1]);
-        TQToolTip::add(m_desktops[i-1], kwin()->desktopName(i));
+        TQToolTip::add(m_desktops[i-1], twin()->desktopName(i));
     }
 
     update();
@@ -530,7 +530,7 @@ void KPager::slotNumberOfDesktopsChanged(int ndesktops)
 
         for (unsigned int d=m_desktops.count()+1;d<=nDesktops; d++)
         {
-            Desktop *dsk=new Desktop(d,kwin()->desktopName(d-1),this);
+            Desktop *dsk=new Desktop(d,twin()->desktopName(d-1),this);
             m_desktops.append(dsk);
             dsk->show();
         }
diff --git a/kpager/kpager.h b/kpager/kpager.h
index b82b43dff..e88c2904f 100644
--- a/kpager/kpager.h
+++ b/kpager/kpager.h
@@ -28,7 +28,7 @@
 #include <tqwidget.h>
 #include <tqintdict.h>
 #include <kmainwindow.h>
-#include <kwin.h>
+#include <twin.h>
 #include "kpagerIface.h"
 
 class KPager;
@@ -67,7 +67,7 @@ public:
     KPager(KPagerMainWindow *parent=0, const char *name=0);
     ~KPager();
 
-    class KWinModule *kwin() const { return m_winmodule; };
+    class KWinModule *twin() const { return m_winmodule; };
     void updateLayout();
 
     void redrawDesktops();