From ffe8a83e053396df448e9413828527613ca3bd46 Mon Sep 17 00:00:00 2001 From: tpearson Date: Sat, 31 Jul 2010 19:46:43 +0000 Subject: Trinity Qt initial conversion git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdelibs@1157647 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- kdecore/kwinmodule.cpp | 134 ++++++++++++++++++++++++------------------------- 1 file changed, 67 insertions(+), 67 deletions(-) (limited to 'kdecore/kwinmodule.cpp') diff --git a/kdecore/kwinmodule.cpp b/kdecore/kwinmodule.cpp index 9e3532b0f..7e4d4f773 100644 --- a/kdecore/kwinmodule.cpp +++ b/kdecore/kwinmodule.cpp @@ -21,15 +21,15 @@ Boston, MA 02110-1301, USA. */ -#include +#include #ifdef Q_WS_X11 //FIXME #include "kwinmodule.h" #include "kwin.h" #include #include "kapplication.h" #include "kdebug.h" -#include -#include +#include +#include #include #include #include "netwm.h" @@ -58,11 +58,11 @@ static unsigned long desktop_properties[ 2 ] = { NET::KDESystemTrayWindows, NET::WM2ShowingDesktop }; -class KWinModulePrivate : public QWidget, public NETRootInfo4 +class KWinModulePrivate : public TQWidget, public NETRootInfo4 { public: KWinModulePrivate(int _what) - : QWidget(0,0), NETRootInfo4( qt_xdisplay(), + : TQWidget(0,0), NETRootInfo4( qt_xdisplay(), _what >= KWinModule::INFO_WINDOWS ? windows_properties : desktop_properties, 2, @@ -79,23 +79,23 @@ public: ~KWinModulePrivate() { } - QPtrList modules; + TQPtrList modules; - QValueList windows; - QValueList stackingOrder; - QValueList systemTrayWindows; + TQValueList windows; + TQValueList stackingOrder; + TQValueList systemTrayWindows; struct StrutData { StrutData( WId window_, const NETStrut& strut_, int desktop_ ) : window( window_ ), strut( strut_ ), desktop( desktop_ ) {}; - StrutData() {}; // for QValueList to be happy + StrutData() {}; // for TQValueList to be happy WId window; NETStrut strut; int desktop; }; - QValueList strutWindows; - QValueList possibleStrutWindows; + TQValueList strutWindows; + TQValueList possibleStrutWindows; bool strutSignalConnected; int what; @@ -109,18 +109,18 @@ public: void updateStackingOrder(); bool removeStrutWindow( WId ); - QSize numberOfViewports(int desktop) const; - QPoint currentViewport(int desktop) const; + TQSize numberOfViewports(int desktop) const; + TQPoint currentViewport(int desktop) const; }; -KWinModule::KWinModule( QObject* parent ) - : QObject( parent, "kwin_module" ) +KWinModule::KWinModule( TQObject* parent ) + : TQObject( parent, "kwin_module" ) { init(INFO_ALL); } -KWinModule::KWinModule( QObject* parent, int what ) - : QObject( parent, "kwin_module" ) +KWinModule::KWinModule( TQObject* parent, int what ) + : TQObject( parent, "kwin_module" ) { init(what); } @@ -138,11 +138,11 @@ void KWinModule::init(int what) } else if (static_d->what < what) { - QPtrList modules = static_d->modules; + TQPtrList modules = static_d->modules; delete static_d; static_d = new KWinModulePrivate(what); static_d->modules = modules; - for ( QPtrListIterator mit( modules ); mit.current(); ++mit ) + for ( TQPtrListIterator mit( modules ); mit.current(); ++mit ) (*mit)->d = static_d; } @@ -159,12 +159,12 @@ KWinModule::~KWinModule() } } -const QValueList& KWinModule::windows() const +const TQValueList& KWinModule::windows() const { return d->windows; } -const QValueList& KWinModule::stackingOrder() const +const TQValueList& KWinModule::stackingOrder() const { return d->stackingOrder; } @@ -175,16 +175,16 @@ bool KWinModule::hasWId(WId w) const return d->windows.findIndex( w ) != -1; } -const QValueList& KWinModule::systemTrayWindows() const +const TQValueList& KWinModule::systemTrayWindows() const { return d->systemTrayWindows; } -QSize KWinModulePrivate::numberOfViewports(int desktop) const +TQSize KWinModulePrivate::numberOfViewports(int desktop) const { NETSize netdesktop = desktopGeometry(desktop); - QSize s(netdesktop.width / QApplication::desktop()->width(), - netdesktop.height / QApplication::desktop()->height()); + TQSize s(netdesktop.width / TQApplication::desktop()->width(), + netdesktop.height / TQApplication::desktop()->height()); // workaround some kwin bugs if (s.width() < 1) s.setWidth(1); @@ -192,12 +192,12 @@ QSize KWinModulePrivate::numberOfViewports(int desktop) const return s; } -QPoint KWinModulePrivate::currentViewport(int desktop) const +TQPoint KWinModulePrivate::currentViewport(int desktop) const { NETPoint netviewport = desktopViewport(desktop); - return QPoint(1+(netviewport.x / QApplication::desktop()->width()), - 1+(netviewport.y / QApplication::desktop()->height())); + return TQPoint(1+(netviewport.x / TQApplication::desktop()->width()), + 1+(netviewport.y / TQApplication::desktop()->height())); } bool KWinModulePrivate::x11Event( XEvent * ev ) @@ -211,36 +211,36 @@ bool KWinModulePrivate::x11Event( XEvent * ev ) NETRootInfo::event( ev, m, 5 ); if (( m[ PROTOCOLS ] & CurrentDesktop ) && currentDesktop() != old_current_desktop ) - for ( QPtrListIterator mit( modules ); mit.current(); ++mit ) + for ( TQPtrListIterator mit( modules ); mit.current(); ++mit ) emit (*mit)->currentDesktopChanged( currentDesktop() ); if (( m[ PROTOCOLS ] & ActiveWindow ) && activeWindow() != old_active_window ) - for ( QPtrListIterator mit( modules ); mit.current(); ++mit ) + for ( TQPtrListIterator mit( modules ); mit.current(); ++mit ) emit (*mit)->activeWindowChanged( activeWindow() ); if ( m[ PROTOCOLS ] & DesktopViewport ) { - for ( QPtrListIterator mit( modules ); mit.current(); ++mit ) + for ( TQPtrListIterator mit( modules ); mit.current(); ++mit ) emit (*mit)->currentDesktopViewportChanged(currentDesktop(), currentViewport(currentDesktop())); } if ( m[ PROTOCOLS ] & DesktopGeometry ) { - for ( QPtrListIterator mit( modules ); mit.current(); ++mit ) + for ( TQPtrListIterator mit( modules ); mit.current(); ++mit ) emit (*mit)->desktopGeometryChanged(currentDesktop()); } if ( m[ PROTOCOLS ] & DesktopNames ) - for ( QPtrListIterator mit( modules ); mit.current(); ++mit ) + for ( TQPtrListIterator mit( modules ); mit.current(); ++mit ) emit (*mit)->desktopNamesChanged(); if (( m[ PROTOCOLS ] & NumberOfDesktops ) && numberOfDesktops() != old_number_of_desktops ) - for ( QPtrListIterator mit( modules ); mit.current(); ++mit ) + for ( TQPtrListIterator mit( modules ); mit.current(); ++mit ) emit (*mit)->numberOfDesktopsChanged( numberOfDesktops() ); if ( m[ PROTOCOLS ] & WorkArea ) - for ( QPtrListIterator mit( modules ); mit.current(); ++mit ) + for ( TQPtrListIterator mit( modules ); mit.current(); ++mit ) emit (*mit)->workAreaChanged(); if ( m[ PROTOCOLS ] & ClientListStacking ) { updateStackingOrder(); - for ( QPtrListIterator mit( modules ); mit.current(); ++mit ) + for ( TQPtrListIterator mit( modules ); mit.current(); ++mit ) emit (*mit)->stackingOrderChanged(); } if(( m[ PROTOCOLS2 ] & WM2ShowingDesktop ) && showingDesktop() != old_showing_desktop ) { - for ( QPtrListIterator mit( modules ); mit.current(); ++mit ) + for ( TQPtrListIterator mit( modules ); mit.current(); ++mit ) emit (*mit)->showingDesktopChanged( showingDesktop()); } } else if ( windows.findIndex( ev->xany.window ) != -1 ){ @@ -261,7 +261,7 @@ bool KWinModulePrivate::x11Event( XEvent * ev ) possibleStrutWindows.append( ev->xany.window ); } if ( dirty[ NETWinInfo::PROTOCOLS ] || dirty[ NETWinInfo::PROTOCOLS2 ] ) { - for ( QPtrListIterator mit( modules ); mit.current(); ++mit ) { + for ( TQPtrListIterator mit( modules ); mit.current(); ++mit ) { emit (*mit)->windowChanged( ev->xany.window ); emit (*mit)->windowChanged( ev->xany.window, dirty ); emit (*mit)->windowChanged( ev->xany.window, dirty[ NETWinInfo::PROTOCOLS ] ); @@ -276,7 +276,7 @@ bool KWinModulePrivate::x11Event( XEvent * ev ) bool KWinModulePrivate::removeStrutWindow( WId w ) { - for( QValueList< StrutData >::Iterator it = strutWindows.begin(); + for( TQValueList< StrutData >::Iterator it = strutWindows.begin(); it != strutWindows.end(); ++it ) if( (*it).window == w ) { @@ -295,7 +295,7 @@ void KWinModulePrivate::updateStackingOrder() void KWinModulePrivate::addClient(Window w) { - if ( (what >= KWinModule::INFO_WINDOWS) && !QWidget::find( w ) ) + if ( (what >= KWinModule::INFO_WINDOWS) && !TQWidget::find( w ) ) XSelectInput( qt_xdisplay(), w, PropertyChangeMask | StructureNotifyMask ); bool emit_strutChanged = false; if( strutSignalConnected && modules.count() > 0 ) { @@ -308,7 +308,7 @@ void KWinModulePrivate::addClient(Window w) } else possibleStrutWindows.append( w ); windows.append( w ); - for ( QPtrListIterator mit( modules ); mit.current(); ++mit ) { + for ( TQPtrListIterator mit( modules ); mit.current(); ++mit ) { emit (*mit)->windowAdded( w ); if ( emit_strutChanged ) emit (*mit)->strutChanged(); @@ -327,7 +327,7 @@ void KWinModulePrivate::removeClient(Window w) } possibleStrutWindows.remove( w ); windows.remove( w ); - for ( QPtrListIterator mit( modules ); mit.current(); ++mit ) { + for ( TQPtrListIterator mit( modules ); mit.current(); ++mit ) { emit (*mit)->windowRemoved( w ); if ( emit_strutChanged ) emit (*mit)->strutChanged(); @@ -337,14 +337,14 @@ void KWinModulePrivate::removeClient(Window w) void KWinModulePrivate::addSystemTrayWin(Window w) { systemTrayWindows.append( w ); - for ( QPtrListIterator mit( modules ); mit.current(); ++mit ) + for ( TQPtrListIterator mit( modules ); mit.current(); ++mit ) emit (*mit)->systemTrayWindowAdded( w ); } void KWinModulePrivate::removeSystemTrayWin(Window w) { systemTrayWindows.remove( w ); - for ( QPtrListIterator mit( modules ); mit.current(); ++mit ) + for ( TQPtrListIterator mit( modules ); mit.current(); ++mit ) emit (*mit)->systemTrayWindowRemoved( w ); } @@ -358,12 +358,12 @@ int KWinModule::numberOfDesktops() const return d->numberOfDesktops(); } -QSize KWinModule::numberOfViewports(int desktop) const +TQSize KWinModule::numberOfViewports(int desktop) const { return d->numberOfViewports(desktop); } -QPoint KWinModule::currentViewport(int desktop) const +TQPoint KWinModule::currentViewport(int desktop) const { return d->currentViewport(desktop); } @@ -378,26 +378,26 @@ bool KWinModule::showingDesktop() const return d->showingDesktop(); } -QRect KWinModule::workArea( int desktop ) const +TQRect KWinModule::workArea( int desktop ) const { int desk = (desktop > 0 && desktop <= (int) d->numberOfDesktops() ) ? desktop : currentDesktop(); if ( desk <= 0 ) - return QApplication::desktop()->geometry(); + return TQApplication::desktop()->geometry(); NETRect r = d->workArea( desk ); if( r.size.width <= 0 || r.size.height <= 0 ) // not set - return QApplication::desktop()->geometry(); - return QRect( r.pos.x, r.pos.y, r.size.width, r.size.height ); + return TQApplication::desktop()->geometry(); + return TQRect( r.pos.x, r.pos.y, r.size.width, r.size.height ); } -QRect KWinModule::workArea( const QValueList& exclude, int desktop ) const +TQRect KWinModule::workArea( const TQValueList& exclude, int desktop ) const { - QRect all = QApplication::desktop()->geometry(); - QRect a = all; + TQRect all = TQApplication::desktop()->geometry(); + TQRect a = all; if (desktop == -1) desktop = d->currentDesktop(); - QValueList::ConstIterator it1; + TQValueList::ConstIterator it1; for( it1 = d->windows.begin(); it1 != d->windows.end(); ++it1 ) { if(exclude.findIndex(*it1) != -1) continue; @@ -406,7 +406,7 @@ QRect KWinModule::workArea( const QValueList& exclude, int desktop ) const // to repeatedly find out struts of all windows. Therefore strut values for strut // windows are cached here. NETStrut strut; - QValueList< KWinModulePrivate::StrutData >::Iterator it2 = d->strutWindows.begin(); + TQValueList< KWinModulePrivate::StrutData >::Iterator it2 = d->strutWindows.begin(); for( ; it2 != d->strutWindows.end(); ++it2 ) @@ -426,7 +426,7 @@ QRect KWinModule::workArea( const QValueList& exclude, int desktop ) const } else continue; // not a strut window - QRect r = all; + TQRect r = all; if ( strut.left > 0 ) r.setLeft( r.left() + (int) strut.left ); if ( strut.top > 0 ) @@ -443,20 +443,20 @@ QRect KWinModule::workArea( const QValueList& exclude, int desktop ) const void KWinModule::connectNotify( const char* signal ) { - if( !d->strutSignalConnected && qstrcmp( signal, SIGNAL(strutChanged())) == 0 ) + if( !d->strutSignalConnected && qstrcmp( signal, TQT_SIGNAL(strutChanged())) == 0 ) d->strutSignalConnected = true; - QObject::connectNotify( signal ); + TQObject::connectNotify( signal ); } -QString KWinModule::desktopName( int desktop ) const +TQString KWinModule::desktopName( int desktop ) const { const char* name = d->desktopName( (desktop > 0 && desktop <= (int) d->numberOfDesktops() ) ? desktop : currentDesktop() ); if ( name && name[0] ) - return QString::fromUtf8( name ); + return TQString::fromUtf8( name ); return i18n("Desktop %1").arg( desktop ); } -void KWinModule::setDesktopName( int desktop, const QString& name ) +void KWinModule::setDesktopName( int desktop, const TQString& name ) { if (desktop <= 0 || desktop > (int) d->numberOfDesktops() ) desktop = currentDesktop(); @@ -464,15 +464,15 @@ void KWinModule::setDesktopName( int desktop, const QString& name ) } -void KWinModule::doNotManage( const QString& title ) +void KWinModule::doNotManage( const TQString& title ) { if ( !kapp->dcopClient()->isAttached() ) kapp->dcopClient()->attach(); - QByteArray data, replyData; - QCString replyType; - QDataStream arg(data, IO_WriteOnly); + TQByteArray data, replyData; + TQCString replyType; + TQDataStream arg(data, IO_WriteOnly); arg << title; - kapp->dcopClient()->call("kwin", "", "doNotManage(QString)", + kapp->dcopClient()->call("kwin", "", "doNotManage(TQString)", data, replyType, replyData); } -- cgit v1.2.1