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

7 files changed, 28 insertions, 25 deletions

diff --git a/kopete/plugins/addbookmarks/addbookmarksplugin.cpp b/kopete/plugins/addbookmarks/addbookmarksplugin.cpp
index 113ec95e..b8f32bcf 100644
--- a/kopete/plugins/addbookmarks/addbookmarksplugin.cpp
+++ b/kopete/plugins/addbookmarks/addbookmarksplugin.cpp
@@ -39,8 +39,8 @@ static bool isURLInGroup(const KURL& url, const KBookmarkGroup& group)
 	return false;
 }
 
-BookmarksPlugin::BookmarksPlugin(TQObject *parent, const char *name, const TQStringList &/*args*/)
- : Kopete::Plugin(BookmarksPluginFactory::instance(), parent, name)
+BookmarksPlugin::BookmarksPlugin(TQObject *tqparent, const char *name, const TQStringList &/*args*/)
+ : Kopete::Plugin(BookmarksPluginFactory::instance(), tqparent, name)
 {
 	//kdDebug(14501) << "plugin loading" << endl;
 	connect( Kopete::ChatSessionManager::self(), TQT_SIGNAL( aboutToDisplay( Kopete::Message & ) ), this, TQT_SLOT( slotBookmarkURLsInMessage( Kopete::Message & ) ) );
@@ -144,7 +144,7 @@ KBookmarkGroup BookmarksPlugin::getKopeteFolder()
 {
 	KBookmarkManager *mgr = KBookmarkManager::userBookmarksManager();
 
-	return getFolder( mgr->root(), TQString::fromLatin1("kopete") );
+	return getFolder( mgr->root(), TQString::tqfromLatin1("kopete") );
 }
 
 KBookmarkGroup BookmarksPlugin::getFolder( KBookmarkGroup group, const TQString& folder )
@@ -165,7 +165,7 @@ KBookmarkGroup BookmarksPlugin::getFolder( KBookmarkGroup group, const TQString&
 
 TQTextCodec* BookmarksPlugin::getPageEncoding( const TQByteArray& data )
 {
-	TQString temp = TQString::fromLatin1(data);
+	TQString temp = TQString::tqfromLatin1(data);
 	TQRegExp rx("<meta[^>]*(charset|CHARSET)\\s*=\\s*[^>]*>");
 	int pos = rx.search( temp );
 	TQTextCodec *codec;
@@ -176,7 +176,7 @@ TQTextCodec* BookmarksPlugin::getPageEncoding( const TQByteArray& data )
 	}
 	//kdDebug(14501) << temp.mid(pos, rx.matchedLength()) << endl;
 	temp = temp.mid(pos, rx.matchedLength()-1);
-	temp = temp.mid( temp.find("charset", 0, false)+7);
+	temp = temp.mid( temp.tqfind("charset", 0, false)+7);
 	temp = temp.remove('=').simplifyWhiteSpace();
 	for( pos = 0 ; temp[pos].isLetterOrNumber() || temp[pos] == '-' ; pos++ );
 	temp = temp.left( pos );
diff --git a/kopete/plugins/addbookmarks/addbookmarksplugin.h b/kopete/plugins/addbookmarks/addbookmarksplugin.h
index 459c1b8b..404fe994 100644
--- a/kopete/plugins/addbookmarks/addbookmarksplugin.h
+++ b/kopete/plugins/addbookmarks/addbookmarksplugin.h
@@ -27,8 +27,9 @@
 class BookmarksPlugin : public Kopete::Plugin
 {
 Q_OBJECT
+  TQ_OBJECT
 public:
-    BookmarksPlugin(TQObject *parent, const char *name, const TQStringList &args);
+    BookmarksPlugin(TQObject *tqparent, const char *name, const TQStringList &args);
 
 private:
     typedef struct S_URLANDNAME{
diff --git a/kopete/plugins/addbookmarks/addbookmarkspreferences.cpp b/kopete/plugins/addbookmarks/addbookmarkspreferences.cpp
index 69b7fc1b..2c8f440f 100644
--- a/kopete/plugins/addbookmarks/addbookmarkspreferences.cpp
+++ b/kopete/plugins/addbookmarks/addbookmarkspreferences.cpp
@@ -26,8 +26,8 @@
 typedef KGenericFactory<BookmarksPreferences> BookmarksPreferencesFactory;
 K_EXPORT_COMPONENT_FACTORY( kcm_kopete_addbookmarks, BookmarksPreferencesFactory("kcm_kopete_addbookmarks") )
 
-BookmarksPreferences::BookmarksPreferences(TQWidget *parent, const char *name, const TQStringList &args)
- : KCModule(BookmarksPreferencesFactory::instance(), parent, args)
+BookmarksPreferences::BookmarksPreferences(TQWidget *tqparent, const char *name, const TQStringList &args)
+ : KCModule(BookmarksPreferencesFactory::instance(), tqparent, args)
 {
 	Q_UNUSED( name );
 	( new TQVBoxLayout (this) )->setAutoAdd( true );
@@ -104,7 +104,7 @@ void BookmarksPreferences::load()
 			 m_settings.isFolderForEachContact() == BookmarksPrefsSettings::UnselectedContacts );
 	list = m_settings.getContactsList();
 	for( it = list.begin() ; it != list.end() ; ++it){
-		if ( ( item = p_dialog->contactList->findItem(*it, Qt::ExactMatch ) ) ){
+		if ( ( item = p_dialog->contactList->tqfindItem(*it, TQt::ExactMatch ) ) ){
 			p_dialog->contactList->setSelected( item, true );
 		}
 	}
diff --git a/kopete/plugins/addbookmarks/addbookmarkspreferences.h b/kopete/plugins/addbookmarks/addbookmarkspreferences.h
index 30c94b70..2702de8a 100644
--- a/kopete/plugins/addbookmarks/addbookmarkspreferences.h
+++ b/kopete/plugins/addbookmarks/addbookmarkspreferences.h
@@ -22,8 +22,9 @@
 class BookmarksPreferences : public KCModule
 {
 Q_OBJECT
+  TQ_OBJECT
 public:
-    BookmarksPreferences(TQWidget *parent = 0, const char *name = 0, const TQStringList &args = TQStringList());
+    BookmarksPreferences(TQWidget *tqparent = 0, const char *name = 0, const TQStringList &args = TQStringList());
 
     ~BookmarksPreferences();
     
diff --git a/kopete/plugins/addbookmarks/addbookmarksprefssettings.cpp b/kopete/plugins/addbookmarks/addbookmarksprefssettings.cpp
index 34d921c3..55a89d30 100644
--- a/kopete/plugins/addbookmarks/addbookmarksprefssettings.cpp
+++ b/kopete/plugins/addbookmarks/addbookmarksprefssettings.cpp
@@ -15,8 +15,8 @@
 
 #include "addbookmarksprefssettings.h"
 
-BookmarksPrefsSettings::BookmarksPrefsSettings(TQObject *parent, const char *name)
- : TQObject(parent, name)
+BookmarksPrefsSettings::BookmarksPrefsSettings(TQObject *tqparent, const char *name)
+ : TQObject(tqparent, name)
 {
 	load();
 }
@@ -71,9 +71,9 @@ bool BookmarksPrefsSettings::useSubfolderForContact( TQString nickname )
 		case Always:
 			return true;
 		case SelectedContacts:
-			return ( m_contactslist.find( nickname ) != m_contactslist.end() );
+			return ( m_contactslist.tqfind( nickname ) != m_contactslist.end() );
 		case UnselectedContacts:
-			return ( m_contactslist.find( nickname ) == m_contactslist.end() );
+			return ( m_contactslist.tqfind( nickname ) == m_contactslist.end() );
 		}
 	}
 	return false;
diff --git a/kopete/plugins/addbookmarks/addbookmarksprefssettings.h b/kopete/plugins/addbookmarks/addbookmarksprefssettings.h
index 659f3c69..d4bd4c0b 100644
--- a/kopete/plugins/addbookmarks/addbookmarksprefssettings.h
+++ b/kopete/plugins/addbookmarks/addbookmarksprefssettings.h
@@ -18,13 +18,14 @@
 /**
 @author Roie Kerstein <sf_kersteinroie@bezeqint.net>
 */
-class BookmarksPrefsSettings : public QObject
+class BookmarksPrefsSettings : public TQObject
 {
 Q_OBJECT
+  TQ_OBJECT
 public:
 	enum UseSubfolders { Always=0, Never=1, SelectedContacts=2, UnselectedContacts=3 };
 
-    BookmarksPrefsSettings(TQObject *parent = 0, const char *name = 0);
+    BookmarksPrefsSettings(TQObject *tqparent = 0, const char *name = 0);
 
     ~BookmarksPrefsSettings();
     
diff --git a/kopete/plugins/addbookmarks/addbookmarksprefsui.ui b/kopete/plugins/addbookmarks/addbookmarksprefsui.ui
index 67be2b9e..20102dc5 100644
--- a/kopete/plugins/addbookmarks/addbookmarksprefsui.ui
+++ b/kopete/plugins/addbookmarks/addbookmarksprefsui.ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.3" stdsetdef="1">
 <class>BookmarksPrefsUI</class>
-<widget class="QWidget">
+<widget class="TQWidget">
     <property name="name">
         <cstring>BookmarksPrefsUI</cstring>
     </property>
@@ -16,7 +16,7 @@
         <property name="name">
             <cstring>unnamed</cstring>
         </property>
-        <widget class="QButtonGroup">
+        <widget class="TQButtonGroup">
             <property name="name">
                 <cstring>buttonGroup1</cstring>
             </property>
@@ -27,7 +27,7 @@
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
-                <widget class="QRadioButton">
+                <widget class="TQRadioButton">
                     <property name="name">
                         <cstring>yesButton</cstring>
                     </property>
@@ -41,7 +41,7 @@
                         <bool>true</bool>
                     </property>
                 </widget>
-                <widget class="QRadioButton">
+                <widget class="TQRadioButton">
                     <property name="name">
                         <cstring>noButton</cstring>
                     </property>
@@ -55,7 +55,7 @@
                         <number>1</number>
                     </property>
                 </widget>
-                <widget class="QRadioButton">
+                <widget class="TQRadioButton">
                     <property name="name">
                         <cstring>onlySelectedButton</cstring>
                     </property>
@@ -72,7 +72,7 @@
                         <number>2</number>
                     </property>
                 </widget>
-                <widget class="QRadioButton">
+                <widget class="TQRadioButton">
                     <property name="name">
                         <cstring>onlyNotSelectedButton</cstring>
                     </property>
@@ -85,12 +85,12 @@
                 </widget>
             </vbox>
         </widget>
-        <widget class="QListBox">
+        <widget class="TQListBox">
             <property name="name">
                 <cstring>contactList</cstring>
             </property>
         </widget>
-        <widget class="QCheckBox">
+        <widget class="TQCheckBox">
             <property name="name">
                 <cstring>m_addUntrusted</cstring>
             </property>
@@ -100,5 +100,5 @@
         </widget>
     </vbox>
 </widget>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 </UI>