Revert automated changes

Sorry guys, they are just not ready for prime time
Work will continue as always


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

14 files changed, 100 insertions, 100 deletions

diff --git a/kicker/libkicker/global.cpp b/kicker/libkicker/global.cpp
index dcf6ba51f..1e9025e5a 100644
--- a/kicker/libkicker/global.cpp
+++ b/kicker/libkicker/global.cpp
@@ -161,7 +161,7 @@ int maxButtonDim()
     int maxDim;
     //return (2 * KickerSettings::iconMargin()) + KIcon::SizeLarge;
 
-    KSimpleConfig *kickerconfig = new KSimpleConfig( TQString::tqfromLatin1( "kickerrc" ));
+    KSimpleConfig *kickerconfig = new KSimpleConfig( TQString::fromLatin1( "kickerrc" ));
     kickerconfig->setGroup("General");
     maxDim = (2 * KickerSettings::iconMargin()) + kickerconfig->readNumEntry("panelIconWidth", KIcon::SizeLarge);;
     delete kickerconfig;
@@ -225,7 +225,7 @@ TQPoint popupPosition(KPanelApplet::Direction d,
     TQRect r;
     if (source->isTopLevel())
     {
-        r = source->tqgeometry();
+        r = source->geometry();
     }
     else
     {
@@ -236,13 +236,13 @@ TQPoint popupPosition(KPanelApplet::Direction d,
         {
             case KPanelApplet::Left:
             case KPanelApplet::Right:
-                r.setLeft( source->tqtopLevelWidget()->x() );
-                r.setWidth( source->tqtopLevelWidget()->width() );
+                r.setLeft( source->topLevelWidget()->x() );
+                r.setWidth( source->topLevelWidget()->width() );
                 break;
             case KPanelApplet::Up:
             case KPanelApplet::Down:
-                r.setTop( source->tqtopLevelWidget()->y() );
-                r.setHeight( source->tqtopLevelWidget()->height() );
+                r.setTop( source->topLevelWidget()->y() );
+                r.setHeight( source->topLevelWidget()->height() );
                 break;
         }
     }
@@ -347,7 +347,7 @@ void colorize(TQImage& image)
     // limit max/min brightness
     int r, g, b;
     color.rgb(&r, &g, &b);
-    int gray = tqGray(r, g, b);
+    int gray = qGray(r, g, b);
     if (gray > 180) {
         r = (r - (gray - 180) < 0 ? 0 : r - (gray - 180));
         g = (g - (gray - 180) < 0 ? 0 : g - (gray - 180));
diff --git a/kicker/libkicker/global.h b/kicker/libkicker/global.h
index ee385fa34..0a4677914 100644
--- a/kicker/libkicker/global.h
+++ b/kicker/libkicker/global.h
@@ -74,7 +74,7 @@ KDE_EXPORT TQString newDesktopFile(const KURL&url);
 /**
  * Reduces a popup menu
  *
- * When a popup menu tqcontains only 1 sub-menu, it makes no sense to
+ * When a popup menu contains only 1 sub-menu, it makes no sense to
  * show this popup-menu but we better show the sub-menu directly.
  *
  * This function checks whether that is the case and returns either the
@@ -85,7 +85,7 @@ KDE_EXPORT TQPopupMenu *reduceMenu(TQPopupMenu *);
 
 /**
  * Calculate the appropriate position for a popup menu based on the
- * direction, the size of the menu, the widget tqgeometry, and a optional
+ * direction, the size of the menu, the widget geometry, and a optional
  * point in the local coordinates of the widget.
  */
 KDE_EXPORT TQPoint popupPosition(KPanelApplet::Direction d,
diff --git a/kicker/libkicker/kickertip.cpp b/kicker/libkicker/kickertip.cpp
index 8af29d33d..586360904 100644
--- a/kicker/libkicker/kickertip.cpp
+++ b/kicker/libkicker/kickertip.cpp
@@ -129,7 +129,7 @@ void KickerTip::display()
 
     // Declare interchange object and define defaults.
     Data data;
-    data.tqmaskEffect = Dissolve;
+    data.maskEffect = Dissolve;
     data.duration = 2000;
     data.direction = KPanelApplet::Up;
     data.mimeFactory = m_mimeFactory;
@@ -165,7 +165,7 @@ void KickerTip::display()
         return;
     }
 
-    m_tqmaskEffect = isVisible() ? Plain : data.tqmaskEffect;
+    m_maskEffect = isVisible() ? Plain : data.maskEffect;
     m_dissolveSize = 24;
     m_dissolveDelta = -1;
 
@@ -281,34 +281,34 @@ static void drawRoundRect(TQPainter &p, const TQRect &r)
 
 void KickerTip::plainMask()
 {
-    TQPainter tqmaskPainter(&m_tqmask);
+    TQPainter maskPainter(&m_mask);
 
-    m_tqmask.fill(Qt::black);
+    m_mask.fill(Qt::black);
 
-    tqmaskPainter.setBrush(Qt::white);
-    tqmaskPainter.setPen(Qt::NoPen);
-    //tqmaskPainter.drawRoundRect(m_tqmask.rect(), 1600 / m_tqmask.rect().width(), 1600 / m_tqmask.rect().height());
-    drawRoundRect(tqmaskPainter, m_tqmask.rect());
-    setMask(m_tqmask);
+    maskPainter.setBrush(Qt::white);
+    maskPainter.setPen(Qt::NoPen);
+    //maskPainter.drawRoundRect(m_mask.rect(), 1600 / m_mask.rect().width(), 1600 / m_mask.rect().height());
+    drawRoundRect(maskPainter, m_mask.rect());
+    setMask(m_mask);
     m_frameTimer.stop();
 }
 
 void KickerTip::dissolveMask()
 {
-    TQPainter tqmaskPainter(&m_tqmask);
+    TQPainter maskPainter(&m_mask);
 
-    m_tqmask.fill(Qt::black);
+    m_mask.fill(Qt::black);
 
-    tqmaskPainter.setBrush(Qt::white);
-    tqmaskPainter.setPen(Qt::NoPen);
-    //tqmaskPainter.drawRoundRect(m_tqmask.rect(), 1600 / m_tqmask.rect().width(), 1600 / m_tqmask.rect().height());
-    drawRoundRect(tqmaskPainter, m_tqmask.rect());
+    maskPainter.setBrush(Qt::white);
+    maskPainter.setPen(Qt::NoPen);
+    //maskPainter.drawRoundRect(m_mask.rect(), 1600 / m_mask.rect().width(), 1600 / m_mask.rect().height());
+    drawRoundRect(maskPainter, m_mask.rect());
 
     m_dissolveSize += m_dissolveDelta;
 
     if (m_dissolveSize > 0)
     {
-        tqmaskPainter.setRasterOp(Qt::EraseROP);
+        maskPainter.setRasterOp(Qt::EraseROP);
 
         int x, y, s;
         const int size = 16;
@@ -323,7 +323,7 @@ void KickerTip::dissolveMask()
                 {
                     break;
                 }
-                tqmaskPainter.drawEllipse(x - s / 2, y - s / 2, s, s);
+                maskPainter.drawEllipse(x - s / 2, y - s / 2, s, s);
             }
         }
     }
@@ -333,7 +333,7 @@ void KickerTip::dissolveMask()
         m_dissolveDelta = 1;
     }
 
-    setMask(m_tqmask);
+    setMask(m_mask);
 }
 
 void KickerTip::displayInternal()
