From 8155225c9be993acc0512956416d195edfef4eb9 Mon Sep 17 00:00:00 2001
From: tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>
Date: Wed, 19 Jan 2011 01:42:14 +0000
Subject: Enable compilation with TQt for Qt4 3.4.0 TP2 This should not break
 compatibility with TQt for Qt3; if it does please fix it ASAP!

git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1215552 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
---
 kicker/proxy/appletproxy.cpp     | 30 +++++++++++++++---------------
 kicker/proxy/appletproxy.h       |  2 +-
 kicker/proxy/extensiondebugger.h |  2 +-
 kicker/proxy/extensionproxy.cpp  | 14 +++++++-------
 4 files changed, 24 insertions(+), 24 deletions(-)

(limited to 'kicker/proxy')

diff --git a/kicker/proxy/appletproxy.cpp b/kicker/proxy/appletproxy.cpp
index 0501fcd9a..312c78f97 100644
--- a/kicker/proxy/appletproxy.cpp
+++ b/kicker/proxy/appletproxy.cpp
@@ -134,7 +134,7 @@ AppletProxy::AppletProxy(TQObject* parent, const char* name)
 	exit(0);
     }
 
-    if (!kapp->dcopClient()->registerAs("applet_proxy", true)) {
+    if (kapp->dcopClient()->registerAs("applet_proxy", true) == 0) {
 	kdError() << "Failed to register at DCOP server." << endl;
         KMessageBox::error(0,
                            i18n("The applet proxy could not be started due to DCOP registration problems."),
@@ -226,24 +226,24 @@ KPanelApplet* AppletProxy::loadApplet(const AppletInfo& info)
     return init_ptr(0, info.configFile());
 }
 
-void AppletProxy::repaintApplet(TQWidget* widget) 
+void AppletProxy::tqrepaintApplet(TQWidget* widget) 
 {
-    widget->repaint();
+    widget->tqrepaint();
  
-    const TQObjectList* children = widget->children();
+    const TQObjectList children = widget->childrenListObject();
 
-    if (!children)
+    if (children.isEmpty())
     {
         return;
     }
 
-    TQObjectList::iterator it = children->begin();
-    for (; it != children->end(); ++it)
+    TQObjectList::iterator it = children.begin();
+    for (; it != children.end(); ++it)
     {
         TQWidget *w = dynamic_cast<TQWidget*>(*it);
         if (w)
         {
-            repaintApplet(w);
+            tqrepaintApplet(w);
         }
     }
 }
@@ -372,14 +372,14 @@ bool AppletProxy::process(const TQCString &fun, const TQByteArray &data,
 	    }
 	    return true;
 	}
-    else if ( fun == "setAlignment(int)" )
+    else if ( fun == "tqsetAlignment(int)" )
 	{
 	    TQDataStream dataStream( data, IO_ReadOnly );
-	    int alignment;
-	    dataStream >> alignment;
+	    int tqalignment;
+	    dataStream >> tqalignment;
 
 	    if(_applet) {
-		_applet->setAlignment( (KPanelApplet::Alignment)alignment );
+		_applet->tqsetAlignment( (KPanelApplet::Alignment)tqalignment );
 	    }
 	    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->repaint();
+		    _applet->tqrepaint();
 		}
                 else { //transparency
 		    _applet->blockSignals(true);
-		    _applet->setBackgroundMode(Qt::FixedPixmap);
+		    _applet->setBackgroundMode(TQt::FixedPixmap);
 		    _applet->setPaletteBackgroundPixmap(_bg);
-		    repaintApplet(_applet);
+		    tqrepaintApplet(_applet);
 		    _applet->blockSignals(false);
                 }
             return true;
diff --git a/kicker/proxy/appletproxy.h b/kicker/proxy/appletproxy.h
index 4c504022f..40ff78cc4 100644
--- a/kicker/proxy/appletproxy.h
+++ b/kicker/proxy/appletproxy.h
@@ -56,7 +56,7 @@ protected slots:
     void slotApplicationRemoved(const TQCString&);
 
 private:
-    void repaintApplet(TQWidget* widget);
+    void tqrepaintApplet(TQWidget* widget);
 
     AppletInfo          *_info;
     KPanelApplet        *_applet;
diff --git a/kicker/proxy/extensiondebugger.h b/kicker/proxy/extensiondebugger.h
index 87ac76ecb..0f4719b9f 100644
--- a/kicker/proxy/extensiondebugger.h
+++ b/kicker/proxy/extensiondebugger.h
@@ -27,7 +27,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 class AppletInfo;
 class KPanelExtension;
 
-class ExtensionContainer : public QWidget
+class ExtensionContainer : public TQWidget
 {
     Q_OBJECT
 
diff --git a/kicker/proxy/extensionproxy.cpp b/kicker/proxy/extensionproxy.cpp
index 3d931c95b..d4b4d67d6 100644
--- a/kicker/proxy/extensionproxy.cpp
+++ b/kicker/proxy/extensionproxy.cpp
@@ -113,7 +113,7 @@ ExtensionProxy::ExtensionProxy(TQObject* parent, const char* name)
 	exit(0);
     }
 
-    if (!kapp->dcopClient()->registerAs("extension_proxy", true)) {
+    if (kapp->dcopClient()->registerAs("extension_proxy", true) == 0) {
 	kdError() << "Failed to register at DCOP server." << endl;
 	exit(0);
     }
@@ -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 == "sizeHint(int,TQSize)" )
+    if ( fun == "tqsizeHint(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->sizeHint((KPanelExtension::Position)pos, maxSize);
+		reply << _extension->tqsizeHint((KPanelExtension::Position)pos, maxSize);
 
 	    return true;
 	}
@@ -287,14 +287,14 @@ bool ExtensionProxy::process(const TQCString &fun, const TQByteArray &data,
 	    }
 	    return true;
 	}
-    else if ( fun == "setAlignment(int)" )
+    else if ( fun == "tqsetAlignment(int)" )
 	{
 	    TQDataStream dataStream( data, IO_ReadOnly );
-	    int alignment;
-	    dataStream >> alignment;
+	    int tqalignment;
+	    dataStream >> tqalignment;
 
 	    if(_extension) {
-		_extension->setAlignment( (KPanelExtension::Alignment)alignment );
+		_extension->tqsetAlignment( (KPanelExtension::Alignment)tqalignment );
 	    }
 	    return true;
 	}
-- 
cgit v1.2.1