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/proxy/appletproxy.cpp    | 18 +++++++++---------
 kicker/proxy/appletproxy.h      |  2 +-
 kicker/proxy/extensionproxy.cpp | 12 ++++++------
 3 files changed, 16 insertions(+), 16 deletions(-)

(limited to 'kicker/proxy')

diff --git a/kicker/proxy/appletproxy.cpp b/kicker/proxy/appletproxy.cpp
index da8508956..0501fcd9a 100644
--- a/kicker/proxy/appletproxy.cpp
+++ b/kicker/proxy/appletproxy.cpp
@@ -226,9 +226,9 @@ KPanelApplet* AppletProxy::loadApplet(const AppletInfo& info)
     return init_ptr(0, info.configFile());
 }
 
-void AppletProxy::tqrepaintApplet(TQWidget* widget) 
+void AppletProxy::repaintApplet(TQWidget* widget) 
 {
-    widget->tqrepaint();
+    widget->repaint();
  
     const TQObjectList* children = widget->children();
 
@@ -243,7 +243,7 @@ void AppletProxy::tqrepaintApplet(TQWidget* widget)
         TQWidget *w = dynamic_cast<TQWidget*>(*it);
         if (w)
         {
-            tqrepaintApplet(w);
+            repaintApplet(w);
         }
     }
 }
@@ -372,14 +372,14 @@ bool AppletProxy::process(const TQCString &fun, const TQByteArray &data,
 	    }
 	    return true;
 	}
-    else if ( fun == "tqsetAlignment(int)" )
+    else if ( fun == "setAlignment(int)" )
 	{
 	    TQDataStream dataStream( data, IO_ReadOnly );
-	    int tqalignment;
-	    dataStream >> tqalignment;
+	    int alignment;
+	    dataStream >> alignment;
 
 	    if(_applet) {
-		_applet->tqsetAlignment( (KPanelApplet::Alignment)tqalignment );
+		_applet->setAlignment( (KPanelApplet::Alignment)alignment );
 	    }
 	    return true;
 	}
@@ -435,13 +435,13 @@ bool AppletProxy::process(const TQCString &fun, const TQByteArray &data,
             if(_applet)
                 if ( _bg.isNull() ) { // no transparency
 		    _applet->unsetPalette();
-		    _applet->tqrepaint();
+		    _applet->repaint();
 		}
                 else { //transparency
 		    _applet->blockSignals(true);
 		    _applet->setBackgroundMode(Qt::FixedPixmap);
 		    _applet->setPaletteBackgroundPixmap(_bg);
-		    tqrepaintApplet(_applet);
+		    repaintApplet(_applet);
 		    _applet->blockSignals(false);
                 }
             return true;
diff --git a/kicker/proxy/appletproxy.h b/kicker/proxy/appletproxy.h
index 40ff78cc4..4c504022f 100644
--- a/kicker/proxy/appletproxy.h
+++ b/kicker/proxy/appletproxy.h
@@ -56,7 +56,7 @@ protected slots:
     void slotApplicationRemoved(const TQCString&);
 
 private:
-    void tqrepaintApplet(TQWidget* widget);
+    void repaintApplet(TQWidget* widget);
 
     AppletInfo          *_info;
     KPanelApplet        *_applet;
diff --git a/kicker/proxy/extensionproxy.cpp b/kicker/proxy/extensionproxy.cpp
index 73b4052ab..3d931c95b 100644
--- a/kicker/proxy/extensionproxy.cpp
+++ b/kicker/proxy/extensionproxy.cpp
@@ -258,7 +258,7 @@ void ExtensionProxy::dock(const TQCString& callbackID)
 bool ExtensionProxy::process(const TQCString &fun, const TQByteArray &data,
                           TQCString& replyType, TQByteArray &replyData)
 {
-    if ( fun == "tqsizeHint(int,TQSize)" )
+    if ( fun == "sizeHint(int,TQSize)" )
 	{
 	    TQDataStream dataStream( data, IO_ReadOnly );
 	    int pos;
@@ -272,7 +272,7 @@ bool ExtensionProxy::process(const TQCString &fun, const TQByteArray &data,
 	    if(!_extension)
 		reply << maxSize;
 	    else
-		reply << _extension->tqsizeHint((KPanelExtension::Position)pos, maxSize);
+		reply << _extension->sizeHint((KPanelExtension::Position)pos, maxSize);
 
 	    return true;
 	}
@@ -287,14 +287,14 @@ bool ExtensionProxy::process(const TQCString &fun, const TQByteArray &data,
 	    }
 	    return true;
 	}
-    else if ( fun == "tqsetAlignment(int)" )
+    else if ( fun == "setAlignment(int)" )
 	{
 	    TQDataStream dataStream( data, IO_ReadOnly );
-	    int tqalignment;
-	    dataStream >> tqalignment;
+	    int alignment;
+	    dataStream >> alignment;
 
 	    if(_extension) {
-		_extension->tqsetAlignment( (KPanelExtension::Alignment)tqalignment );
+		_extension->setAlignment( (KPanelExtension::Alignment)alignment );
 	    }
 	    return true;
 	}
-- 
cgit v1.2.1