summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--kdelirc/irkick/irkick.cpp4
-rw-r--r--kdelirc/irkick/main.cpp2
-rw-r--r--kgpg/kgpg.cpp2
-rw-r--r--kgpg/listkeys.cpp2
-rw-r--r--khexedit/toplevel.cc2
-rw-r--r--kmilo/kmilod/defaultskin.cpp2
-rw-r--r--kregexpeditor/auxbuttons.h2
-rw-r--r--kregexpeditor/regexpbuttons.h2
-rw-r--r--kregexpeditor/userdefinedregexps.h2
-rw-r--r--kregexpeditor/verifybuttons.h2
-rw-r--r--ksim/ChangeLog2
-rw-r--r--ksim/ksimview.cpp2
-rw-r--r--kwallet/kwmapeditor.cpp2
-rw-r--r--superkaramba/src/karamba.cpp2
-rw-r--r--superkaramba/src/karamba.h4
-rw-r--r--superkaramba/src/showdesktop.cpp6
-rw-r--r--superkaramba/src/systemtray.cpp16
-rw-r--r--superkaramba/src/systemtray.h2
-rw-r--r--superkaramba/src/taskmanager.cpp42
-rw-r--r--superkaramba/src/taskmanager.h2
20 files changed, 51 insertions, 51 deletions
diff --git a/kdelirc/irkick/irkick.cpp b/kdelirc/irkick/irkick.cpp
index cd3140c..d85e299 100644
--- a/kdelirc/irkick/irkick.cpp
+++ b/kdelirc/irkick/irkick.cpp
@@ -30,8 +30,8 @@
#include <klocale.h>
#include <kaboutdialog.h>
#include <kaboutkde.h>
-#include <kwinmodule.h>
-#include <kwin.h>
+#include <twinmodule.h>
+#include <twin.h>
#include <khelpmenu.h>
#include <kglobal.h>
#include <kstdguiitem.h>
diff --git a/kdelirc/irkick/main.cpp b/kdelirc/irkick/main.cpp
index 956d000..b1e5898 100644
--- a/kdelirc/irkick/main.cpp
+++ b/kdelirc/irkick/main.cpp
@@ -9,7 +9,7 @@
#include <klocale.h>
#include <kcmdlineargs.h>
-#include <kwin.h>
+#include <twin.h>
#include <kaboutdata.h>
#include <kglobal.h>
#include <kdebug.h>
diff --git a/kgpg/kgpg.cpp b/kgpg/kgpg.cpp
index 4b58ed9..81ef6a0 100644
--- a/kgpg/kgpg.cpp
+++ b/kgpg/kgpg.cpp
@@ -46,7 +46,7 @@
#include <tqbuttongroup.h>
#include <kiconloader.h>
#include <ktempfile.h>
-#include <kwin.h>
+#include <twin.h>
#include <kprocess.h>
#include <kprocio.h>
#include <kaboutapplication.h>
diff --git a/kgpg/listkeys.cpp b/kgpg/listkeys.cpp
index 75895cb..5f01af7 100644
--- a/kgpg/listkeys.cpp
+++ b/kgpg/listkeys.cpp
@@ -59,7 +59,7 @@
#include <krun.h>
#include <kprinter.h>
#include <kurldrag.h>
-#include <kwin.h>
+#include <twin.h>
#include <dcopclient.h>
#include <klineedit.h>
#include <kiconloader.h>
diff --git a/khexedit/toplevel.cc b/khexedit/toplevel.cc
index d4aa185..9d90a46 100644
--- a/khexedit/toplevel.cc
+++ b/khexedit/toplevel.cc
@@ -1342,7 +1342,7 @@ int KHexEdit::acceleratorNumKey( uint index )
#include <unistd.h>
//
-// This function is used to test kwin performance
+// This function is used to test twin performance
//
void KHexEdit::resizeTest()
{
diff --git a/kmilo/kmilod/defaultskin.cpp b/kmilo/kmilod/defaultskin.cpp
index f8275a8..febc9a9 100644
--- a/kmilo/kmilod/defaultskin.cpp
+++ b/kmilo/kmilod/defaultskin.cpp
@@ -29,7 +29,7 @@
#include <tqlabel.h>
#include <tqapplication.h>
-#include <kwin.h>
+#include <twin.h>
#include <netwm.h>
#include <kglobalsettings.h>
#include <kdeversion.h>
diff --git a/kregexpeditor/auxbuttons.h b/kregexpeditor/auxbuttons.h
index d16b7c7..ff3a09a 100644
--- a/kregexpeditor/auxbuttons.h
+++ b/kregexpeditor/auxbuttons.h
@@ -18,7 +18,7 @@
#ifndef AUXBUTTONS_H
#define AUXBUTTONS_H
-#include <tqdockwindow.h>
+#include <tqdoctwindow.h>
class TQComboBox;
class TQLabel;
class TQToolButton;
diff --git a/kregexpeditor/regexpbuttons.h b/kregexpeditor/regexpbuttons.h
index 5cdbba0..a058f65 100644
--- a/kregexpeditor/regexpbuttons.h
+++ b/kregexpeditor/regexpbuttons.h
@@ -18,7 +18,7 @@
#ifndef __REGEXPBUTTONS_H
#define __REGEXPBUTTONS_H
-#include <tqdockwindow.h>
+#include <tqdoctwindow.h>
#include "widgetfactory.h"
class DoubleClickButton;
class TQButtonGroup;
diff --git a/kregexpeditor/userdefinedregexps.h b/kregexpeditor/userdefinedregexps.h
index 0b01b81..dbf3cb5 100644
--- a/kregexpeditor/userdefinedregexps.h
+++ b/kregexpeditor/userdefinedregexps.h
@@ -17,7 +17,7 @@
**/
#ifndef __USERDEFINEDREGEXPS_H
#define __USERDEFINEDREGEXPS_H
-#include <tqdockwindow.h>
+#include <tqdoctwindow.h>
#include <tqlistview.h>
#include "compoundregexp.h"
diff --git a/kregexpeditor/verifybuttons.h b/kregexpeditor/verifybuttons.h
index 90629c0..6012bdb 100644
--- a/kregexpeditor/verifybuttons.h
+++ b/kregexpeditor/verifybuttons.h
@@ -18,7 +18,7 @@
#ifndef VERIFYBUTTONS_H
#define VERIFYBUTTONS_H
-#include <tqdockwindow.h>
+#include <tqdoctwindow.h>
#include "regexpconverter.h"
class TQToolButton;
class TQLabel;
diff --git a/ksim/ChangeLog b/ksim/ChangeLog
index 837a287..0220f05 100644
--- a/ksim/ChangeLog
+++ b/ksim/ChangeLog
@@ -331,7 +331,7 @@ KSim 0.3:
* Reset the net-plugin information to zero when a net interface goes off line
* Insert the available net interfaces into the add net interface dialog
* Fixed the bug where some themes (one without masked image borders)
- would influence if KSim had a kwin deco or not
+ would influence if KSim had a twin deco or not
* Re-worked the KSim::Base class, a derived class of KSim::Base no
longer has to inherit a QObject derived class and doesn't have to
reimplement 'void setName(const char *name)'
diff --git a/ksim/ksimview.cpp b/ksim/ksimview.cpp
index 0315cd1..1e93816 100644
--- a/ksim/ksimview.cpp
+++ b/ksim/ksimview.cpp
@@ -43,7 +43,7 @@
#include <kstandarddirs.h>
#include <kmessagebox.h>
#include <kdesktopfile.h>
-#include <kwin.h>
+#include <twin.h>
#include <krun.h>
#include <tqfile.h>
diff --git a/kwallet/kwmapeditor.cpp b/kwallet/kwmapeditor.cpp
index fd53723..d5a9722 100644
--- a/kwallet/kwmapeditor.cpp
+++ b/kwallet/kwmapeditor.cpp
@@ -24,7 +24,7 @@
#include <klocale.h>
#include <kpopupmenu.h>
#include <kstdaction.h>
-#include <kwin.h>
+#include <twin.h>
#include <tqapplication.h>
#include <tqclipboard.h>
diff --git a/superkaramba/src/karamba.cpp b/superkaramba/src/karamba.cpp
index 5965355..e7d95db 100644
--- a/superkaramba/src/karamba.cpp
+++ b/superkaramba/src/karamba.cpp
@@ -35,7 +35,7 @@
#include <kmessagebox.h>
#include <krun.h>
#include <klocale.h>
-#include <kwin.h>
+#include <twin.h>
#include <kdeversion.h>
#include <kdirwatch.h>
diff --git a/superkaramba/src/karamba.h b/superkaramba/src/karamba.h
index a8088ff..9eac2fc 100644
--- a/superkaramba/src/karamba.h
+++ b/superkaramba/src/karamba.h
@@ -31,8 +31,8 @@
#include <tqwidget.h>
#include <kapplication.h>
-#include <kwinmodule.h>
-#include <kwin.h>
+#include <twinmodule.h>
+#include <twin.h>
#include <tqfile.h>
#include <kfile.h>
diff --git a/superkaramba/src/showdesktop.cpp b/superkaramba/src/showdesktop.cpp
index 159ccae..16a04b8 100644
--- a/superkaramba/src/showdesktop.cpp
+++ b/superkaramba/src/showdesktop.cpp
@@ -18,9 +18,9 @@
* along with SuperKaramba; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
****************************************************************************/
-#include <kwinmodule.h>
+#include <twinmodule.h>
#include <netwm.h>
-#include <kwin.h>
+#include <twin.h>
#include "karambaapp.h"
#include "showdesktop.h"
@@ -62,7 +62,7 @@ void ShowDesktop::slotWindowChanged(WId w, unsigned int dirty)
if (!showingDesktop)
return;
- // SELI this needs checking for kwin_iii (_NET_SHOWING_DESKTOP)
+ // SELI this needs checking for twin_iii (_NET_SHOWING_DESKTOP)
if ( dirty & NET::XAWMState )
{
NETWinInfo inf(qt_xdisplay(), w, qt_xrootwin(),
diff --git a/superkaramba/src/systemtray.cpp b/superkaramba/src/systemtray.cpp
index fbd4625..3e0d4ba 100644
--- a/superkaramba/src/systemtray.cpp
+++ b/superkaramba/src/systemtray.cpp
@@ -22,10 +22,10 @@
#include <tqobject.h>
#include <kiconloader.h>
#include <klocale.h>
-#include <kwinmodule.h>
+#include <twinmodule.h>
#include <kmessagebox.h>
#include <kdebug.h>
-#include <kwin.h>
+#include <twin.h>
#include <tqpopupmenu.h>
#include <tqdragobject.h>
@@ -51,7 +51,7 @@ Systemtray::~Systemtray()
int Systemtray::getTraySize() {
- return (int) kwin_module->systemTrayWindows().size();
+ return (int) twin_module->systemTrayWindows().size();
}
void Systemtray::updateBackgroundPixmap ( const TQPixmap & pixmap) {
@@ -82,8 +82,8 @@ void Systemtray::initSystray( void )
Display *display = qt_xdisplay();
no_of_systray_windows = 0;
- kwin_module = new KWinModule();
- systemTrayWindows = kwin_module->systemTrayWindows();
+ twin_module = new KWinModule();
+ systemTrayWindows = twin_module->systemTrayWindows();
TQValueList<WId>::ConstIterator end(systemTrayWindows.end());
for (TQValueList<WId>::ConstIterator it = systemTrayWindows.begin(); it!=end; ++it)
{
@@ -107,8 +107,8 @@ void Systemtray::initSystray( void )
updateTrayWindows();
- connect(kwin_module, TQT_SIGNAL(systemTrayWindowAdded(WId)), TQT_SLOT(systemTrayWindowAdded(WId)));
- connect(kwin_module, TQT_SIGNAL(systemTrayWindowRemoved(WId)), TQT_SLOT(systemTrayWindowRemoved(WId)));
+ connect(twin_module, TQT_SIGNAL(systemTrayWindowAdded(WId)), TQT_SLOT(systemTrayWindowAdded(WId)));
+ connect(twin_module, TQT_SIGNAL(systemTrayWindowRemoved(WId)), TQT_SLOT(systemTrayWindowRemoved(WId)));
TQCString screenstr;
screenstr.setNum(qt_xscreen());
@@ -153,7 +153,7 @@ void Systemtray::updateTrayWindows( void )
while ((emb = m_Wins.current()) != 0L)
{
WId wid = emb->embeddedWinId();
- if ((wid == 0) || !kwin_module->systemTrayWindows().contains(wid) )
+ if ((wid == 0) || !twin_module->systemTrayWindows().contains(wid) )
m_Wins.remove(emb);
else
m_Wins.next();
diff --git a/superkaramba/src/systemtray.h b/superkaramba/src/systemtray.h
index 7ff60ac..ba8d1e8 100644
--- a/superkaramba/src/systemtray.h
+++ b/superkaramba/src/systemtray.h
@@ -56,7 +56,7 @@ signals:
void updated();
private:
- KWinModule *kwin_module;
+ KWinModule *twin_module;
TQValueList<WId> systemTrayWindows;
TQPtrList<QXEmbed> m_Wins;
diff --git a/superkaramba/src/taskmanager.cpp b/superkaramba/src/taskmanager.cpp
index 26a417e..79ef9a9 100644
--- a/superkaramba/src/taskmanager.cpp
+++ b/superkaramba/src/taskmanager.cpp
@@ -26,7 +26,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <kdebug.h>
#include <kconfig.h>
#include <kiconloader.h>
-#include <kwinmodule.h>
+#include <twinmodule.h>
#include <netwm.h>
#include <tqtimer.h>
#include <tqimage.h>
@@ -46,29 +46,29 @@ template class TQPtrList<Task>;
// variable without changing Task, which also uses it.
// So, we'll leak a little memory, but it's better than crashing.
// The real problem is that KWinModule should be a singleton.
-KWinModule* kwin_module = 0;
+KWinModule* twin_module = 0;
TaskManager::TaskManager(TQObject *parent, const char *name)
: TQObject(parent, name), _active(0), _startup_info( NULL )
{
- kwin_module = new KWinModule();
+ twin_module = new KWinModule();
// KGlobal::locale()->insertCatalogue("libtaskmanager");
- connect(kwin_module, TQT_SIGNAL(windowAdded(WId)), TQT_SLOT(windowAdded(WId)));
- connect(kwin_module, TQT_SIGNAL(windowRemoved(WId)), TQT_SLOT(windowRemoved(WId)));
- connect(kwin_module, TQT_SIGNAL(activeWindowChanged(WId)), TQT_SLOT(activeWindowChanged(WId)));
- connect(kwin_module, TQT_SIGNAL(currentDesktopChanged(int)), TQT_SLOT(currentDesktopChanged(int)));
- connect(kwin_module, TQT_SIGNAL(windowChanged(WId,unsigned int)), TQT_SLOT(windowChanged(WId,unsigned int)));
+ connect(twin_module, TQT_SIGNAL(windowAdded(WId)), TQT_SLOT(windowAdded(WId)));
+ connect(twin_module, TQT_SIGNAL(windowRemoved(WId)), TQT_SLOT(windowRemoved(WId)));
+ connect(twin_module, TQT_SIGNAL(activeWindowChanged(WId)), TQT_SLOT(activeWindowChanged(WId)));
+ connect(twin_module, TQT_SIGNAL(currentDesktopChanged(int)), TQT_SLOT(currentDesktopChanged(int)));
+ connect(twin_module, TQT_SIGNAL(windowChanged(WId,unsigned int)), TQT_SLOT(windowChanged(WId,unsigned int)));
// register existing windows
- const TQValueList<WId> windows = kwin_module->windows();
+ const TQValueList<WId> windows = twin_module->windows();
TQValueList<WId>::ConstIterator end( windows.end() );
for (TQValueList<WId>::ConstIterator it = windows.begin(); it != end; ++it )
windowAdded(*it);
// set active window
- WId win = kwin_module->activeWindow();
+ WId win = twin_module->activeWindow();
activeWindowChanged(win);
configure_startup();
@@ -300,20 +300,20 @@ void TaskManager::killStartup(Startup* s)
TQString TaskManager::desktopName(int desk) const
{
- return kwin_module->desktopName(desk);
+ return twin_module->desktopName(desk);
}
int TaskManager::numberOfDesktops() const
{
- return kwin_module->numberOfDesktops();
+ return twin_module->numberOfDesktops();
}
bool TaskManager::isOnTop(const Task* task)
{
if(!task) return false;
- for (TQValueList<WId>::ConstIterator it = kwin_module->stackingOrder().fromLast();
- it != kwin_module->stackingOrder().end(); --it ) {
+ for (TQValueList<WId>::ConstIterator it = twin_module->stackingOrder().fromLast();
+ it != twin_module->stackingOrder().end(); --it ) {
for (Task* t = _tasks.first(); t != 0; t = _tasks.next() ) {
if ( (*it) == t->window() ) {
if ( t == task )
@@ -435,9 +435,9 @@ bool Task::isShaded() const
bool Task::isOnCurrentDesktop() const
{
#ifdef KDE_3_2
- return (_info.onAllDesktops() || _info.desktop() == kwin_module->currentDesktop());
+ return (_info.onAllDesktops() || _info.desktop() == twin_module->currentDesktop());
#else
- return (_info.onAllDesktops || _info.desktop == kwin_module->currentDesktop());
+ return (_info.onAllDesktops || _info.desktop == twin_module->currentDesktop());
#endif
}
@@ -692,13 +692,13 @@ void Task::toDesktop(int desk)
#ifdef KDE_3_2
if (_info.onAllDesktops())
{
- ni.setDesktop(kwin_module->currentDesktop());
+ ni.setDesktop(twin_module->currentDesktop());
KWin::forceActiveWindow(_win);
}
#else
if (_info.onAllDesktops)
{
- ni.setDesktop(kwin_module->currentDesktop());
+ ni.setDesktop(twin_module->currentDesktop());
KWin::setActiveWindow(_win);
}
#endif
@@ -707,7 +707,7 @@ void Task::toDesktop(int desk)
return;
}
ni.setDesktop(desk);
- if (desk == kwin_module->currentDesktop())
+ if (desk == twin_module->currentDesktop())
#ifdef KDE_3_2
KWin::forceActiveWindow(_win);
#else
@@ -717,7 +717,7 @@ void Task::toDesktop(int desk)
void Task::toCurrentDesktop()
{
- toDesktop(kwin_module->currentDesktop());
+ toDesktop(twin_module->currentDesktop());
}
void Task::setAlwaysOnTop(bool stay)
@@ -821,5 +821,5 @@ void Startup::update( const KStartupInfoData& data )
int TaskManager::currentDesktop() const
{
- return kwin_module->currentDesktop();
+ return twin_module->currentDesktop();
}
diff --git a/superkaramba/src/taskmanager.h b/superkaramba/src/taskmanager.h
index 0daac31..7313ea5 100644
--- a/superkaramba/src/taskmanager.h
+++ b/superkaramba/src/taskmanager.h
@@ -34,7 +34,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <tqpixmap.h>
#include <dcopobject.h>
-#include <kwin.h>
+#include <twin.h>
#include <kstartupinfo.h>
#include "karambaapp.h"
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-24 22:37:14 +0000