@@ -361,11 +361,11 @@ void KickerTip::displayInternal()
     int width = textX + textRect.width() + margin;
     int textY = (height - textRect.height()) / 2;
 
-    // resize pixmap, tqmask and widget
+    // resize pixmap, mask and widget
     bool firstTime = m_dissolveSize == 24;
     if (firstTime)
     {
-        m_tqmask.resize(width, height);
+        m_mask.resize(width, height);
         m_pixmap.resize(width, height);
         resize(width, height);
         if (isVisible())
@@ -378,8 +378,8 @@ void KickerTip::displayInternal()
         }
     }
 
-    // create and set transparency tqmask
-    switch(m_tqmaskEffect)
+    // create and set transparency mask
+    switch(m_maskEffect)
     {
         case Plain:
             plainMask();
@@ -392,8 +392,8 @@ void KickerTip::displayInternal()
 
     // draw background
     TQPainter bufferPainter(&m_pixmap);
-    bufferPainter.setPen(tqcolorGroup().foreground());
-    bufferPainter.setBrush(tqcolorGroup().background());
+    bufferPainter.setPen(colorGroup().foreground());
+    bufferPainter.setBrush(colorGroup().background());
     //bufferPainter.drawRoundRect(0, 0, width, height, 1600 / width, 1600 / height);
     drawRoundRect(bufferPainter, TQRect(0, 0, width, height));
 
@@ -409,13 +409,13 @@ void KickerTip::displayInternal()
     if (KickerSettings::mouseOversShowText())
     {
         // draw text shadow
-        TQColorGroup cg = tqcolorGroup();
+        TQColorGroup cg = colorGroup();
         cg.setColor(TQColorGroup::Text, cg.background().dark(115));
         int shadowOffset = TQApplication::reverseLayout() ? -1 : 1;
         m_richText->draw(&bufferPainter, textX + shadowOffset, textY + 1, TQRect(), cg);
 
         // draw text
-        cg = tqcolorGroup();
+        cg = colorGroup();
         m_richText->draw(&bufferPainter, textX, textY, rect(), cg);
     }
 }
