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

---
 knotes/ChangeLog          |  4 ++--
 knotes/knote.cpp          | 16 ++++++++--------
 knotes/knote.h            |  2 +-
 knotes/knoteconfigdlg.cpp |  2 +-
 knotes/knotesapp.cpp      |  2 +-
 5 files changed, 13 insertions(+), 13 deletions(-)

(limited to 'knotes')

diff --git a/knotes/ChangeLog b/knotes/ChangeLog
index 6353a107f..b50317249 100644
--- a/knotes/ChangeLog
+++ b/knotes/ChangeLog
@@ -117,7 +117,7 @@ ChangeLog for KNotes
 
 2004/09/27  Michael Brade <brade@kde.org>
 
-    * no compile-time dependency on kdebase allowed, so read kwinrc directly
+    * no compile-time dependency on kdebase allowed, so read twinrc directly
 
 2004/08/31  Michael Brade <brade@kde.org>
 
@@ -517,7 +517,7 @@ ChangeLog for KNotes
 
 2002/09/30  Michael Brade <brade@kde.org>
 
-    * fixed mouse behaviour to be like kwin:
+    * fixed mouse behaviour to be like twin:
          - raise() and lower() windows already on mouse button press,
            not on mouse button release
          - MMB moves notes as well
diff --git a/knotes/knote.cpp b/knotes/knote.cpp
index 8a260576c..b2a804be5 100644
--- a/knotes/knote.cpp
+++ b/knotes/knote.cpp
@@ -70,7 +70,7 @@
 
 #include "pushpin.xpm"
 
-#include <kwin.h>
+#include <twin.h>
 #include <netwm.h>
 
 #include <fixx11h.h>
@@ -83,7 +83,7 @@ KNote::KNote( TQDomDocument buildDoc, Journal *j, TQWidget *parent, const char *
   : TQFrame( parent, name, WStyle_Customize | WStyle_NoBorder | WDestructiveClose ),
     m_label( 0 ), m_pushpin( 0 ), m_fold( 0 ), m_button( 0 ), m_tool( 0 ), m_editor( 0 ),
     m_config( 0 ), m_journal( j ), m_find( 0 ),
-    m_kwinConf( KSharedConfig::openConfig( "kwinrc", true ) ),
+    m_twinConf( KSharedConfig::openConfig( "twinrc", true ) ),
     m_busy( 0 ), m_deleteWhenIdle( false ), m_blockEmitDataChanged( false )
 {
     setAcceptDrops( true );
@@ -262,9 +262,9 @@ KNote::KNote( TQDomDocument buildDoc, Journal *j, TQWidget *parent, const char *
 
     // can be done here since this doesn't pick up changes while KNotes is running anyway
     bool closeLeft = false;
-    m_kwinConf->setGroup( "Style" );
-    if ( m_kwinConf->readBoolEntry( "CustomButtonPositions" ) )
-        closeLeft = m_kwinConf->readEntry( "ButtonsOnLeft" ).find( 'X' ) > -1;
+    m_twinConf->setGroup( "Style" );
+    if ( m_twinConf->readBoolEntry( "CustomButtonPositions" ) )
+        closeLeft = m_twinConf->readEntry( "ButtonsOnLeft" ).find( 'X' ) > -1;
 
     TQPixmap pushpin_pix;
     if ( closeLeft )
@@ -1165,9 +1165,9 @@ void KNote::updateLayout()
     const int margin = m_editor->margin();
     bool closeLeft = false;
 
-    m_kwinConf->setGroup( "Style" );
-    if ( m_kwinConf->readBoolEntry( "CustomButtonPositions" ) )
-        closeLeft = m_kwinConf->readEntry( "ButtonsOnLeft" ).find( 'X' ) > -1;
+    m_twinConf->setGroup( "Style" );
+    if ( m_twinConf->readBoolEntry( "CustomButtonPositions" ) )
+        closeLeft = m_twinConf->readEntry( "ButtonsOnLeft" ).find( 'X' ) > -1;
 
     if ( s_ppOffset )
     {
diff --git a/knotes/knote.h b/knotes/knote.h
index 027c88d59..cf8dbca54 100644
--- a/knotes/knote.h
+++ b/knotes/knote.h
@@ -176,7 +176,7 @@ private:
     KToggleAction *m_keepAbove;
     KToggleAction *m_keepBelow;
 
-    KSharedConfig::Ptr m_kwinConf;
+    KSharedConfig::Ptr m_twinConf;
 
     static int s_ppOffset;
 
diff --git a/knotes/knoteconfigdlg.cpp b/knotes/knoteconfigdlg.cpp
index 617d90ab0..034a3239e 100644
--- a/knotes/knoteconfigdlg.cpp
+++ b/knotes/knoteconfigdlg.cpp
@@ -33,7 +33,7 @@
 #include <knuminput.h>
 #include <klineedit.h>
 #include <kfontrequester.h>
-#include <kwin.h>
+#include <twin.h>
 
 #include "knote.h"
 #include "knoteconfigdlg.h"
diff --git a/knotes/knotesapp.cpp b/knotes/knotesapp.cpp
index 3ea8caea6..22ee49fd6 100644
--- a/knotes/knotesapp.cpp
+++ b/knotes/knotesapp.cpp
@@ -37,7 +37,7 @@
 #include <kkeydialog.h>
 #include <kglobalaccel.h>
 #include <ksimpleconfig.h>
-#include <kwin.h>
+#include <twin.h>
 #include <kbufferedsocket.h>
 #include <kserversocket.h>
 
-- 
cgit v1.2.1