diff options
author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2010-07-31 19:33:34 +0000 |
---|---|---|
committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2010-07-31 19:33:34 +0000 |
commit | c663b6440964f6ac48027143ac9e63298991f9d0 (patch) | |
tree | 6d8b0c5a5f9db1ee16acf98b1397cea9126b281d /kwin/activation.cpp | |
parent | a061f7191beebb0e4a3b0c0a7c534ec5f22f2dc7 (diff) | |
download | tdebase-c663b6440964f6ac48027143ac9e63298991f9d0.tar.gz tdebase-c663b6440964f6ac48027143ac9e63298991f9d0.zip |
Trinity Qt initial conversion
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1157639 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kwin/activation.cpp')
-rw-r--r-- | kwin/activation.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/kwin/activation.cpp b/kwin/activation.cpp index a6844b737..f80a00f9a 100644 --- a/kwin/activation.cpp +++ b/kwin/activation.cpp @@ -20,7 +20,7 @@ License. See the file "COPYING" for the exact licensing terms. #include "workspace.h" #include <fixx11h.h> -#include <qpopupmenu.h> +#include <tqpopupmenu.h> #include <kxerrorhandler.h> #include <kstartupinfo.h> #include <kstringhandler.h> @@ -44,7 +44,7 @@ namespace KWinInternal to force focus change even in cases when ICCCM 4.2.7 doesn't allow it (e.g. they may try to activate their main window because the user definitely "needs" to see something happened - misusing - of QWidget::setActiveWindow() may be such case). + of TQWidget::setActiveWindow() may be such case). There are 4 ways how a window may become active: - the user changes the active window (e.g. focus follows mouse, clicking @@ -221,7 +221,7 @@ void Workspace::setActiveClient( Client* c, allowed_t ) closeActivePopup(); StackingUpdatesBlocker blocker( this ); ++set_active_client_recursion; - updateFocusMousePosition( QCursor::pos()); + updateFocusMousePosition( TQCursor::pos()); if( active_client != NULL ) { // note that this may call setActiveClient( NULL ), therefore the recursion counter active_client->setActive( false, !c || !c->isModal() || c != active_client->transientFor() ); @@ -713,8 +713,8 @@ void Client::demandAttention( bool set ) if( demandAttentionKNotifyTimer == NULL ) { - demandAttentionKNotifyTimer = new QTimer( this ); - connect( demandAttentionKNotifyTimer, SIGNAL( timeout()), SLOT( demandAttentionKNotify())); + demandAttentionKNotifyTimer = new TQTimer( this ); + connect( demandAttentionKNotifyTimer, TQT_SIGNAL( timeout()), TQT_SLOT( demandAttentionKNotify())); } demandAttentionKNotifyTimer->start( 1000, true ); } |