@@ -458,7 +458,7 @@ void KickerTip::tipperDestroyed(TQObject* o)
 void KickerTip::internalUpdate()
 {
     m_dirty = true;
-    tqrepaint(false);
+    repaint(false);
 }
 
 void KickerTip::enableTipping(bool tip)
@@ -519,7 +519,7 @@ bool KickerTip::eventFilter(TQObject *object, TQEvent *event)
             }
 
             if (!mouseGrabber() &&
-                !tqApp->activePopupWidget() &&
+                !qApp->activePopupWidget() &&
                 !isTippingFor(widget))
             {
                 TQToolTip::setGloballyEnabled(false);
diff --git a/kicker/libkicker/kickertip.h b/kicker/libkicker/kickertip.h
index 65a28b8c2..14118029b 100644
--- a/kicker/libkicker/kickertip.h
+++ b/kicker/libkicker/kickertip.h
@@ -50,7 +50,7 @@ public:
             TQString message;
             TQString subtext;
             TQPixmap icon;
-            KickerTip::MaskEffect tqmaskEffect;
+            KickerTip::MaskEffect maskEffect;
             int duration;
             KPanelApplet::Direction direction;
 
@@ -95,10 +95,10 @@ protected slots:
     void slotSettingsChanged();
 
 private:
-    TQBitmap m_tqmask;
+    TQBitmap m_mask;
     TQPixmap m_pixmap;
     TQPixmap m_icon;
-    MaskEffect m_tqmaskEffect;
+    MaskEffect m_maskEffect;
     TQSimpleRichText* m_richText;
     TQMimeSourceFactory* m_mimeFactory;
 
diff --git a/kicker/libkicker/kshadowengine.cpp b/kicker/libkicker/kshadowengine.cpp
index c8be4377c..19ccc669d 100644
--- a/kicker/libkicker/kshadowengine.cpp
+++ b/kicker/libkicker/kshadowengine.cpp
@@ -114,7 +114,7 @@ TQImage KShadowEngine::makeShadow(const TQPixmap& textPixmap, const TQColor &bgC
       alphaShadow = (alphaShadow > m_shadowSettings->maxOpacity()) ? m_shadowSettings->maxOpacity() : alphaShadow;
 
       // update the shadow's i,j pixel.
-      result.setPixel(i,j, tqRgba(bgRed, bgGreen , bgBlue, (int) alphaShadow));
+      result.setPixel(i,j, qRgba(bgRed, bgGreen , bgBlue, (int) alphaShadow));
     }
   }
   return result;
@@ -131,15 +131,15 @@ double KShadowEngine::defaultDecay(TQImage& source, int i, int j)
     return 0;
 
   double alphaShadow;
