From b3eb2c6da36c05d2f33f1326934b44d9e494bb19 Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Thu, 5 Mar 2026 10:32:08 +0900 Subject: Rename KWinModule to TWinModule Signed-off-by: Michele Calgaro --- kcontrol/access/kaccess.cpp | 2 +- kcontrol/access/kaccess.h | 2 +- kcontrol/background/bgdialog.cpp | 4 +-- kcontrol/hwmanager/hwdevicetray_configdialog.cpp | 2 +- kcontrol/randr/configdialog.cpp | 2 +- kdesktop/bgmanager.cpp | 46 ++++++++++++------------ kdesktop/bgmanager.h | 6 ++-- kdesktop/desktop.cpp | 8 ++--- kdesktop/desktop.h | 6 ++-- kdesktop/krootwm.h | 2 +- kdesktop/lock/lockprocess.cpp | 10 +++--- kdesktop/lock/lockprocess.h | 4 +-- khotkeys/shared/windows.cpp | 2 +- khotkeys/shared/windows.h | 4 +-- kicker/applets/menu/menuapplet.cpp | 2 +- kicker/applets/menu/menuapplet.h | 4 +-- kicker/applets/minipager/pagerapplet.cpp | 2 +- kicker/applets/minipager/pagerapplet.h | 6 ++-- kicker/applets/minipager/pagerbutton.cpp | 2 +- kicker/applets/minipager/pagerbutton.h | 2 +- kicker/applets/swallow/swallow.cpp | 4 +-- kicker/applets/swallow/swallow.h | 6 ++-- kicker/applets/systemtray/systemtrayapplet.cpp | 4 +-- kicker/applets/systemtray/systemtrayapplet.h | 4 +-- kicker/extensions/dockbar/dockbarextension.cpp | 2 +- kicker/extensions/dockbar/dockbarextension.h | 4 +-- kicker/kicker/core/container_extension.h | 2 +- kicker/kicker/core/kicker.cpp | 4 +-- kicker/kicker/core/kicker.h | 6 ++-- kicker/kicker/core/showdesktop.h | 2 +- kicker/taskmanager/taskmanager.cpp | 2 +- kicker/taskmanager/taskmanager.h | 10 +++--- klipper/configdialog.cpp | 2 +- konsole/konsole/konsole.cpp | 6 ++-- konsole/konsole/konsole.h | 2 +- kpager/kpager.cpp | 2 +- kpager/kpager.h | 4 +-- krootbacking/krootbacking.cpp | 4 +-- ksmserver/legacy.cpp | 2 +- kstart/kstart.cpp | 4 +-- kstart/kstart.h | 2 +- ksystraycmd/ksystraycmd.cpp | 2 +- ksystraycmd/ksystraycmd.h | 4 +-- kxkb/kxkb.cpp | 16 ++++----- kxkb/kxkb.h | 4 +-- twin/kcmtwin/twinrules/ruleswidget.cpp | 2 +- twin/workspace.cpp | 2 +- 47 files changed, 113 insertions(+), 113 deletions(-) diff --git a/kcontrol/access/kaccess.cpp b/kcontrol/access/kaccess.cpp index 874df3b67..919b15608 100644 --- a/kcontrol/access/kaccess.cpp +++ b/kcontrol/access/kaccess.cpp @@ -93,7 +93,7 @@ static ModifierKey modifierKeys[] = { KAccessApp::KAccessApp(bool allowStyles, bool GUIenabled) : TDEUniqueApplication(allowStyles, GUIenabled), _artsBellBlocked(false), - overlay(0), wm(0, KWinModule::INFO_DESKTOP) + overlay(0), wm(0, TWinModule::INFO_DESKTOP) { _activeWindow = wm.activeWindow(); connect(&wm, TQ_SIGNAL(activeWindowChanged(WId)), this, TQ_SLOT(activeWindowChanged(WId))); diff --git a/kcontrol/access/kaccess.h b/kcontrol/access/kaccess.h index 0bb22f8e7..fc4c015ca 100644 --- a/kcontrol/access/kaccess.h +++ b/kcontrol/access/kaccess.h @@ -73,7 +73,7 @@ private: TQTimer *artsBellTimer; - KWinModule wm; + TWinModule wm; WId _activeWindow; diff --git a/kcontrol/background/bgdialog.cpp b/kcontrol/background/bgdialog.cpp index 79686182e..c3531c07f 100644 --- a/kcontrol/background/bgdialog.cpp +++ b/kcontrol/background/bgdialog.cpp @@ -72,8 +72,8 @@ BGDialog::BGDialog(TQWidget* parent, TDEConfig* _config, bool _multidesktop) m_multidesktop = _multidesktop; m_previewUpdates = true; - KWinModule *m_twin; - m_twin = new KWinModule(this); + TWinModule *m_twin; + m_twin = new TWinModule(this); m_curDesk = m_twin->currentDesktop(); TQSize s(m_twin->numberOfViewports(m_twin->currentDesktop())); m_useViewports = s.width() * s.height() > 1; diff --git a/kcontrol/hwmanager/hwdevicetray_configdialog.cpp b/kcontrol/hwmanager/hwdevicetray_configdialog.cpp index c98944461..d6ac94b29 100644 --- a/kcontrol/hwmanager/hwdevicetray_configdialog.cpp +++ b/kcontrol/hwmanager/hwdevicetray_configdialog.cpp @@ -54,7 +54,7 @@ ConfigDialog::~ConfigDialog() { // prevent huge size due to long regexps in the action-widget void ConfigDialog::show() { if (!isVisible()) { - KWinModule module(0, KWinModule::INFO_DESKTOP); + TWinModule module(0, TWinModule::INFO_DESKTOP); TQSize s1 = sizeHint(); TQSize s2 = module.workArea().size(); int w = s1.width(); diff --git a/kcontrol/randr/configdialog.cpp b/kcontrol/randr/configdialog.cpp index 88ec261f2..315c03b8c 100644 --- a/kcontrol/randr/configdialog.cpp +++ b/kcontrol/randr/configdialog.cpp @@ -58,7 +58,7 @@ ConfigDialog::~ConfigDialog() void ConfigDialog::show() { if ( !isVisible() ) { - KWinModule module(0, KWinModule::INFO_DESKTOP); + TWinModule module(0, TWinModule::INFO_DESKTOP); TQSize s1 = sizeHint(); TQSize s2 = module.workArea().size(); int w = s1.width(); diff --git a/kdesktop/bgmanager.cpp b/kdesktop/bgmanager.cpp index 49cff2c16..8446a5729 100644 --- a/kdesktop/bgmanager.cpp +++ b/kdesktop/bgmanager.cpp @@ -65,7 +65,7 @@ extern KDesktopApp *myApp; /**** KBackgroundManager ****/ -KBackgroundManager::KBackgroundManager(TQWidget *desktop, KWinModule* twinModule) +KBackgroundManager::KBackgroundManager(TQWidget *desktop, TWinModule* twinModule) : KBackgroundIface() { if( !properties_inited ) @@ -86,7 +86,7 @@ KBackgroundManager::KBackgroundManager(TQWidget *desktop, KWinModule* twinModule m_Serial = 0; m_Hash = 0; m_pConfig = TDEGlobal::config(); m_bExport = m_bCommon = m_bInit = false; - m_pKwinmodule = twinModule; + m_pTWinModule = twinModule; m_pPixmapServer = new KPixmapServer(); m_xrootpmap = None; @@ -121,11 +121,11 @@ KBackgroundManager::KBackgroundManager(TQWidget *desktop, KWinModule* twinModule /*Ends here*/ - connect(m_pKwinmodule, TQ_SIGNAL(currentDesktopChanged(int)), + connect(m_pTWinModule, TQ_SIGNAL(currentDesktopChanged(int)), TQ_SLOT(slotChangeDesktop(int))); - connect(m_pKwinmodule, TQ_SIGNAL(numberOfDesktopsChanged(int)), + connect(m_pTWinModule, TQ_SIGNAL(numberOfDesktopsChanged(int)), TQ_SLOT(slotChangeNumberOfDesktops(int))); - connect(m_pKwinmodule, TQ_SIGNAL(currentDesktopViewportChanged(int, const TQPoint&)), + connect(m_pTWinModule, TQ_SIGNAL(currentDesktopViewportChanged(int, const TQPoint&)), TQ_SLOT(slotChangeViewport(int, const TQPoint&))); @@ -133,12 +133,12 @@ KBackgroundManager::KBackgroundManager(TQWidget *desktop, KWinModule* twinModule connect( tdeApp->desktop(), TQ_SIGNAL( resized( int )), TQ_SLOT( desktopResized())); // RANDR support #endif - TQSize s(m_pKwinmodule->numberOfViewports(m_pKwinmodule->currentDesktop())); + TQSize s(m_pTWinModule->numberOfViewports(m_pTWinModule->currentDesktop())); m_numberOfViewports = s.width() * s.height(); if (m_numberOfViewports < 1) { m_numberOfViewports = 1; } - for (signed j=0;j<(m_pKwinmodule->numberOfDesktops() * m_numberOfViewports);j++) { + for (signed j=0;j<(m_pTWinModule->numberOfDesktops() * m_numberOfViewports);j++) { renderBackground(j); } } @@ -258,12 +258,12 @@ void KBackgroundManager::configure() slotChangeDesktop(0); // Redraw all desktops so that applications relying on exported data, e.g. kpager, continue to work properly - TQSize s(m_pKwinmodule->numberOfViewports(m_pKwinmodule->currentDesktop())); + TQSize s(m_pTWinModule->numberOfViewports(m_pTWinModule->currentDesktop())); m_numberOfViewports = s.width() * s.height(); if (m_numberOfViewports < 1) { m_numberOfViewports = 1; } - for (signed j=0;j<(m_pKwinmodule->numberOfDesktops() * m_numberOfViewports);j++) { + for (signed j=0;j<(m_pTWinModule->numberOfDesktops() * m_numberOfViewports);j++) { renderBackground(j); } } @@ -271,7 +271,7 @@ void KBackgroundManager::configure() int KBackgroundManager::realDesktop() { - int desk = m_pKwinmodule->currentDesktop(); + int desk = m_pTWinModule->currentDesktop(); if (desk) desk--; return desk; } @@ -279,7 +279,7 @@ int KBackgroundManager::realDesktop() int KBackgroundManager::effectiveDesktop() { - TQSize s(m_pKwinmodule->numberOfViewports(m_pKwinmodule->currentDesktop())); + TQSize s(m_pTWinModule->numberOfViewports(m_pTWinModule->currentDesktop())); m_numberOfViewports = s.width() * s.height(); if (m_numberOfViewports > 1) { @@ -287,7 +287,7 @@ int KBackgroundManager::effectiveDesktop() return 0; } else { - TQPoint vx(m_pKwinmodule->currentViewport(m_pKwinmodule->currentDesktop())); + TQPoint vx(m_pTWinModule->currentViewport(m_pTWinModule->currentDesktop())); return (realDesktop() * m_numberOfViewports) + ((vx.x() * vx.y()) - 1); } } @@ -302,7 +302,7 @@ int KBackgroundManager::effectiveDesktop() */ void KBackgroundManager::slotChangeNumberOfDesktops(int num) { - TQSize s(m_pKwinmodule->numberOfViewports(m_pKwinmodule->currentDesktop())); + TQSize s(m_pTWinModule->numberOfViewports(m_pTWinModule->currentDesktop())); m_numberOfViewports = s.width() * s.height(); if (m_numberOfViewports < 1) { m_numberOfViewports = 1; @@ -352,7 +352,7 @@ void KBackgroundManager::slotChangeNumberOfDesktops(int num) void KBackgroundManager::slotChangeDesktop(int desk) { resizingDesktop = true; - TQSize s(m_pKwinmodule->numberOfViewports(m_pKwinmodule->currentDesktop())); + TQSize s(m_pTWinModule->numberOfViewports(m_pTWinModule->currentDesktop())); m_numberOfViewports = s.width() * s.height(); if (m_numberOfViewports < 1) { m_numberOfViewports = 1; @@ -364,8 +364,8 @@ void KBackgroundManager::slotChangeDesktop(int desk) desk--; // Lazy initialisation of # of desktops - if ((unsigned)(m_pKwinmodule->numberOfDesktops() * m_numberOfViewports) >= m_Renderer.size()) - slotChangeNumberOfDesktops( m_pKwinmodule->numberOfDesktops() * m_numberOfViewports); + if ((unsigned)(m_pTWinModule->numberOfDesktops() * m_numberOfViewports) >= m_Renderer.size()) + slotChangeNumberOfDesktops( m_pTWinModule->numberOfDesktops() * m_numberOfViewports); int edesk = effectiveDesktop(); m_Serial++; @@ -413,7 +413,7 @@ void KBackgroundManager::slotChangeDesktop(int desk) */ void KBackgroundManager::slotChangeViewport(int desk, const TQPoint& viewport) { - TQSize s(m_pKwinmodule->numberOfViewports(m_pKwinmodule->currentDesktop())); + TQSize s(m_pTWinModule->numberOfViewports(m_pTWinModule->currentDesktop())); m_numberOfViewports = s.width() * s.height(); if (m_numberOfViewports < 1) { m_numberOfViewports = 1; @@ -425,8 +425,8 @@ void KBackgroundManager::slotChangeViewport(int desk, const TQPoint& viewport) desk--; // Lazy initialisation of # of desktops - if ((unsigned)(m_pKwinmodule->numberOfDesktops() * m_numberOfViewports) >= m_Renderer.size()) - slotChangeNumberOfDesktops( m_pKwinmodule->numberOfDesktops() * m_numberOfViewports ); + if ((unsigned)(m_pTWinModule->numberOfDesktops() * m_numberOfViewports) >= m_Renderer.size()) + slotChangeNumberOfDesktops( m_pTWinModule->numberOfDesktops() * m_numberOfViewports ); int edesk = effectiveDesktop(); m_Serial++; @@ -625,7 +625,7 @@ void KBackgroundManager::slotCrossFadeTimeout() */ void KBackgroundManager::slotImageDone(int desk) { - TQSize s(m_pKwinmodule->numberOfViewports(m_pKwinmodule->currentDesktop())); + TQSize s(m_pTWinModule->numberOfViewports(m_pTWinModule->currentDesktop())); m_numberOfViewports = s.width() * s.height(); if (m_numberOfViewports < 1) { m_numberOfViewports = 1; @@ -863,7 +863,7 @@ void KBackgroundManager::slotTimeout() int KBackgroundManager::validateDesk(int desk) { if (desk > (int)m_Renderer.size()) - slotChangeNumberOfDesktops( m_pKwinmodule->numberOfDesktops() ); + slotChangeNumberOfDesktops( m_pTWinModule->numberOfDesktops() ); if ( (desk <= 0) || (desk > (int)m_Renderer.size()) ) return realDesktop(); @@ -1042,12 +1042,12 @@ void KBackgroundManager::desktopResized() repaintBackground(); // Redraw all desktops so that applications relying on exported data, e.g. kpager, continue to work properly - TQSize s(m_pKwinmodule->numberOfViewports(m_pKwinmodule->currentDesktop())); + TQSize s(m_pTWinModule->numberOfViewports(m_pTWinModule->currentDesktop())); m_numberOfViewports = s.width() * s.height(); if (m_numberOfViewports < 1) { m_numberOfViewports = 1; } - for (signed j=0;j<(m_pKwinmodule->numberOfDesktops() * m_numberOfViewports);j++) { + for (signed j=0;j<(m_pTWinModule->numberOfDesktops() * m_numberOfViewports);j++) { renderBackground(j); } } diff --git a/kdesktop/bgmanager.h b/kdesktop/bgmanager.h index d78ebebc3..0c7722311 100644 --- a/kdesktop/bgmanager.h +++ b/kdesktop/bgmanager.h @@ -24,7 +24,7 @@ class TDEConfig; class TQTimer; class TQPixmap; class TDEPopupMenu; -class KWinModule; +class TWinModule; class KPixmap; class KVirtualBGRenderer; class KPixmapServer; @@ -58,7 +58,7 @@ class KBackgroundManager public: - KBackgroundManager(TQWidget *desktop, KWinModule* twinModule); + KBackgroundManager(TQWidget *desktop, TWinModule* twinModule); ~KBackgroundManager(); void configure(); @@ -129,7 +129,7 @@ private: TQPtrVector m_Renderer; TQPtrVector m_Cache; - KWinModule *m_pKwinmodule; + TWinModule *m_pTWinModule; KPixmapServer *m_pPixmapServer; unsigned long m_xrootpmap; diff --git a/kdesktop/desktop.cpp b/kdesktop/desktop.cpp index 3ef0e33e7..5303e8cf6 100644 --- a/kdesktop/desktop.cpp +++ b/kdesktop/desktop.cpp @@ -155,7 +155,7 @@ KDesktop::KDesktop( SaverEngine* saver, bool x_root_hack, bool wait_for_kded ) : setCaption( "KDE Desktop"); setAcceptDrops(true); // WStyle_Customize seems to disable that - m_pKwinmodule = new KWinModule( this ); + m_pTWinModule = new TWinModule( this ); tdeApp->dcopClient()->setNotifications(true); tdeApp->dcopClient()->connectDCOPSignal(kicker_name, kicker_name, "desktopIconsAreaChanged(TQRect, int)", @@ -245,7 +245,7 @@ KDesktop::initRoot() // Geert Jansen: backgroundmanager belongs here // TODO tell KBackgroundManager if we change widget() - bgMgr = new KBackgroundManager( m_pIconView, m_pKwinmodule ); + bgMgr = new KBackgroundManager( m_pIconView, m_pTWinModule ); bgMgr->setExport(1); connect( bgMgr, TQ_SIGNAL( initDone()), TQ_SLOT( backgroundInitDone())); if (!m_bInit) @@ -286,7 +286,7 @@ KDesktop::initRoot() // Geert Jansen: backgroundmanager belongs here // TODO tell KBackgroundManager if we change widget() - bgMgr = new KBackgroundManager( m_pIconView, m_pKwinmodule ); + bgMgr = new KBackgroundManager( m_pIconView, m_pTWinModule ); bgMgr->setExport(1); connect( bgMgr, TQ_SIGNAL( initDone()), TQ_SLOT( backgroundInitDone())); @@ -347,7 +347,7 @@ void KDesktop::slotNoKicker() { kdDebug(1204) << "KDesktop::slotNoKicker ... kicker did not respond" << endl; // up till now, we got no desktopIconsArea from kicker - probably - // it's not running, so use the area from KWinModule + // it's not running, so use the area from TWinModule TQRect area = twinModule()->workArea(twinModule()->currentDesktop()); m_pIconView->updateWorkArea(area); } diff --git a/kdesktop/desktop.h b/kdesktop/desktop.h index ca1eefc61..c295a6a8e 100644 --- a/kdesktop/desktop.h +++ b/kdesktop/desktop.h @@ -33,7 +33,7 @@ class TQCloseEvent; class TQDropEvent; class TQPopupMenu; class TDEGlobalAccel; -class KWinModule; +class TWinModule; class KBackgroundManager; class TQTimer; class StartupId; @@ -97,7 +97,7 @@ public: void logout( TDEApplication::ShutdownConfirm confirm, TDEApplication::ShutdownType sdtype ); - KWinModule* twinModule() const { return m_pKwinmodule; } + TWinModule* twinModule() const { return m_pTWinModule; } // The action collection of the active widget TDEActionCollection *actionCollection(); @@ -194,7 +194,7 @@ private: TDEGlobalAccel *keys; - KWinModule* m_pKwinmodule; + TWinModule* m_pTWinModule; KBackgroundManager* bgMgr; diff --git a/kdesktop/krootwm.h b/kdesktop/krootwm.h index efdd64c3e..1216eef39 100644 --- a/kdesktop/krootwm.h +++ b/kdesktop/krootwm.h @@ -37,7 +37,7 @@ class SaverEngine; class TQPopupMenu; class KCMultiDialog; class KNewMenu; -class KWinModule; +class TWinModule; class KBookmarkMenu; class KHelpMenu; class TDEActionCollection; diff --git a/kdesktop/lock/lockprocess.cpp b/kdesktop/lock/lockprocess.cpp index 2ad89f5ab..e0eeed05d 100644 --- a/kdesktop/lock/lockprocess.cpp +++ b/kdesktop/lock/lockprocess.cpp @@ -204,7 +204,7 @@ LockProcess::LockProcess() resizeTimer(NULL), hackResumeTimer(NULL), mVkbdProcess(NULL), - mKWinModule(NULL), + mTWinModule(NULL), mPipeOpen(false), mPipeOpen_out(false), mInfoMessageDisplayed(false), @@ -2467,8 +2467,8 @@ void LockProcess::showVkbd() if( run_vkbd ) { mVkbdWindows.clear(); mVkbdLastEventWindow = None; - mKWinModule = new KWinModule( NULL, KWinModule::INFO_WINDOWS ); - connect( mKWinModule, TQ_SIGNAL( windowAdded( WId )), TQ_SLOT( windowAdded( WId ))); + mTWinModule = new TWinModule( NULL, TWinModule::INFO_WINDOWS ); + connect( mTWinModule, TQ_SIGNAL( windowAdded( WId )), TQ_SLOT( windowAdded( WId ))); mVkbdProcess = new TDEProcess; *mVkbdProcess << "xvkbd" << "-compact" << "-geometry" << "-0-0" << "-xdm"; mVkbdProcess->start(); @@ -2481,8 +2481,8 @@ void LockProcess::hideVkbd() mVkbdProcess->kill(); delete mVkbdProcess; mVkbdProcess = NULL; - delete mKWinModule; - mKWinModule = NULL; + delete mTWinModule; + mTWinModule = NULL; mVkbdWindows.clear(); } } diff --git a/kdesktop/lock/lockprocess.h b/kdesktop/lock/lockprocess.h index 1afc9bb46..b0e33aad2 100644 --- a/kdesktop/lock/lockprocess.h +++ b/kdesktop/lock/lockprocess.h @@ -26,7 +26,7 @@ #include class KLibrary; -class KWinModule; +class TWinModule; class KSMModalDialog; class LockProcess; #ifdef WITH_TDEHWLIB @@ -214,7 +214,7 @@ class LockProcess : public TQWidget TQTimer *hackResumeTimer; TDEProcess* mVkbdProcess; - KWinModule* mKWinModule; + TWinModule* mTWinModule; struct VkbdWindow { WId id; TQRect rect; diff --git a/khotkeys/shared/windows.cpp b/khotkeys/shared/windows.cpp index e91e41df3..42dc3f6b1 100644 --- a/khotkeys/shared/windows.cpp +++ b/khotkeys/shared/windows.cpp @@ -39,7 +39,7 @@ namespace KHotKeys Windows::Windows( bool enable_signal_P, TQObject* parent_P ) : TQObject( parent_P ), signals_enabled( enable_signal_P ), - twin_module( new KWinModule( this )), _action_window( 0 ) + twin_module( new TWinModule( this )), _action_window( 0 ) { assert( windows_handler == NULL ); windows_handler = this; diff --git a/khotkeys/shared/windows.h b/khotkeys/shared/windows.h index 05890c435..c40c31b1f 100644 --- a/khotkeys/shared/windows.h +++ b/khotkeys/shared/windows.h @@ -22,7 +22,7 @@ #include "khotkeysglobal.h" class TDEConfig; -class KWinModule; +class TWinModule; namespace KHotKeys { @@ -63,7 +63,7 @@ class TDE_EXPORT Windows void window_changed_slot( WId window_P, unsigned int flags_P ); private: bool signals_enabled; - KWinModule* twin_module; + TWinModule* twin_module; WId _action_window; }; diff --git a/kicker/applets/menu/menuapplet.cpp b/kicker/applets/menu/menuapplet.cpp index d1aae0268..2f1a8616b 100644 --- a/kicker/applets/menu/menuapplet.cpp +++ b/kicker/applets/menu/menuapplet.cpp @@ -299,7 +299,7 @@ void Applet::claimSelection() delete selection_watcher; selection_watcher = NULL; connect( selection, TQ_SIGNAL( lostOwnership()), TQ_SLOT( lostSelection())); - module = new KWinModule; + module = new TWinModule; connect( module, TQ_SIGNAL( windowAdded( WId )), this, TQ_SLOT( windowAdded( WId ))); connect( module, TQ_SIGNAL( activeWindowChanged( WId )), this, TQ_SLOT( activeWindowChanged( WId ))); diff --git a/kicker/applets/menu/menuapplet.h b/kicker/applets/menu/menuapplet.h index 159c7a37d..9512b1c1f 100644 --- a/kicker/applets/menu/menuapplet.h +++ b/kicker/applets/menu/menuapplet.h @@ -39,7 +39,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include -class KWinModule; +class TWinModule; namespace KickerMenuApplet { @@ -145,7 +145,7 @@ private: */ static Atom makeSelectionAtom(); void updateTopEdgeOffset(); - KWinModule* module; + TWinModule* module; /** * List of all known menus. diff --git a/kicker/applets/minipager/pagerapplet.cpp b/kicker/applets/minipager/pagerapplet.cpp index 0af954fcb..7c6f1e8eb 100644 --- a/kicker/applets/minipager/pagerapplet.cpp +++ b/kicker/applets/minipager/pagerapplet.cpp @@ -114,7 +114,7 @@ KMiniPager::KMiniPager(const TQString& configFile, Type type, int actions, setFont( TDEGlobalSettings::taskbarFont() ); - m_twin = new KWinModule(this); + m_twin = new TWinModule(this); m_activeWindow = m_twin->activeWindow(); m_curDesk = m_twin->currentDesktop(); diff --git a/kicker/applets/minipager/pagerapplet.h b/kicker/applets/minipager/pagerapplet.h index 6433a6790..4390b4b6b 100644 --- a/kicker/applets/minipager/pagerapplet.h +++ b/kicker/applets/minipager/pagerapplet.h @@ -38,7 +38,7 @@ class TQGridLayout; class TQTimer; class TDEProcess; -class KWinModule; +class TWinModule; class KTextShadowEngine; class TDESelectionOwner; @@ -58,7 +58,7 @@ public: int heightForWidth(int width) const; KWin::WindowInfo* info( WId win ); - KWinModule* twin() { return m_twin; } + TWinModule* twin() { return m_twin; } KTextShadowEngine* shadowEngine(); void setActive( WId active ) { m_activeWindow = active; } @@ -131,7 +131,7 @@ private: int desktopLayoutY; TDESelectionOwner* m_desktopLayoutOwner; - KWinModule *m_twin; + TWinModule *m_twin; KTextShadowEngine* m_shadowEngine; TQPopupMenu *m_contextMenu; diff --git a/kicker/applets/minipager/pagerbutton.cpp b/kicker/applets/minipager/pagerbutton.cpp index 3274f406b..06ad608af 100644 --- a/kicker/applets/minipager/pagerbutton.cpp +++ b/kicker/applets/minipager/pagerbutton.cpp @@ -436,7 +436,7 @@ void KMiniPagerButton::drawButton(TQPainter *bp) // window preview... if (m_pager->desktopPreview()) { - KWinModule* twin = m_pager->twin(); + TWinModule* twin = m_pager->twin(); KWin::WindowInfo *info = 0; int dw = TQApplication::desktop()->width(); int dh = TQApplication::desktop()->height(); diff --git a/kicker/applets/minipager/pagerbutton.h b/kicker/applets/minipager/pagerbutton.h index 4d889c39e..f2bb0d4ff 100644 --- a/kicker/applets/minipager/pagerbutton.h +++ b/kicker/applets/minipager/pagerbutton.h @@ -30,7 +30,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include "kickertip.h" class KPixmap; -class KWinModule; +class TWinModule; class KMiniPager; class TDESharedPixmap; class TQLineEdit; diff --git a/kicker/applets/swallow/swallow.cpp b/kicker/applets/swallow/swallow.cpp index a9eea202e..ad28dfc5f 100644 --- a/kicker/applets/swallow/swallow.cpp +++ b/kicker/applets/swallow/swallow.cpp @@ -48,7 +48,7 @@ template class TQPtrList; // init static variables SwallowAppList * SwallowApplet::appList = 0L; SwallowAppList * SwallowApplet::embeddedList = 0L; -KWinModule * SwallowApplet::wModule = 0L; +TWinModule * SwallowApplet::wModule = 0L; SwallowApplet * SwallowApplet::self = 0L; extern "C" @@ -68,7 +68,7 @@ SwallowApplet::SwallowApplet( const TQString& configFile, self = this; m_swcList = new SwallowCommandList; m_swcList->setAutoDelete( true ); - wModule = new KWinModule(this); + wModule = new TWinModule(this); embeddedList = new SwallowAppList; embeddedList->setAutoDelete( false ); appList = new SwallowAppList; diff --git a/kicker/applets/swallow/swallow.h b/kicker/applets/swallow/swallow.h index 8bacc79f3..1aa3d34e8 100644 --- a/kicker/applets/swallow/swallow.h +++ b/kicker/applets/swallow/swallow.h @@ -29,7 +29,7 @@ class TQBoxLayout; class TDEConfig; class TDEProcess; -class KWinModule; +class TWinModule; class SwallowApp; @@ -53,7 +53,7 @@ public: // returns 0L if we don't have a SwallowApplet object yet, // but who cares - static KWinModule * winModule() { return wModule; } + static TWinModule * winModule() { return wModule; } static void removeApplet( SwallowApp * ); public: // for KPanelApplet @@ -78,7 +78,7 @@ private: static SwallowApplet *self; static SwallowAppList *appList; static SwallowAppList *embeddedList; - static KWinModule *wModule; + static TWinModule *wModule; SwallowCommandList * m_swcList; TQBoxLayout *m_layout; diff --git a/kicker/applets/systemtray/systemtrayapplet.cpp b/kicker/applets/systemtray/systemtrayapplet.cpp index 0175bd689..ed138212f 100644 --- a/kicker/applets/systemtray/systemtrayapplet.cpp +++ b/kicker/applets/systemtray/systemtrayapplet.cpp @@ -110,7 +110,7 @@ SystemTrayApplet::SystemTrayApplet(const TQString& configFile, Type type, int ac setBackgroundOrigin(AncestorOrigin); - twin_module = new KWinModule(this); + twin_module = new TWinModule(this); // tdeApp notifies us of settings changes. added to support // disabling of frame effect on mouse hover @@ -156,7 +156,7 @@ void SystemTrayApplet::initialize() layoutTray(); } - // the KWinModule notifies us when tray windows are added or removed + // the TWinModule notifies us when tray windows are added or removed connect( twin_module, TQ_SIGNAL( systemTrayWindowAdded(WId) ), this, TQ_SLOT( systemTrayWindowAdded(WId) ) ); connect( twin_module, TQ_SIGNAL( systemTrayWindowRemoved(WId) ), diff --git a/kicker/applets/systemtray/systemtrayapplet.h b/kicker/applets/systemtray/systemtrayapplet.h index 26a02de1c..8785bca11 100644 --- a/kicker/applets/systemtray/systemtrayapplet.h +++ b/kicker/applets/systemtray/systemtrayapplet.h @@ -41,7 +41,7 @@ class TQGridLayout; class TQSpinBox; class TQCheckBox; class TQTimer; -class KWinModule; +class TWinModule; class TrayEmbed; class KDialogBase; class TDEActionSelector; @@ -104,7 +104,7 @@ private: TrayEmbedList m_hiddenWins; TQStringList m_hiddenIconList; TQStringList m_sortOrderIconList; - KWinModule *twin_module; + TWinModule *twin_module; Atom net_system_tray_selection; Atom net_system_tray_opcode; bool m_showFrame; diff --git a/kicker/extensions/dockbar/dockbarextension.cpp b/kicker/extensions/dockbar/dockbarextension.cpp index ac35bfdbc..17182fee7 100644 --- a/kicker/extensions/dockbar/dockbarextension.cpp +++ b/kicker/extensions/dockbar/dockbarextension.cpp @@ -57,7 +57,7 @@ DockBarExtension::DockBarExtension(const TQString& configFile, Type type, : KPanelExtension(configFile, type, actions, parent, name) { dragging_container = 0; - twin_module = new KWinModule(this); + twin_module = new TWinModule(this); connect( twin_module, TQ_SIGNAL( windowAdded(WId) ), TQ_SLOT( windowAdded(WId) ) ); setMinimumSize(DockContainer::sz(), DockContainer::sz()); setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding); diff --git a/kicker/extensions/dockbar/dockbarextension.h b/kicker/extensions/dockbar/dockbarextension.h index 1431f29ee..1bf8a6266 100644 --- a/kicker/extensions/dockbar/dockbarextension.h +++ b/kicker/extensions/dockbar/dockbarextension.h @@ -28,7 +28,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include #include "dockcontainer.h" -class KWinModule; +class TWinModule; class DockBarExtension : public KPanelExtension { @@ -61,7 +61,7 @@ protected: void mouseReleaseEvent(TQMouseEvent *); void mouseMoveEvent(TQMouseEvent *); private: - KWinModule* twin_module; + TWinModule* twin_module; DockContainer::Vector containers; // handle the dragging of applets diff --git a/kicker/kicker/core/container_extension.h b/kicker/kicker/core/container_extension.h index b1db1efeb..cf6148671 100644 --- a/kicker/kicker/core/container_extension.h +++ b/kicker/kicker/core/container_extension.h @@ -44,7 +44,7 @@ class TQVBox; class QXEmbed; class HideButton; class TDEConfig; -class KWinModule; +class TWinModule; class PopupWidgetFilter; class PanelExtensionOpMenu; class TQColor; diff --git a/kicker/kicker/core/kicker.cpp b/kicker/kicker/core/kicker.cpp index 21ff97684..2e9f8f01f 100644 --- a/kicker/kicker/core/kicker.cpp +++ b/kicker/kicker/core/kicker.cpp @@ -427,11 +427,11 @@ void Kicker::clearQuickStartMenu() MenuManager::the()->kmenu()->clearRecentMenuItems(); } -KWinModule* Kicker::twinModule() +TWinModule* Kicker::twinModule() { if (!m_twinModule) { - m_twinModule = new KWinModule(); + m_twinModule = new TWinModule(); } return m_twinModule; diff --git a/kicker/kicker/core/kicker.h b/kicker/kicker/core/kicker.h index 5a76570a5..744190678 100644 --- a/kicker/kicker/core/kicker.h +++ b/kicker/kicker/core/kicker.h @@ -32,7 +32,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. class KCMultiDialog; class KDirWatch; class TDEGlobalAccel; -class KWinModule; +class TWinModule; class PanelKMenu; class PanelPopupButton; @@ -72,7 +72,7 @@ k_dcop_signals: public: static Kicker* the(); KDirWatch* fileWatcher(); - KWinModule* twinModule(); + TWinModule* twinModule(); bool isImmutable() const; bool isKioskImmutable() const; @@ -125,7 +125,7 @@ private: static void crashHandler(int signal); TDEGlobalAccel* keys; - KWinModule* m_twinModule; + TWinModule* m_twinModule; KCMultiDialog* m_configDialog; bool m_canAddContainers; TQPoint m_insertionPoint; diff --git a/kicker/kicker/core/showdesktop.h b/kicker/kicker/core/showdesktop.h index ec7119438..2b9ef0706 100644 --- a/kicker/kicker/core/showdesktop.h +++ b/kicker/kicker/core/showdesktop.h @@ -24,7 +24,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #ifndef __showdesktop_h__ #define __showdesktop_h__ -class KWinModule; +class TWinModule; #include diff --git a/kicker/taskmanager/taskmanager.cpp b/kicker/taskmanager/taskmanager.cpp index 3e941315f..014cf5f1c 100644 --- a/kicker/taskmanager/taskmanager.cpp +++ b/kicker/taskmanager/taskmanager.cpp @@ -59,7 +59,7 @@ TaskManager::TaskManager() : TQObject(), _active(0), _startup_info(0), - m_winModule(new KWinModule()), + m_winModule(new TWinModule()), m_trackGeometry(false) { TDEGlobal::locale()->insertCatalogue("libtaskmanager"); diff --git a/kicker/taskmanager/taskmanager.h b/kicker/taskmanager/taskmanager.h index 3f8e2f5e2..2b517c5de 100644 --- a/kicker/taskmanager/taskmanager.h +++ b/kicker/taskmanager/taskmanager.h @@ -57,7 +57,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #endif #endif -class KWinModule; +class TWinModule; class TaskManager; typedef TQValueList WindowList; @@ -66,7 +66,7 @@ typedef TQValueList WindowList; * A dynamic interface to a task (main window). * * @see TaskManager - * @see KWinModule + * @see TWinModule */ class TDE_EXPORT Task: public TQObject, public TDEShared { @@ -569,7 +569,7 @@ private: * * @see Task * @see Startup - * @see KWinModule + * @see TWinModule */ class TDE_EXPORT TaskManager : public TQObject { @@ -634,7 +634,7 @@ public: */ static bool isOnScreen( int screen, const WId wid ); - KWinModule* winModule() const { return m_winModule; } + TWinModule* winModule() const { return m_winModule; } void setXCompositeEnabled(bool state); static bool xCompositeEnabled() { return m_xCompositeEnabled != 0; } @@ -707,7 +707,7 @@ private: WindowList _skiptaskbar_windows; Startup::List _startups; TDEStartupInfo* _startup_info; - KWinModule* m_winModule; + TWinModule* m_winModule; bool m_trackGeometry; static TaskManager* m_self; diff --git a/klipper/configdialog.cpp b/klipper/configdialog.cpp index 0dfc7ede1..f407aeab9 100644 --- a/klipper/configdialog.cpp +++ b/klipper/configdialog.cpp @@ -64,7 +64,7 @@ ConfigDialog::~ConfigDialog() void ConfigDialog::show() { if ( !isVisible() ) { - KWinModule module(0, KWinModule::INFO_DESKTOP); + TWinModule module(0, TWinModule::INFO_DESKTOP); TQSize s1 = sizeHint(); TQSize s2 = module.workArea().size(); int w = s1.width(); diff --git a/konsole/konsole/konsole.cpp b/konsole/konsole/konsole.cpp index 1c435165c..e5159b15e 100644 --- a/konsole/konsole/konsole.cpp +++ b/konsole/konsole/konsole.cpp @@ -201,7 +201,7 @@ Konsole::Konsole(const char* name, int histon, bool menubaron, bool tabbaron, bo ,se_previous(0) ,m_initialSession(0) ,colors(0) -,kWinModule(0) +,tWinModule(0) ,menubar(0) ,statusbar(0) ,m_session_string(i18n("&Session")) @@ -389,8 +389,8 @@ Konsole::~Konsole() delete colors; colors=0; - delete kWinModule; - kWinModule = 0; + delete tWinModule; + tWinModule = 0; } void Konsole::setAutoClose(bool on) diff --git a/konsole/konsole/konsole.h b/konsole/konsole/konsole.h index 7af520661..71e80b4ba 100644 --- a/konsole/konsole/konsole.h +++ b/konsole/konsole/konsole.h @@ -312,7 +312,7 @@ private: TQString s_encodingName; TQPtrDict rootxpms; - KWinModule* kWinModule; + TWinModule* tWinModule; KMenuBar* menubar; KStatusBar* statusbar; diff --git a/kpager/kpager.cpp b/kpager/kpager.cpp index 95f4ec61c..a3b665d7d 100644 --- a/kpager/kpager.cpp +++ b/kpager/kpager.cpp @@ -187,7 +187,7 @@ KPager::KPager(KPagerMainWindow *parent, const char *name) m_windows.setAutoDelete(true); // delete windows info after removal setBackgroundColor( black ); - m_winmodule=new KWinModule(this); + m_winmodule=new TWinModule(this); m_currentDesktop=m_winmodule->currentDesktop(); m_grabWinTimer=new TQTimer(this,"grabWinTimer"); diff --git a/kpager/kpager.h b/kpager/kpager.h index 7fdd7d573..96af163fe 100644 --- a/kpager/kpager.h +++ b/kpager/kpager.h @@ -67,7 +67,7 @@ public: KPager(KPagerMainWindow *parent=0, const char *name=0); ~KPager(); - class KWinModule *twin() const { return m_winmodule; }; + class TWinModule *twin() const { return m_winmodule; }; void updateLayout(); void redrawDesktops(); @@ -110,7 +110,7 @@ protected: }; protected: - KWinModule *m_winmodule; + TWinModule *m_winmodule; TQValueList m_desktops; TQIntDict m_windows; diff --git a/krootbacking/krootbacking.cpp b/krootbacking/krootbacking.cpp index bab627df1..8e3480600 100644 --- a/krootbacking/krootbacking.cpp +++ b/krootbacking/krootbacking.cpp @@ -46,7 +46,7 @@ class KRootBackingData public: TQWidget *toplevel; #ifdef TQ_WS_X11 - KWinModule *twin; + TWinModule *twin; #endif }; @@ -73,7 +73,7 @@ void KRootBacking::init() #ifdef TQ_WS_X11 connect(m_pPixmap, TQ_SIGNAL(done(bool)), TQ_SLOT(slotDone(bool))); - d->twin = new KWinModule( this ); + d->twin = new TWinModule( this ); #endif m_bInit = true; diff --git a/ksmserver/legacy.cpp b/ksmserver/legacy.cpp index bc2c17670..b0ea31fa8 100644 --- a/ksmserver/legacy.cpp +++ b/ksmserver/legacy.cpp @@ -87,7 +87,7 @@ void KSMServer::performLegacySessionSave() XErrorHandler oldHandler = XSetErrorHandler(winsErrorHandler); // Compute set of leader windows that need legacy session management // and determine which style (WM_COMMAND or WM_SAVE_YOURSELF) - KWinModule module; + TWinModule module; if( wm_save_yourself == (Atom)None ) { Atom atoms[ 3 ]; const char* const names[] diff --git a/kstart/kstart.cpp b/kstart/kstart.cpp index 50efa566c..69ec79158 100644 --- a/kstart/kstart.cpp +++ b/kstart/kstart.cpp @@ -43,7 +43,7 @@ static bool fullscreen = false; static unsigned long state = 0; static unsigned long mask = 0; static NET::WindowType windowtype = NET::Unknown; -static KWinModule* twinmodule; +static TWinModule* twinmodule; KStart::KStart() :TQObject() @@ -312,7 +312,7 @@ int main( int argc, char *argv[] ) for(int i=0; i < args->count(); i++) proc << args->arg(i); - twinmodule = new KWinModule; + twinmodule = new TWinModule; desktop = args->getOption( "desktop" ).toInt(); if ( args->isSet ( "alldesktops") ) diff --git a/kstart/kstart.h b/kstart/kstart.h index adfaf53c6..bee4dc876 100644 --- a/kstart/kstart.h +++ b/kstart/kstart.h @@ -13,7 +13,7 @@ #include -class KWinModule; +class TWinModule; class KStart: public TQObject { TQ_OBJECT diff --git a/ksystraycmd/ksystraycmd.cpp b/ksystraycmd/ksystraycmd.cpp index bb0c06c5c..3446601f4 100644 --- a/ksystraycmd/ksystraycmd.cpp +++ b/ksystraycmd/ksystraycmd.cpp @@ -26,7 +26,7 @@ KSysTrayCmd::KSysTrayCmd() win(0), client(0), twinmodule(0), top(0), left(0) { setAlignment( AlignCenter ); - twinmodule = new KWinModule( this ); + twinmodule = new TWinModule( this ); refresh(); } diff --git a/ksystraycmd/ksystraycmd.h b/ksystraycmd/ksystraycmd.h index 20ebd0b25..5c477cc84 100644 --- a/ksystraycmd/ksystraycmd.h +++ b/ksystraycmd/ksystraycmd.h @@ -5,7 +5,7 @@ #include class KShellProcess; -class KWinModule; +class TWinModule; /** * Provides a system tray icon for a normal window. @@ -75,7 +75,7 @@ private: WId win; KShellProcess *client; - KWinModule *twinmodule; + TWinModule *twinmodule; TQString errStr; /** Memorized 'top' position of the window*/ diff --git a/kxkb/kxkb.cpp b/kxkb/kxkb.cpp index 6aa5b8ee2..a223a6f9b 100644 --- a/kxkb/kxkb.cpp +++ b/kxkb/kxkb.cpp @@ -69,7 +69,7 @@ KXKBApp::KXKBApp(bool allowStyles, bool GUIenabled) m_prevWinId(X11Helper::UNKNOWN_WINDOW_ID), m_rules(nullptr), m_tray(nullptr), - kWinModule(nullptr) + tWinModule(nullptr) { X11Helper::initializeTranslations(); XKBExtension *xkb = XKBExtension::the(); @@ -98,7 +98,7 @@ KXKBApp::~KXKBApp() delete m_tray; delete m_rules; delete m_layoutOwnerMap; - delete kWinModule; + delete tWinModule; delete keys; } @@ -130,8 +130,8 @@ void KXKBApp::readSettings() if (kxkbConfig.m_switchingPolicy == SWITCH_POLICY_GLOBAL) { - delete kWinModule; - kWinModule = nullptr; + delete tWinModule; + tWinModule = nullptr; } else @@ -143,13 +143,13 @@ void KXKBApp::readSettings() //TODO: find out how to handle that } - if (!kWinModule) + if (!tWinModule) { - kWinModule = new KWinModule(nullptr, KWinModule::INFO_DESKTOP); - connect(kWinModule, TQ_SIGNAL(activeWindowChanged(WId)), TQ_SLOT(windowChanged(WId))); + tWinModule = new TWinModule(nullptr, TWinModule::INFO_DESKTOP); + connect(tWinModule, TQ_SIGNAL(activeWindowChanged(WId)), TQ_SLOT(windowChanged(WId))); } - m_prevWinId = kWinModule->activeWindow(); + m_prevWinId = tWinModule->activeWindow(); kdDebug() << "Active window " << m_prevWinId << endl; } diff --git a/kxkb/kxkb.h b/kxkb/kxkb.h index 803057f61..2977101f7 100644 --- a/kxkb/kxkb.h +++ b/kxkb/kxkb.h @@ -45,7 +45,7 @@ DESCRIPTION class XKBExtension; class XkbRules; class TDEGlobalAccel; -class KWinModule; +class TWinModule; class LayoutMap; /* This is the main Kxkb class responsible for reading options @@ -107,7 +107,7 @@ private: XkbRules *m_rules; KxkbSystemTray *m_tray; TDEGlobalAccel *keys; - KWinModule* kWinModule; + TWinModule* tWinModule; bool m_forceSetXKBMap; }; diff --git a/twin/kcmtwin/twinrules/ruleswidget.cpp b/twin/kcmtwin/twinrules/ruleswidget.cpp index 116ac8b41..504321544 100644 --- a/twin/kcmtwin/twinrules/ruleswidget.cpp +++ b/twin/kcmtwin/twinrules/ruleswidget.cpp @@ -108,7 +108,7 @@ RulesWidget::RulesWidget( TQWidget* parent, const char* name ) SETUP( maxsize, force ); SETUP( strictgeometry, force ); SETUP( disableglobalshortcuts, force ); - KWinModule module; + TWinModule module; int i; for( i = 1; i <= module.numberOfDesktops(); diff --git a/twin/workspace.cpp b/twin/workspace.cpp index 57171d706..af7b671d7 100644 --- a/twin/workspace.cpp +++ b/twin/workspace.cpp @@ -216,7 +216,7 @@ Workspace::Workspace( bool restore ) tdeApp->setGlobalMouseTracking( true ); // so that this doesn't mess eventmask on root window later // call this before XSelectInput() on the root window startup = new TDEStartupInfo( - TDEStartupInfo::DisableKWinModule | TDEStartupInfo::AnnounceSilenceChanges, this ); + TDEStartupInfo::DisableTWinModule | TDEStartupInfo::AnnounceSilenceChanges, this ); // select windowmanager privileges XSelectInput(tqt_xdisplay(), root, -- cgit v1.2.3