Rename kwin to twin (part 1 of 2)

59 files changed, 100 insertions, 100 deletions

diff --git a/NewsLog.txt b/NewsLog.txt
index 3748e00c1..9890107f1 100644
--- a/NewsLog.txt
+++ b/NewsLog.txt
@@ -1914,7 +1914,7 @@ Features
  - protrinity5-z item 9:  first part of this item, concerning sync of SEEN flags in read only folders (issue1376) (703473)
    protrinity5-z item 9:  second part, ability to store custom flags on the server (704199) merges
 - protrinity5 w1-20 (665722)
-- protrinity5 w1-11: Let the navigator toolbar be always the last one, if it's in the top dockwindow ( 666073)
+- protrinity5 w1-11: Let the navigator toolbar be always the last one, if it's in the top doctwindow ( 666073)
  - protrinity5 W1-19 / kolab/issue1749 Since mail folders are not groupware folders, do a full sync, when
   the mail part is already active. (668988)
  - protrinity5 It's now possible to resize the magenta rectangle that represents the event in the freebusy
diff --git a/akregator/src/trayicon.cpp b/akregator/src/trayicon.cpp
index e2fb42274..8bfb78958 100644
--- a/akregator/src/trayicon.cpp
+++ b/akregator/src/trayicon.cpp
@@ -26,7 +26,7 @@
 #include "trayicon.h"
 
 #include <kapplication.h>
-#include <kwin.h>
+#include <twin.h>
 #include <kiconeffect.h>
 #include <kdebug.h>
 #include <klocale.h>
diff --git a/certmanager/conf/configuredialog.cpp b/certmanager/conf/configuredialog.cpp
index 6a7b6a082..2aa622d08 100644
--- a/certmanager/conf/configuredialog.cpp
+++ b/certmanager/conf/configuredialog.cpp
@@ -33,7 +33,7 @@
 
 #include "configuredialog.h"
 
-#include <kwin.h>
+#include <twin.h>
 #include <kapplication.h>
 #include <kconfig.h>
 #include <klocale.h>
diff --git a/certmanager/lib/ui/keyselectiondialog.cpp b/certmanager/lib/ui/keyselectiondialog.cpp
index 29d24e151..bd4496485 100644
--- a/certmanager/lib/ui/keyselectiondialog.cpp
+++ b/certmanager/lib/ui/keyselectiondialog.cpp
@@ -57,7 +57,7 @@
 #include <kglobal.h>
 #include <kiconloader.h>
 #include <kdebug.h>
-#include <kwin.h>
+#include <twin.h>
 #include <kconfig.h>
 #include <kmessagebox.h>
 #include <kprocess.h>
diff --git a/kaddressbook/main.cpp b/kaddressbook/main.cpp
index c6382ace8..3c57e61d2 100644
--- a/kaddressbook/main.cpp
+++ b/kaddressbook/main.cpp
@@ -34,7 +34,7 @@
 #include <klocale.h>
 #include <kstartupinfo.h>
 #include <kuniqueapplication.h>
-#include <kwin.h>
+#include <twin.h>
 
 #include "kaddressbookmain.h"
 #include "kaddressbook_options.h"
diff --git a/kalarm/editdlg.cpp b/kalarm/editdlg.cpp
index 250686922..15a2b38ae 100644
--- a/kalarm/editdlg.cpp
+++ b/kalarm/editdlg.cpp
@@ -47,8 +47,8 @@
 #include <kmessagebox.h>
 #include <kurldrag.h>
 #include <kurlcompletion.h>
-#include <kwin.h>
-#include <kwinmodule.h>
+#include <twin.h>
+#include <twinmodule.h>
 #include <kstandarddirs.h>
 #include <kstdguiitem.h>
 #include <kabc/addresseedialog.h>
diff --git a/kalarm/find.cpp b/kalarm/find.cpp
index ed302f63b..560fcfd95 100644
--- a/kalarm/find.cpp
+++ b/kalarm/find.cpp
@@ -28,7 +28,7 @@
 #include <kfinddialog.h>
 #include <kfind.h>
 #include <kseparator.h>
-#include <kwin.h>
+#include <twin.h>
 #include <klocale.h>
 #include <kmessagebox.h>
 #include <kdebug.h>
diff --git a/kalarm/messagewin.cpp b/kalarm/messagewin.cpp
index 755a1e223..f7decdf65 100644
--- a/kalarm/messagewin.cpp
+++ b/kalarm/messagewin.cpp
@@ -46,8 +46,8 @@
 #include <kglobalsettings.h>
 #include <kmimetype.h>
 #include <kmessagebox.h>
-#include <kwin.h>
-#include <kwinmodule.h>
+#include <twin.h>
+#include <twinmodule.h>
 #include <kprocess.h>
 #include <kio/netaccess.h>
 #include <knotifyclient.h>
diff --git a/kalarm/prefdlg.cpp b/kalarm/prefdlg.cpp
index 860d68193..3aa6fc622 100644
--- a/kalarm/prefdlg.cpp
+++ b/kalarm/prefdlg.cpp
@@ -44,7 +44,7 @@
 #include <kcolorcombo.h>
 #include <kstdguiitem.h>
 #ifdef TQ_WS_X11