-  alphaShadow =(tqGray(source.pixel(i-1,j-1)) * DIAGONAL_FACTOR +
-		tqGray(source.pixel(i-1,j  )) * AXIS_FACTOR +
-		tqGray(source.pixel(i-1,j+1)) * DIAGONAL_FACTOR +
-		tqGray(source.pixel(i  ,j-1)) * AXIS_FACTOR +
+  alphaShadow =(qGray(source.pixel(i-1,j-1)) * DIAGONAL_FACTOR +
+		qGray(source.pixel(i-1,j  )) * AXIS_FACTOR +
+		qGray(source.pixel(i-1,j+1)) * DIAGONAL_FACTOR +
+		qGray(source.pixel(i  ,j-1)) * AXIS_FACTOR +
 		0                         +
-		tqGray(source.pixel(i  ,j+1)) * AXIS_FACTOR +
-		tqGray(source.pixel(i+1,j-1)) * DIAGONAL_FACTOR +
-		tqGray(source.pixel(i+1,j  )) * AXIS_FACTOR +
-		tqGray(source.pixel(i+1,j+1)) * DIAGONAL_FACTOR) / m_shadowSettings->multiplicationFactor();
+		qGray(source.pixel(i  ,j+1)) * AXIS_FACTOR +
+		qGray(source.pixel(i+1,j-1)) * DIAGONAL_FACTOR +
+		qGray(source.pixel(i+1,j  )) * AXIS_FACTOR +
+		qGray(source.pixel(i+1,j+1)) * DIAGONAL_FACTOR) / m_shadowSettings->multiplicationFactor();
 
   return alphaShadow;
 }
@@ -189,7 +189,7 @@ double KShadowEngine::noDecay(TQImage& source, int i, int j)
 	else
 	  sy = j + m;
 
-	opacity += tqGray(source.pixel(sx, sy));
+	opacity += qGray(source.pixel(sx, sy));
       }
     }
     alphaShadow += opacity / m_shadowSettings->multiplicationFactor();
diff --git a/kicker/libkicker/kshadowengine.h b/kicker/libkicker/kshadowengine.h
index 0c44e1816..041e8faf6 100644
--- a/kicker/libkicker/kshadowengine.h
+++ b/kicker/libkicker/kshadowengine.h
@@ -94,13 +94,13 @@ private:
 
     /*
     * a slower algorithm where the influence of a pixel
-    * is  tqGray(px)/(abs(dx) + abs(dy) +1).
+    * is  qGray(px)/(abs(dx) + abs(dy) +1).
     */
     double doubleLinearDecay(TQImage& source, int x, int y);
 
     /*
     * a very slow algorithm where the influence of a pixel
-    * is  tqGray(px)/(sqrt(sqr(dx) + sqr(dy)) +1).
+    * is  qGray(px)/(sqrt(sqr(dx) + sqr(dy)) +1).
     */
     double radialDecay(TQImage& source, int x, int y);
 
diff --git a/kicker/libkicker/menuinfo.cpp b/kicker/libkicker/menuinfo.cpp
index 91a6c6c84..0c36ffea0 100644
--- a/kicker/libkicker/menuinfo.cpp
+++ b/kicker/libkicker/menuinfo.cpp
@@ -35,7 +35,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 MenuInfo::MenuInfo(const TQString& desktopFile)
 {
-    KSimpleConfig df(locate("data", TQString::tqfromLatin1("kicker/menuext/%1").arg(desktopFile)));
+    KSimpleConfig df(locate("data", TQString::fromLatin1("kicker/menuext/%1").arg(desktopFile)));
     df.setGroup("Desktop Entry");
 
     TQStringList list = df.readListEntry("X-KDE-AuthorizeAction");
diff --git a/kicker/libkicker/panelbutton.cpp b/kicker/libkicker/panelbutton.cpp
index 483763c45..a04e9aee0 100644
--- a/kicker/libkicker/panelbutton.cpp
+++ b/kicker/libkicker/panelbutton.cpp
@@ -427,7 +427,7 @@ void PanelButton::enterEvent(TQEvent* e)
     if (!m_highlight)
     {
         m_highlight = true;
-        tqrepaint(false);
+        repaint(false);
     }
 
     TQButton::enterEvent(e);
@@ -438,7 +438,7 @@ void PanelButton::leaveEvent(TQEvent* e)
     if (m_highlight)
     {
         m_highlight = false;
-        tqrepaint(false);
+        repaint(false);
     }
 
     TQButton::leaveEvent(e);
@@ -505,7 +505,7 @@ void PanelButton::mouseReleaseEvent(TQMouseEvent *e)
 	
 	TQPixmap pix = labelIcon();
 	if (KickerSettings::showIconActivationEffect() == true) {
-		KIconEffect::visualActivate(this, this->tqgeometry(), &pix);
+		KIconEffect::visualActivate(this, this->geometry(), &pix);
 	}
     }
     TQButton::mouseReleaseEvent(e);
