TDE
/
tdeutils
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/tdeutils
0
0
Fork 0
Code Issues Releases Wiki Activity

Rename KWinModule to TWinModule

Browse Source 
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
pull/120/head
Michele Calgaro 2 weeks ago
parent 1ddc8e16d8
commit daf2382776
Signed by: MicheleC
GPG Key ID: 2A75B7CA8ADED5CF
10 changed files with 27 additions and 27 deletions
Show Stats Download Patch File Download Diff File

12
superkaramba/src/karamba.cpp
Unescape Escape View File

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

2
superkaramba/src/karamba.h
Unescape Escape View File

@ -163,7 +163,7 @@ public:
void toggleWidgetUpdate( bool );
KWinModule* kWinModule;
TWinModule* tWinModule;
TQString incomingData;
TQString getIncomingData() { return incomingData; }

2
superkaramba/src/misc_python.cpp
Unescape Escape View File

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

12
superkaramba/src/showdesktop.cpp
Unescape Escape View File

@ -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<WId> windows = kWinModule->windows();
const TQValueList<WId> windows = tWinModule->windows();
TQValueList<WId>::ConstIterator it;
TQValueList<WId>::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 );
}

4
superkaramba/src/showdesktop.h
Unescape Escape View File

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

2
superkaramba/src/systemtray.cpp
Unescape Escape View File

@ -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<WId>::ConstIterator end(systemTrayWindows.end());
for (TQValueList<WId>::ConstIterator it = systemTrayWindows.begin(); it!=end; ++it)

4
superkaramba/src/systemtray.h
Unescape Escape View File

@ -26,7 +26,7 @@
#include <tqptrlist.h>
#include <qxembed.h>
class KWinModule;
class TWinModule;
typedef long unsigned int Atom;
@ -56,7 +56,7 @@ signals:
void updated();
private:
KWinModule *twin_module;
TWinModule *twin_module;
TQValueList<WId> systemTrayWindows;
TQPtrList<QXEmbed> m_Wins;

8
superkaramba/src/taskmanager.cpp
Unescape Escape View File

@ -40,19 +40,19 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
template class TQPtrList<Task>;
// 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)));

4
superkaramba/src/taskmanager.h
Unescape Escape View File

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

4
tdelirc/irkick/irkick.cpp
Unescape Escape View File

@ -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<WId> s = KWinModule().stackingOrder();
{ TQValueList<WId> s = TWinModule().stackingOrder();
// go through all the (ordered) window pids
for(TQValueList<WId>::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<WId> s = KWinModule().stackingOrder();
{ TQValueList<WId> s = TWinModule().stackingOrder();
// go through all the (ordered) window pids
for(TQValueList<WId>::iterator i = s.begin(); i != s.end(); ++i)
{ int p = KWin::info(*i).pid;

Write Preview
Loading…
Cancel
Save