From daf23827766a9e3949c21880dde7dd52fd856d13 Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Thu, 5 Mar 2026 09:28:22 +0900 Subject: Rename KWinModule to TWinModule Signed-off-by: Michele Calgaro --- superkaramba/src/karamba.cpp | 12 ++++++------ superkaramba/src/karamba.h | 2 +- superkaramba/src/misc_python.cpp | 2 +- superkaramba/src/showdesktop.cpp | 12 ++++++------ superkaramba/src/showdesktop.h | 4 ++-- superkaramba/src/systemtray.cpp | 2 +- superkaramba/src/systemtray.h | 4 ++-- superkaramba/src/taskmanager.cpp | 8 ++++---- superkaramba/src/taskmanager.h | 4 ++-- tdelirc/irkick/irkick.cpp | 4 ++-- 10 files changed, 27 insertions(+), 27 deletions(-) diff --git a/superkaramba/src/karamba.cpp b/superkaramba/src/karamba.cpp index eab94db6..f4e3767b 100644 --- a/superkaramba/src/karamba.cpp +++ b/superkaramba/src/karamba.cpp @@ -54,7 +54,7 @@ karamba::karamba(TQString fn, TQString name, bool reloading, int instance, TQWidget(0,"karamba", TQt::WGroupLeader | WStyle_Customize | WRepaintNoErase| WStyle_NoBorder | WDestructiveClose ), meterList(0), imageList(0), clickList(0), kpop(0), widgetMask(0), - config(0), kWinModule(0), tempUnit('C'), m_instance(instance), + config(0), tWinModule(0), tempUnit('C'), m_instance(instance), sensorList(0), timeList(0), themeConfMenu(0), toDesktopMenu(0), kglobal(0), clickPos(0, 0), accColl(0), menuAccColl(0), toggleLocked(0), pythonIface(0), defaultTextField(0), @@ -139,10 +139,10 @@ karamba::karamba(TQString fn, TQString name, bool reloading, int instance, info = new NETWinInfo( tqt_xdisplay(), winId(), tqt_xrootwin(), NET::WMState ); // could be replaced with TaskManager - kWinModule = new KWinModule(); + tWinModule = new TWinModule(); desktop = 0; - connect( kWinModule,TQ_SIGNAL(currentDesktopChanged(int)), this, + connect( tWinModule,TQ_SIGNAL(currentDesktopChanged(int)), this, TQ_SLOT(currentDesktopChanged(int)) ); connect( tdeApp, TQ_SIGNAL(backgroundChanged(int)), this, TQ_SLOT(currentWallpaperChanged(int))); @@ -175,7 +175,7 @@ karamba::karamba(TQString fn, TQString name, bool reloading, int instance, dslot->setMenuId(mid); toDesktopMenu -> insertSeparator(); - for (int ndesktop=1; ndesktop <= kWinModule->numberOfDesktops(); ndesktop++) + for (int ndesktop=1; ndesktop <= tWinModule->numberOfDesktops(); ndesktop++) { TQString name = i18n("Desktop &"); name += ('0' + ndesktop); @@ -284,7 +284,7 @@ karamba::karamba(TQString fn, TQString name, bool reloading, int instance, } desktop = config -> readNumEntry("desktop", desktop); - if (desktop > kWinModule->numberOfDesktops()) + if (desktop > tWinModule->numberOfDesktops()) { desktop = 0; } @@ -365,7 +365,7 @@ karamba::~karamba() delete themeConfMenu; delete kpop; delete widgetMask; - delete kWinModule; + delete tWinModule; delete defaultTextField; if (pythonIface != NULL) delete pythonIface; diff --git a/superkaramba/src/karamba.h b/superkaramba/src/karamba.h index 6fc2140c..c83ee987 100644 --- a/superkaramba/src/karamba.h +++ b/superkaramba/src/karamba.h @@ -163,7 +163,7 @@ public: void toggleWidgetUpdate( bool ); - KWinModule* kWinModule; + TWinModule* tWinModule; TQString incomingData; TQString getIncomingData() { return incomingData; } diff --git a/superkaramba/src/misc_python.cpp b/superkaramba/src/misc_python.cpp index 5f60ff0e..85dbde0c 100644 --- a/superkaramba/src/misc_python.cpp +++ b/superkaramba/src/misc_python.cpp @@ -564,7 +564,7 @@ int getNumberOfDesktops(long widget) { karamba* currTheme = (karamba*)widget; - return currTheme->kWinModule->numberOfDesktops(); + return currTheme->tWinModule->numberOfDesktops(); } PyObject* py_get_number_of_desktops(PyObject *, PyObject *args) diff --git a/superkaramba/src/showdesktop.cpp b/superkaramba/src/showdesktop.cpp index 1259288e..f37c35ef 100644 --- a/superkaramba/src/showdesktop.cpp +++ b/superkaramba/src/showdesktop.cpp @@ -35,14 +35,14 @@ ShowDesktop* ShowDesktop::the() ShowDesktop::ShowDesktop() : TQObject() , showingDesktop( false ) - , kWinModule( 0 ) + , tWinModule( 0 ) { - kWinModule = new KWinModule( this ); + tWinModule = new TWinModule( this ); // on desktop changes or when a window is deiconified, we abort the show desktop mode - connect( kWinModule, TQ_SIGNAL(currentDesktopChanged(int)), + connect( tWinModule, TQ_SIGNAL(currentDesktopChanged(int)), TQ_SLOT(slotCurrentDesktopChanged(int))); - connect( kWinModule, TQ_SIGNAL(windowChanged(WId,unsigned int)), + connect( tWinModule, TQ_SIGNAL(windowChanged(WId,unsigned int)), TQ_SLOT(slotWindowChanged(WId,unsigned int))); } @@ -91,7 +91,7 @@ void ShowDesktop::showDesktop( bool b ) if ( b ) { // this code should move to KWin after supporting NETWM1.2 iconifiedList.clear(); - const TQValueList windows = kWinModule->windows(); + const TQValueList windows = tWinModule->windows(); TQValueList::ConstIterator it; TQValueList::ConstIterator end( windows.end() ); for ( it=windows.begin(); it!=end; ++it ) { @@ -100,7 +100,7 @@ void ShowDesktop::showDesktop( bool b ) NET::XAWMState | NET::WMDesktop ); if ( info.mappingState() == NET::Visible && ( info.desktop() == NETWinInfo::OnAllDesktops - || info.desktop() == (int) kWinModule->currentDesktop() ) + || info.desktop() == (int) tWinModule->currentDesktop() ) ) { iconifiedList.append( w ); } diff --git a/superkaramba/src/showdesktop.h b/superkaramba/src/showdesktop.h index c26a6503..18a221dd 100644 --- a/superkaramba/src/showdesktop.h +++ b/superkaramba/src/showdesktop.h @@ -22,7 +22,7 @@ #ifndef __showdesktop_h__ #define __showdesktop_h__ -class KWinModule; +class TWinModule; /** * Singleton class that handles desktop access (minimizing all windows) @@ -51,7 +51,7 @@ private: ShowDesktop(); bool showingDesktop; - KWinModule* kWinModule; + TWinModule* tWinModule; TQValueList iconifiedList; }; diff --git a/superkaramba/src/systemtray.cpp b/superkaramba/src/systemtray.cpp index ea93889f..fa604753 100644 --- a/superkaramba/src/systemtray.cpp +++ b/superkaramba/src/systemtray.cpp @@ -82,7 +82,7 @@ void Systemtray::initSystray( void ) Display *display = tqt_xdisplay(); no_of_systray_windows = 0; - twin_module = new KWinModule(); + twin_module = new TWinModule(); systemTrayWindows = twin_module->systemTrayWindows(); TQValueList::ConstIterator end(systemTrayWindows.end()); for (TQValueList::ConstIterator it = systemTrayWindows.begin(); it!=end; ++it) diff --git a/superkaramba/src/systemtray.h b/superkaramba/src/systemtray.h index ba2d87cf..3165bbd1 100644 --- a/superkaramba/src/systemtray.h +++ b/superkaramba/src/systemtray.h @@ -26,7 +26,7 @@ #include #include -class KWinModule; +class TWinModule; typedef long unsigned int Atom; @@ -56,7 +56,7 @@ signals: void updated(); private: - KWinModule *twin_module; + TWinModule *twin_module; TQValueList systemTrayWindows; TQPtrList m_Wins; diff --git a/superkaramba/src/taskmanager.cpp b/superkaramba/src/taskmanager.cpp index b666d280..abfd99f3 100644 --- a/superkaramba/src/taskmanager.cpp +++ b/superkaramba/src/taskmanager.cpp @@ -40,19 +40,19 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. template class TQPtrList; -// Hack: create a global KWinModule without a parent. We +// Hack: create a global TWinModule without a parent. We // can't make it a child of TaskManager because more than one // TaskManager might be created. We can't make it a class // 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* twin_module = 0; +// The real problem is that TWinModule should be a singleton. +TWinModule* twin_module = 0; TaskManager::TaskManager(TQObject *parent, const char *name) : TQObject(parent, name), _active(0), _startup_info( NULL ) { - twin_module = new KWinModule(); + twin_module = new TWinModule(); // TDEGlobal::locale()->insertCatalogue("libtaskmanager"); connect(twin_module, TQ_SIGNAL(windowAdded(WId)), TQ_SLOT(windowAdded(WId))); diff --git a/superkaramba/src/taskmanager.h b/superkaramba/src/taskmanager.h index 0626b505..da6d834d 100644 --- a/superkaramba/src/taskmanager.h +++ b/superkaramba/src/taskmanager.h @@ -44,7 +44,7 @@ class TaskManager; * A dynamic interface to a task (main window). * * @see TaskManager - * @see KWinModule + * @see TWinModule */ class Task: public TQObject { @@ -426,7 +426,7 @@ typedef TQPtrList StartupList; * * @see Task * @see Startup - * @see KWinModule + * @see TWinModule * @version $Id: taskmanager.h,v 1.2 2004/11/17 10:16:47 kodaaja Exp $ */ class TaskManager : public TQObject diff --git a/tdelirc/irkick/irkick.cpp b/tdelirc/irkick/irkick.cpp index 6255430c..62873a35 100644 --- a/tdelirc/irkick/irkick.cpp +++ b/tdelirc/irkick/irkick.cpp @@ -201,7 +201,7 @@ bool IRKick::getPrograms(const IRAction &action, TQStringList &programs) if(programs.size() > 1 && action.ifMulti() == IM_DONTSEND) return false; else if(programs.size() > 1 && action.ifMulti() == IM_SENDTOTOP) - { TQValueList s = KWinModule().stackingOrder(); + { TQValueList s = TWinModule().stackingOrder(); // go through all the (ordered) window pids for(TQValueList::iterator i = s.fromLast(); i != s.end(); i--) { int p = KWin::info(*i).pid; @@ -215,7 +215,7 @@ bool IRKick::getPrograms(const IRAction &action, TQStringList &programs) while(programs.size() > 1) programs.remove(programs.begin()); } else if(programs.size() > 1 && action.ifMulti() == IM_SENDTOBOTTOM) - { TQValueList s = KWinModule().stackingOrder(); + { TQValueList s = TWinModule().stackingOrder(); // go through all the (ordered) window pids for(TQValueList::iterator i = s.begin(); i != s.end(); ++i) { int p = KWin::info(*i).pid; -- cgit v1.2.3