From 8155225c9be993acc0512956416d195edfef4eb9 Mon Sep 17 00:00:00 2001 From: tpearson Date: Wed, 19 Jan 2011 01:42:14 +0000 Subject: Enable compilation with TQt for Qt4 3.4.0 TP2 This should not break compatibility with TQt for Qt3; if it does please fix it ASAP! git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1215552 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- ksystraycmd/ksystraycmd.cpp | 14 +++++++------- ksystraycmd/ksystraycmd.h | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) (limited to 'ksystraycmd') diff --git a/ksystraycmd/ksystraycmd.cpp b/ksystraycmd/ksystraycmd.cpp index f912c1221..3fd228a30 100644 --- a/ksystraycmd/ksystraycmd.cpp +++ b/ksystraycmd/ksystraycmd.cpp @@ -25,8 +25,8 @@ KSysTrayCmd::KSysTrayCmd() isVisible(true), lazyStart( false ), noquit( false ), quitOnHide( false ), onTop(false), ownIcon(false), win(0), client(0), kwinmodule(0), top(0), left(0) { - setAlignment( AlignCenter ); - kwinmodule = new KWinModule( this ); + tqsetAlignment( AlignCenter ); + kwinmodule = new KWinModule( TQT_TQOBJECT(this) ); refresh(); } @@ -195,7 +195,7 @@ void KSysTrayCmd::clientExited() if ( lazyStart && noquit ) refresh(); else - qApp->quit(); + tqApp->quit(); } void KSysTrayCmd::quitClient() @@ -212,11 +212,11 @@ void KSysTrayCmd::quitClient() // That's why when the application is closed we aren't informed. // So we quit now. if ( !command ) { - qApp->quit(); + tqApp->quit(); } } else { - qApp->quit(); + tqApp->quit(); } } @@ -225,7 +225,7 @@ void KSysTrayCmd::quit() if ( !isVisible ) { showWindow(); } - qApp->quit(); + tqApp->quit(); } void KSysTrayCmd::execContextMenu( const TQPoint &pos ) @@ -292,7 +292,7 @@ void KSysTrayCmd::windowChanged( WId w ) void KSysTrayCmd::mousePressEvent( TQMouseEvent *e ) { - if ( e->button() == RightButton ) + if ( e->button() == Qt::RightButton ) execContextMenu( e->globalPos() ); else if ( lazyStart && ( !hasRunningClient() ) ) { diff --git a/ksystraycmd/ksystraycmd.h b/ksystraycmd/ksystraycmd.h index 90e3bc36f..b8af38785 100644 --- a/ksystraycmd/ksystraycmd.h +++ b/ksystraycmd/ksystraycmd.h @@ -14,7 +14,7 @@ class KWinModule; * * @author Richard Moore, rich@kde.org */ -class KSysTrayCmd : public QLabel +class KSysTrayCmd : public TQLabel { Q_OBJECT public: -- cgit v1.2.3