@@ -528,7 +528,7 @@ void PanelButton::drawButton(TQPainter *p)
     if (m_tileColor.isValid())
     {
         p->fillRect(rect(), m_tileColor);
-        style().drawPrimitive(TQStyle::PE_Panel, p, rect(), tqcolorGroup());
+        style().drawPrimitive(TQStyle::PE_Panel, p, rect(), colorGroup());
     }
     else if (paletteBackgroundPixmap())
     {
@@ -547,8 +547,8 @@ void PanelButton::drawButton(TQPainter *p)
     }
     else if (isDown() || isOn())
     {
-        // Draw tqshapes to indicate the down state.
-        style().drawPrimitive(TQStyle::PE_Panel, p, rect(), tqcolorGroup(), TQStyle::Style_Sunken);
+        // Draw shapes to indicate the down state.
+        style().drawPrimitive(TQStyle::PE_Panel, p, rect(), colorGroup(), TQStyle::Style_Sunken);
     }
 
     drawButtonLabel(p);
@@ -558,8 +558,8 @@ void PanelButton::drawButton(TQPainter *p)
         int x1, y1, x2, y2;
         rect().coords(&x1, &y1, &x2, &y2);
         TQRect r(x1+2, y1+2, x2-x1-3, y2-y1-3);
-        style().drawPrimitive(TQStyle::PE_FocusRect, p, r, tqcolorGroup(),
-        TQStyle::Style_Default, tqcolorGroup().button());
+        style().drawPrimitive(TQStyle::PE_FocusRect, p, r, colorGroup(),
+        TQStyle::Style_Default, colorGroup().button());
     }
 }
 
@@ -663,7 +663,7 @@ void PanelButton::drawButtonLabel(TQPainter *p)
     if (m_drawArrow && (m_highlight || active))
     {
         TQStyle::PrimitiveElement e = TQStyle::PE_ArrowUp;
-        int arrowSize = style().tqpixelMetric(TQStyle::PM_MenuButtonIndicator);
+        int arrowSize = style().pixelMetric(TQStyle::PM_MenuButtonIndicator);
         TQRect r((width() - arrowSize)/2, 0, arrowSize, arrowSize);
 
         switch (m_arrowDirection)
@@ -707,7 +707,7 @@ void PanelButton::drawButtonLabel(TQPainter *p)
         {
             flags |= TQStyle::Style_Down;
         }
-        style().drawPrimitive(e, p, r, tqcolorGroup(), flags);
+        style().drawPrimitive(e, p, r, colorGroup(), flags);
     }
 }
 
@@ -771,7 +771,7 @@ void PanelButton::backedByFile(const TQString& localFilePath)
     disconnect(KDirWatch::self(), TQT_SIGNAL(deleted(const TQString&)),
                this, TQT_SLOT(checkForDeletion(const TQString&)));
 
-    if (!KDirWatch::self()->tqcontains(m_backingFile))
+    if (!KDirWatch::self()->contains(m_backingFile))
     {
         KDirWatch::self()->addFile(m_backingFile);
     }
