From 20f2ea59acc996ef56d65640f5a9a77b8ae90066 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Mon, 7 Nov 2011 20:29:02 -0600
Subject: Rename kwin to twin (part 1 of 2)

---
 kmix/kmixdockwidget.cpp                    | 4 ++--
 kscd/docking.h                             | 2 +-
 kscd/kscd.cpp                              | 2 +-
 mpeglib/lib/util/render/x11/x11Surface.cpp | 4 ++--
 noatun/modules/excellent/userinterface.cpp | 2 +-
 noatun/modules/kaiman/userinterface.cpp    | 2 +-
 noatun/modules/kjofol-skin/kjloader.cpp    | 2 +-
 noatun/modules/kjofol-skin/kjloader.h      | 2 +-
 noatun/modules/noatunui/userinterface.cpp  | 2 +-
 noatun/modules/splitplaylist/playlist.cpp  | 2 +-
 noatun/modules/winskin/waSkin.cpp          | 2 +-
 11 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/kmix/kmixdockwidget.cpp b/kmix/kmixdockwidget.cpp
index 49d96627..039d3237 100644
--- a/kmix/kmixdockwidget.cpp
+++ b/kmix/kmixdockwidget.cpp
@@ -32,7 +32,7 @@
 #include <kaudioplayer.h>
 #include <kiconloader.h>
 #include <kdebug.h>
-#include <kwin.h>
+#include <twin.h>
 
 #include <tqapplication.h>
 #include <tqcursor.h>
@@ -45,7 +45,7 @@
 #include "mixer.h"
 #include "mixdevicewidget.h"
 #include "kmixdockwidget.h"
-#include "kwin.h"
+#include "twin.h"
 #include "viewdockareapopup.h"
 
 KMixDockWidget::KMixDockWidget( Mixer *mixer, TQWidget *parent, const char *name, bool volumePopup, bool dockIconMuting )
diff --git a/kscd/docking.h b/kscd/docking.h
index 56245ffd..fd9c2ab8 100644
--- a/kscd/docking.h
+++ b/kscd/docking.h
@@ -35,7 +35,7 @@
 #include <tqtimer.h>
 #include <tqpopupmenu.h>
 #include <tqpoint.h>
-#include <kdockwindow.h>
+#include <kdoctwindow.h>
 
 class KSCD;
 
diff --git a/kscd/kscd.cpp b/kscd/kscd.cpp
index 604a023d..74842d50 100644
--- a/kscd/kscd.cpp
+++ b/kscd/kscd.cpp
@@ -68,7 +68,7 @@
 #include "version.h"
 #include "prefs.h"
 
-#include <kwin.h>
+#include <twin.h>
 #include <netwm.h>
 #include <stdlib.h>
 
