diff options
72 files changed, 159 insertions, 159 deletions
@@ -36,8 +36,8 @@ LDFLAGS: -module $(KIMGIO_PLUGIN) KWin plugin =========== -Name: kwin3_<clientname>.la -Definition: kde_module_LTLIBRARIES = kwin3_<clientname>.la +Name: twin3_<clientname>.la +Definition: kde_module_LTLIBRARIES = twin3_<clientname>.la LDFLAGS: -module $(KDE_PLUGIN) diff --git a/arts/knotify/knotify.cpp b/arts/knotify/knotify.cpp index c080ba30b..b8d5b8d26 100644 --- a/arts/knotify/knotify.cpp +++ b/arts/knotify/knotify.cpp @@ -65,7 +65,7 @@ #include <kprocess.h> #include <kstandarddirs.h> #include <kuniqueapplication.h> -#include <kwin.h> +#include <twin.h> #include "knotify.h" #include "knotify.moc" @@ -130,7 +130,7 @@ KDE_EXPORT int kdemain(int argc, char **argv) // KNotifClient::startDaemon()) whenever a KNotify event occurs. Especially // KWin may fire many events (e.g. when a window pops up). When we have // problems with aRts or the installation, we might get an infinite loop - // of knotify crashing, popping up the crashhandler window and kwin firing + // of knotify crashing, popping up the crashhandler window and twin firing // another event, starting knotify again... // We try to prevent this by tracking our startup and offer options to // abort this. diff --git a/kate/ChangeLog b/kate/ChangeLog index 21fc54ba5..d36cab42f 100644 --- a/kate/ChangeLog +++ b/kate/ChangeLog @@ -336,7 +336,7 @@ * kateconsole.* konsole/* : add kateconsole widget 2001-02-16 Anders Lund <anders@alweb.dk> - * katemainwindow.cpp :fixing read/write options to use maindockwindow functions. + * katemainwindow.cpp :fixing read/write options to use maindoctwindow functions. 2001-02-15 Joseph Wenninger <jowenn@kde.org> * kateview.cpp : Tab doesn't jump to next widget anymore, but inserts a tab into the text diff --git a/kate/part/katedocument.cpp b/kate/part/katedocument.cpp index dcbb5936c..938758852 100644 --- a/kate/part/katedocument.cpp +++ b/kate/part/katedocument.cpp @@ -64,7 +64,7 @@ #include <kglobalsettings.h> #include <klibloader.h> #include <kdirwatch.h> -#include <kwin.h> +#include <twin.h> #include <kencodingfiledialog.h> #include <ktempfile.h> #include <kmdcodec.h> diff --git a/kcmshell/main.cpp b/kcmshell/main.cpp index 80abb405e..4bd1ace4d 100644 --- a/kcmshell/main.cpp +++ b/kcmshell/main.cpp @@ -41,7 +41,7 @@ #include <kservice.h> #include <kservicegroup.h> #include <kstartupinfo.h> -#include <kwin.h> +#include <twin.h> #include <kglobal.h> #include "main.h" diff --git a/kdoctools/customization/entities/general.entities b/kdoctools/customization/entities/general.entities index 36e2914b7..103b3d0ca 100644 --- a/kdoctools/customization/entities/general.entities +++ b/kdoctools/customization/entities/general.entities @@ -338,7 +338,7 @@ <!ENTITY kvoctrain "<application>KVocTrain</application>"> <!ENTITY kworldclock "<application>KWorldClock</application>"> <!ENTITY kword "<application>KWord</application>"> -<!ENTITY kwin "<application>KWin</application>"> +<!ENTITY twin "<application>KWin</application>"> <!ENTITY k4wins "<application>KWin4</application>"> <!ENTITY kwordquiz "<application>KWordQuiz</application>"> <!ENTITY kwrite "<application>KWrite</application>"> diff --git a/kdoctools/customization/obsolete/general.entities b/kdoctools/customization/obsolete/general.entities index 11f6e5aa1..43556d97a 100644 --- a/kdoctools/customization/obsolete/general.entities +++ b/kdoctools/customization/obsolete/general.entities @@ -312,7 +312,7 @@ <!ENTITY kvoctrain "<application>KVocTrain</application>"> <!ENTITY kworldclock "<application>KWorldClock</application>"> <!ENTITY kword "<application>KWord</application>"> -<!ENTITY kwin "<application>KWin</application>"> +<!ENTITY twin "<application>KWin</application>"> <!ENTITY k4wins "<application>K Four Wins</application>"> <!ENTITY kwrite "<application>KWrite</application>"> <!ENTITY kwuftpd "<application>kwuftpd</application>"> @@ -385,4 +385,4 @@ <!ENTITY kmoon "<application>Moon Phase</application>"> <!ENTITY kodo "<application>KOdometer</application>"> <!ENTITY kpat "<application>KPatience</application>"> -<!ENTITY kwin4 "<application>K Four Wins</application>"> +<!ENTITY twin4 "<application>K Four Wins</application>"> diff --git a/kdoctools/customization/sr/user.entities b/kdoctools/customization/sr/user.entities index 356e3d7c3..ee0e54166 100644 --- a/kdoctools/customization/sr/user.entities +++ b/kdoctools/customization/sr/user.entities @@ -295,8 +295,8 @@ <!ENTITY kstart-g "<application>К-покрета</application>" > <!ENTITY kstart-n "<application>К-покрет</application>" > <!ENTITY kterm-n "<application>Ктерм</application>" > -<!ENTITY kwin-g "<application>К-проза</application>" > -<!ENTITY kwin-n "<application>К-проз</application>" > +<!ENTITY twin-g "<application>К-проза</application>" > +<!ENTITY twin-n "<application>К-проз</application>" > <!ENTITY LeeWeeTiong-n "<personname><firstname>Ли Ви</firstname> <surname>Тионг</surname></personname>" > <!ENTITY LGPL-i "<acronym>МОЈЛ</acronym>ом" > <!ENTITY LGPL-n "<acronym>МОЈЛ</acronym>" > diff --git a/khtml/ecma/kjs_window.cpp b/khtml/ecma/kjs_window.cpp index 067a189ac..bed6b83c6 100644 --- a/khtml/ecma/kjs_window.cpp +++ b/khtml/ecma/kjs_window.cpp @@ -41,10 +41,10 @@ #include <klocale.h> #include <kmdcodec.h> #include <kparts/browserinterface.h> -#include <kwin.h> +#include <twin.h> #if defined Q_WS_X11 && ! defined K_WS_QTONLY -#include <kwinmodule.h> // schroder +#include <twinmodule.h> // schroder #endif #ifndef KONQ_EMBEDDED diff --git a/khtml/java/kjavaappletwidget.cpp b/khtml/java/kjavaappletwidget.cpp index a8238b9f0..5dae56875 100644 --- a/khtml/java/kjavaappletwidget.cpp +++ b/khtml/java/kjavaappletwidget.cpp @@ -22,7 +22,7 @@ #include "kjavaappletwidget.h" #include "kjavaappletserver.h" -#include <kwin.h> +#include <twin.h> #include <kdebug.h> #include <klocale.h> diff --git a/khtml/java/kjavaappletwidget.h b/khtml/java/kjavaappletwidget.h index f69ee59aa..5bd644e8e 100644 --- a/khtml/java/kjavaappletwidget.h +++ b/khtml/java/kjavaappletwidget.h @@ -29,7 +29,7 @@ #include "java/kjavaappletcontext.h" #include "java/kjavaapplet.h" #include <qxembed.h> -#include <kwinmodule.h> +#include <twinmodule.h> /** * @short A widget for displaying Java applets diff --git a/khtml/khtml_part.cpp b/khtml/khtml_part.cpp index 6412902a7..18ca537b8 100644 --- a/khtml/khtml_part.cpp +++ b/khtml/khtml_part.cpp @@ -117,7 +117,7 @@ using namespace DOM; #include "kpassivepopup.h" #include "kpopupmenu.h" #include "rendering/render_form.h" -#include <kwin.h> +#include <twin.h> #define HINT_UTF8 106 diff --git a/khtml/rendering/render_form.cpp b/khtml/rendering/render_form.cpp index a83c1788e..13843fb7a 100644 --- a/khtml/rendering/render_form.cpp +++ b/khtml/rendering/render_form.cpp @@ -36,7 +36,7 @@ #include <kreplacedialog.h> #include <kspell.h> #include <kurlcompletion.h> -#include <kwin.h> +#include <twin.h> #include <tqstyle.h> diff --git a/kio/kfile/knotifydialog.cpp b/kio/kfile/knotifydialog.cpp index 0b31dc8c0..e9a4c2b6f 100644 --- a/kio/kfile/knotifydialog.cpp +++ b/kio/kfile/knotifydialog.cpp @@ -826,8 +826,8 @@ void KNotifyWidget::save() emit changed( false ); } -// returns e.g. "kwin/eventsrc" from a given path -// "/opt/trinity/share/apps/kwin/eventsrc" +// returns e.g. "twin/eventsrc" from a given path +// "/opt/trinity/share/apps/twin/eventsrc" TQString KNotifyWidget::makeRelative( const TQString& fullPath ) { int slash = fullPath.findRev( '/' ) - 1; diff --git a/kio/kfile/knotifydialog.h b/kio/kfile/knotifydialog.h index 337f4d1be..165df42f4 100644 --- a/kio/kfile/knotifydialog.h +++ b/kio/kfile/knotifydialog.h @@ -107,7 +107,7 @@ public: * KNotifyDialog can handle events for multiple applications (i.e. eventsrc files). * Successive calls with a different @p path will add them. * @param path The absolute or relative path to the eventsrc file to be configured. - * A relative path would be e.g. "kwin/eventsrc". + * A relative path would be e.g. "twin/eventsrc". * @see clearApplicationEvents() */ virtual void addApplicationEvents( const TQString& path ); diff --git a/kio/kfile/tests/knotifytest.cpp b/kio/kfile/tests/knotifytest.cpp index e27893589..f6e93fa99 100644 --- a/kio/kfile/tests/knotifytest.cpp +++ b/kio/kfile/tests/knotifytest.cpp @@ -5,6 +5,6 @@ int main( int argc, char **argv ) { KApplication app( argc, argv, "knotifytest" ); KNotifyDialog *dlg = new KNotifyDialog(); - dlg->addApplicationEvents( "kwin" ); + dlg->addApplicationEvents( "twin" ); return dlg->exec(); } diff --git a/kio/kio/defaultprogress.cpp b/kio/kio/defaultprogress.cpp index fea74a037..76a88bccf 100644 --- a/kio/kio/defaultprogress.cpp +++ b/kio/kio/defaultprogress.cpp @@ -36,7 +36,7 @@ #include <klineedit.h> #ifdef Q_WS_X11 -#include <kwin.h> +#include <twin.h> #endif #include "jobclasses.h" diff --git a/kio/kio/krun.cpp b/kio/kio/krun.cpp index 43bdb9f50..2f488bc70 100644 --- a/kio/kio/krun.cpp +++ b/kio/kio/krun.cpp @@ -62,7 +62,7 @@ #include <kstringhandler.h> #ifdef Q_WS_X11 -#include <kwin.h> +#include <twin.h> #endif class KRun::KRunPrivate diff --git a/kio/kio/renamedlg.cpp b/kio/kio/renamedlg.cpp index 8f1b2d087..bc9e3b96d 100644 --- a/kio/kio/renamedlg.cpp +++ b/kio/kio/renamedlg.cpp @@ -49,7 +49,7 @@ #include <ksqueezedtextlabel.h> #ifdef Q_WS_X11 -#include <kwin.h> +#include <twin.h> #endif using namespace KIO; diff --git a/kio/kio/skipdlg.cpp b/kio/kio/skipdlg.cpp index fabc6f841..ceb48b550 100644 --- a/kio/kio/skipdlg.cpp +++ b/kio/kio/skipdlg.cpp @@ -33,7 +33,7 @@ #include <kstdguiitem.h> #ifdef Q_WS_X11 -#include <kwin.h> +#include <twin.h> #endif using namespace KIO; diff --git a/kio/misc/kwalletd/kwalletd.cpp b/kio/misc/kwalletd/kwalletd.cpp index 0513305bd..3815277c5 100644 --- a/kio/misc/kwalletd/kwalletd.cpp +++ b/kio/misc/kwalletd/kwalletd.cpp @@ -38,7 +38,7 @@ #include <kpassdlg.h> #include <kstandarddirs.h> #include <kwalletentry.h> -#include <kwin.h> +#include <twin.h> #include <tqdir.h> #include <tqlabel.h> diff --git a/kio/misc/uiserver.cpp b/kio/misc/uiserver.cpp index 55da183ee..3dd862b54 100644 --- a/kio/misc/uiserver.cpp +++ b/kio/misc/uiserver.cpp @@ -38,7 +38,7 @@ #include <kdebug.h> #include <kmessagebox.h> #include <tdesu/client.h> -#include <kwin.h> +#include <twin.h> #include <kdialog.h> #include <ksystemtray.h> #include <kpopupmenu.h> diff --git a/kioslave/http/http_cache_cleaner.desktop b/kioslave/http/http_cache_cleaner.desktop index a2e129977..1af09abc0 100644 --- a/kioslave/http/http_cache_cleaner.desktop +++ b/kioslave/http/http_cache_cleaner.desktop @@ -160,7 +160,7 @@ Comment[uz]=HTTP keshidagi eski elementlarni oʻchiradi Comment[uz@cyrillic]=HTTP кэшидаги эски элементларни ўчиради Comment[ven]=I kulumaga zwithu zwakale u bva kha HTTP cache Comment[vi]=Xoá sạch các mục nhập cũ ra bộ nhớ tạm HTTP. -Comment[xh]=Icoca amangeno amadala asuka kwindawo efihlakeleyo yokugcina ye HTTP +Comment[xh]=Icoca amangeno amadala asuka twindawo efihlakeleyo yokugcina ye HTTP Comment[zh_CN]=从 HTTP 缓存中清除旧条目 Comment[zh_HK]=從 HTTP 快取中清除舊的項目 Comment[zh_TW]=從 HTTP 快取中清除舊的項目 diff --git a/kioslave/http/kcookiejar/kcookiewin.cpp b/kioslave/http/kcookiejar/kcookiewin.cpp index 50477e40d..4a35a1cb0 100644 --- a/kioslave/http/kcookiejar/kcookiewin.cpp +++ b/kioslave/http/kcookiejar/kcookiewin.cpp @@ -57,7 +57,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #endif #include <kidna.h> -#include <kwin.h> +#include <twin.h> #include <klocale.h> #include <kglobal.h> #include <kurllabel.h> diff --git a/krandr/ktimerdialog.cpp b/krandr/ktimerdialog.cpp index fe5ab89df..0be416be7 100644 --- a/krandr/ktimerdialog.cpp +++ b/krandr/ktimerdialog.cpp @@ -26,7 +26,7 @@ #include <tqprogressbar.h> #include <tqlabel.h> -#include <kwin.h> +#include <twin.h> #include <kiconloader.h> #include <klocale.h> diff --git a/krsync/krsync.h b/krsync/krsync.h index 4c457e333..c9273f697 100644 --- a/krsync/krsync.h +++ b/krsync/krsync.h @@ -52,7 +52,7 @@ #include <klocale.h> #include <kinstance.h> -#include <kwin.h> +#include <twin.h> #include <kurl.h> #include <kaction.h> #include <kpopupmenu.h> diff --git a/krsync/rsyncconfigdialog.cpp b/krsync/rsyncconfigdialog.cpp index 48d09e7aa..b51fa4756 100644 --- a/krsync/rsyncconfigdialog.cpp +++ b/krsync/rsyncconfigdialog.cpp @@ -74,7 +74,7 @@ #include <klocale.h> #include <kinstance.h> -#include <kwin.h> +#include <twin.h> #include <kaction.h> #include <kpopupmenu.h> #include <kmessagebox.h> diff --git a/kstyles/asteroid/asteroid.cpp b/kstyles/asteroid/asteroid.cpp index 76a5c0d6c..434cd6366 100644 --- a/kstyles/asteroid/asteroid.cpp +++ b/kstyles/asteroid/asteroid.cpp @@ -30,7 +30,7 @@ #include <tqtabbar.h> #include <tqgroupbox.h> #include <tqtoolbutton.h> -#include <tqdockwindow.h> +#include <tqdoctwindow.h> #include <tqtooltip.h> #include <tqdrawutil.h> #include <tqlistview.h> diff --git a/kstyles/plastik/plastik.cpp b/kstyles/plastik/plastik.cpp index 1c6f5cd6a..08c97b3c1 100644 --- a/kstyles/plastik/plastik.cpp +++ b/kstyles/plastik/plastik.cpp @@ -2689,7 +2689,7 @@ void PlastikStyle::tqdrawControl(TQ_ControlElement element, break; } - // Menu and dockwindow empty space + // Menu and doctwindow empty space // case CE_DockWindowEmptyArea: p->fillRect(r, cg.background()); diff --git a/tdecore/CMakeLists.txt b/tdecore/CMakeLists.txt index 348e80451..c82e25408 100644 --- a/tdecore/CMakeLists.txt +++ b/tdecore/CMakeLists.txt @@ -48,8 +48,8 @@ install( FILES kurl.h ksock.h kaboutdata.h kcmdlineargs.h kconfigbackend.h kapp.h kapplication.h kuniqueapp.h kuniqueapplication.h kcharsets.h kdeversion.h kpty.h kprocess.h kprocctrl.h - klocale.h kicontheme.h kiconloader.h kdebug.h kwinmodule.h - kwin.h krootprop.h kshortcut.h kkeynative.h kaccel.h + klocale.h kicontheme.h kiconloader.h kdebug.h twinmodule.h + twin.h krootprop.h kshortcut.h kkeynative.h kaccel.h kglobalaccel.h kstdaccel.h kshortcutlist.h kcatalogue.h kregexp.h kcompletion.h kstringhandler.h kstddirs.h kstandarddirs.h kglobal.h kglobalsettings.h ksharedptr.h @@ -98,7 +98,7 @@ set( ${target}_SRCS kmanagerselection.cpp kdesktopfile.cpp kstandarddirs.cpp ksock.cpp kpty.cpp kprocess.cpp kprocctrl.cpp klocale.cpp krfcdate.cpp kiconeffect.cpp kicontheme.cpp kiconloader.cpp - kwin.cpp kwinmodule.cpp krootprop.cpp kcharsets.cpp + twin.cpp twinmodule.cpp krootprop.cpp kcharsets.cpp kckey.cpp kshortcut.cpp kkeynative_x11.cpp kkeyserver_x11.cpp kaccelaction.cpp kshortcutmenu.cpp kaccelbase.cpp kaccel.cpp kglobalaccel_x11.cpp kglobalaccel.cpp kstdaccel.cpp kshortcutlist.cpp diff --git a/tdecore/MAINTAINERS b/tdecore/MAINTAINERS index 64b825f06..c052a36d6 100644 --- a/tdecore/MAINTAINERS +++ b/tdecore/MAINTAINERS @@ -71,8 +71,8 @@ ktempfile.cpp Waldo Bastian <bastian@kde.org> kuniqueapplication.cpp Waldo Bastian <bastian@kde.org> kurl.cpp Waldo Bastian <bastian@kde.org> kurldrag.cpp David Faure <faure@kde.org> -kwin.cpp Lubos Lunak <l.lunak@kde.org> -kwinmodule.cpp Lubos Lunak <l.lunak@kde.org> +twin.cpp Lubos Lunak <l.lunak@kde.org> +twinmodule.cpp Lubos Lunak <l.lunak@kde.org> kxmessages.cpp Lubos Lunak <l.lunak@kde.org> kxerrorhandler.cpp Lubos Lunak <l.lunak@kde.org> libintl.cpp Hans Petter Bieker <bieker@kde.org> diff --git a/tdecore/Makefile.am b/tdecore/Makefile.am index 92ee7ebfc..a9c44ee15 100644 --- a/tdecore/Makefile.am +++ b/tdecore/Makefile.am @@ -42,7 +42,7 @@ include_HEADERS = kconfig.h kconfigskeleton.h \ kcmdlineargs.h kconfigbackend.h kapp.h kapplication.h kuniqueapp.h \ kuniqueapplication.h kcharsets.h kdeversion.h kpty.h kprocess.h \ kprocctrl.h klocale.h kicontheme.h kiconloader.h kdebug.h \ - kwinmodule.h kwin.h krootprop.h kshortcut.h kkeynative.h kaccel.h \ + twinmodule.h twin.h krootprop.h kshortcut.h kkeynative.h kaccel.h \ kglobalaccel.h kstdaccel.h kshortcutlist.h kcatalogue.h \ kregexp.h kcompletion.h kstringhandler.h \ kstddirs.h kstandarddirs.h kglobal.h kglobalsettings.h ksharedptr.h \ @@ -94,7 +94,7 @@ libtdecore_la_SOURCES = libintl.cpp kapplication.cpp \ kconfigbackend.cpp kmanagerselection.cpp kdesktopfile.cpp \ kstandarddirs.cpp ksock.cpp kpty.cpp kprocess.cpp kprocctrl.cpp \ klocale.cpp krfcdate.cpp kiconeffect.cpp kicontheme.cpp \ - kiconloader.cpp kwin.cpp kwinmodule.cpp krootprop.cpp kcharsets.cpp \ + kiconloader.cpp twin.cpp twinmodule.cpp krootprop.cpp kcharsets.cpp \ kckey.cpp kshortcut.cpp kkeynative_x11.cpp kkeyserver_x11.cpp \ kaccelaction.cpp kshortcutmenu.cpp kaccelbase.cpp kaccel.cpp \ kglobalaccel_x11.cpp kglobalaccel.cpp kstdaccel.cpp kshortcutlist.cpp \ diff --git a/tdecore/README.kiosk b/tdecore/README.kiosk index cd59f8db3..257c5a446 100644 --- a/tdecore/README.kiosk +++ b/tdecore/README.kiosk @@ -239,7 +239,7 @@ action/menuedit KWin related: -action/kwin_rmb // RMB window context menu +action/twin_rmb // RMB window context menu Konsole related: action/konsole_rmb // RMB context menu diff --git a/tdecore/all_languages.desktop b/tdecore/all_languages.desktop index 2f36efff6..3c3483ee8 100644 --- a/tdecore/all_languages.desktop +++ b/tdecore/all_languages.desktop @@ -1648,7 +1648,7 @@ Name[gl]=Eslávo Eclesiástico Name[he]=סלבית כנסייתית Name[hi]=चर्च स्लाविक Name[hr]=Crkveni pravoslavni -Name[hsb]=Cyrkwinosłowjansce +Name[hsb]=Cyrtwinosłowjansce Name[hu]=Szláv (egyházi) Name[is]=Kirkju-slavneska Name[it]=Slavo della Chiesa diff --git a/tdecore/kapplication.cpp b/tdecore/kapplication.cpp index 6fad03069..b56f683ea 100644 --- a/tdecore/kapplication.cpp +++ b/tdecore/kapplication.cpp @@ -104,7 +104,7 @@ #include <sys/types.h> #ifndef Q_WS_WIN -#include "kwin.h" +#include "twin.h" #endif #include <fcntl.h> diff --git a/tdecore/kapplication.h b/tdecore/kapplication.h index bec523a0b..014b1cad5 100644 --- a/tdecore/kapplication.h +++ b/tdecore/kapplication.h @@ -1078,7 +1078,7 @@ public: /** * Updates the last user action timestamp to the given time, or to the current time, * if 0 is given. Do not use unless you're really sure what you're doing. - * Consult focus stealing prevention section in kdebase/kwin/README. + * Consult focus stealing prevention section in kdebase/twin/README. * @since 3.2 */ void updateUserTimestamp( unsigned long time = 0 ); @@ -1095,7 +1095,7 @@ public: * to the given time, or to this application's user time, if 0 is given. * Use before causing user interaction in the remote application, e.g. invoking a dialog * in the application using a DCOP call. - * Consult focus stealing prevention section in kdebase/kwin/README. + * Consult focus stealing prevention section in kdebase/twin/README. * @since 3.3 */ void updateRemoteUserTimestamp( const TQCString& dcopId, unsigned long time = 0 ); diff --git a/tdecore/kdebug.areas b/tdecore/kdebug.areas index efa46034c..03f7a8c95 100644 --- a/tdecore/kdebug.areas +++ b/tdecore/kdebug.areas @@ -80,11 +80,11 @@ 1208 kcontrol 1210 kicker 1211 konsole -1212 kwin +1212 twin 1213 kappfinder 1214 kdesktop (icons) 1215 ksysguard -1216 kwin (client errors) +1216 twin (client errors) 1217 khotkeys 1218 ksmserver 1219 media kioslave @@ -360,7 +360,7 @@ 12007 kolf 12008 kbounce 12009 kblackbox -12010 kwin4 +12010 twin4 12011 kenolaba 12012 kasteroids diff --git a/tdecore/kdetcompmgr.cpp b/tdecore/kdetcompmgr.cpp index 9b78e3478..d989bbe19 100644 --- a/tdecore/kdetcompmgr.cpp +++ b/tdecore/kdetcompmgr.cpp @@ -51,7 +51,7 @@ int main(int argc, char **argv) KApplication app; - KConfig config("kwinrc", true); + KConfig config("twinrc", true); config.setGroup( "Notification Messages" ); if (!config.readBoolEntry("UseTranslucency",false)) { // Attempt to load the kompmgr pid file @@ -100,7 +100,7 @@ int main(int argc, char **argv) // app.detectCompositionManagerAvailable(); // if (!app.isCompositionManagerAvailable()) { - KConfig config2("kwinrc", true); + KConfig config2("twinrc", true); config2.setGroup( "Notification Messages" ); if (config2.readBoolEntry("UseTranslucency",false)) { app.detectCompositionManagerAvailable(true, true); diff --git a/tdecore/knotifyclient.cpp b/tdecore/knotifyclient.cpp index 185639f11..e146fec85 100644 --- a/tdecore/knotifyclient.cpp +++ b/tdecore/knotifyclient.cpp @@ -38,7 +38,7 @@ static bool canAvoidStartupEvent( const TQString& event, const TQString& appname static bool checkAvoid = true; if( !checkAvoid ) return false; - if(( appname != "kwin" && appname != "ksmserver" ) || present > 0 ) { + if(( appname != "twin" && appname != "ksmserver" ) || present > 0 ) { checkAvoid = false; return false; } diff --git a/tdecore/kstartupinfo.cpp b/tdecore/kstartupinfo.cpp index 12825e805..ae3b3d277 100644 --- a/tdecore/kstartupinfo.cpp +++ b/tdecore/kstartupinfo.cpp @@ -58,9 +58,9 @@ DEALINGS IN THE SOFTWARE. #include <kapplication.h> #include <signal.h> #ifdef Q_WS_X11 -#include <kwinmodule.h> +#include <twinmodule.h> #include <kxmessages.h> -#include <kwin.h> +#include <twin.h> #endif static const char* const NET_STARTUP_MSG = "_NET_STARTUP_INFO"; diff --git a/tdecore/kuniqueapplication.cpp b/tdecore/kuniqueapplication.cpp index 193aafcd3..686f40e86 100644 --- a/tdecore/kuniqueapplication.cpp +++ b/tdecore/kuniqueapplication.cpp @@ -39,7 +39,7 @@ #include <kaboutdata.h> #if defined Q_WS_X11 -#include <kwin.h> +#include <twin.h> #include <kstartupinfo.h> #endif diff --git a/tdecore/kwin.cpp b/tdecore/kwin.cpp index fa68da63c..0e5db11b1 100644 --- a/tdecore/kwin.cpp +++ b/tdecore/kwin.cpp @@ -34,7 +34,7 @@ #include <tqdialog.h> #include "config.h" -#include "kwin.h" +#include "twin.h" #include "kapplication.h" #include <kglobal.h> @@ -62,10 +62,10 @@ static Atom net_wm_context_help; static Atom kde_wm_change_state; static Atom kde_wm_window_opacity; static Atom kde_wm_window_shadow; -static Atom kwin_UTF8_STRING; +static Atom twin_UTF8_STRING; static Atom net_wm_cm; -static void kwin_net_create_atoms() { +static void twin_net_create_atoms() { if (!atoms_created){ const int max = 20; Atom* atoms[max]; @@ -146,7 +146,7 @@ static void sendClientMessage(Window w, Atom a, long x){ bool KWin::compositingActive() { #ifdef Q_WS_X11 - kwin_net_create_atoms(); + twin_net_create_atoms(); return XGetSelectionOwner( qt_xdisplay(), net_wm_cm ) != None; #else return false; @@ -166,7 +166,7 @@ public: ContextWidget::ContextWidget() : TQWidget(0,0) { - kwin_net_create_atoms(); + twin_net_create_atoms(); kapp->installX11EventFilter( this ); TQWhatsThis::enterWhatsThisMode(); TQCursor c = *TQApplication::overrideCursor(); @@ -561,7 +561,7 @@ void KWin::clearState( WId win, unsigned long state ) void KWin::setOpacity( WId win, uint percent ) { #ifdef Q_WS_X11 - kwin_net_create_atoms(); + twin_net_create_atoms(); if (percent > 99) XDeleteProperty (qt_xdisplay(), win, kde_wm_window_opacity); else @@ -575,7 +575,7 @@ void KWin::setOpacity( WId win, uint percent ) void KWin::setShadowSize( WId win, uint percent ) { #ifdef Q_WS_X11 - kwin_net_create_atoms(); + twin_net_create_atoms(); long shadowSize = long(0xFFFFFFFF/100.0*percent); XChangeProperty(qt_xdisplay(), win, kde_wm_window_shadow, XA_CARDINAL, 32, PropModeReplace, (unsigned char *) &shadowSize, 1L); #endif @@ -686,7 +686,7 @@ void KWin::iconifyWindow( WId win, bool animation) #ifdef Q_WS_X11 if ( !animation ) { - kwin_net_create_atoms(); + twin_net_create_atoms(); sendClientMessageToRoot( win, kde_wm_change_state, IconicState, 1 ); } XIconifyWindow( qt_xdisplay(), win, qt_xscreen() ); @@ -699,7 +699,7 @@ void KWin::deIconifyWindow( WId win, bool animation ) #ifdef Q_WS_X11 if ( !animation ) { - kwin_net_create_atoms(); + twin_net_create_atoms(); sendClientMessageToRoot( win, kde_wm_change_state, NormalState, 1 ); } XMapWindow( qt_xdisplay(), win ); @@ -1245,10 +1245,10 @@ TQString KWin::readNameProperty( WId win, unsigned long atom ) #ifdef Q_WS_X11 if ( XGetTextProperty( qt_xdisplay(), win, &tp, atom ) != 0 && tp.value != NULL ) { - if (!kwin_UTF8_STRING) - kwin_UTF8_STRING = XInternAtom( qt_xdisplay(), "UTF8_STRING", False); + if (!twin_UTF8_STRING) + twin_UTF8_STRING = XInternAtom( qt_xdisplay(), "UTF8_STRING", False); - if ( tp.encoding == kwin_UTF8_STRING ) { + if ( tp.encoding == twin_UTF8_STRING ) { result = TQString::fromUtf8 ( (const char*) tp.value ); } else if ( XmbTextPropertyToTextList( qt_xdisplay(), &tp, &text, &count) == Success && diff --git a/tdecore/kwin.h b/tdecore/kwin.h index d3df42bd6..e8f00f44a 100644 --- a/tdecore/kwin.h +++ b/tdecore/kwin.h @@ -81,7 +81,7 @@ public: * and normal applications are forbidden to use it. * * In case of problems, consult the KWin README in the kdebase - * package (kdebase/kwin/README), or ask on the kwin@kde.org + * package (kdebase/twin/README), or ask on the twin@kde.org * mailing list. * * @param win the id of the window to make active diff --git a/tdecore/kwinmodule.cpp b/tdecore/kwinmodule.cpp index f113570db..72dc0c5b5 100644 --- a/tdecore/kwinmodule.cpp +++ b/tdecore/kwinmodule.cpp @@ -23,8 +23,8 @@ #include <tqwidget.h> #ifdef Q_WS_X11 //FIXME -#include "kwinmodule.h" -#include "kwin.h" +#include "twinmodule.h" +#include "twin.h" #include <X11/Xatom.h> #include "kapplication.h" #include "kdebug.h" @@ -114,13 +114,13 @@ public: }; KWinModule::KWinModule( TQObject* parent ) - : TQObject( parent, "kwin_module" ) + : TQObject( parent, "twin_module" ) { init(INFO_ALL); } KWinModule::KWinModule( TQObject* parent, int what ) - : TQObject( parent, "kwin_module" ) + : TQObject( parent, "twin_module" ) { init(what); } @@ -186,7 +186,7 @@ TQSize KWinModulePrivate::numberOfViewports(int desktop) const TQSize s(netdesktop.width / TQApplication::desktop()->width(), netdesktop.height / TQApplication::desktop()->height()); - // workaround some kwin bugs + // workaround some twin bugs if (s.width() < 1) s.setWidth(1); if (s.height() < 1) s.setHeight(1); return s; @@ -474,9 +474,9 @@ void KWinModule::doNotManage( const TQString& title ) TQCString replyType; TQDataStream arg(data, IO_WriteOnly); arg << title; - kapp->dcopClient()->call("kwin", "", "doNotManage(TQString)", + kapp->dcopClient()->call("twin", "", "doNotManage(TQString)", data, replyType, replyData); } -#include "kwinmodule.moc" +#include "twinmodule.moc" #endif diff --git a/tdecore/kwinmodule.h b/tdecore/kwinmodule.h index 261449a16..afde02597 100644 --- a/tdecore/kwinmodule.h +++ b/tdecore/kwinmodule.h @@ -17,7 +17,7 @@ Boston, MA 02110-1301, USA. */ /* - * kwinmodule.h. Part of the KDE project. + * twinmodule.h. Part of the KDE project. */ #ifndef KWINMODULE_H @@ -220,7 +220,7 @@ public: bool showingDesktop() const; /** - * Informs kwin via dcop to not manage a window with the + * Informs twin via dcop to not manage a window with the * specified @p title. * * Useful for swallowing legacy applications, for example java diff --git a/tdecore/tests/kstddirstest.cpp b/tdecore/tests/kstddirstest.cpp index fa797d665..69e9a0200 100644 --- a/tdecore/tests/kstddirstest.cpp +++ b/tdecore/tests/kstddirstest.cpp @@ -43,9 +43,9 @@ int main(int argc, char **argv) kdDebug() << "docs " << (*it).ascii() << endl; } - list = t.findDirs("data", "kwin"); + list = t.findDirs("data", "twin"); for (TQStringList::ConstIterator it = list.begin(); it != list.end(); ++it) { - kdDebug() << "kwin dirs " << (*it).ascii() << endl; + kdDebug() << "twin dirs " << (*it).ascii() << endl; } kdDebug() << "hit " << t.findResourceDir("config", "kcmdisplayrc") << endl; diff --git a/tdeprint/filters/poster.desktop b/tdeprint/filters/poster.desktop index 843290fab..a5cb6ee1e 100644 --- a/tdeprint/filters/poster.desktop +++ b/tdeprint/filters/poster.desktop @@ -157,7 +157,7 @@ Description[xh]=Uncedo lokushicilela izazisi eszinkulu kumakhasi amaphepha amani Description[zh_CN]=此工具用于在多张纸上打印大型的海报。要使用此命令，<b>poster</b> 可执行文件必须可在您的 <tt>PATH</tt> 中访问到。此工具的源代码位于<a href="http://printing.kde.org/downloads">KDEPrint 网站</a>。<p><b><u>警告：</u></b>您虽然可以在任何 CTAN 归档镜像找到的原始版本，但是在 KDEPrint 网站上找到的包对其进行了修改，原因是原始的包<b>无法</b>用于 KDE。您<b>必须</b>使用在 <a href="http://printing.kde.org/downloads">KDEPrint 网站</a>上找到的包。 Description[zh_HK]=將大型海報列印在多張小型紙張上的公用程式。要使用這個命令，可執行檔<b>poster</b>必須在你的<tt>PATH</tt>中。這個公用程式的原始碼可以在<a href="http://printing.kde.org/downloads"KDEPrint 網站</a>。<p><b><u>警告：</u></b>在 KDEPrint 網站上找到的套件是修改過的版本，而非在任何 CTAN 檔案庫鏡射站中可以找到的原始版本，其原始套件<b>無法</b>在 KDE 下運作。你<b>必須</b>使用在<a href="http://printing.kde.org/downloads">KDEPrint 網站</a>上的套件。 Description[zh_TW]=將大型海報列印在多張小型紙張上的公用程式。要使用這個命令，可執行檔<b>poster</b>必須在您的<tt>PATH</tt>中。這個公用程式的原始碼可以在<a href="http://printing.kde.org/downloads"KDEPrint 網站</a>。<p><b><u>警告：</u></b>在 KDEPrint 網站上找到的套件是修改過的版本，而非在任何 CTAN 檔案庫鏡射站中可以找到的原始版本，其原始套件<b>無法</b>在 KDE 下運作。您<b>必須</b>使用在<a href="http://printing.kde.org/downloads">KDEPrint 網站</a>上的套件。 -Description[zu]=Insebenziso yokushicicela amabhodi emiyalezo emikhulu kumapheshana ekhasi eliningana elincane. Ukusebenzisa lomyalelo, ibhodi <b> lomyalezo</b> eliphumelelisekayo kumele lingeniswe ngokunemvume kweyakho <tt>Indlela</tt>. Ikhodi lemvelaphi lalokhu k kusebenzisa kungaba kwi <a href="http://printing.kde.org/downloads"> kwindawo yeweb ye KDEPrint</a>. <p><b><u>Isexwayiso:</u></b> Iphakethe elitholakala kwindawo yeweb ye-KDEPrint inguguqulelo olushintshiweyo lwasekuqaleni lolo olungatholakala kunoma yisiphi isibuko somqulu we CTAN, kodwa iphakethe lasekuqaleni <b>angeke </b> lisebenze nge-KDE. Wena<b>kumele</b> usebenzise iphakethe elitholakala e <a href="http://printing.kde.org/downloads">kwindawo yeweb ye-KDEPrint</a>. +Description[zu]=Insebenziso yokushicicela amabhodi emiyalezo emikhulu kumapheshana ekhasi eliningana elincane. Ukusebenzisa lomyalelo, ibhodi <b> lomyalezo</b> eliphumelelisekayo kumele lingeniswe ngokunemvume kweyakho <tt>Indlela</tt>. Ikhodi lemvelaphi lalokhu k kusebenzisa kungaba kwi <a href="http://printing.kde.org/downloads"> twindawo yeweb ye KDEPrint</a>. <p><b><u>Isexwayiso:</u></b> Iphakethe elitholakala twindawo yeweb ye-KDEPrint inguguqulelo olushintshiweyo lwasekuqaleni lolo olungatholakala kunoma yisiphi isibuko somqulu we CTAN, kodwa iphakethe lasekuqaleni <b>angeke </b> lisebenze nge-KDE. Wena<b>kumele</b> usebenzise iphakethe elitholakala e <a href="http://printing.kde.org/downloads">twindawo yeweb ye-KDEPrint</a>. MimeTypeIn=application/postscript MimeTypeOut=application/postscript Require=exec:/poster diff --git a/tdeprint/management/kmjobviewer.cpp b/tdeprint/management/kmjobviewer.cpp index 7f168faed..78a26c97c 100644 --- a/tdeprint/management/kmjobviewer.cpp +++ b/tdeprint/management/kmjobviewer.cpp @@ -43,7 +43,7 @@ #include <kcursor.h> #include <kmenubar.h> #include <kdebug.h> -#include <kwin.h> +#include <twin.h> #include <kio/netaccess.h> #include <tqtimer.h> #include <tqlayout.h> diff --git a/tdeprint/specials.desktop b/tdeprint/specials.desktop index 72c648c4c..3cf71f698 100644 --- a/tdeprint/specials.desktop +++ b/tdeprint/specials.desktop @@ -673,7 +673,7 @@ Description[uz@cyrillic]=Ташқи факсга жўнатиш Description[ven]=Rumelani kha sisitemu ya maitele a nnda a fekisi Description[vi]=Gởi tới hệ thống điện thư bên ngoài. Description[wa]=Evoyî so on dfoûtrin sistinme di facs -Description[xh]=Thumela kwindlela engaphandle ye fax +Description[xh]=Thumela twindlela engaphandle ye fax Description[zh_CN]=发至外部传真系统 Description[zh_HK]=發送到外部傳真系統 Description[zh_TW]=發送到外部傳真系統 diff --git a/tdeprint/tdeprintd.cpp b/tdeprint/tdeprintd.cpp index d6237b2b2..e320cf0bc 100644 --- a/tdeprint/tdeprintd.cpp +++ b/tdeprint/tdeprintd.cpp @@ -32,7 +32,7 @@ #include <kpushbutton.h> #include <kiconloader.h> #include <kstandarddirs.h> -#include <kwin.h> +#include <twin.h> #include <kapplication.h> #include <tqlayout.h> #include <tqtimer.h> diff --git a/tdeui/CMakeLists.txt b/tdeui/CMakeLists.txt index 08428cc23..ed6fca193 100644 --- a/tdeui/CMakeLists.txt +++ b/tdeui/CMakeLists.txt @@ -46,7 +46,7 @@ install( FILES kmainwindow.h kmainwindowiface.h ktoolbar.h kmenubar.h knuminput.h kseparator.h klineedit.h krestrictedline.h kcolorbutton.h kcolorbtn.h - ksystemtray.h kdockwindow.h kbuttonbox.h + ksystemtray.h kdoctwindow.h kbuttonbox.h keditcl.h kled.h keditlistbox.h kwizard.h kkeydialog.h kkeybutton.h kurllabel.h kruler.h kcursor.h @@ -67,9 +67,9 @@ install( FILES krootpixmap.h kaboutkde.h kaboutapplication.h kpanelapplet.h kpushbutton.h kdcopactionproxy.h kcolorcombo.h kpanelextension.h kcompletionbox.h ksqueezedtextlabel.h - kcommand.h kwindowlistmenu.h kfontcombo.h kaccelgen.h ktip.h + kcommand.h twindowlistmenu.h kfontcombo.h kaccelgen.h ktip.h kdatewidget.h karrowbutton.h kguiitem.h kstdguiitem.h - kstringvalidator.h kwindowinfo.h + kstringvalidator.h twindowinfo.h ktextedit.h kpassivepopup.h kdatetimewidget.h ktimewidget.h ktimezonewidget.h kscrollview.h kspell.h ksconfig.h kspelldlg.h ksyntaxhighlighter.h @@ -130,11 +130,11 @@ set( ${target}_SRCS kaboutapplication.cpp kpanelapplet.cpp kdcopactionproxy.cpp kcolorcombo.cpp kpushbutton.cpp kpanelextension.cpp kcompletionbox.cpp ksqueezedtextlabel.cpp kcmodule.cpp - kcommand.cpp kwindowlistmenu.cpp kfontcombo.cpp ktip.cpp + kcommand.cpp twindowlistmenu.cpp kfontcombo.cpp ktip.cpp kdatewidget.cpp karrowbutton.cpp kmainwindowiface.cpp kmainwindowiface.skel kguiitem.cpp kstdguiitem.cpp kstringvalidator.cpp kactivelabel.cpp - kwindowinfo.cpp ktextedit.cpp kwizard.cpp kpassivepopup.cpp + twindowinfo.cpp ktextedit.cpp kwizard.cpp kpassivepopup.cpp ktoolbarhandler.cpp kdatetimewidget.cpp ktimewidget.cpp ktimezonewidget.cpp ksconfig.cpp kspelldlg.cpp kspell.cpp ksyntaxhighlighter.cpp ktabbar.cpp ktabwidget.cpp diff --git a/tdeui/MAINTAINERS b/tdeui/MAINTAINERS index 16942949f..f666536cb 100644 --- a/tdeui/MAINTAINERS +++ b/tdeui/MAINTAINERS @@ -88,7 +88,7 @@ ktoolbar.cpp Waldo Bastian <bastian@kde.org> ktoolbarbutton.cpp Waldo Bastian <bastian@kde.org> ktoolbarradiogroup.cpp kurllabel.cpp -kwindowlistmenu.cpp +twindowlistmenu.cpp kwizard.cpp kwordwrap.cpp David Faure <faure@kde.org> kxmlguibuilder.cpp diff --git a/tdeui/Makefile.am b/tdeui/Makefile.am index 4752cdb95..d85c952ff 100644 --- a/tdeui/Makefile.am +++ b/tdeui/Makefile.am @@ -43,7 +43,7 @@ include_HEADERS = kprogressbox.h kprogress.h kcolordlg.h \ kmainwindow.h kmainwindowiface.h ktoolbar.h kmenubar.h \ knuminput.h kseparator.h klineedit.h \ krestrictedline.h kcolorbutton.h kcolorbtn.h \ - ksystemtray.h kdockwindow.h kbuttonbox.h \ + ksystemtray.h kdoctwindow.h kbuttonbox.h \ keditcl.h kled.h keditlistbox.h \ kwizard.h kkeydialog.h kkeybutton.h \ kurllabel.h kruler.h kcursor.h \ @@ -64,9 +64,9 @@ include_HEADERS = kprogressbox.h kprogress.h kcolordlg.h \ krootpixmap.h kaboutkde.h kaboutapplication.h \ kpanelapplet.h kpushbutton.h kdcopactionproxy.h kcolorcombo.h \ kpanelextension.h kcompletionbox.h ksqueezedtextlabel.h \ - kcommand.h kwindowlistmenu.h kfontcombo.h kaccelgen.h ktip.h \ + kcommand.h twindowlistmenu.h kfontcombo.h kaccelgen.h ktip.h \ kdatewidget.h karrowbutton.h kguiitem.h kstdguiitem.h \ - kstringvalidator.h kwindowinfo.h \ + kstringvalidator.h twindowinfo.h \ ktextedit.h kpassivepopup.h \ kdatetimewidget.h ktimewidget.h ktimezonewidget.h kscrollview.h \ kspell.h ksconfig.h kspelldlg.h ksyntaxhighlighter.h \ @@ -111,11 +111,11 @@ libtdeui_la_SOURCES = \ kaboutapplication.cpp kpanelapplet.cpp kdcopactionproxy.cpp \ kcolorcombo.cpp kpushbutton.cpp kpanelextension.cpp \ kcompletionbox.cpp ksqueezedtextlabel.cpp kcmodule.cpp \ - kcommand.cpp kwindowlistmenu.cpp kfontcombo.cpp ktip.cpp \ + kcommand.cpp twindowlistmenu.cpp kfontcombo.cpp ktip.cpp \ kdatewidget.cpp karrowbutton.cpp kmainwindowiface.cpp \ kmainwindowiface.skel kguiitem.cpp kstdguiitem.cpp \ kstringvalidator.cpp kactivelabel.cpp \ - kwindowinfo.cpp ktextedit.cpp kwizard.cpp kpassivepopup.cpp \ + twindowinfo.cpp ktextedit.cpp kwizard.cpp kpassivepopup.cpp \ ktoolbarhandler.cpp kdatetimewidget.cpp ktimewidget.cpp ktimezonewidget.cpp \ ksconfig.cpp kspelldlg.cpp \ kspell.cpp ksyntaxhighlighter.cpp ktabbar.cpp ktabwidget.cpp \ diff --git a/tdeui/kdepackages.h b/tdeui/kdepackages.h index 0f146975b..2997391cb 100644 --- a/tdeui/kdepackages.h +++ b/tdeui/kdepackages.h @@ -345,8 +345,8 @@ const char * const packages[] = { "kcontrol/kcmksplash", "kcontrol/kcmkurifilt", "kcontrol/kcmkvaio", -"kcontrol/kcmkwindecoration", -"kcontrol/kcmkwinoptions", +"kcontrol/kcmtwindecoration", +"kcontrol/kcmtwinoptions", "kcontrol/kcmlanbrowser", "kcontrol/kcmlaptop", "kcontrol/kcmlilo", @@ -1150,15 +1150,15 @@ const char * const packages[] = { "kwebget", "kwifimanager", "kwikdisk", -"kwin", -"kwin/compatibility", -"kwin/compositing", -"kwin/decorations", -"kwin/eyecandy", -"kwin/multihead", -"kwin/xinerama", -"kwin4", -"kwintv", +"twin", +"twin/compatibility", +"twin/compositing", +"twin/decorations", +"twin/eyecandy", +"twin/multihead", +"twin/xinerama", +"twin4", +"twintv", "kwireless", "kword", "kword/filters", @@ -1281,9 +1281,9 @@ const char * const packages[] = { "systemsettings/khotkeys", "systemsettings/ksplashthememgr", "systemsettings/kthememanager", -"systemsettings/kwincompositing", -"systemsettings/kwindecoration", -"systemsettings/kwinoptions", +"systemsettings/twincompositing", +"systemsettings/twindecoration", +"systemsettings/twinoptions", "systemsettings/language", "systemsettings/mouse", "systemsettings/netpref", diff --git a/tdeui/kdetrayproxy/kdetrayproxy.h b/tdeui/kdetrayproxy/kdetrayproxy.h index 8500bcb4f..640ae322b 100644 --- a/tdeui/kdetrayproxy/kdetrayproxy.h +++ b/tdeui/kdetrayproxy/kdetrayproxy.h @@ -22,7 +22,7 @@ #include <tqvaluelist.h> #include <kmanagerselection.h> -#include <kwinmodule.h> +#include <twinmodule.h> #include <tqwidget.h> class KDETrayProxy diff --git a/tdeui/kdockwidget.cpp b/tdeui/kdockwidget.cpp index e9cd24014..a27d4cb6c 100644 --- a/tdeui/kdockwidget.cpp +++ b/tdeui/kdockwidget.cpp @@ -38,7 +38,7 @@ #include <klocale.h> #include <ktoolbar.h> #include <kpopupmenu.h> -#include <kwin.h> +#include <twin.h> #include <kdebug.h> #include <kglobalsettings.h> diff --git a/tdeui/kmainwindow.cpp b/tdeui/kmainwindow.cpp index 1a605be18..90d572bda 100644 --- a/tdeui/kmainwindow.cpp +++ b/tdeui/kmainwindow.cpp @@ -42,7 +42,7 @@ #include <khelpmenu.h> #include <kmenubar.h> #include <kstatusbar.h> -#include <kwin.h> +#include <twin.h> #include <kedittoolbar.h> #include <kmainwindow.h> diff --git a/tdeui/kmenubar.cpp b/tdeui/kmenubar.cpp index 2014142e8..7febea06f 100644 --- a/tdeui/kmenubar.cpp +++ b/tdeui/kmenubar.cpp @@ -41,8 +41,8 @@ #include <kmanagerselection.h> #ifdef Q_WS_X11 -#include <kwin.h> -#include <kwinmodule.h> +#include <twin.h> +#include <twinmodule.h> #include <qxembed.h> #include <X11/Xlib.h> diff --git a/tdeui/kprogress.cpp b/tdeui/kprogress.cpp index e10cb0f7b..34bc211d4 100644 --- a/tdeui/kprogress.cpp +++ b/tdeui/kprogress.cpp @@ -36,7 +36,7 @@ #include <kapplication.h> #include <klocale.h> -#include <kwin.h> +#include <twin.h> KProgress::KProgress(TQWidget *parent, const char *name, WFlags f) : TQProgressBar(parent, name, f), diff --git a/tdeui/kprogressbox.cpp b/tdeui/kprogressbox.cpp index 472d36fba..4638f78fb 100644 --- a/tdeui/kprogressbox.cpp +++ b/tdeui/kprogressbox.cpp @@ -39,7 +39,7 @@ #include <kapplication.h> #include <klocale.h> -#include <kwin.h> +#include <twin.h> struct KProgressBoxDialog::KProgressBoxDialogPrivate { diff --git a/tdeui/krootpixmap.cpp b/tdeui/krootpixmap.cpp index 6f664b9a0..b87e887d7 100644 --- a/tdeui/krootpixmap.cpp +++ b/tdeui/krootpixmap.cpp @@ -17,8 +17,8 @@ #include <kapplication.h> #include <kimageeffect.h> #include <kpixmapio.h> -#include <kwinmodule.h> -#include <kwin.h> +#include <twinmodule.h> +#include <twin.h> #include <kdebug.h> #include <netwm.h> #include <dcopclient.h> @@ -38,7 +38,7 @@ class KRootPixmapData public: TQWidget *toplevel; #ifdef Q_WS_X11 - KWinModule *kwin; + KWinModule *twin; #endif }; @@ -72,9 +72,9 @@ void KRootPixmap::init() #ifdef Q_WS_X11 connect(m_pPixmap, TQT_SIGNAL(done(bool)), TQT_SLOT(slotDone(bool))); - d->kwin = new KWinModule( this ); - connect(d->kwin, TQT_SIGNAL(windowChanged(WId, unsigned int)), TQT_SLOT(desktopChanged(WId, unsigned int))); - connect(d->kwin, TQT_SIGNAL(currentDesktopChanged(int)), TQT_SLOT(desktopChanged(int))); + d->twin = new KWinModule( this ); + connect(d->twin, TQT_SIGNAL(windowChanged(WId, unsigned int)), TQT_SLOT(desktopChanged(WId, unsigned int))); + connect(d->twin, TQT_SIGNAL(currentDesktopChanged(int)), TQT_SLOT(desktopChanged(int))); #endif d->toplevel = m_pWidget->tqtopLevelWidget(); diff --git a/tdeui/kspell.cpp b/tdeui/kspell.cpp index 3a13e6e3d..9ca882962 100644 --- a/tdeui/kspell.cpp +++ b/tdeui/kspell.cpp @@ -43,7 +43,7 @@ #include <klocale.h> #include "kspell.h" #include "kspelldlg.h" -#include <kwin.h> +#include <twin.h> #include <kprocio.h> #define MAXLINELENGTH 10000 diff --git a/tdeui/ksystemtray.cpp b/tdeui/ksystemtray.cpp index e354b95a2..063ffa0e1 100644 --- a/tdeui/ksystemtray.cpp +++ b/tdeui/ksystemtray.cpp @@ -29,8 +29,8 @@ #include "kaboutdata.h" #ifdef Q_WS_X11 -#include <kwin.h> -#include <kwinmodule.h> +#include <twin.h> +#include <twinmodule.h> #include <qxembed.h> #endif @@ -347,4 +347,4 @@ void KSystemTray::virtual_hook( int, void* ) { /*BASE::virtual_hook( id, data );*/ } #include "ksystemtray.moc" -#include "kdockwindow.moc" +#include "kdoctwindow.moc" diff --git a/tdeui/ktip.cpp b/tdeui/ktip.cpp index 8ccd23945..195da29e6 100644 --- a/tdeui/ktip.cpp +++ b/tdeui/ktip.cpp @@ -49,7 +49,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <kglobalsettings.h> #ifdef Q_WS_X11 -#include <kwin.h> +#include <twin.h> #endif #include "ktip.h" diff --git a/tdeui/ktoolbar.cpp b/tdeui/ktoolbar.cpp index a3d266efa..8c890feb9 100644 --- a/tdeui/ktoolbar.cpp +++ b/tdeui/ktoolbar.cpp @@ -27,7 +27,7 @@ #ifdef KDE_USE_FINAL #undef Always -#include <tqdockwindow.h> +#include <tqdoctwindow.h> #endif #include <string.h> @@ -58,7 +58,7 @@ #include <kanimwidget.h> #include <kedittoolbar.h> #include <kipc.h> -#include <kwin.h> +#include <twin.h> #include <kdebug.h> #include <ktoolbarbutton.h> diff --git a/tdeui/kwindowinfo.cpp b/tdeui/kwindowinfo.cpp index 9c17b03c1..436aa5227 100644 --- a/tdeui/kwindowinfo.cpp +++ b/tdeui/kwindowinfo.cpp @@ -9,10 +9,10 @@ #include <tqtimer.h> #include <tqtooltip.h> #include <ksystemtray.h> -#include <kwin.h> +#include <twin.h> -#include "kwindowinfo.h" -#include "kwindowinfo.moc" +#include "twindowinfo.h" +#include "twindowinfo.moc" static const int UNSPECIFIED_TIMEOUT = -1; static const int DEFAULT_MESSAGE_TIMEOUT = 3000; diff --git a/tdeui/kwindowlistmenu.cpp b/tdeui/kwindowlistmenu.cpp index 10538a67c..1334abd6e 100644 --- a/tdeui/kwindowlistmenu.cpp +++ b/tdeui/kwindowlistmenu.cpp @@ -30,8 +30,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <tqpainter.h> #include <tqvaluelist.h> -#include <kwin.h> -#include <kwinmodule.h> +#include <twin.h> +#include <twinmodule.h> #include <klocale.h> #include <kstringhandler.h> @@ -42,16 +42,16 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <dcopclient.h> #undef Bool -#include "kwindowlistmenu.h" -#include "kwindowlistmenu.moc" +#include "twindowlistmenu.h" +#include "twindowlistmenu.moc" -static TQCString kwinName() { +static TQCString twinName() { TQCString appname; int screen_number = DefaultScreen(qt_xdisplay()); if (screen_number == 0) - appname = "kwin"; + appname = "twin"; else - appname.sprintf("kwin-screen-%d", screen_number); + appname.sprintf("twin-screen-%d", screen_number); return appname; } @@ -85,7 +85,7 @@ int NameSortedInfoList::compareItems( TQPtrCollection::Item s1, TQPtrCollection: KWindowListMenu::KWindowListMenu(TQWidget *parent, const char *name) : KPopupMenu(parent, name) { - kwin_module = new KWinModule(TQT_TQOBJECT(this)); + twin_module = new KWinModule(TQT_TQOBJECT(this)); connect(this, TQT_SIGNAL(activated(int)), TQT_SLOT(slotExec(int))); } @@ -115,9 +115,9 @@ void KWindowListMenu::init() int i, d; i = 0; - int nd = kwin_module->numberOfDesktops(); - int cd = kwin_module->currentDesktop(); - WId active_window = kwin_module->activeWindow(); + int nd = twin_module->numberOfDesktops(); + int cd = twin_module->currentDesktop(); + WId active_window = twin_module->activeWindow(); // Make sure the popup is not too wide, otherwise clicking in the middle of kdesktop // wouldn't leave any place for the popup, and release would activate some menu entry. @@ -139,8 +139,8 @@ void KWindowListMenu::init() TQValueList<KWin::WindowInfo> windows; - for (TQValueList<WId>::ConstIterator it = kwin_module->windows().begin(); - it != kwin_module->windows().end(); ++it) { + for (TQValueList<WId>::ConstIterator it = twin_module->windows().begin(); + it != twin_module->windows().end(); ++it) { windows.append( KWin::windowInfo( *it, NET::WMDesktop )); } bool show_all_desktops_group = ( nd > 1 ); @@ -180,7 +180,7 @@ void KWindowListMenu::init() if ( items == 1 && nd > 1 ) { if( !on_all_desktops ) - insertTitle(kwin_module->desktopName( d ), 1000 + d); + insertTitle(twin_module->desktopName( d ), 1000 + d); else insertTitle(i18n("On All Desktops"), 2000 ); } @@ -242,12 +242,12 @@ void KWindowListMenu::selectActiveWindow() void KWindowListMenu::slotUnclutterWindows() { - kapp->dcopClient()->send(kwinName(), "KWinInterface", "unclutterDesktop()", TQString("")); + kapp->dcopClient()->send(twinName(), "KWinInterface", "unclutterDesktop()", TQString("")); } void KWindowListMenu::slotCascadeWindows() { - kapp->dcopClient()->send(kwinName(), "KWinInterface", "cascadeDesktop()", TQString("")); + kapp->dcopClient()->send(twinName(), "KWinInterface", "cascadeDesktop()", TQString("")); } void KWindowListMenu::virtual_hook( int id, void* data ) diff --git a/tdeui/kwindowlistmenu.h b/tdeui/kwindowlistmenu.h index 7d796b632..dcd81826f 100644 --- a/tdeui/kwindowlistmenu.h +++ b/tdeui/kwindowlistmenu.h @@ -22,8 +22,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ******************************************************************/ -#ifndef __kwindowlistmenu_h__ -#define __kwindowlistmenu_h__ +#ifndef __twindowlistmenu_h__ +#define __twindowlistmenu_h__ #include <kpopupmenu.h> #include <tqmap.h> @@ -61,7 +61,7 @@ protected slots: void slotCascadeWindows(); private: - KWinModule* kwin_module; + KWinModule* twin_module; TQMap<int,WId> map; protected: virtual void virtual_hook( int id, void* data ); diff --git a/tdeui/tests/CMakeLists.txt b/tdeui/tests/CMakeLists.txt index 3cc853235..9b3cc6568 100644 --- a/tdeui/tests/CMakeLists.txt +++ b/tdeui/tests/CMakeLists.txt @@ -34,7 +34,7 @@ set( test_PROGS kpalettetest kpopuptest kprogresstest krulertest kseparatortest kstatusbartest ktabctltest - kunbalancedgrdtest kwindowtest kwizardtest + kunbalancedgrdtest twindowtest kwizardtest itemcontainertest kpanelmenutest kedittest kxmlguitest kaccelgentest ksystemtraytest klistviewtest ktextedittest kmainwindowtest kmainwindowrestoretest diff --git a/tdeui/tests/Makefile.am b/tdeui/tests/Makefile.am index b919ab3b4..a7c0cb26d 100644 --- a/tdeui/tests/Makefile.am +++ b/tdeui/tests/Makefile.am @@ -33,7 +33,7 @@ check_PROGRAMS = kaboutdialogtest kblendtest kbuttonboxtest kcharselecttest \ kpalettetest \ kpopuptest kprogresstest krulertest kseparatortest \ kstatusbartest ktabctltest \ - kunbalancedgrdtest kwindowtest kwizardtest \ + kunbalancedgrdtest twindowtest kwizardtest \ itemcontainertest kpanelmenutest kedittest \ kxmlguitest kaccelgentest ksystemtraytest klistviewtest \ ktextedittest kmainwindowtest kmainwindowrestoretest \ @@ -79,7 +79,7 @@ kstatusbartest_SOURCES = kstatusbartest.cpp ktabctltest_SOURCES = ktabctltest.cpp ktimewidgettest_SOURCES = ktimewidgettest.cpp kunbalancedgrdtest_SOURCES = kunbalancedgrdtest.cpp -kwindowtest_SOURCES = kwindowtest.cpp +twindowtest_SOURCES = twindowtest.cpp kwizardtest_SOURCES = kwizardtest.cpp itemcontainertest_SOURCES = itemcontainertest.cpp kpanelmenutest_SOURCES = kpanelmenutest.cpp diff --git a/tdeui/tests/kwindowtest.cpp b/tdeui/tests/kwindowtest.cpp index 0615d492f..9c4ac571a 100644 --- a/tdeui/tests/kwindowtest.cpp +++ b/tdeui/tests/kwindowtest.cpp @@ -18,7 +18,7 @@ #include <kiconloader.h> #include <kpopupmenu.h> #include <tqmultilineedit.h> -#include "kwindowtest.h" +#include "twindowtest.h" #include <kglobal.h> @@ -372,13 +372,13 @@ testWindow::~testWindow () /********************************************************/ delete tb1->getWidget(8); - //debug ("kwindowtest: deleted clock"); + //debug ("twindowtest: deleted clock"); delete tb; delete tb1; delete menuBar; - qDebug ("kwindowtest finished"); + qDebug ("twindowtest finished"); } void testWindow::beFixed() @@ -524,5 +524,5 @@ int main( int argc, char *argv[] ) return ret; } -#include "kwindowtest.moc" +#include "twindowtest.moc" diff --git a/win/pro_files/tdeui/tdeui.pro b/win/pro_files/tdeui/tdeui.pro index be39628e7..5c438b6cf 100644 --- a/win/pro_files/tdeui/tdeui.pro +++ b/win/pro_files/tdeui/tdeui.pro @@ -113,7 +113,7 @@ ktoolbarhandler.cpp \ ktoolbarradiogroup.cpp \ kurllabel.cpp \ kwhatsthismanager.cpp \ -kwindowinfo.cpp \ +twindowinfo.cpp \ kwizard.cpp \ kwordwrap.cpp \ kxmlguibuilder.cpp \ |