From 27556c799540cacccf0e520ddd93b2a527c9244f Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Thu, 5 Mar 2026 09:27:52 +0900 Subject: Rename KWinModule to TWinModule Signed-off-by: Michele Calgaro --- kalarm/messagewin.cpp | 8 ++++---- kalarm/messagewin.h | 4 ++-- karm/desktoptracker.cpp | 12 ++++++------ karm/desktoptracker.h | 2 +- karm/edittaskdialog.cpp | 2 +- 5 files changed, 14 insertions(+), 14 deletions(-) diff --git a/kalarm/messagewin.cpp b/kalarm/messagewin.cpp index 4e8c90a8..9c2e0a03 100644 --- a/kalarm/messagewin.cpp +++ b/kalarm/messagewin.cpp @@ -400,7 +400,7 @@ void MessageWin::initView() topLayout->addStretch(); // Don't include any horizontal margins if message is 2/3 screen width if (!mWinModule) - mWinModule = new KWinModule(0, KWinModule::INFO_DESKTOP); + mWinModule = new TWinModule(0, TWinModule::INFO_DESKTOP); if (text->sizeHint().width() >= mWinModule->workArea().width()*2/3) topLayout->addWidget(text, 1, TQt::AlignHCenter); else @@ -1205,7 +1205,7 @@ TQSize MessageWin::sizeHint() const if (mAction != KAEvent::MESSAGE) return MainWindowBase::sizeHint(); if (!mWinModule) - mWinModule = new KWinModule(0, KWinModule::INFO_DESKTOP); + mWinModule = new TWinModule(0, TWinModule::INFO_DESKTOP); TQSize frame = frameGeometry().size(); TQSize contents = geometry().size(); TQSize desktop = mWinModule->workArea().size(); @@ -1260,7 +1260,7 @@ void MessageWin::showEvent(TQShowEvent* se) */ TQPoint cursor = TQCursor::pos(); if (!mWinModule) - mWinModule = new KWinModule(0, KWinModule::INFO_DESKTOP); + mWinModule = new TWinModule(0, TWinModule::INFO_DESKTOP); TQRect desk = mWinModule->workArea(); TQDesktopWidget* dw = TQApplication::desktop(); if (dw->numScreens() > 1) @@ -1653,7 +1653,7 @@ bool wantModal() bool modal = Preferences::modalMessages(); if (modal) { - KWinModule wm(0, KWinModule::INFO_DESKTOP); + TWinModule wm(0, TWinModule::INFO_DESKTOP); KWin::WindowInfo wi = KWin::windowInfo(wm.activeWindow(), NET::WMState); modal = !(wi.valid() && wi.hasState(NET::FullScreen)); } diff --git a/kalarm/messagewin.h b/kalarm/messagewin.h index 8cf48740..9823d09b 100644 --- a/kalarm/messagewin.h +++ b/kalarm/messagewin.h @@ -32,7 +32,7 @@ class TQPushButton; class KPushButton; class TQLabel; class TQTimer; -class KWinModule; +class TWinModule; class AlarmTimeWidget; class DeferAlarmDlg; class KArtsDispatcher; @@ -146,7 +146,7 @@ class MessageWin : public MainWindowBase TQPushButton* mKMailButton; DeferAlarmDlg* mDeferDlg; TQDateTime mDeferLimit; // last time to which the message can currently be deferred - mutable KWinModule* mWinModule; + mutable TWinModule* mWinModule; int mFlags; int mLateCancel; int mButtonDelay; // delay (ms) after window is shown before buttons are enabled diff --git a/karm/desktoptracker.cpp b/karm/desktoptracker.cpp index cf41d5b3..46b3865b 100644 --- a/karm/desktoptracker.cpp +++ b/karm/desktoptracker.cpp @@ -11,11 +11,11 @@ const int minimumInterval = 5; // seconds DesktopTracker::DesktopTracker () { // Setup desktop change handling - connect( &kWinModule, TQ_SIGNAL( currentDesktopChanged(int) ), + connect( &tWinModule, TQ_SIGNAL( currentDesktopChanged(int) ), this, TQ_SLOT( handleDesktopChange(int) )); - _desktopCount = kWinModule.numberOfDesktops(); - _previousDesktop = kWinModule.currentDesktop()-1; + _desktopCount = tWinModule.numberOfDesktops(); + _previousDesktop = tWinModule.currentDesktop()-1; // TODO: removed? fixed by Lubos? // currentDesktop will return 0 if no window manager is started if( _previousDesktop < 0 ) _previousDesktop = 0; @@ -60,7 +60,7 @@ void DesktopTracker::changeTimers() TQString DesktopTracker::startTracking() { TQString err; - int currentDesktop = kWinModule.currentDesktop() -1; + int currentDesktop = tWinModule.currentDesktop() -1; // TODO: removed? fixed by Lubos? // currentDesktop will return 0 if no window manager is started if ( currentDesktop < 0 ) currentDesktop = 0; @@ -89,7 +89,7 @@ void DesktopTracker::registerForDesktops( Task* task, DesktopList desktopList) desktopTracker[i].erase(tit); // if the task was previously tracking this desktop then // emit a signal that is not tracking it any more - if( i == kWinModule.currentDesktop() -1) + if( i == tWinModule.currentDesktop() -1) emit leftActiveDesktop(task); } @@ -115,7 +115,7 @@ void DesktopTracker::registerForDesktops( Task* task, DesktopList desktopList) v.erase(tit); // so we delete it from desktopTracker // if the task was previously tracking this desktop then // emit a signal that is not tracking it any more - if( i == kWinModule.currentDesktop() -1) + if( i == tWinModule.currentDesktop() -1) emit leftActiveDesktop(task); } } diff --git a/karm/desktoptracker.h b/karm/desktoptracker.h index d02931bd..10a5d6d5 100644 --- a/karm/desktoptracker.h +++ b/karm/desktoptracker.h @@ -31,7 +31,7 @@ class DesktopTracker: public TQObject int desktopCount() const { return _desktopCount; }; private: // member variables - KWinModule kWinModule; + TWinModule tWinModule; // define vectors for at most 16 virtual desktops // E.g.: desktopTrackerStop[3] contains a vector with diff --git a/karm/edittaskdialog.cpp b/karm/edittaskdialog.cpp index 37d215d5..2fceb447 100644 --- a/karm/edittaskdialog.cpp +++ b/karm/edittaskdialog.cpp @@ -47,7 +47,7 @@ EditTaskDialog::EditTaskDialog( TQString caption, bool editDlg, { TQWidget *page = new TQWidget( this ); setMainWidget(page); - KWinModule twinmodule(0, KWinModule::INFO_DESKTOP); + TWinModule twinmodule(0, TWinModule::INFO_DESKTOP); TQVBoxLayout *lay1 = new TQVBoxLayout(page); -- cgit v1.2.3