diff --git a/mpeglib/lib/util/render/x11/x11Surface.cpp b/mpeglib/lib/util/render/x11/x11Surface.cpp
index d7b8f052..0f9231c0 100644
--- a/mpeglib/lib/util/render/x11/x11Surface.cpp
+++ b/mpeglib/lib/util/render/x11/x11Surface.cpp
@@ -298,7 +298,7 @@ int X11Surface::closeImage() {
   imageCurrent=NULL;
 	  
   XWindowAttributes attr;
-  Window junkwin;
+  Window juntwin;
   
   if (!IS_FULL(imageMode)) {
     if (!XGetWindowAttributes(xWindow->display, xWindow->window, &attr))
@@ -307,7 +307,7 @@ int X11Surface::closeImage() {
     XTranslateCoordinates (xWindow->display, xWindow->window, attr.root, 
 			   -attr.border_width,
 			   -attr.border_width,
-			   &xWindow->x, &xWindow->y, &junkwin);
+			   &xWindow->x, &xWindow->y, &juntwin);
   }
   
   imageMode=_IMAGE_NONE;
diff --git a/noatun/modules/excellent/userinterface.cpp b/noatun/modules/excellent/userinterface.cpp
index 86c4f500..5d18d488 100644
--- a/noatun/modules/excellent/userinterface.cpp
+++ b/noatun/modules/excellent/userinterface.cpp
@@ -48,7 +48,7 @@
 #include <kpopupmenu.h>
 #include <kstatusbar.h>
 #include <kstdaction.h>
-#include <kwin.h>
+#include <twin.h>
 #include <kurldrag.h>
 
 #include <tqbitmap.h>
diff --git a/noatun/modules/kaiman/userinterface.cpp b/noatun/modules/kaiman/userinterface.cpp
index 47e8a8b7..a8b241f7 100644
--- a/noatun/modules/kaiman/userinterface.cpp
+++ b/noatun/modules/kaiman/userinterface.cpp
@@ -41,7 +41,7 @@
 #include <kfiledialog.h>
 #include <kdebug.h>
 #include <kapplication.h>
-#include <kwin.h>
+#include <twin.h>
 #include <kglobal.h>
 #include <klocale.h>
 #include <kconfig.h>
diff --git a/noatun/modules/kjofol-skin/kjloader.cpp b/noatun/modules/kjofol-skin/kjloader.cpp
index ae25f152..a97acb98 100644
--- a/noatun/modules/kjofol-skin/kjloader.cpp
+++ b/noatun/modules/kjofol-skin/kjloader.cpp
@@ -66,7 +66,7 @@
 #include <kpixmapeffect.h>
 #include <kurldrag.h>
 
-#include <kwin.h>
+#include <twin.h>
 #include <kiconloader.h>
 
 class KJToolTip : public TQToolTip
diff --git a/noatun/modules/kjofol-skin/kjloader.h b/noatun/modules/kjofol-skin/kjloader.h
index 117545b2..fa54dc5c 100644
--- a/noatun/modules/kjofol-skin/kjloader.h
+++ b/noatun/modules/kjofol-skin/kjloader.h
@@ -18,7 +18,7 @@
 #include <tqptrlist.h>
 #include <tqcstring.h>
 
-#include <kwinmodule.h>
+#include <twinmodule.h>
 
 class TQLabel;
 class KJWidget;
diff --git a/noatun/modules/noatunui/userinterface.cpp b/noatun/modules/noatunui/userinterface.cpp
index 0aeb2fc8..07ff7e15 100644
--- a/noatun/modules/noatunui/userinterface.cpp
+++ b/noatun/modules/noatunui/userinterface.cpp
@@ -205,7 +205,7 @@ void MilkChocolate::popup()
 
 void MilkChocolate::slotPlaying()
 {
-//	connect(kwinmodule, TQT_SIGNAL(windowAdded(WId)), view, TQT_SLOT(attemptReparent(WId)));
+//	connect(twinmodule, TQT_SIGNAL(windowAdded(WId)), view, TQT_SLOT(attemptReparent(WId)));
 	changeStatusbar(napp->player()->current().title(), napp->player()->lengthString());
 	mPlay->setOn(true);
 	mStop->setEnabled(true);
diff --git a/noatun/modules/splitplaylist/playlist.cpp b/noatun/modules/splitplaylist/playlist.cpp
index d7ddd1bf..787791ac 100644
--- a/noatun/modules/splitplaylist/playlist.cpp
+++ b/noatun/modules/splitplaylist/playlist.cpp
@@ -5,7 +5,7 @@
 #include <kapplication.h>
 #include <krandomsequence.h>
 #include <kdebug.h>
-#include <kwin.h>
+#include <twin.h>
 
 #include <kiconloader.h>
 
diff --git a/noatun/modules/winskin/waSkin.cpp b/noatun/modules/winskin/waSkin.cpp
index aae49bf9..e4770b7f 100644
--- a/noatun/modules/winskin/waSkin.cpp
+++ b/noatun/modules/winskin/waSkin.cpp
@@ -23,7 +23,7 @@
 #include <kaction.h>
 #include <tqdragobject.h>
 #include <kstandarddirs.h>
-#include <kwin.h>
+#include <twin.h>
 #include <time.h>
 
 #include <noatun/playlist.h>
-- 
cgit v1.2.1