From cc0ad49c75d6cf6b4e63eb8c6012afe55c1589f9 Mon Sep 17 00:00:00 2001 From: tpearson Date: Tue, 15 Feb 2011 19:15:16 +0000 Subject: Allow kdebase to (mostly) function correctly with TQt for Qt4 Fix kicker tackbar handling under Classic mode (thanks to Ilya Chernykh for the patch) Fix a newly invalidated section of code under GCC 4.5.2 (http://gcc.gnu.org/bugzilla/show_bug.cgi?id=47723#c6) git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1220927 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- kwin/workspace.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'kwin/workspace.cpp') diff --git a/kwin/workspace.cpp b/kwin/workspace.cpp index 448732963..7cb63acd2 100644 --- a/kwin/workspace.cpp +++ b/kwin/workspace.cpp @@ -1197,7 +1197,7 @@ void ObscuringWindows::create( Client* c ) ObscuringWindows::~ObscuringWindows() { - max_cache_size = QMAX( max_cache_size, obscuring_windows.count() + 4 ) - 1; + max_cache_size = TQMAX( max_cache_size, obscuring_windows.count() + 4 ) - 1; for( TQValueList::ConstIterator it = obscuring_windows.begin(); it != obscuring_windows.end(); ++it ) @@ -1829,7 +1829,7 @@ void Workspace::slotGrabWindow() } } - QClipboard *cb = TQApplication::clipboard(); + TQClipboard *cb = TQApplication::tqclipboard(); cb->setPixmap( snapshot ); } else @@ -1842,7 +1842,7 @@ void Workspace::slotGrabWindow() void Workspace::slotGrabDesktop() { TQPixmap p = TQPixmap::grabWindow( qt_xrootwin() ); - QClipboard *cb = TQApplication::clipboard(); + TQClipboard *cb = TQApplication::tqclipboard(); cb->setPixmap( p ); } -- cgit v1.2.3