summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--kghostview/kgvshell.cpp2
-rw-r--r--kolourpaint/kpmainwindow_help.cpp10
-rw-r--r--kolourpaint/kpthumbnail.cpp2
-rw-r--r--kolourpaint/kpthumbnail.h2
-rw-r--r--kooka/main.cpp2
-rw-r--r--kpdf/ui/presentationwidget.cpp2
-rw-r--r--kpovmodeler/pmdockwidget.cpp2
-rw-r--r--kruler/klineal.cpp2
-rw-r--r--ksnapshot/configure.in.in2
-rw-r--r--kuickshow/ChangeLog6
-rw-r--r--kuickshow/src/aboutwidget.cpp2
-rw-r--r--kuickshow/src/imagewindow.cpp2
-rw-r--r--kuickshow/src/kuick.h4
-rw-r--r--kuickshow/src/kuickglobals.h2
-rw-r--r--kuickshow/src/kuickshow.cpp2
-rw-r--r--kview/kview.cpp2
16 files changed, 23 insertions, 23 deletions
diff --git a/kghostview/kgvshell.cpp b/kghostview/kgvshell.cpp
index 09afb6c5..74df4cde 100644
--- a/kghostview/kgvshell.cpp
+++ b/kghostview/kgvshell.cpp
@@ -40,7 +40,7 @@
#include <kpopupmenu.h>
#include <kparts/componentfactory.h>
-#include <kwin.h>
+#include <twin.h>
#include <tqcursor.h>
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;
diff --git a/kooka/main.cpp b/kooka/main.cpp
index f0f3c32a..c6c53449 100644
--- a/kooka/main.cpp
+++ b/kooka/main.cpp
@@ -38,7 +38,7 @@
#include <kimageio.h>
#include <kiconloader.h>
#include <kdebug.h>
-#include <kwin.h>
+#include <twin.h>
#include "kooka.h"
#include "version.h"
diff --git a/kpdf/ui/presentationwidget.cpp b/kpdf/ui/presentationwidget.cpp
index d4e14b6a..6e8f52c2 100644
--- a/kpdf/ui/presentationwidget.cpp
+++ b/kpdf/ui/presentationwidget.cpp
@@ -24,7 +24,7 @@
#include <kiconloader.h>
#include <kimageeffect.h>
#include <kmessagebox.h>
-#include <kwin.h>
+#include <twin.h>
// system includes
#include <stdlib.h>
diff --git a/kpovmodeler/pmdockwidget.cpp b/kpovmodeler/pmdockwidget.cpp
index 575e0af0..87fc37ef 100644
--- a/kpovmodeler/pmdockwidget.cpp
+++ b/kpovmodeler/pmdockwidget.cpp
@@ -34,7 +34,7 @@
#include <kglobal.h>
#include <ktoolbar.h>
#include <kpopupmenu.h>
-#include <kwin.h>
+#include <twin.h>
#include <kdebug.h>
#ifdef TQ_WS_X11
#include <X11/X.h>
diff --git a/kruler/klineal.cpp b/kruler/klineal.cpp
index 896c8656..dfe02b20 100644
--- a/kruler/klineal.cpp
+++ b/kruler/klineal.cpp
@@ -29,7 +29,7 @@
#include <knotifyclient.h>
#include <kpopupmenu.h>
#include <kstandarddirs.h>
-#include <kwin.h>
+#include <twin.h>
#include <kstdguiitem.h>
#include <tqbitmap.h>
diff --git a/ksnapshot/configure.in.in b/ksnapshot/configure.in.in
index 56c82023..e4039c60 100644
--- a/ksnapshot/configure.in.in
+++ b/ksnapshot/configure.in.in
@@ -1,4 +1,4 @@
-dnl Check for the X shaped windows extension - test taken from kdebase/kwin/clients/keramik
+dnl Check for the X shaped windows extension - test taken from kdebase/twin/clients/keramik
KDE_CHECK_HEADERS(X11/extensions/shape.h,,,
[
#include <X11/Xlib.h>
diff --git a/kuickshow/ChangeLog b/kuickshow/ChangeLog
index 33767a5d..ae15e9a0 100644
--- a/kuickshow/ChangeLog
+++ b/kuickshow/ChangeLog
@@ -312,7 +312,7 @@ Sun Mar 4 13:57:52 2001 Carsten Pfeiffer <pfeiffer@kde.org>
hack around QWidget::move() resizing us -> we just ignore that
resizeEvent. Gives less flicker when switching into window-mode.
- * initial fullscreen mode works again as well (hacking around a kwin
+ * initial fullscreen mode works again as well (hacking around a twin
"limitation")
Sun Mar 4 10:50:23 2001 Carsten Pfeiffer <pfeiffer@kde.org>
@@ -387,7 +387,7 @@ Wed Jan 10 23:39:14 2001 Carsten Pfeiffer <pfeiffer@kde.org>
Fri Nov 3 14:32:53 2000 Carsten Pfeiffer <pfeiffer@kde.org>
* src/imagewindow.cpp (setFullscreen):
- cool, no need to workaround kwin's auto-maximization needed,
+ cool, no need to workaround twin's auto-maximization needed,
setMinimumSize() does it! Thanks Matthias Ettrich!
Fri Nov 3 13:23:41 2000 Carsten Pfeiffer <pfeiffer@kde.org>
@@ -400,7 +400,7 @@ Fri Nov 3 13:23:41 2000 Carsten Pfeiffer <pfeiffer@kde.org>
Fri Nov 3 01:49:57 2000 Carsten Pfeiffer <pfeiffer@kde.org>
* src/*: some more work on the KDE2 port/integration. Workarounds for
- kwin's auto-maximization added. Fullscreen works. Moving images inside
+ twin's auto-maximization added. Fullscreen works. Moving images inside
the window works properly again. NETWM/KWin handling is better now.
Also better handling of non-loadable files.
diff --git a/kuickshow/src/aboutwidget.cpp b/kuickshow/src/aboutwidget.cpp
index 79689a5b..d5d3a841 100644
--- a/kuickshow/src/aboutwidget.cpp
+++ b/kuickshow/src/aboutwidget.cpp
@@ -22,7 +22,7 @@
#include <tqgroupbox.h>
#include <tqlabel.h>
-#include <kwin.h>
+#include <twin.h>
#include <kstandarddirs.h>
#include "imlibwidget.h"
diff --git a/kuickshow/src/imagewindow.cpp b/kuickshow/src/imagewindow.cpp
index 215c8adb..1d11a423 100644
--- a/kuickshow/src/imagewindow.cpp
+++ b/kuickshow/src/imagewindow.cpp
@@ -56,7 +56,7 @@
#include <kstandarddirs.h>
#include <kglobalsettings.h>
#include <ktempfile.h>
-#include <kwin.h>
+#include <twin.h>
#include <netwm.h>
#include <kurldrag.h>
#include <kio/netaccess.h>
diff --git a/kuickshow/src/kuick.h b/kuickshow/src/kuick.h
index 98289dfc..c55745ec 100644
--- a/kuickshow/src/kuick.h
+++ b/kuickshow/src/kuick.h
@@ -22,8 +22,8 @@
#include <tqrect.h>
#include <tqsize.h>
-#include <kwin.h>
-#include <kwinmodule.h>
+#include <twin.h>
+#include <twinmodule.h>
class Kuick
{
diff --git a/kuickshow/src/kuickglobals.h b/kuickshow/src/kuickglobals.h
index 4ea2ff3c..bd5be8cc 100644
--- a/kuickshow/src/kuickglobals.h
+++ b/kuickshow/src/kuickglobals.h
@@ -19,7 +19,7 @@
#ifndef KUICKGLOBALS_H
#define KUICKGLOBALS_H
-#include <kwinmodule.h>
+#include <twinmodule.h>
class KuickGlobals
{
diff --git a/kuickshow/src/kuickshow.cpp b/kuickshow/src/kuickshow.cpp
index 62095b6e..0dd6d2bf 100644
--- a/kuickshow/src/kuickshow.cpp
+++ b/kuickshow/src/kuickshow.cpp
@@ -57,7 +57,7 @@
#include <kurlcombobox.h>
#include <kurlcompletion.h>
#include <kurldrag.h>
-#include <kwin.h>
+#include <twin.h>
#include <kstdguiitem.h>
#include <kdebug.h>
diff --git a/kview/kview.cpp b/kview/kview.cpp
index aca76bd4..a67ad03a 100644
--- a/kview/kview.cpp
+++ b/kview/kview.cpp
@@ -34,7 +34,7 @@
#include <kimageio.h>
#include <kfiledialog.h>
#include <klocale.h>
-#include <kwinmodule.h>
+#include <twinmodule.h>
#include <kmenubar.h>
#include <kstatusbar.h>
#include <kdebug.h>