Rename kwin to twin (part 1 of 2)

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

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>

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>

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>

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"

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>

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>

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>

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>
 

karm/desktoptracker.h

@@ -3,7 +3,7 @@
 
 #include <vector>
 
-#include <kwinmodule.h>
+#include <twinmodule.h>
 
 #include "desktoplist.h"
 

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]);

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>

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() );

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 );

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;
 }

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:

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

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 \

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>

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());
 

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>

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;

kmail/kmmainwidget.cpp

@@ -6,7 +6,7 @@
 #include <config.h>
 #endif
 
-#include <kwin.h>
+#include <twin.h>
 
 #ifdef MALLOC_DEBUG
 #include <malloc.h>

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; };

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>

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>
 

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"

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>

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>

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"
 

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>

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>

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>

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>

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"

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"

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>

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>
 

knode/knscoring.cpp

@@ -14,7 +14,7 @@
 
 #include <tqstring.h>
 
-#include <kwin.h>
+#include <twin.h>
 #include <kscoringeditor.h>
 
 #include "knscoring.h"

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

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 )
     {

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;
 

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"

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>
 

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>

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()
 {

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"

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 );

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>

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>

korganizer/kodialogmanager.cpp

@@ -25,7 +25,7 @@
 
 #include <kcmultidialog.h>
 #include <ksettings/dialog.h>
-#include <kwin.h>
+#include <twin.h>
 
 #include <libtdepim/categoryeditdialog.h>
 

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}

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
 

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>

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"

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>
 

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>

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?
 

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