From fde9470fdc13eda19011cb648f8c2d17e74aad31 Mon Sep 17 00:00:00 2001
From: Laurent Montel <montel@kde.org>
Date: Fri, 10 Feb 2006 15:33:40 +0000
Subject: [PATCH] Fix QToolTip

svn path=/trunk/KDE/kdebase/workspace/; revision=508032
---
 clients/b2/b2client.cpp             | 3 ---
 clients/keramik/keramik.cpp         | 3 ---
 clients/kwmtheme/kwmthemeclient.cpp | 2 --
 lib/kcommondecoration.cpp           | 1 -
 4 files changed, 9 deletions(-)

diff --git a/clients/b2/b2client.cpp b/clients/b2/b2client.cpp
index f21f783a6c..8eb1240c30 100644
--- a/clients/b2/b2client.cpp
+++ b/clients/b2/b2client.cpp
@@ -820,7 +820,6 @@ void B2Client::desktopChange()
     bool on = isOnAllDesktops();
     if (B2Button *b = button[BtnSticky]) {
         b->setDown(on);
-	QToolTip::remove(b);
 	b->setToolTip( 
 		on ? i18n("Not on all desktops") : i18n("On all desktops"));
     }
@@ -832,7 +831,6 @@ void B2Client::maximizeChange()
     if (button[BtnMax]) {
         button[BtnMax]->setPixmaps(m ? P_NORMALIZE : P_MAX);
         button[BtnMax]->repaint();
-	QToolTip::remove(button[BtnMax]);
 	button[BtnMax]->setToolTip(
 		m ? i18n("Restore") : i18n("Maximize"));
     }
@@ -866,7 +864,6 @@ void B2Client::shadeChange()
     g->activate();
     doShape();
     if (B2Button *b = button[BtnShade]) {
-	QToolTip::remove(b);
 	b->setToolTip( isSetShade() ? i18n("Unshade") : i18n("Shade"));
     }
 }
diff --git a/clients/keramik/keramik.cpp b/clients/keramik/keramik.cpp
index 8cb586d0b2..2c9cb19b5e 100644
--- a/clients/keramik/keramik.cpp
+++ b/clients/keramik/keramik.cpp
@@ -1411,7 +1411,6 @@ void KeramikClient::maximizeChange()
 	}
 
 	if ( button[ MaxButton ] ) {
-		QToolTip::remove( button[ MaxButton ] );
 		button[ MaxButton ]->setToolTip( maximizeMode() == MaximizeFull ? i18n("Restore") : i18n("Maximize") );
 		button[ MaxButton ]->repaint();
 	}
@@ -1423,7 +1422,6 @@ void KeramikClient::desktopChange()
 	if ( button[ OnAllDesktopsButton ] )
 		{
                 button[ OnAllDesktopsButton ]->repaint( true );
-		QToolTip::remove( button[ OnAllDesktopsButton ] );
 		button[ OnAllDesktopsButton ]->setToolTip( isOnAllDesktops() ? i18n("Not on all desktops") : i18n("On all desktops") );
 		}
 }
@@ -1434,7 +1432,6 @@ void KeramikClient::shadeChange()
 	if ( button[ ShadeButton ] )
 		{
                 button[ ShadeButton ]->repaint( true );
-		QToolTip::remove( button[ ShadeButton ] );
 		button[ ShadeButton ]->setToolTip( isSetShade() ? i18n("Unshade") : i18n("Shade") );
 		}
 }
diff --git a/clients/kwmtheme/kwmthemeclient.cpp b/clients/kwmtheme/kwmthemeclient.cpp
index bb46bd78a6..bb118a68bd 100644
--- a/clients/kwmtheme/kwmthemeclient.cpp
+++ b/clients/kwmtheme/kwmthemeclient.cpp
@@ -761,7 +761,6 @@ void KWMThemeClient::desktopChange()
     if (stickyBtn) {
        bool on = isOnAllDesktops();
        stickyBtn->setPixmap(on ? *pindownPix : *pinupPix);
-       QToolTip::remove( stickyBtn );
        stickyBtn->setToolTip( on ? i18n("Unsticky") : i18n("Sticky") );
     }
 }
@@ -771,7 +770,6 @@ void KWMThemeClient::maximizeChange()
     if (maxBtn) {
        bool m = maximizeMode() == MaximizeFull;
        maxBtn->setPixmap(m ? *minmaxPix : *maxPix);
-       QToolTip::remove( maxBtn );
        maxBtn->setToolTip( m ? i18n("Restore") : i18n("Maximize"));
     }
 }
diff --git a/lib/kcommondecoration.cpp b/lib/kcommondecoration.cpp
index b6846c2619..d844b9d835 100644
--- a/lib/kcommondecoration.cpp
+++ b/lib/kcommondecoration.cpp
@@ -928,7 +928,6 @@ QSize KCommonDecorationButton::sizeHint() const
 }
 
 void KCommonDecorationButton::setTipText(const QString &tip) {
-    QToolTip::remove(this );
     this->setToolTip( tip );
 }