Browse Source

Rename kwin to twin (part 1 of 2)

tags/r14.0.0
Timothy Pearson 8 years ago
parent
commit
8cfbfac527
72 changed files with 159 additions and 159 deletions
  1. +2
    -2
      NAMING
  2. +2
    -2
      arts/knotify/knotify.cpp
  3. +1
    -1
      kate/ChangeLog
  4. +1
    -1
      kate/part/katedocument.cpp
  5. +1
    -1
      kcmshell/main.cpp
  6. +1
    -1
      kdoctools/customization/entities/general.entities
  7. +2
    -2
      kdoctools/customization/obsolete/general.entities
  8. +2
    -2
      kdoctools/customization/sr/user.entities
  9. +2
    -2
      khtml/ecma/kjs_window.cpp
  10. +1
    -1
      khtml/java/kjavaappletwidget.cpp
  11. +1
    -1
      khtml/java/kjavaappletwidget.h
  12. +1
    -1
      khtml/khtml_part.cpp
  13. +1
    -1
      khtml/rendering/render_form.cpp
  14. +2
    -2
      kio/kfile/knotifydialog.cpp
  15. +1
    -1
      kio/kfile/knotifydialog.h
  16. +1
    -1
      kio/kfile/tests/knotifytest.cpp
  17. +1
    -1
      kio/kio/defaultprogress.cpp
  18. +1
    -1
      kio/kio/krun.cpp
  19. +1
    -1
      kio/kio/renamedlg.cpp
  20. +1
    -1
      kio/kio/skipdlg.cpp
  21. +1
    -1
      kio/misc/kwalletd/kwalletd.cpp
  22. +1
    -1
      kio/misc/uiserver.cpp
  23. +1
    -1
      kioslave/http/http_cache_cleaner.desktop
  24. +1
    -1
      kioslave/http/kcookiejar/kcookiewin.cpp
  25. +1
    -1
      krandr/ktimerdialog.cpp
  26. +1
    -1
      krsync/krsync.h
  27. +1
    -1
      krsync/rsyncconfigdialog.cpp
  28. +1
    -1
      kstyles/asteroid/asteroid.cpp
  29. +1
    -1
      kstyles/plastik/plastik.cpp
  30. +3
    -3
      tdecore/CMakeLists.txt
  31. +2
    -2
      tdecore/MAINTAINERS
  32. +2
    -2
      tdecore/Makefile.am
  33. +1
    -1
      tdecore/README.kiosk
  34. +1
    -1
      tdecore/all_languages.desktop
  35. +1
    -1
      tdecore/kapplication.cpp
  36. +2
    -2
      tdecore/kapplication.h
  37. +3
    -3
      tdecore/kdebug.areas
  38. +2
    -2
      tdecore/kdetcompmgr.cpp
  39. +1
    -1
      tdecore/knotifyclient.cpp
  40. +2
    -2
      tdecore/kstartupinfo.cpp
  41. +1
    -1
      tdecore/kuniqueapplication.cpp
  42. +12
    -12
      tdecore/kwin.cpp
  43. +1
    -1
      tdecore/kwin.h
  44. +7
    -7
      tdecore/kwinmodule.cpp
  45. +2
    -2
      tdecore/kwinmodule.h
  46. +2
    -2
      tdecore/tests/kstddirstest.cpp
  47. +1
    -1
      tdeprint/filters/poster.desktop
  48. +1
    -1
      tdeprint/management/kmjobviewer.cpp
  49. +1
    -1
      tdeprint/specials.desktop
  50. +1
    -1
      tdeprint/tdeprintd.cpp
  51. +5
    -5
      tdeui/CMakeLists.txt
  52. +1
    -1
      tdeui/MAINTAINERS
  53. +5
    -5
      tdeui/Makefile.am
  54. +14
    -14
      tdeui/kdepackages.h
  55. +1
    -1
      tdeui/kdetrayproxy/kdetrayproxy.h
  56. +1
    -1
      tdeui/kdockwidget.cpp
  57. +1
    -1
      tdeui/kmainwindow.cpp
  58. +2
    -2
      tdeui/kmenubar.cpp
  59. +1
    -1
      tdeui/kprogress.cpp
  60. +1
    -1
      tdeui/kprogressbox.cpp
  61. +6
    -6
      tdeui/krootpixmap.cpp
  62. +1
    -1
      tdeui/kspell.cpp
  63. +3
    -3
      tdeui/ksystemtray.cpp
  64. +1
    -1
      tdeui/ktip.cpp
  65. +2
    -2
      tdeui/ktoolbar.cpp
  66. +3
    -3
      tdeui/kwindowinfo.cpp
  67. +16
    -16
      tdeui/kwindowlistmenu.cpp
  68. +3
    -3
      tdeui/kwindowlistmenu.h
  69. +1
    -1
      tdeui/tests/CMakeLists.txt
  70. +2
    -2
      tdeui/tests/Makefile.am
  71. +4
    -4
      tdeui/tests/kwindowtest.cpp
  72. +1
    -1
      win/pro_files/tdeui/tdeui.pro

