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 --- kdeui/kdetrayproxy/kdetrayproxy.cpp | 10 +++++----- kdeui/kdetrayproxy/kdetrayproxy.h | 10 +++++----- kdeui/kdetrayproxy/module.cpp | 4 ++-- kdeui/kdetrayproxy/module.h | 2 +- 4 files changed, 13 insertions(+), 13 deletions(-) (limited to 'kdeui/kdetrayproxy') diff --git a/kdeui/kdetrayproxy/kdetrayproxy.cpp b/kdeui/kdetrayproxy/kdetrayproxy.cpp index b41b337b3..e49f3a148 100644 --- a/kdeui/kdetrayproxy/kdetrayproxy.cpp +++ b/kdeui/kdetrayproxy/kdetrayproxy.cpp @@ -32,10 +32,10 @@ KDETrayProxy::KDETrayProxy() : selection( makeSelectionAtom()) { - connect( &selection, SIGNAL( newOwner( Window )), SLOT( newOwner( Window ))); - connect( &module, SIGNAL( windowAdded( WId )), SLOT( windowAdded( WId ))); + connect( &selection, TQT_SIGNAL( newOwner( Window )), TQT_SLOT( newOwner( Window ))); + connect( &module, TQT_SIGNAL( windowAdded( WId )), TQT_SLOT( windowAdded( WId ))); selection.owner(); - for( QValueList< WId >::ConstIterator it = module.windows().begin(); + for( TQValueList< WId >::ConstIterator it = module.windows().begin(); it != module.windows().end(); ++it ) windowAdded( *it ); @@ -45,7 +45,7 @@ KDETrayProxy::KDETrayProxy() Atom KDETrayProxy::makeSelectionAtom() { - return XInternAtom( qt_xdisplay(), "_NET_SYSTEM_TRAY_S" + QCString().setNum( qt_xscreen()), False ); + return XInternAtom( qt_xdisplay(), "_NET_SYSTEM_TRAY_S" + TQCString().setNum( qt_xscreen()), False ); } extern Time qt_x_time; @@ -76,7 +76,7 @@ void KDETrayProxy::windowAdded( WId w ) void KDETrayProxy::newOwner( Window owner ) { // kdDebug() << "New owner:" << owner << endl; - for( QValueList< Window >::ConstIterator it = pending_windows.begin(); + for( TQValueList< Window >::ConstIterator it = pending_windows.begin(); it != pending_windows.end(); ++it ) dockWindow( *it, owner ); diff --git a/kdeui/kdetrayproxy/kdetrayproxy.h b/kdeui/kdetrayproxy/kdetrayproxy.h index 67c9c6299..49a7164cc 100644 --- a/kdeui/kdetrayproxy/kdetrayproxy.h +++ b/kdeui/kdetrayproxy/kdetrayproxy.h @@ -20,10 +20,10 @@ #ifndef _KDE_TRAY_PROXY_H_ #define _KDE_TRAY_PROXY_H_ -#include +#include #include #include -#include +#include class KDETrayProxy : public QWidget @@ -42,9 +42,9 @@ class KDETrayProxy static Atom makeSelectionAtom(); KSelectionWatcher selection; KWinModule module; - QValueList< Window > pending_windows; - QValueList< Window > tray_windows; - QMap< Window, unsigned long > docked_windows; + TQValueList< Window > pending_windows; + TQValueList< Window > tray_windows; + TQMap< Window, unsigned long > docked_windows; }; #endif diff --git a/kdeui/kdetrayproxy/module.cpp b/kdeui/kdetrayproxy/module.cpp index c3a6a7b0c..5da30bab8 100644 --- a/kdeui/kdetrayproxy/module.cpp +++ b/kdeui/kdetrayproxy/module.cpp @@ -19,13 +19,13 @@ #include "module.h" -KDETrayModule::KDETrayModule( const QCString& obj ) +KDETrayModule::KDETrayModule( const TQCString& obj ) : KDEDModule( obj ) { } extern "C" -KDE_EXPORT KDEDModule *create_kdetrayproxy( const QCString& obj ) +KDE_EXPORT KDEDModule *create_kdetrayproxy( const TQCString& obj ) { return new KDETrayModule( obj ); } diff --git a/kdeui/kdetrayproxy/module.h b/kdeui/kdetrayproxy/module.h index f5ef55f6d..67ed1a29d 100644 --- a/kdeui/kdetrayproxy/module.h +++ b/kdeui/kdetrayproxy/module.h @@ -31,7 +31,7 @@ class KDETrayModule Q_OBJECT K_DCOP public: - KDETrayModule( const QCString& obj ); + KDETrayModule( const TQCString& obj ); private: KDETrayProxy proxy; }; -- cgit v1.2.1