TQt4 port kdenetwork

This enables compilation under both Qt3 and Qt4


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

3 files changed, 25 insertions, 23 deletions

diff --git a/knewsticker/kntsrcfilepropsdlg/kntsrcfilepropsdlg.cpp b/knewsticker/kntsrcfilepropsdlg/kntsrcfilepropsdlg.cpp
index 14ca80d0..6401a13e 100644
--- a/knewsticker/kntsrcfilepropsdlg/kntsrcfilepropsdlg.cpp
+++ b/knewsticker/kntsrcfilepropsdlg/kntsrcfilepropsdlg.cpp
@@ -30,7 +30,7 @@
 
 using namespace RSS;
 
-class ArticleListBoxItem : public QListBoxText
+class ArticleListBoxItem : public TQListBoxText
 {
 	public:
 		ArticleListBoxItem( TQListBox *listbox, const Article &article );
@@ -58,8 +58,8 @@ KntSrcFilePropsDlg::KntSrcFilePropsDlg(KPropertiesDialog *props)
 	        TQT_SLOT(slotClickedArticle(TQListBoxItem *)));
 
 	Loader *loader = Loader::create();
-	connect(loader, TQT_SIGNAL(loadingComplete(Loader *, Document, Status)),
-	        TQT_SLOT(slotConstructUI(Loader *, Document, Status)));
+	connect(loader, TQT_SIGNAL(loadingComplete(Loader *, Document, tqStatus)),
+	        TQT_SLOT(slotConstructUI(Loader *, Document, tqStatus)));
 	loader->loadFrom(props->item()->url(), new FileRetriever);
 
 	connect(NewsIconMgr::self(), TQT_SIGNAL(gotIcon(const KURL &, const TQPixmap &)),
@@ -68,13 +68,13 @@ KntSrcFilePropsDlg::KntSrcFilePropsDlg(KPropertiesDialog *props)
 	m_child->show();
 }
 
-void KntSrcFilePropsDlg::slotConstructUI(Loader *, Document doc, Status status)
+void KntSrcFilePropsDlg::slotConstructUI(Loader *, Document doc, tqStatus status)
 {
 	if (status != RSS::Success)
 		return;
 
 	KURL iconURL = doc.link();
-	iconURL.setEncodedPathAndQuery(TQString::fromLatin1("/favicon.ico"));
+	iconURL.setEncodedPathAndQuery(TQString::tqfromLatin1("/favicon.ico"));
 	NewsIconMgr::self()->getIcon(iconURL);
 
 	m_child->urlName->setText(doc.title());
@@ -104,15 +104,15 @@ void KntSrcFilePropsDlg::slotClickedArticle(TQListBoxItem *item)
 	slotOpenURL(articleItem->article().link().url());
 }
 
