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

---
 ksmserver/README          | 4 ++--
 ksmserver/legacy.cpp      | 4 ++--
 ksmserver/main.cpp        | 4 ++--
 ksmserver/server.cpp      | 4 ++--
 ksmserver/shutdowndlg.cpp | 2 +-
 ksmserver/startup.cpp     | 2 +-
 ksmserver/startupdlg.cpp  | 2 +-
 7 files changed, 11 insertions(+), 11 deletions(-)

(limited to 'ksmserver')

diff --git a/ksmserver/README b/ksmserver/README
index 759e57c9d..d6779c070 100644
--- a/ksmserver/README
+++ b/ksmserver/README
@@ -28,11 +28,11 @@ The server is usually started from the 'startkde' script. It supports the follow
 
   -r, --restore             Restores the previous session if available
   -w, --windowmanager <wm>  Starts 'wm' in case no other window manager is
-                            participating in the session. Default is 'kwin'
+                            participating in the session. Default is 'twin'
 
 The default 'startkde' launches 'ksmserver --restore'.  The
 'windowmanager' option is useful for users that prefer a window
-manager other than kwin. Since the window manager has to participate
+manager other than twin. Since the window manager has to participate
 in the session (it has to remember window positions and states), it is
 usually restarted when the session is restored. To be *really* sure
 that this happens, even if the wm might have crashed during the
diff --git a/ksmserver/legacy.cpp b/ksmserver/legacy.cpp
index 186fdcf64..ad190185e 100644
--- a/ksmserver/legacy.cpp
+++ b/ksmserver/legacy.cpp
@@ -50,7 +50,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 #include <kconfig.h>
 #include <kdebug.h>
-#include <kwinmodule.h>
+#include <twinmodule.h>
 
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>
@@ -239,7 +239,7 @@ void KSMServer::restoreLegacySession( KConfig* config )
     if( config->hasGroup( "Legacy" + sessionGroup )) {
         KConfigGroupSaver saver( config, "Legacy" + sessionGroup );
         restoreLegacySessionInternal( config );
-    } else if( wm == "kwin" ) { // backwards comp. - get it from kwinrc
+    } else if( wm == "twin" ) { // backwards comp. - get it from twinrc
 	KConfigGroupSaver saver( config, sessionGroup );
 	int count =  config->readNumEntry( "count", 0 );
 	for ( int i = 1; i <= count; i++ ) {
diff --git a/ksmserver/main.cpp b/ksmserver/main.cpp
index 5ac04acf3..8e2270068 100644
--- a/ksmserver/main.cpp
+++ b/ksmserver/main.cpp
@@ -34,7 +34,7 @@ static const KCmdLineOptions options[] =
    { "r", 0, 0 },
    { "restore", I18N_NOOP("Restores the saved user session if available"), 0},
    { "w", 0, 0 },
-   { "windowmanager <wm>", I18N_NOOP("Starts 'wm' in case no other window manager is \nparticipating in the session. Default is 'kwin'"), 0},
+   { "windowmanager <wm>", I18N_NOOP("Starts 'wm' in case no other window manager is \nparticipating in the session. Default is 'twin'"), 0},
    { "nolocal", I18N_NOOP("Also allow remote connections"), 0},
    KCmdLineLastOption
 };
@@ -204,7 +204,7 @@ extern "C" KDE_EXPORT int kdemain( int argc, char* argv[] )
 
     TQCString wm = args->getOption("windowmanager");
     if ( wm.isEmpty() )
-	wm = "kwin";
+	wm = "twin";
 
     bool only_local = args->isSet("local");
 #ifndef HAVE__ICETRANSNOLISTEN
diff --git a/ksmserver/server.cpp b/ksmserver/server.cpp
index ac4ef0e28..91cfb7544 100644
--- a/ksmserver/server.cpp
+++ b/ksmserver/server.cpp
@@ -911,9 +911,9 @@ bool KSMServer::isWM( const TQString& program ) const
 {
     // KWin relies on ksmserver's special treatment in phase1,
     // therefore make sure it's recognized even if ksmserver
-    // was initially started with different WM, and kwin replaced
+    // was initially started with different WM, and twin replaced
     // it later
-    return ((program == wm) || (program == "kwin"));
+    return ((program == wm) || (program == "twin"));
 }
 
 bool KSMServer::isCM( const KSMClient* client ) const
diff --git a/ksmserver/shutdowndlg.cpp b/ksmserver/shutdowndlg.cpp
index d715cf277..3df6870b7 100644
--- a/ksmserver/shutdowndlg.cpp
+++ b/ksmserver/shutdowndlg.cpp
@@ -37,7 +37,7 @@ Copyright (C) 2000 Matthias Ettrich <ettrich@kde.org>
 #include <kguiitem.h>
 #include <kiconloader.h>
 #include <kglobalsettings.h>
-#include <kwin.h>
+#include <twin.h>
 #include <kuser.h>
 #include <kpixmap.h>
 #include <kimageeffect.h>
diff --git a/ksmserver/startup.cpp b/ksmserver/startup.cpp
index 00cf57714..bd2fe440f 100644
--- a/ksmserver/startup.cpp
+++ b/ksmserver/startup.cpp
@@ -76,7 +76,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <kprocess.h>
 #include <dcopclient.h>
 #include <dcopref.h>
-#include <kwinmodule.h>
+#include <twinmodule.h>
 #include <knotifyclient.h>
 
 #include "server.h"
diff --git a/ksmserver/startupdlg.cpp b/ksmserver/startupdlg.cpp
index 43e12c075..2d42dd3a2 100644
--- a/ksmserver/startupdlg.cpp
+++ b/ksmserver/startupdlg.cpp
@@ -37,7 +37,7 @@ Copyright (C) 2000 Matthias Ettrich <ettrich@kde.org>
 #include <kguiitem.h>
 #include <kiconloader.h>
 #include <kglobalsettings.h>
-#include <kwin.h>
+#include <twin.h>
 #include <kuser.h>
 #include <kpixmap.h>
 #include <kimageeffect.h>
-- 
cgit v1.2.1