@@ -923,7 +923,7 @@ bool PanelPopupButton::eventFilter(TQObject *, TQEvent *e)
     if (e->type() == TQEvent::MouseMove)
     {
         TQMouseEvent *me = static_cast<TQMouseEvent *>(e);
-        if (rect().tqcontains(mapFromGlobal(me->globalPos())) &&
+        if (rect().contains(mapFromGlobal(me->globalPos())) &&
             ((me->state() & ControlButton) != 0 ||
              (me->state() & ShiftButton) != 0))
         {
@@ -935,7 +935,7 @@ bool PanelPopupButton::eventFilter(TQObject *, TQEvent *e)
              e->type() == TQEvent::MouseButtonDblClick)
     {
         TQMouseEvent *me = static_cast<TQMouseEvent *>(e);
-        if (rect().tqcontains(mapFromGlobal(me->globalPos())))
+        if (rect().contains(mapFromGlobal(me->globalPos())))
         {
             m_pressedDuringPopup = true;
             return true;
@@ -944,7 +944,7 @@ bool PanelPopupButton::eventFilter(TQObject *, TQEvent *e)
     else if (e->type() == TQEvent::MouseButtonRelease)
     {
         TQMouseEvent *me = static_cast<TQMouseEvent *>(e);
-        if (rect().tqcontains(mapFromGlobal(me->globalPos())))
+        if (rect().contains(mapFromGlobal(me->globalPos())))
         {
             if (m_pressedDuringPopup && m_popup)
             {
diff --git a/kicker/libkicker/paneldrag.cpp b/kicker/libkicker/paneldrag.cpp
index 28721d3f7..1fb6b9ce6 100644
--- a/kicker/libkicker/paneldrag.cpp
+++ b/kicker/libkicker/paneldrag.cpp
@@ -46,7 +46,7 @@ PanelDrag::~PanelDrag()
 
 bool PanelDrag::decode(const TQMimeSource* e, BaseContainer** container)
 {
-    TQByteArray a = e->tqencodedData("application/basecontainerptr");
+    TQByteArray a = e->encodedData("application/basecontainerptr");
 
     if (a.size() != PANELDRAG_BUFSIZE)
     {
@@ -73,7 +73,7 @@ bool PanelDrag::canDecode(const TQMimeSource *e)
         return false;
     }
 
-    TQByteArray a = e->tqencodedData("application/basecontainerptr");
+    TQByteArray a = e->encodedData("application/basecontainerptr");
     if (a.size() != PANELDRAG_BUFSIZE)
     {
         return false;
@@ -91,7 +91,7 @@ bool PanelDrag::canDecode(const TQMimeSource *e)
     return true;
 }
 
-TQByteArray PanelDrag::tqencodedData(const char * mimeType) const
+TQByteArray PanelDrag::encodedData(const char * mimeType) const
 {
     if (TQString("application/basecontainerptr") == mimeType &&
         a.size() == PANELDRAG_BUFSIZE)
@@ -136,7 +136,7 @@ const char * AppletInfoDrag::format(int i) const
     return 0;
 }
 
-TQByteArray AppletInfoDrag::tqencodedData(const char* mimeType) const
+TQByteArray AppletInfoDrag::encodedData(const char* mimeType) const
 {
     if (TQString("application/appletinfo") == mimeType)
     {
@@ -158,7 +158,7 @@ bool AppletInfoDrag::canDecode(const TQMimeSource * e)
 
 bool AppletInfoDrag::decode(const TQMimeSource* e, AppletInfo& container)
 {
-    TQByteArray a = e->tqencodedData("application/appletinfo");
+    TQByteArray a = e->encodedData("application/appletinfo");
 
     if (a.isEmpty())
     {
diff --git a/kicker/libkicker/paneldrag.h b/kicker/libkicker/paneldrag.h
index ad620a192..3d7cbf858 100644
--- a/kicker/libkicker/paneldrag.h
+++ b/kicker/libkicker/paneldrag.h
@@ -39,7 +39,7 @@ class KDE_EXPORT PanelDrag : public QDragObject
         ~PanelDrag();
 
         virtual const char * format(int i = 0) const;
-        virtual TQByteArray tqencodedData(const char *) const;
+        virtual TQByteArray encodedData(const char *) const;
 
         static bool canDecode(const TQMimeSource * e);
         static bool decode(const TQMimeSource* e, BaseContainer** container);
@@ -55,7 +55,7 @@ class KDE_EXPORT AppletInfoDrag : public QDragObject
         ~AppletInfoDrag();
 
         virtual const char * format(int i = 0) const;
-        virtual TQByteArray tqencodedData(const char *) const;
+        virtual TQByteArray encodedData(const char *) const;
 
         static bool canDecode(const TQMimeSource * e);
         static bool decode(const TQMimeSource* e, AppletInfo& container);
diff --git a/kicker/libkicker/panner.cpp b/kicker/libkicker/panner.cpp
index ccd40da67..7d11a429e 100644
--- a/kicker/libkicker/panner.cpp
+++ b/kicker/libkicker/panner.cpp
@@ -54,9 +54,9 @@ Panner::Panner( TQWidget* parent, const char* name )
     _viewport = new TQWidget(_clipper);
     _viewport->setBackgroundOrigin(AncestorOrigin);
     
-    // tqlayout
-    _tqlayout = new TQBoxLayout(this, TQBoxLayout::LeftToRight);
-    _tqlayout->addWidget(_clipper, 1);
+    // layout
+    _layout = new TQBoxLayout(this, TQBoxLayout::LeftToRight);
+    _layout->addWidget(_clipper, 1);
     setOrientation(Horizontal);
 }
 
@@ -77,7 +77,7 @@ void Panner::createScrollButtons()
     //_luSB->setAutoRepeat(true);
     _luSB->setMinimumSize(12, 12);
     _luSB->hide();
-    _tqlayout->addWidget(_luSB);
+    _layout->addWidget(_luSB);
     connect(_luSB, TQT_SIGNAL(pressed()), TQT_SLOT(startScrollLeftUp()));
     connect(_luSB, TQT_SIGNAL(released()), TQT_SLOT(stopScroll()));
 
@@ -87,7 +87,7 @@ void Panner::createScrollButtons()
     //_rdSB->setAutoRepeat(true);
     _rdSB->setMinimumSize(12, 12);
     _rdSB->hide();
-    _tqlayout->addWidget(_rdSB);
+    _layout->addWidget(_rdSB);
     connect(_rdSB, TQT_SIGNAL(pressed()), TQT_SLOT(startScrollRightDown()));
     connect(_rdSB, TQT_SIGNAL(released()), TQT_SLOT(stopScroll()));
 
@@ -103,13 +103,13 @@ void Panner::setupButtons()
         {
             _luSB->setArrowType(Qt::LeftArrow);
             _rdSB->setArrowType(Qt::RightArrow);
-            _luSB->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Expanding));
-            _rdSB->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Expanding));
+            _luSB->setSizePolicy(TQSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Expanding));
+            _rdSB->setSizePolicy(TQSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Expanding));
             TQToolTip::add(_luSB, i18n("Scroll left"));
             TQToolTip::add(_rdSB, i18n("Scroll right"));
             setMinimumSize(24, 0);
         }
-        _tqlayout->setDirection(TQBoxLayout::LeftToRight);
+        _layout->setDirection(TQBoxLayout::LeftToRight);
     }
     else
     {
@@ -117,20 +117,20 @@ void Panner::setupButtons()
         {
             _luSB->setArrowType(Qt::UpArrow);
             _rdSB->setArrowType(Qt::DownArrow);
-            _luSB->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Minimum));
-            _rdSB->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Minimum));
+            _luSB->setSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Minimum));
+            _rdSB->setSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Minimum));
             TQToolTip::add(_luSB, i18n("Scroll up"));
             TQToolTip::add(_rdSB, i18n("Scroll down"));
             setMinimumSize(0, 24);
         }
