From 47edcc660c3549a9c516e803ff0bf143fd6786ec Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Mon, 7 Nov 2011 20:28:23 -0600 Subject: Rename kwin to twin (part 1 of 2) --- kghostview/kgvshell.cpp | 2 +- kolourpaint/kpmainwindow_help.cpp | 10 +++++----- kolourpaint/kpthumbnail.cpp | 2 +- kolourpaint/kpthumbnail.h | 2 +- kooka/main.cpp | 2 +- kpdf/ui/presentationwidget.cpp | 2 +- kpovmodeler/pmdockwidget.cpp | 2 +- kruler/klineal.cpp | 2 +- ksnapshot/configure.in.in | 2 +- kuickshow/ChangeLog | 6 +++--- kuickshow/src/aboutwidget.cpp | 2 +- kuickshow/src/imagewindow.cpp | 2 +- kuickshow/src/kuick.h | 4 ++-- kuickshow/src/kuickglobals.h | 2 +- kuickshow/src/kuickshow.cpp | 2 +- kview/kview.cpp | 2 +- 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 #include -#include +#include #include 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 #include -#include +#include #include #include 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 +#include 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 #include #include -#include +#include #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 #include #include -#include +#include // system includes #include 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 #include #include -#include +#include #include #ifdef TQ_WS_X11 #include 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 #include #include -#include +#include #include #include 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 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 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 @@ -387,7 +387,7 @@ Wed Jan 10 23:39:14 2001 Carsten Pfeiffer Fri Nov 3 14:32:53 2000 Carsten Pfeiffer * 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 @@ -400,7 +400,7 @@ Fri Nov 3 13:23:41 2000 Carsten Pfeiffer Fri Nov 3 01:49:57 2000 Carsten Pfeiffer * 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 #include -#include +#include #include #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 #include #include -#include +#include #include #include #include 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 #include -#include -#include +#include +#include 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 +#include 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 #include #include -#include +#include #include #include 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 #include #include -#include +#include #include #include #include -- cgit v1.2.3