-#include <kwin.h>
+#include <twin.h>
 #endif
 #include <kdebug.h>
 
diff --git a/karm/desktoptracker.h b/karm/desktoptracker.h
index b24b77389..00b2cc49c 100644
--- a/karm/desktoptracker.h
+++ b/karm/desktoptracker.h
@@ -3,7 +3,7 @@
 
 #include <vector>
 
-#include <kwinmodule.h>
+#include <twinmodule.h>
 
 #include "desktoplist.h"
 
diff --git a/karm/edittaskdialog.cpp b/karm/edittaskdialog.cpp
index c91f13eaf..9b404d0af 100644
--- a/karm/edittaskdialog.cpp
+++ b/karm/edittaskdialog.cpp
@@ -34,7 +34,7 @@
 #include <tqwhatsthis.h>
 
 #include <klocale.h>            // i18n
-#include <kwinmodule.h>
+#include <twinmodule.h>
 
 #include "edittaskdialog.h"
 #include "ktimewidget.h"
@@ -47,7 +47,7 @@ EditTaskDialog::EditTaskDialog( TQString caption, bool editDlg,
 {
   TQWidget *page = new TQWidget( this ); 
   setMainWidget(page);
-  KWinModule kwinmodule(0, KWinModule::INFO_DESKTOP);
+  KWinModule twinmodule(0, KWinModule::INFO_DESKTOP);
 
   TQVBoxLayout *lay1 = new TQVBoxLayout(page);
   
@@ -146,7 +146,7 @@ EditTaskDialog::EditTaskDialog( TQString caption, bool editDlg,
   _diffTW = new KArmTimeWidget( page, "_sessionAddTW" );
   lay4->addWidget( _diffTW );
 
-  desktopCount = kwinmodule.numberOfDesktops();
+  desktopCount = twinmodule.numberOfDesktops();
   
   // If desktopList contains higher numbered desktops than desktopCount then
   // delete those from desktopList. This may be the case if the user has
@@ -183,7 +183,7 @@ EditTaskDialog::EditTaskDialog( TQString caption, bool editDlg,
   lay1->addLayout(lay6);
   for (int i=0; i<desktopCount; i++) {
     _deskBox.push_back(new TQCheckBox(groupBox,TQString::number(i).latin1()));
-    _deskBox[i]->setText(kwinmodule.desktopName(i+1));
+    _deskBox[i]->setText(twinmodule.desktopName(i+1));
     _deskBox[i]->setChecked(false);
 
     lay6->addWidget(_deskBox[i]);
diff --git a/karm/printdialog.cpp b/karm/printdialog.cpp
index ffca496a7..197875491 100644
--- a/karm/printdialog.cpp
+++ b/karm/printdialog.cpp
@@ -34,7 +34,7 @@
 
 #include <kiconloader.h>
 #include <klocale.h>            // i18n
-#include <kwinmodule.h>
+#include <twinmodule.h>
 
 #include "printdialog.h"
 #include <libtdepim/kdateedit.h>
diff --git a/kdgantt/KDGanttView.cpp b/kdgantt/KDGanttView.cpp
index 303ca8651..0af98043b 100644
--- a/kdgantt/KDGanttView.cpp
+++ b/kdgantt/KDGanttView.cpp
@@ -606,12 +606,12 @@ void KDGanttView::slotHeaderSizeChanged()
   Specifies whether the legend should be shown as a dock window or not.
 
   \param show if true, show legend as a dock window
-  \sa showLegend(), legendIsDockwindow(), legendDockwindow()
-*/void KDGanttView::setLegendIsDockwindow( bool show )
+  \sa showLegend(), legendIsDoctwindow(), legendDoctwindow()
+*/void KDGanttView::setLegendIsDoctwindow( bool show )
 {
-  bool isdock = myLegend->asDockwindow();
+  bool isdock = myLegend->asDoctwindow();
   if ( show != isdock ) {
-    myLegend->setAsDockwindow(show);
+    myLegend->setAsDoctwindow(show);
     // legend is cleared - reinit legend with list
     legendItem* li;
     for ( li = myLegendItems->first(); li; li = myLegendItems->next() ) {
@@ -625,10 +625,10 @@ void KDGanttView::slotHeaderSizeChanged()
   Returns whether the legend is shown as a dock window
 
   \return true if the legend is shown as a dock window
-  \sa setShowLegend(), setLegendIsDockwindow(), legendDockwindow()
-*/bool KDGanttView::legendIsDockwindow() const
+  \sa setShowLegend(), setLegendIsDoctwindow(), legendDoctwindow()
+*/bool KDGanttView::legendIsDoctwindow() const
 {
-    return myLegend->asDockwindow();
+    return myLegend->asDoctwindow();
 }
 
 
@@ -637,16 +637,16 @@ void KDGanttView::slotHeaderSizeChanged()
   DO NOT DELETE THIS POINTER!
   If the legend is not a dock window, 0 is returned
   To set the legend as a dock window, call
-  KDGanttView::setLegendIsDockwindow( true );
+  KDGanttView::setLegendIsDoctwindow( true );
 
   \return the pointer to the legend dock window
           0 is returned, if the legend is no dock window
           DO NOT DELETE THIS POINTER!
-  \sa setShowLegend(), setLegendIsDockwindow(),legendIsDockwindow()
+  \sa setShowLegend(), setLegendIsDoctwindow(),legendIsDoctwindow()
 */
-TQDockWindow* KDGanttView::legendDockwindow() const
+TQDockWindow* KDGanttView::legendDoctwindow() const
 {
-  return myLegend->dockwindow();
+  return myLegend->doctwindow();
 }
 
 
@@ -2529,7 +2529,7 @@ bool KDGanttView::loadXML( const TQDomDocument& doc )
             } else if( tagName == "LegendIsDockWindow" ) {
                 bool value;
                 if( KDGanttXML::readBoolNode( element, value ) )
-                    setLegendIsDockwindow( value );
+                    setLegendIsDoctwindow( value );
             } else if( tagName == "ShowListView" ) {
                 bool value;
                 if( KDGanttXML::readBoolNode( element, value ) )
@@ -3285,7 +3285,7 @@ TQDomDocument KDGanttView::saveXML( bool withPI ) const
 
     // the LegendIsDockWindow element
     KDGanttXML::createBoolNode( doc, docRoot, "LegendIsDockWindow",
-                           legendIsDockwindow() );
+                           legendIsDoctwindow() );
 
     // the ShowListView element
     KDGanttXML::createBoolNode( doc, docRoot, "ShowListView", showListView() );
diff --git a/kdgantt/KDGanttView.h b/kdgantt/KDGanttView.h
index 264b609c1..70b423218 100644
--- a/kdgantt/KDGanttView.h
+++ b/kdgantt/KDGanttView.h
@@ -102,7 +102,7 @@ class KDGanttView : public KDGanttMinimizeSplitter
     TQ_PROPERTY( bool showTimeTablePopupMenu READ showTimeTablePopupMenu WRITE setShowTimeTablePopupMenu )
     TQ_PROPERTY( bool headerVisible READ headerVisible WRITE setHeaderVisible )
     TQ_PROPERTY( bool showLegendButton READ showLegendButton	WRITE setShowLegendButton )
-    TQ_PROPERTY( bool legendIsDockwindow READ legendIsDockwindow WRITE setLegendIsDockwindow )
+    TQ_PROPERTY( bool legendIsDoctwindow READ legendIsDoctwindow WRITE setLegendIsDoctwindow )
     TQ_PROPERTY( bool displayEmptyTasksAsLine READ displayEmptyTasksAsLine WRITE setDisplayEmptyTasksAsLine )
     TQ_PROPERTY( TQBrush noInformationBrush READ noInformationBrush WRITE setNoInformationBrush )
     TQ_PROPERTY( bool dragEnabled READ dragEnabled WRITE setDragEnabled )
@@ -132,9 +132,9 @@ public:
     int ganttMaximumWidth() const;
     void setShowLegend( bool show );
     bool showLegend() const;
-    void setLegendIsDockwindow( bool dock );
-    bool legendIsDockwindow( ) const;
-    TQDockWindow* legendDockwindow( ) const;
+    void setLegendIsDoctwindow( bool dock );
+    bool legendIsDoctwindow( ) const;
+    TQDockWindow* legendDoctwindow( ) const;
     void setShowListView( bool show );
     bool showListView() const;
     void setEditorEnabled( bool enable );
diff --git a/kdgantt/KDGanttViewSubwidgets.cpp b/kdgantt/KDGanttViewSubwidgets.cpp
index c6a326a3c..9f76bea6e 100644
--- a/kdgantt/KDGanttViewSubwidgets.cpp
+++ b/kdgantt/KDGanttViewSubwidgets.cpp
@@ -2553,11 +2553,11 @@ KDLegendWidget:: KDLegendWidget( TQWidget* parent,
     clearLegend();
     showMe ( false );
 }
-void KDLegendWidget::setAsDockwindow( bool dockwin )
+void KDLegendWidget::setAsDoctwindow( bool doctwin )
 {
-    if ( (dock == 0 && !dockwin) || ( dock && dockwin  ) )
+    if ( (dock == 0 && !doctwin) || ( dock && doctwin  ) )
         return;
-    if ( dockwin )
+    if ( doctwin )
         {
             setMaximizedWidget( 0 );
             showMe ( false );
@@ -2594,7 +2594,7 @@ void KDLegendWidget::setAsDockwindow( bool dockwin )
 }
 
 
-bool KDLegendWidget::asDockwindow( )
+bool KDLegendWidget::asDoctwindow( )
 {
     if ( dock )
         return true;
@@ -2602,7 +2602,7 @@ bool KDLegendWidget::asDockwindow( )
 }
 
 
-TQDockWindow* KDLegendWidget::dockwindow( )
+TQDockWindow* KDLegendWidget::doctwindow( )
 {
     return dock;
 }
diff --git a/kdgantt/KDGanttViewSubwidgets.h b/kdgantt/KDGanttViewSubwidgets.h
index b044c10ec..cbccbb109 100644
--- a/kdgantt/KDGanttViewSubwidgets.h
+++ b/kdgantt/KDGanttViewSubwidgets.h
@@ -53,7 +53,7 @@
 #include <tqlabel.h>
 #include <tqbrush.h>
 #include <tqvbox.h>
-#include <tqdockwindow.h>
+#include <tqdoctwindow.h>
 #include <tqtimer.h>
 
 #include "KDGanttView.h"
@@ -341,9 +341,9 @@ public:
   void clearLegend();
   void setFont( TQFont );
   void drawToPainter( TQPainter *p );
-  void setAsDockwindow( bool dockwin );
-  bool asDockwindow();
-  TQDockWindow* dockwindow();
+  void setAsDoctwindow( bool doctwin );
+  bool asDoctwindow();
+  TQDockWindow* doctwindow();
   TQSize legendSize();
   TQSize legendSizeHint();
  private:
diff --git a/kmail/CMakeLists.txt b/kmail/CMakeLists.txt
index 8f32abcbb..372a05233 100644
--- a/kmail/CMakeLists.txt
+++ b/kmail/CMakeLists.txt
@@ -168,7 +168,7 @@ set( ${target}_SRCS
   warningconfiguration.ui smimeconfiguration.ui annotationjobs.cpp accountcombobox.cpp
   redirectdialog.cpp foldershortcutdialog.cpp folderrequester.cpp spamheaderanalyzer.cpp
   antispamconfig.cpp replyphrases.kcfgc custommimeheader.kcfgc recipientseditor.cpp
-  recipientspicker.cpp kwindowpositioner.cpp textsource.cpp distributionlistdialog.cpp
+  recipientspicker.cpp twindowpositioner.cpp textsource.cpp distributionlistdialog.cpp
   expirypropertiesdialog.cpp scalix.cpp mailinglistpropertiesdialog.cpp newfolderdialog.cpp
   accountwizard.cpp managesievescriptsdialog.cpp chiasmuskeyselector.cpp
   util.cpp templatesinsertcommand.cpp customtemplates_base.ui customtemplates.cpp
diff --git a/kmail/Makefile.am b/kmail/Makefile.am
index 62bad8340..0bcdbefac 100644
--- a/kmail/Makefile.am
+++ b/kmail/Makefile.am
@@ -124,7 +124,7 @@ libkmailprivate_la_SOURCES = kmmessage.cpp kmmainwin.cpp configuredialog.cpp \
                 spamheaderanalyzer.cpp antispamconfig.cpp \
                 replyphrases.kcfgc custommimeheader.kcfgc \
                 recipientseditor.cpp \
-                recipientspicker.cpp kwindowpositioner.cpp \
+                recipientspicker.cpp twindowpositioner.cpp \
                 distributionlistdialog.cpp expirypropertiesdialog.cpp \
                 mailinglistpropertiesdialog.cpp newfolderdialog.cpp \
                 accountwizard.cpp textsource.cpp \
diff --git a/kmail/configuredialog.cpp b/kmail/configuredialog.cpp
index 549ef94de..03bd834d8 100644
--- a/kmail/configuredialog.cpp
+++ b/kmail/configuredialog.cpp
@@ -94,7 +94,7 @@ using KMime::DateFormatter;
 #include <kseparator.h>
 #include <kiconloader.h>
 #include <kstandarddirs.h>
-#include <kwin.h>
+#include <twin.h>
 #include <knotifydialog.h>
 #include <kconfig.h>
 #include <kactivelabel.h>
diff --git a/kmail/kmcomposewin.cpp b/kmail/kmcomposewin.cpp
index 06010fb31..cc8059ccd 100644
--- a/kmail/kmcomposewin.cpp
+++ b/kmail/kmcomposewin.cpp
@@ -86,7 +86,7 @@ using KRecentAddress::RecentAddresses;
 #include <kkeydialog.h>
 #include <kdebug.h>
 #include <kfiledialog.h>
-#include <kwin.h>
+#include <twin.h>
 #include <kinputdialog.h>
 #include <kmessagebox.h>
 #include <kurldrag.h>
@@ -4979,7 +4979,7 @@ void KMComposeWin::slotSpellcheckConfig()
   KDialogBase dlg(KDialogBase::Plain, i18n("Spellchecker"),
                   KDialogBase::Ok|KDialogBase::Cancel, KDialogBase::Ok,
                   TQT_TQWIDGET(this), 0, true, true );
-  KWin kwin;
+  KWin twin;
   TQTabDialog qtd (this, "tabdialog", true);
   KSpellConfig mKSpellConfig (&qtd);
   mKSpellConfig.tqlayout()->setMargin( KDialog::marginHint() );
@@ -4987,7 +4987,7 @@ void KMComposeWin::slotSpellcheckConfig()
   qtd.addTab (&mKSpellConfig, i18n("Spellchecker"));
   qtd.setCancelButton ();
 
-  kwin.setIcons (qtd.winId(), kapp->icon(), kapp->miniIcon());
+  twin.setIcons (qtd.winId(), kapp->icon(), kapp->miniIcon());
   qtd.setCancelButton(KStdGuiItem::cancel().text());
   qtd.setOkButton(KStdGuiItem::ok().text());
 
diff --git a/kmail/kmfilterdlg.cpp b/kmail/kmfilterdlg.cpp
index c730375e4..b9d0e5060 100644
--- a/kmail/kmfilterdlg.cpp
+++ b/kmail/kmfilterdlg.cpp
@@ -25,7 +25,7 @@ using KMail::FilterImporterExporter;
 #include <kinputdialog.h>
 #include <kiconloader.h>
 #include <kapplication.h>
-#include <kwin.h>
+#include <twin.h>
 #include <kconfig.h>
 #include <kicondialog.h>
 #include <kkeybutton.h>
diff --git a/kmail/kmkernel.cpp b/kmail/kmkernel.cpp
index 5bc83e7c9..54334d8ac 100644
--- a/kmail/kmkernel.cpp
+++ b/kmail/kmkernel.cpp
@@ -46,7 +46,7 @@ using KRecentAddress::RecentAddresses;
 #include "transportmanager.h"
 #include "importarchivedialog.h"
 
-#include <kwin.h>
+#include <twin.h>
 #include "kmailicalifaceimpl.h"
 #include "mailserviceimpl.h"
 using KMail::MailServiceImpl;
diff --git a/kmail/kmmainwidget.cpp b/kmail/kmmainwidget.cpp
index 6c46f14a6..fc782fbb2 100644
--- a/kmail/kmmainwidget.cpp
+++ b/kmail/kmmainwidget.cpp
@@ -6,7 +6,7 @@
 #include <config.h>
 #endif
 
-#include <kwin.h>
+#include <twin.h>
 
 #ifdef MALLOC_DEBUG
 #include <malloc.h>
diff --git a/kmail/kmmainwin.h b/kmail/kmmainwin.h
index 1cafbc3da..4e784e121 100644
--- a/kmail/kmmainwin.h
+++ b/kmail/kmmainwin.h
@@ -39,7 +39,7 @@ class KMMainWin : public KMainWindow
 
 public:
   // the main window needs to have a name since else restoring the window
-  // settings by kwin doesn't work
+  // settings by twin doesn't work
   KMMainWin(TQWidget *parent = 0);
   virtual ~KMMainWin();
   KMMainWidget *mainKMWidget() const { return mKMMainWidget; };
diff --git a/kmail/kmreadermainwin.cpp b/kmail/kmreadermainwin.cpp
index af62b411d..92ab049ca 100644
--- a/kmail/kmreadermainwin.cpp
+++ b/kmail/kmreadermainwin.cpp
@@ -31,7 +31,7 @@
 #include <kedittoolbar.h>
 #include <klocale.h>
 #include <kstdaccel.h>
-#include <kwin.h>
+#include <twin.h>
 #include <kaction.h>
 #include <kiconloader.h>
 #include <kdebug.h>
diff --git a/kmail/kmsystemtray.cpp b/kmail/kmsystemtray.cpp
index 6bd99f991..d7bba197b 100644
--- a/kmail/kmsystemtray.cpp
+++ b/kmail/kmsystemtray.cpp
@@ -33,7 +33,7 @@ using KMail::AccountManager;
 #include <kglobalsettings.h>
 #include <kiconloader.h>
 #include <kiconeffect.h>
-#include <kwin.h>
+#include <twin.h>
 #include <kdebug.h>
 #include <kpopupmenu.h>
 
diff --git a/kmail/kwindowpositioner.cpp b/kmail/kwindowpositioner.cpp
index 4fb399479..fbcb97607 100644
--- a/kmail/kwindowpositioner.cpp
+++ b/kmail/kwindowpositioner.cpp
@@ -19,7 +19,7 @@
     Boston, MA 02110-1301, USA.
 */
 
-#include "kwindowpositioner.h"
+#include "twindowpositioner.h"
 
 #include <kdebug.h>
 
@@ -57,4 +57,4 @@ void KWindowPositioner::reposition()
   mSlave->raise();
 }
 
-#include "kwindowpositioner.moc"
+#include "twindowpositioner.moc"
diff --git a/kmail/mailsourceviewer.cpp b/kmail/mailsourceviewer.cpp
index 0f0d0536f..d2469348c 100644
--- a/kmail/mailsourceviewer.cpp
+++ b/kmail/mailsourceviewer.cpp
@@ -36,7 +36,7 @@
 #include "mailsourceviewer.h"
 
 #include <kapplication.h>
-#include <kwin.h>
+#include <twin.h>
 
 #include <tqregexp.h>
 #include <tqaccel.h>
diff --git a/kmail/managesievescriptsdialog.cpp b/kmail/managesievescriptsdialog.cpp
index 317429d52..b65acadf8 100644
--- a/kmail/managesievescriptsdialog.cpp
+++ b/kmail/managesievescriptsdialog.cpp
@@ -9,7 +9,7 @@
 
 #include <klocale.h>
 #include <kiconloader.h>
-#include <kwin.h>
+#include <twin.h>
 #include <kapplication.h>
 #include <kinputdialog.h>
 #include <kglobalsettings.h>
diff --git a/kmail/recipientseditor.cpp b/kmail/recipientseditor.cpp
index 04a695a95..5b18e044b 100644
--- a/kmail/recipientseditor.cpp
+++ b/kmail/recipientseditor.cpp
@@ -25,7 +25,7 @@
 #include "recipientseditor.h"
 
 #include "recipientspicker.h"
-#include "kwindowpositioner.h"
+#include "twindowpositioner.h"
 #include "distributionlistdialog.h"
 #include "globalsettings.h"
 
diff --git a/kmail/recipientspicker.cpp b/kmail/recipientspicker.cpp
index 03a34d776..6d00e41c4 100644
--- a/kmail/recipientspicker.cpp
+++ b/kmail/recipientspicker.cpp
@@ -37,7 +37,7 @@
 #include <kabc/resource.h>
 #include <kiconloader.h>
 #include <kdialog.h>
-#include <kwin.h>
+#include <twin.h>
 #include <kmessagebox.h>
 
 #include <tqlayout.h>
diff --git a/kmail/searchwindow.cpp b/kmail/searchwindow.cpp
index 8714109c3..ff2248832 100644
--- a/kmail/searchwindow.cpp
+++ b/kmail/searchwindow.cpp
@@ -38,7 +38,7 @@
 #include <kapplication.h>
 #include <kdebug.h>
 #include <kstatusbar.h>
-#include <kwin.h>
+#include <twin.h>
 #include <kconfig.h>
 #include <kstdaction.h>
 #include <kiconloader.h>
diff --git a/kmail/vacationdialog.cpp b/kmail/vacationdialog.cpp
index 87e1d8411..e214a46cd 100644
--- a/kmail/vacationdialog.cpp
+++ b/kmail/vacationdialog.cpp
@@ -27,7 +27,7 @@ using KMime::HeaderParsing::parseAddressList;
 #include <knuminput.h>
 #include <klocale.h>
 #include <kdebug.h>
-#include <kwin.h>
+#include <twin.h>
 #include <kapplication.h>
 
 #include <tqlayout.h>
diff --git a/knode/knapplication.cpp b/knode/knapplication.cpp
index c8b2837f3..9c1e14e51 100644
--- a/knode/knapplication.cpp
+++ b/knode/knapplication.cpp
@@ -14,7 +14,7 @@
     Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, US
 */
 
-#include <kwin.h>
+#include <twin.h>
 #include <kdebug.h>
 #include <kcmdlineargs.h>
 #include <kconfig.h>
diff --git a/knode/knarticlefactory.cpp b/knode/knarticlefactory.cpp
index 53eabd8bb..d82bb5c74 100644
--- a/knode/knarticlefactory.cpp
+++ b/knode/knarticlefactory.cpp
@@ -18,7 +18,7 @@
 
 #include <klocale.h>
 #include <kmessagebox.h>
-#include <kwin.h>
+#include <twin.h>
 #include <kapplication.h>
 
 #include "knarticlefactory.h"
diff --git a/knode/knarticlemanager.cpp b/knode/knarticlemanager.cpp
index ab9c97eac..7673eabfd 100644
--- a/knode/knarticlemanager.cpp
+++ b/knode/knarticlemanager.cpp
@@ -17,7 +17,7 @@
 #include <kopenwith.h>
 #include <klocale.h>
 #include <kdebug.h>
-#include <kwin.h>
+#include <twin.h>
 #include <ktempfile.h>
 
 #include "articlewidget.h"
diff --git a/knode/knarticlewindow.cpp b/knode/knarticlewindow.cpp
index aef3aab0c..f891a7894 100644
--- a/knode/knarticlewindow.cpp
+++ b/knode/knarticlewindow.cpp
@@ -13,7 +13,7 @@
     Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, US
 */
 
-#include <kwin.h>
+#include <twin.h>
 
 #include <kstdaction.h>
 #include <kconfig.h>
diff --git a/knode/knconfigmanager.cpp b/knode/knconfigmanager.cpp
index ad77b0235..95e342d5b 100644
--- a/knode/knconfigmanager.cpp
+++ b/knode/knconfigmanager.cpp
@@ -19,7 +19,7 @@
 #include <kcmultidialog.h>
 #include <kiconloader.h>
 #include <klocale.h>
-#include <kwin.h>
+#include <twin.h>
 
 #include <tqhbox.h>
 
diff --git a/knode/knscoring.cpp b/knode/knscoring.cpp
index c83cbccde..04fd17c72 100644
--- a/knode/knscoring.cpp
+++ b/knode/knscoring.cpp
@@ -14,7 +14,7 @@
 
 #include <tqstring.h>
 
-#include <kwin.h>
+#include <twin.h>
 #include <kscoringeditor.h>
 
 #include "knscoring.h"
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>
 
diff --git a/kontact/interfaces/uniqueapphandler.cpp b/kontact/interfaces/uniqueapphandler.cpp
index 5dd9e72d0..2dfd1daef 100644
--- a/kontact/interfaces/uniqueapphandler.cpp
+++ b/kontact/interfaces/uniqueapphandler.cpp
@@ -24,7 +24,7 @@
 #include <kapplication.h>
 #include <kcmdlineargs.h>
 #include "core.h"
-#include <kwin.h>
+#include <twin.h>
 #include <dcopclient.h>
 #include <kdebug.h>
 #include <klocale.h>
diff --git a/kontact/plugins/korganizer/korg_uniqueapp.cpp b/kontact/plugins/korganizer/korg_uniqueapp.cpp
index 42a7adcae..3ece77c45 100644
--- a/kontact/plugins/korganizer/korg_uniqueapp.cpp
+++ b/kontact/plugins/korganizer/korg_uniqueapp.cpp
@@ -26,7 +26,7 @@
 #include <dcopref.h>
 #include <kapplication.h>
 #include <kstartupinfo.h>
-#include <kwin.h>
+#include <twin.h>
 
 void KOrganizerUniqueAppHandler::loadCommandLineOptions()
 {
diff --git a/kontact/src/main.cpp b/kontact/src/main.cpp
index a2ebad5e8..d2a57bcb7 100644
--- a/kontact/src/main.cpp
+++ b/kontact/src/main.cpp
@@ -29,7 +29,7 @@
 #include <klocale.h>
 #include <kstartupinfo.h>
 #include <kuniqueapplication.h>
-#include <kwin.h>
+#include <twin.h>
 #include <kstandarddirs.h>
 #include <ktrader.h>
 #include "plugin.h"
diff --git a/kontact/src/mainwindow.cpp b/kontact/src/mainwindow.cpp
index fe24bd8dd..52576bcf5 100644
--- a/kontact/src/mainwindow.cpp
+++ b/kontact/src/mainwindow.cpp
@@ -842,7 +842,7 @@ void MainWindow::selectPlugin( Kontact::Plugin *plugin )
     createGUI( plugin->part() );
 
     KToolBar* navigatorToolBar = findToolBar( "navigatorToolBar" );
-    // Let the navigator toolbar be always the last one, if it's in the top dockwindow
+    // Let the navigator toolbar be always the last one, if it's in the top doctwindow
     if ( navigatorToolBar && !navigatorToolBar->isHidden() &&
          navigatorToolBar->barPos() == KToolBar::Top ) {
       topDock()->moveDockWindow( navigatorToolBar, -1 );
diff --git a/korganizer/actionmanager.cpp b/korganizer/actionmanager.cpp
index 1e37c599d..ce8521a13 100644
--- a/korganizer/actionmanager.cpp
+++ b/korganizer/actionmanager.cpp
@@ -65,7 +65,7 @@
 #include <ktip.h>
 #include <ktempfile.h>
 #include <kxmlguiclient.h>
-#include <kwin.h>
+#include <twin.h>
 #include <knotifyclient.h>
 #include <kstdguiitem.h>
 #include <kdeversion.h>
diff --git a/korganizer/koapp.cpp b/korganizer/koapp.cpp
index 6b15af08d..aecf8ba9c 100644
--- a/korganizer/koapp.cpp
+++ b/korganizer/koapp.cpp
@@ -32,7 +32,7 @@
 #include <kconfig.h>
 #include <kdebug.h>
 #include <klocale.h>
-#include <kwin.h>
+#include <twin.h>
 #include <kurl.h>
 
 #include <libkcal/calformat.h>
diff --git a/korganizer/kodialogmanager.cpp b/korganizer/kodialogmanager.cpp
index 2a56bda42..91e0e27d0 100644
--- a/korganizer/kodialogmanager.cpp
+++ b/korganizer/kodialogmanager.cpp
@@ -25,7 +25,7 @@
 
 #include <kcmultidialog.h>
 #include <ksettings/dialog.h>
-#include <kwin.h>
+#include <twin.h>
 
 #include <libtdepim/categoryeditdialog.h>
 
diff --git a/korganizer/korgac/CMakeLists.txt b/korganizer/korgac/CMakeLists.txt
index c870221be..b0f923024 100644
--- a/korganizer/korgac/CMakeLists.txt
+++ b/korganizer/korgac/CMakeLists.txt
@@ -34,7 +34,7 @@ install( FILES korgac.desktop DESTINATION ${AUTOSTART_INSTALL_DIR} )
 
 tde_add_executable( korgac AUTOMOC
   SOURCES
-    korgacmain.cpp alarmdialog.cpp alarmdockwindow.cpp koalarmclient.cpp
+    korgacmain.cpp alarmdialog.cpp alarmdoctwindow.cpp koalarmclient.cpp
     alarmclientiface.skel
   LINK korganizer_eventviewer-shared
   DESTINATION ${BIN_INSTALL_DIR}
diff --git a/korganizer/korgac/Makefile.am b/korganizer/korgac/Makefile.am
index d5ac531a1..b218ef2f1 100644
--- a/korganizer/korgac/Makefile.am
+++ b/korganizer/korgac/Makefile.am
@@ -6,7 +6,7 @@ korgac_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $
 korgac_LDADD   = $(LIB_TDEUI) \
                  $(top_builddir)/korganizer/libkorganizer_eventviewer.la
 korgac_SOURCES = korgacmain.cpp alarmdialog.cpp \
-	         alarmdockwindow.cpp koalarmclient.cpp \
+	         alarmdoctwindow.cpp koalarmclient.cpp \
                  alarmclientiface.skel
 
 check_PROGRAMS = testalarmdlg
@@ -17,7 +17,7 @@ testalarmdlg_LDADD = $(LIB_TDEUI) $(top_builddir)/libkcal/libkcal.la \
 testalarmdlg_SOURCES = testalarmdlg.cpp alarmdialog.cpp
 
 noinst_HEADERS = alarmclientiface.h alarmdialog.h \
-                 alarmdockwindow.h koalarmclient.h
+                 alarmdoctwindow.h koalarmclient.h
 
 METASOURCES = AUTO
 
diff --git a/korganizer/korgac/alarmdialog.cpp b/korganizer/korgac/alarmdialog.cpp
index 43370a039..a1b436850 100644
--- a/korganizer/korgac/alarmdialog.cpp
+++ b/korganizer/korgac/alarmdialog.cpp
@@ -48,7 +48,7 @@
 #include <knotifyclient.h>
 #include <kcombobox.h>
 #include <klistview.h>
-#include <kwin.h>
+#include <twin.h>
 #include <klockfile.h>
 
 #include <libkcal/event.h>
diff --git a/korganizer/korgac/alarmdockwindow.cpp b/korganizer/korgac/alarmdockwindow.cpp
index 85673ef03..8951560dc 100644
--- a/korganizer/korgac/alarmdockwindow.cpp
+++ b/korganizer/korgac/alarmdockwindow.cpp
@@ -22,7 +22,7 @@
     without including the source code for TQt in the source distribution.
 */
 
-#include "alarmdockwindow.h"
+#include "alarmdoctwindow.h"
 #include "koalarmclient.h"
 
 #include <kapplication.h>
@@ -203,4 +203,4 @@ void AlarmDockWindow::slotQuit()
     emit quitSignal();
 }
 
-#include "alarmdockwindow.moc"
+#include "alarmdoctwindow.moc"
diff --git a/korganizer/korgac/koalarmclient.cpp b/korganizer/korgac/koalarmclient.cpp
index ac9b96c89..9e55b59e9 100644
--- a/korganizer/korgac/koalarmclient.cpp
+++ b/korganizer/korgac/koalarmclient.cpp
@@ -26,7 +26,7 @@
 
 #include "koalarmclient.h"
 
-#include "alarmdockwindow.h"
+#include "alarmdoctwindow.h"
 #include "alarmdialog.h"
 
 #include <libkcal/calendarresources.h>
@@ -35,7 +35,7 @@
 #include <kdebug.h>
 #include <klocale.h>
 #include <kapplication.h>
-#include <kwin.h>
+#include <twin.h>
 
 #include <tqpushbutton.h>
 
diff --git a/korganizer/korganizer.cpp b/korganizer/korganizer.cpp
index 4e1f498b5..6067ca02a 100644
--- a/korganizer/korganizer.cpp
+++ b/korganizer/korganizer.cpp
@@ -68,7 +68,7 @@
 #include <kmessagebox.h>
 #include <dcopclient.h>
 #include <kprocess.h>
-#include <kwin.h>
+#include <twin.h>
 #include <ktip.h>
 #include <kstdguiitem.h>
 #include <kstatusbar.h>
diff --git a/kresources/tvanytime/DESIGN b/kresources/tvanytime/DESIGN
index b40b88775..874fa7cd3 100644
--- a/kresources/tvanytime/DESIGN
+++ b/kresources/tvanytime/DESIGN
@@ -1,5 +1,5 @@
 Aim: 
-Use Kontact as an EPG showing BBC TV and radio programs.  Calendar KResource for BBC TV and radio schedules made available by the backstage.bbc.co.uk open tech portal.  KResource can be used in other programs - kwintv?
+Use Kontact as an EPG showing BBC TV and radio programs.  Calendar KResource for BBC TV and radio schedules made available by the backstage.bbc.co.uk open tech portal.  KResource can be used in other programs - twintv?
 
 DESIGN: Fetch TVAnywhere tarballs via http.  Parse contents using KArchive classes and QDom API.  Present channel listing from tarball in resource config so that user can control which channels are shown in resource.  Use subresources to show channels.  Use categories for genre descriptors?
 
diff --git a/libkpgp/kpgpui.cpp b/libkpgp/kpgpui.cpp
index d3fa21260..c9288b01b 100644
--- a/libkpgp/kpgpui.cpp
+++ b/libkpgp/kpgpui.cpp
@@ -42,7 +42,7 @@
 #include <kconfig.h>
 #include <kprogress.h>
 #include <kapplication.h>
-#include <kwin.h>
+#include <twin.h>
 #if KDE_IS_VERSION( 3, 1, 90 )
 #include <kglobalsettings.h>
 #endif