From 69cac65817d949cda2672ec4f0aa73d5e66a0ba1 Mon Sep 17 00:00:00 2001 From: tpearson Date: Wed, 22 Jun 2011 00:30:31 +0000 Subject: 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 --- ksirc/KSOpenkSirc/enter_combo.h | 9 ++++---- ksirc/KSOpenkSirc/open_ksirc.cpp | 14 ++++++------- ksirc/KSOpenkSirc/open_ksirc.h | 5 +++-- ksirc/KSOpenkSirc/open_ksircData.ui | 42 ++++++++++++++++++------------------- ksirc/KSOpenkSirc/serverDataType.h | 2 +- 5 files changed, 37 insertions(+), 35 deletions(-) (limited to 'ksirc/KSOpenkSirc') diff --git a/ksirc/KSOpenkSirc/enter_combo.h b/ksirc/KSOpenkSirc/enter_combo.h index 7af88d8f..bca46165 100644 --- a/ksirc/KSOpenkSirc/enter_combo.h +++ b/ksirc/KSOpenkSirc/enter_combo.h @@ -10,13 +10,14 @@ class EnterCombo : public TQComboBox { Q_OBJECT + TQ_OBJECT public: - EnterCombo ( TQWidget * parent=0, const char * name=0 ) - : TQComboBox(TRUE, parent, name) + EnterCombo ( TQWidget * tqparent=0, const char * name=0 ) + : TQComboBox(TRUE, tqparent, name) { } - EnterCombo ( bool rw, TQWidget * parent=0, const char * name=0 ) - : TQComboBox(rw, parent, name) + EnterCombo ( bool rw, TQWidget * tqparent=0, const char * name=0 ) + : TQComboBox(rw, tqparent, name) { TQKeyEvent ke(TQEvent::KeyPress, SHIFT|Key_Home, 0, 0); keyPressEvent(&ke); diff --git a/ksirc/KSOpenkSirc/open_ksirc.cpp b/ksirc/KSOpenkSirc/open_ksirc.cpp index d3ff7488..f005394b 100644 --- a/ksirc/KSOpenkSirc/open_ksirc.cpp +++ b/ksirc/KSOpenkSirc/open_ksirc.cpp @@ -1,6 +1,6 @@ /********************************************************************** - --- Qt Architect generated file --- + --- TQt Architect generated file --- File: open_ksirc.cpp Last generated: Wed Jul 29 16:41:26 1998 @@ -35,11 +35,11 @@ TQPtrList Groups; open_ksirc::open_ksirc ( - TQWidget* parent, + TQWidget* tqparent, const char* name ) : - Inherited( parent, name, true ) + Inherited( tqparent, name, true ) { setCaption( i18n("Connect to Server") ); @@ -137,7 +137,7 @@ void open_ksirc::insertGroupList() Server *serv; for ( serv=Groups.first(); serv != 0; serv=Groups.next() ) { - if (tempgroups.find(serv->group()) == -1) + if (tempgroups.tqfind(serv->group()) == -1) tempgroups.inSort( serv->group() ); } @@ -233,7 +233,7 @@ TQString open_ksirc::encryptPassword( const TQString &password ) memcpy(result.data(), kapp->randomString(utf8Length).latin1(), utf8Length); for (unsigned int i = 0; i < utf8Length; ++i) result[i + utf8Length] = utf8[i] ^ result[i]; - return TQString::fromLatin1(KCodecs::base64Encode(result)); + return TQString::tqfromLatin1(KCodecs::base64Encode(result)); } TQString open_ksirc::decryptPassword( const TQString &scrambled ) @@ -307,8 +307,8 @@ void open_ksirc::clickConnect() conf->setGroup("ServerList"); conf->writeEntry("StorePasswords", CheckB_StorePassword->isChecked()); TQStringList recent = conf->readListEntry("RecentServers"); - if(recent.contains(server)){ - TQStringList::Iterator it = recent.find(server); + if(recent.tqcontains(server)){ + TQStringList::Iterator it = recent.tqfind(server); recent.remove(it); } diff --git a/ksirc/KSOpenkSirc/open_ksirc.h b/ksirc/KSOpenkSirc/open_ksirc.h index 29fb4f60..238d6b84 100644 --- a/ksirc/KSOpenkSirc/open_ksirc.h +++ b/ksirc/KSOpenkSirc/open_ksirc.h @@ -1,6 +1,6 @@ /********************************************************************** - --- Qt Architect generated file --- + --- TQt Architect generated file --- File: open_ksirc.h Last generated: Wed Jul 29 16:41:26 1998 @@ -19,12 +19,13 @@ class KSircServer; class open_ksirc : public open_ksircData { Q_OBJECT + TQ_OBJECT public: open_ksirc ( - TQWidget* parent = NULL, + TQWidget* tqparent = NULL, const char* name = NULL ); diff --git a/ksirc/KSOpenkSirc/open_ksircData.ui b/ksirc/KSOpenkSirc/open_ksircData.ui index ae97f341..df4ae7c6 100644 --- a/ksirc/KSOpenkSirc/open_ksircData.ui +++ b/ksirc/KSOpenkSirc/open_ksircData.ui @@ -1,6 +1,6 @@ open_ksircData - + Form1 @@ -22,7 +22,7 @@ 6 - + TextLabel2 @@ -33,7 +33,7 @@ ComboB_ServerName - + TextLabel3 @@ -44,7 +44,7 @@ ComboB_ServerPort - + ComboB_ServerGroup @@ -55,7 +55,7 @@ Usually IRC Servers are connected to a net (IRCNet, Freenode, etc.). Here, you can select the closest server for your favorite network. - + TextLabel1 @@ -88,7 +88,7 @@ If you selected an IRC Network in <i>"Group"</i>, this window shows all of its servers. If you did not choose a group, you can enter your own here or select one of the recently used ones (<i>"Quick Connect"</i>). - + ComboB_ServerPort @@ -102,7 +102,7 @@ Using <i>"6667"</i> or <i>"6666"</i> here is safe in most cases. Only use other values if you have been told so. - + GroupBox2 @@ -122,7 +122,7 @@ 6 - + Label_ServerDesc @@ -134,7 +134,7 @@ 0 - + WordBreak|AlignTop|AlignLeft @@ -144,7 +144,7 @@ - + GroupBox1 @@ -169,7 +169,7 @@ 6 - + TextLabel5 @@ -180,7 +180,7 @@ LineE_Password - + LineE_Password @@ -196,7 +196,7 @@ Password - + CheckB_UseSSL @@ -207,7 +207,7 @@ This will use a secure connection to the server. This must be supported by the server. - + CheckB_StorePassword @@ -220,7 +220,7 @@ - + PB_Cancel @@ -234,7 +234,7 @@ Cancel Connect - + PB_Connect @@ -259,7 +259,7 @@ Connect to the server given in <i>"Server / Quick Connect to:"</i> on the port given in <i>"Port:"</i>. - + PB_Edit @@ -280,7 +280,7 @@ Expanding - + 20 20 @@ -330,8 +330,8 @@ PB_Connect PB_Cancel - + passwordChanged(const QString &) - - + + diff --git a/ksirc/KSOpenkSirc/serverDataType.h b/ksirc/KSOpenkSirc/serverDataType.h index 157be09e..417625e8 100644 --- a/ksirc/KSOpenkSirc/serverDataType.h +++ b/ksirc/KSOpenkSirc/serverDataType.h @@ -26,7 +26,7 @@ public: TQPtrList ports, const TQString &serverdesc, const TQString &script, - const TQString &password = TQString::null, + const TQString &password = TQString(), bool dossl = false ) { g=group; s=server; p=ports; sd=serverdesc; sc=script; -- cgit v1.2.1