+ 2
- 2
NAMING View File

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




+ 2
- 2
arts/knotify/knotify.cpp View File

@@ -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.


+ 1
- 1
kate/ChangeLog View File

@@ -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


+ 1
- 1
kate/part/katedocument.cpp View File

@@ -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>


+ 1
- 1
kcmshell/main.cpp View File

@@ -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"


+ 1
- 1
kdoctools/customization/entities/general.entities View File

@@ -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>">


+ 2
- 2
kdoctools/customization/obsolete/general.entities View File

@@ -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>">

+ 2
- 2
kdoctools/customization/sr/user.entities View File

@@ -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>" >


+ 2
- 2
khtml/ecma/kjs_window.cpp View File

@@ -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


+ 1
- 1
khtml/java/kjavaappletwidget.cpp View File

@@ -22,7 +22,7 @@
#include "kjavaappletwidget.h"
#include "kjavaappletserver.h"

#include <kwin.h>
#include <twin.h>
#include <kdebug.h>
#include <klocale.h>



+ 1
- 1
khtml/java/kjavaappletwidget.h View File

@@ -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


+ 1
- 1
khtml/khtml_part.cpp View File

@@ -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



+ 1
- 1
khtml/rendering/render_form.cpp View File

@@ -36,7 +36,7 @@
#include <kreplacedialog.h>
#include <kspell.h>
#include <kurlcompletion.h>
#include <kwin.h>
#include <twin.h>

#include <tqstyle.h>



+ 2
- 2
kio/kfile/knotifydialog.cpp View File

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


+ 1
- 1
kio/kfile/knotifydialog.h View File

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


+ 1
- 1
kio/kfile/tests/knotifytest.cpp View File

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

+ 1
- 1
kio/kio/defaultprogress.cpp View File

@@ -36,7 +36,7 @@
#include <klineedit.h>

#ifdef Q_WS_X11
#include <kwin.h>
#include <twin.h>
#endif

#include "jobclasses.h"


+ 1
- 1
kio/kio/krun.cpp View File

@@ -62,7 +62,7 @@
#include <kstringhandler.h>

#ifdef Q_WS_X11
#include <kwin.h>
#include <twin.h>
#endif

class KRun::KRunPrivate


+ 1
- 1
kio/kio/renamedlg.cpp View File

@@ -49,7 +49,7 @@
#include <ksqueezedtextlabel.h>

#ifdef Q_WS_X11
#include <kwin.h>
#include <twin.h>
#endif

using namespace KIO;


+ 1
- 1
kio/kio/skipdlg.cpp View File

@@ -33,7 +33,7 @@
#include <kstdguiitem.h>

#ifdef Q_WS_X11
#include <kwin.h>
#include <twin.h>
#endif

using namespace KIO;


+ 1
- 1
kio/misc/kwalletd/kwalletd.cpp View File

@@ -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>


+ 1
- 1
kio/misc/uiserver.cpp View File

@@ -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>


+ 1
- 1
kioslave/http/http_cache_cleaner.desktop View File

@@ -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 快取中清除舊的項目


+ 1
- 1
kioslave/http/kcookiejar/kcookiewin.cpp View File

@@ -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>


+ 1
- 1
krandr/ktimerdialog.cpp View File

@@ -26,7 +26,7 @@
#include <tqprogressbar.h>
#include <tqlabel.h>

#include <kwin.h>
#include <twin.h>
#include <kiconloader.h>

#include <klocale.h>


+ 1
- 1
krsync/krsync.h View File

@@ -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>


+ 1
- 1
krsync/rsyncconfigdialog.cpp View File

@@ -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>


+ 1
- 1
kstyles/asteroid/asteroid.cpp View File

@@ -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>


+ 1
- 1
kstyles/plastik/plastik.cpp View File

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


+ 3
- 3
tdecore/CMakeLists.txt View File

@@ -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


+ 2
- 2
tdecore/MAINTAINERS View File

@@ -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>