-TQObject *KntSrcFilePropsFactory::createObject(TQObject *parent, const char *,
+TQObject *KntSrcFilePropsFactory::createObject(TQObject *tqparent, const char *,
 		const char *classname, const TQStringList &)
 {
-	if (TQString::fromLatin1(classname) == "KPropsDlgPlugin")
+	if (TQString::tqfromLatin1(classname) == "KPropsDlgPlugin")
 	{
-		if (!parent->inherits("KPropertiesDialog"))
+		if (!tqparent->inherits("KPropertiesDialog"))
 			return 0L;
 
-		TQObject *obj = new KntSrcFilePropsDlg(static_cast<KPropertiesDialog *>(parent));
+		TQObject *obj = new KntSrcFilePropsDlg(static_cast<KPropertiesDialog *>(TQT_TQWIDGET(tqparent)));
 		return obj;
 	}
 	return 0L;
diff --git a/knewsticker/kntsrcfilepropsdlg/kntsrcfilepropsdlg.h b/knewsticker/kntsrcfilepropsdlg/kntsrcfilepropsdlg.h
index 0b1a0022..8a06a7b4 100644
--- a/knewsticker/kntsrcfilepropsdlg/kntsrcfilepropsdlg.h
+++ b/knewsticker/kntsrcfilepropsdlg/kntsrcfilepropsdlg.h
@@ -26,27 +26,29 @@ namespace RSS {
 
 using RSS::Loader;
 using RSS::Document;
-using RSS::Status;
+using RSS::tqStatus;
 
 class KntSrcFilePropsFactory : public KLibFactory
 {
 	Q_OBJECT
+  TQ_OBJECT
 	
 	public:
 		virtual TQObject *createObject(TQObject * = 0, const char * = 0,
-				const char * = "TQObject", const TQStringList & = TQStringList());
+				const char * = TQOBJECT_OBJECT_NAME_STRING, const TQStringList & = TQStringList());
 };
 
 class KntSrcFilePropsDlg : public KPropsDlgPlugin
 {
 	Q_OBJECT
+  TQ_OBJECT
 	
 	public:
 		KntSrcFilePropsDlg(KPropertiesDialog *);
 	
 	protected slots:
 		void slotOpenURL(const TQString &);
-		void slotConstructUI(Loader *loader, Document doc, Status status);
+		void slotConstructUI(Loader *loader, Document doc, tqStatus status);
 		void slotGotIcon(const KURL &, const TQPixmap &);
 		void slotClickedArticle(TQListBoxItem *);
 	
diff --git a/knewsticker/kntsrcfilepropsdlg/kntsrcfilepropsdlgwidget.ui b/knewsticker/kntsrcfilepropsdlg/kntsrcfilepropsdlgwidget.ui
index b8d1827e..c5e265f6 100644
--- a/knewsticker/kntsrcfilepropsdlg/kntsrcfilepropsdlgwidget.ui
+++ b/knewsticker/kntsrcfilepropsdlg/kntsrcfilepropsdlgwidget.ui
@@ -2,7 +2,7 @@
 <class>KntSrcFilePropsDlgWidget</class>
 <comment>The widget to be used for the RDF/RSS file properties dialog plugin.</comment>
 <author>Frerich Raabe &lt;raabe@kde.org&gt;</author>
-<widget class="QWidget">
+<widget class="TQWidget">
     <property name="name">
         <cstring>KntSrcFilePropsDlgWidget</cstring>
     </property>
@@ -14,9 +14,9 @@
             <height>274</height>
         </rect>
     </property>
-    <property name="layoutMargin" stdset="0">
+    <property name="tqlayoutMargin" stdset="0">
     </property>
-    <property name="layoutSpacing" stdset="0">
+    <property name="tqlayoutSpacing" stdset="0">
     </property>
     <grid>
         <property name="name">
@@ -38,14 +38,14 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>20</height>
                 </size>
             </property>
         </spacer>
-        <widget class="QLabel" row="0" column="4">
+        <widget class="TQLabel" row="0" column="4">
             <property name="name">
                 <cstring>pixmapIcon</cstring>
             </property>
@@ -78,7 +78,7 @@
                 <string>http://www.heise.de/newsticker/</string>
             </property>
         </widget>
-        <widget class="QLabel" row="1" column="0" rowspan="1" colspan="2">
+        <widget class="TQLabel" row="1" column="0" rowspan="1" colspan="2">
             <property name="name">
                 <cstring>lDescription</cstring>
             </property>
@@ -92,7 +92,7 @@
                 <string>Here you can see a brief description about the news site and its contents.</string>
             </property>
         </widget>
-        <widget class="QLabel" row="0" column="0">
+        <widget class="TQLabel" row="0" column="0">
             <property name="name">
                 <cstring>lName</cstring>
             </property>
@@ -109,7 +109,7 @@
                 <string>This is the name of the news site.</string>
             </property>
         </widget>
-        <widget class="QMultiLineEdit" row="1" column="2" rowspan="2" colspan="3">
+        <widget class="TQMultiLineEdit" row="1" column="2" rowspan="2" colspan="3">
             <property name="name">
                 <cstring>mleDescription</cstring>
             </property>
@@ -144,7 +144,7 @@
             <property name="sizeType">
                 <enum>Maximum</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>63</height>
@@ -159,7 +159,7 @@
                 <number>5</number>
             </property>
         </widget>
-        <widget class="QLabel" row="4" column="0" rowspan="1" colspan="5">
+        <widget class="TQLabel" row="4" column="0" rowspan="1" colspan="5">
             <property name="name">
                 <cstring>lArticles</cstring>
             </property>
@@ -206,7 +206,7 @@
     <include location="global" impldecl="in declaration">kurllabel.h</include>
     <include location="global" impldecl="in declaration">kseparator.h</include>
 </includes>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>kurllabel.h</includehint>
     <includehint>kseparator.h</includehint>