3 files changed, 7 insertions, 7 deletions
diff --git a/kolourpaint/kpmainwindow_help.cpp b/kolourpaint/kpmainwindow_help.cpp
index d7b529dd..5c0c41de 100644
--- a/kolourpaint/kpmainwindow_help.cpp
+++ b/kolourpaint/kpmainwindow_help.cpp
@@ -70,13 +70,13 @@ void kpMainWindow::enableHelpMenuDocumentActions (bool /*enable*/)
 }
 
 
-// SYNC: kdebase/kwin/kwinbindings.cpp
+// SYNC: kdebase/twin/twinbindings.cpp
 static TQString printScreenShortcutString ()
 {
     KConfigGroupSaver cfgGroupSaver (KGlobal::config (), "Global Shortcuts");
     KConfigBase *cfg = cfgGroupSaver.config ();
 
-    // TODO: i18n() entry name?  kwinbindings.cpp seems to but it doesn't
+    // TODO: i18n() entry name?  twinbindings.cpp seems to but it doesn't
     //       make sense.
     const TQString cfgEntryString = cfg->readEntry ("Desktop Screenshot");
 
@@ -108,13 +108,13 @@ void kpMainWindow::slotHelpTakingScreenshots ()
         tool ()->endShapeInternal ();
 
 
-    // TODO: Totally bogus logic if kwin not running under same user as KolourPaint.
+    // TODO: Totally bogus logic if twin not running under same user as KolourPaint.
     // SYNC: KWin contains PrintScreen key logic
     QCStringList dcopApps = KApplication::dcopClient ()->registeredApplications ();
 #if DEBUG_KP_MAIN_WINDOW
     kdDebug () << "\tdcopApps=" << dcopApps << endl;
 #endif
-    bool isRunningKDE = (dcopApps.findIndex ("kwin") >= 0);
+    bool isRunningKDE = (dcopApps.findIndex ("twin") >= 0);
 
 #if 0
 {
@@ -172,7 +172,7 @@ void kpMainWindow::slotHelpTakingScreenshots ()
         );
     }
 
-    // TODO: Totally bogus logic if kwin not running under same user as KolourPaint.
+    // TODO: Totally bogus logic if twin not running under same user as KolourPaint.
     message = message.arg (::printScreenShortcutString ());
 
     // Add extra vertical space
diff --git a/kolourpaint/kpthumbnail.cpp b/kolourpaint/kpthumbnail.cpp
index 84923c1d..5cce9adc 100644
--- a/kolourpaint/kpthumbnail.cpp
+++ b/kolourpaint/kpthumbnail.cpp
@@ -31,7 +31,7 @@
 #include <kpthumbnail.h>
 
 #include <tqdockarea.h>
-#include <tqdockwindow.h>
+#include <tqdoctwindow.h>
 #include <tqtimer.h>
 
 #include <kdebug.h>
diff --git a/kolourpaint/kpthumbnail.h b/kolourpaint/kpthumbnail.h
index 5cb17d54..f43c0fd0 100644
--- a/kolourpaint/kpthumbnail.h
+++ b/kolourpaint/kpthumbnail.h
@@ -29,7 +29,7 @@
 #ifndef __kp_thumbnail_h__
 #define __kp_thumbnail_h__
 
-#include <tqdockwindow.h>
+#include <tqdoctwindow.h>
 
 class kpMainWindow;
 class kpThumbnailView;