+ 2
- 2
tdecore/Makefile.am View File

@@ -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 \


+ 1
- 1
tdecore/README.kiosk View File

@@ -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


+ 1
- 1
tdecore/all_languages.desktop View File

@@ -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


+ 1
- 1
tdecore/kapplication.cpp View File

@@ -104,7 +104,7 @@
#include <sys/types.h>

#ifndef Q_WS_WIN
#include "kwin.h"
#include "twin.h"
#endif

#include <fcntl.h>


+ 2
- 2
tdecore/kapplication.h View File

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


+ 3
- 3
tdecore/kdebug.areas View File

@@ -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



+ 2
- 2
tdecore/kdetcompmgr.cpp View File

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


+ 1
- 1
tdecore/knotifyclient.cpp View File

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


+ 2
- 2
tdecore/kstartupinfo.cpp View File

@@ -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";


+ 1
- 1
tdecore/kuniqueapplication.cpp View File

@@ -39,7 +39,7 @@
#include <kaboutdata.h>

#if defined Q_WS_X11
#include <kwin.h>
#include <twin.h>
#include <kstartupinfo.h>
#endif



+ 12
- 12
tdecore/kwin.cpp View File

@@ -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 &&


+ 1
- 1
tdecore/kwin.h View File

@@ -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


+ 7
- 7
tdecore/kwinmodule.cpp View File

@@ -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

+ 2
- 2
tdecore/kwinmodule.h View File

@@ -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


+ 2
- 2
tdecore/tests/kstddirstest.cpp View File

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


+ 1
- 1
tdeprint/filters/poster.desktop View File

@@ -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

+ 1
- 1
tdeprint/management/kmjobviewer.cpp View File

@@ -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>


+ 1
- 1
tdeprint/specials.desktop View File

@@ -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]=發送到外部傳真系統


+ 1
- 1
tdeprint/tdeprintd.cpp View File

@@ -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>


+ 5
- 5
tdeui/CMakeLists.txt View File

@@ -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


+ 1
- 1
tdeui/MAINTAINERS View File

@@ -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


+ 5
- 5
tdeui/Makefile.am View File

@@ -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 \


+ 14
- 14
tdeui/kdepackages.h View File

@@ -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",


+ 1
- 1
tdeui/kdetrayproxy/kdetrayproxy.h View File

@@ -22,7 +22,7 @@

#include <tqvaluelist.h>
#include <kmanagerselection.h>
#include <kwinmodule.h>
#include <twinmodule.h>
#include <tqwidget.h>

class KDETrayProxy


+ 1
- 1
tdeui/kdockwidget.cpp View File

@@ -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>



+ 1
- 1
tdeui/kmainwindow.cpp View File

@@ -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>



+ 2
- 2
tdeui/kmenubar.cpp View File

@@ -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>


+ 1
- 1
tdeui/kprogress.cpp View File

@@ -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),


+ 1
- 1
tdeui/kprogressbox.cpp View File

@@ -39,7 +39,7 @@

#include <kapplication.h>
#include <klocale.h>
#include <kwin.h>
#include <twin.h>

struct KProgressBoxDialog::KProgressBoxDialogPrivate
{


+ 6
- 6
tdeui/krootpixmap.cpp View File

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


+ 1
- 1
tdeui/kspell.cpp View File

@@ -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


+ 3
- 3
tdeui/ksystemtray.cpp View File

@@ -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"

+ 1
- 1
tdeui/ktip.cpp View File

@@ -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"


+ 2
- 2
tdeui/ktoolbar.cpp View File

@@ -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>



+ 3
- 3
tdeui/kwindowinfo.cpp View File

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


+ 16
- 16
tdeui/kwindowlistmenu.cpp View File

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


+ 3
- 3
tdeui/kwindowlistmenu.h View File

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


+ 1
- 1
tdeui/tests/CMakeLists.txt View File

@@ -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


+ 2
- 2
tdeui/tests/Makefile.am View File

@@ -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


+ 4
- 4
tdeui/tests/kwindowtest.cpp View File

@@ -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"


+ 1
- 1
win/pro_files/tdeui/tdeui.pro View File

@@ -113,7 +113,7 @@ ktoolbarhandler.cpp \
ktoolbarradiogroup.cpp \
kurllabel.cpp \
kwhatsthismanager.cpp \
kwindowinfo.cpp \
twindowinfo.cpp \
kwizard.cpp \
kwordwrap.cpp \
kxmlguibuilder.cpp \


Loading…
Cancel
Save