From cc0ad49c75d6cf6b4e63eb8c6012afe55c1589f9 Mon Sep 17 00:00:00 2001
From: tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>
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/COMPLIANCE                         | 2 +-
 kwin/kcmkwin/kwindecoration/buttons.cpp | 8 ++++----
 kwin/manage.cpp                         | 4 ++--
 kwin/workspace.cpp                      | 6 +++---
 4 files changed, 10 insertions(+), 10 deletions(-)

(limited to 'kwin')

diff --git a/kwin/COMPLIANCE b/kwin/COMPLIANCE
index e63455e4f..8f3222f9b 100644
--- a/kwin/COMPLIANCE
+++ b/kwin/COMPLIANCE
@@ -164,7 +164,7 @@ version 2.0
 + 2.8. kmanagerselection.* in kdecore
 + 2. (rest of the section)
         Not a KWin thing.
-*   - patch sent to TT to make QClipboard sufficiently compliant
+*   - patch sent to TT to make TQClipboard sufficiently compliant
 + 3.
         Feature not supported, obsolete.
 + 4.1.1
diff --git a/kwin/kcmkwin/kwindecoration/buttons.cpp b/kwin/kcmkwin/kwindecoration/buttons.cpp
index 67f197fd9..b5736fcce 100644
--- a/kwin/kcmkwin/kwindecoration/buttons.cpp
+++ b/kwin/kcmkwin/kwindecoration/buttons.cpp
@@ -167,7 +167,7 @@ void ButtonSource::hideAllButtons()
 {
 	TQListViewItemIterator it(this);
 	while (it.current() ) {
-		it.current()->setVisible(false);
+		it.current()->tqsetVisible(false);
 		++it;
 	}
 }
@@ -176,7 +176,7 @@ void ButtonSource::showAllButtons()
 {
 	TQListViewItemIterator it(this);
 	while (it.current() ) {
-		it.current()->setVisible(true);
+		it.current()->tqsetVisible(true);
 		++it;
 	}
 }
@@ -187,7 +187,7 @@ void ButtonSource::showButton( TQChar btn )
 	while (it.current() ) {
 		ButtonSourceItem *item = dynamic_cast<ButtonSourceItem*>(it.current() );
 		if (item && item->button().type == btn) {
-			it.current()->setVisible(true);
+			it.current()->tqsetVisible(true);
 			return;
 		}
 		++it;
@@ -200,7 +200,7 @@ void ButtonSource::hideButton( TQChar btn )
 	while (it.current() ) {
 		ButtonSourceItem *item = dynamic_cast<ButtonSourceItem*>(it.current() );
 		if (item && item->button().type == btn && !item->button().duplicate) {
-			it.current()->setVisible(false);
+			it.current()->tqsetVisible(false);
 			return;
 		}
 		++it;
diff --git a/kwin/manage.cpp b/kwin/manage.cpp
index dc05e5e2c..c50a504d0 100644
--- a/kwin/manage.cpp
+++ b/kwin/manage.cpp
@@ -573,9 +573,9 @@ void Client::embedClient( Window w, const XWindowAttributes &attr )
 		    attr.depth, InputOutput, attr.visual,
 		    CWColormap | CWBackPixmap | CWBorderPixel, &swa );
 
-    XDefineCursor( qt_xdisplay(), frame, TQCursor(tqarrowCursor).handle());
+    XDefineCursor( qt_xdisplay(), frame, tqarrowCursor.handle());
     // some apps are stupid and don't define their own cursor - set the arrow one for them
-    XDefineCursor( qt_xdisplay(), wrapper, TQCursor(tqarrowCursor).handle());
+    XDefineCursor( qt_xdisplay(), wrapper, tqarrowCursor.handle());
     XReparentWindow( qt_xdisplay(), client, wrapper, 0, 0 );
     XSelectInput( qt_xdisplay(), frame,
             KeyPressMask | KeyReleaseMask |
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<Window>::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.1