From fd3a982e26813f5bcc82c7e89ce6fa2ad44432bf Mon Sep 17 00:00:00 2001
From: tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>
Date: Fri, 7 Jan 2011 04:10:07 +0000
Subject: 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
---
 kicker/libkicker/global.cpp | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'kicker/libkicker/global.cpp')

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));
-- 
cgit v1.2.1