-        _tqlayout->setDirection(TQBoxLayout::TopToBottom);
+        _layout->setDirection(TQBoxLayout::TopToBottom);
     }
 
     if (isVisible())
     {
-        // we need to manually redo the tqlayout if we are visible
+        // we need to manually redo the layout if we are visible
         // otherwise let the toolkit decide when to do this
-        _tqlayout->activate();
+        _layout->activate();
     }
 }
 
diff --git a/kicker/libkicker/panner.h b/kicker/libkicker/panner.h
index fbce0569f..66ce6cd18 100644
--- a/kicker/libkicker/panner.h
+++ b/kicker/libkicker/panner.h
@@ -39,7 +39,7 @@ public:
     Panner( TQWidget* parent, const char* name = 0 );
     ~Panner();
 
-    TQSize tqminimumSizeHint() const { return TQWidget::tqminimumSizeHint(); }
+    TQSize minimumSizeHint() const { return TQWidget::minimumSizeHint(); }
 
     Qt::Orientation orientation() const { return _orient; }
     virtual void setOrientation(Orientation orientation);
@@ -99,7 +99,7 @@ private:
     void updateScrollButtons();
 
     Orientation       _orient;
-    TQBoxLayout       *_tqlayout;
+    TQBoxLayout       *_layout;
     SimpleArrowButton *_luSB; // Left Scroll Button
     SimpleArrowButton *_rdSB; // Right Scroll Button
     TQTimer *_updateScrollButtonsTimer;
