Fix the following problems under Qt4:

* Konsole compilation failure
* ksplash exit failure
* kicker rounded tip masking behaviour
* kwin auto-exit issue


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1223001 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

1 files changed, 5 insertions, 5 deletions

diff --git a/kicker/libkicker/kickertip.cpp b/kicker/libkicker/kickertip.cpp
index 69e0897f8..47a66f845 100644
--- a/kicker/libkicker/kickertip.cpp
+++ b/kicker/libkicker/kickertip.cpp
@@ -283,9 +283,9 @@ void KickerTip::plainMask()
 {
     TQPainter maskPainter(&m_mask);
 
-    m_mask.fill(Qt::black);
+    m_mask.fill(Qt::color0);
 
-    maskPainter.setBrush(Qt::white);
+    maskPainter.setBrush(Qt::color1);
     maskPainter.setPen(Qt::NoPen);
     //maskPainter.drawRoundRect(m_mask.rect(), 1600 / m_mask.rect().width(), 1600 / m_mask.rect().height());
     drawRoundRect(maskPainter, m_mask.rect());
@@ -297,9 +297,9 @@ void KickerTip::dissolveMask()
 {
     TQPainter maskPainter(&m_mask);
 
-    m_mask.fill(Qt::black);
+    m_mask.fill(Qt::color0);
 
-    maskPainter.setBrush(Qt::white);
+    maskPainter.setBrush(Qt::color1);
     maskPainter.setPen(Qt::NoPen);
     //maskPainter.drawRoundRect(m_mask.rect(), 1600 / m_mask.rect().width(), 1600 / m_mask.rect().height());
     drawRoundRect(maskPainter, m_mask.rect());
@@ -450,7 +450,7 @@ bool KickerTip::isTippingFor(const TQWidget* w) const
 
 void KickerTip::tipperDestroyed(TQObject* o)
 {
-    // we can't do a dynamic cast because we are in the process of dieing
+    // we can't do a dynamic cast because we are in the process of dying
     // so static it is.
     untipFor(TQT_TQWIDGET(o));
 }