diff --git a/kicker/libkicker/simplebutton.cpp b/kicker/libkicker/simplebutton.cpp
index 5d928a6b6..4c28b2101 100644
--- a/kicker/libkicker/simplebutton.cpp
+++ b/kicker/libkicker/simplebutton.cpp
@@ -65,22 +65,22 @@ void SimpleButton::setOrientation(Qt::Orientation orientation)
     update();
 }
 
-TQSize SimpleButton::tqsizeHint() const
+TQSize SimpleButton::sizeHint() const
 {
     const TQPixmap* pm = pixmap();
 
     if (!pm)
-        return TQButton::tqsizeHint();
+        return TQButton::sizeHint();
     else
         return TQSize(pm->width() + BUTTON_MARGIN, pm->height() + BUTTON_MARGIN);
 }
 
-TQSize SimpleButton::tqminimumSizeHint() const
+TQSize SimpleButton::minimumSizeHint() const
 {
     const TQPixmap* pm = pixmap();
 
     if (!pm)
-        return TQButton::tqminimumSizeHint();
+        return TQButton::minimumSizeHint();
     else
         return TQSize(pm->width(), pm->height());
 }
@@ -176,7 +176,7 @@ void SimpleButton::enterEvent( TQEvent *e )
 {
     m_highlight = true;
 
-    tqrepaint( false );
+    repaint( false );
     TQButton::enterEvent( e );
 }
 
@@ -184,7 +184,7 @@ void SimpleButton::leaveEvent( TQEvent *e )
 {
     m_highlight = false;
 
-    tqrepaint( false );
+    repaint( false );
     TQButton::enterEvent( e );
 }
 
@@ -202,7 +202,7 @@ SimpleArrowButton::SimpleArrowButton(TQWidget *parent, Qt::ArrowType arrow, cons
     _inside = false;
 }
 
-TQSize SimpleArrowButton::tqsizeHint() const
+TQSize SimpleArrowButton::sizeHint() const
 {
     return TQSize( 12, 12 );
 }
@@ -236,7 +236,7 @@ void SimpleArrowButton::drawButton( TQPainter *p )
     
     int flags = TQStyle::Style_Default | TQStyle::Style_Enabled;
     if (isDown() || isOn())	flags |= TQStyle::Style_Down;
-    style().drawPrimitive(pe, p, r, tqcolorGroup(), flags);
+    style().drawPrimitive(pe, p, r, colorGroup(), flags);
 }
 
 void SimpleArrowButton::enterEvent( TQEvent *e )
diff --git a/kicker/libkicker/simplebutton.h b/kicker/libkicker/simplebutton.h
index d05f556c2..1ea5c7a44 100644
--- a/kicker/libkicker/simplebutton.h
+++ b/kicker/libkicker/simplebutton.h
@@ -34,8 +34,8 @@ class KDE_EXPORT SimpleButton : public QButton
         SimpleButton(TQWidget *parent, const char *name = 0);
         void setPixmap(const TQPixmap &pix);
         void setOrientation(Qt::Orientation orientaton);
-        TQSize tqsizeHint() const;
-        TQSize tqminimumSizeHint() const;
+        TQSize sizeHint() const;
+        TQSize minimumSizeHint() const;
 
     protected:
         void drawButton( TQPainter *p );
@@ -67,7 +67,7 @@ class KDE_EXPORT SimpleArrowButton: public SimpleButton
     public:
         SimpleArrowButton(TQWidget *parent = 0, Qt::ArrowType arrow = Qt::UpArrow, const char *name = 0);
         virtual ~SimpleArrowButton() {};
-        TQSize tqsizeHint() const;
+        TQSize sizeHint() const;
     
     protected:
         virtual void enterEvent( TQEvent *e );