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 --- kopete/protocols/yahoo/yahooprotocol.cpp | 92 ++++++++++++++++---------------- 1 file changed, 46 insertions(+), 46 deletions(-) (limited to 'kopete/protocols/yahoo/yahooprotocol.cpp') diff --git a/kopete/protocols/yahoo/yahooprotocol.cpp b/kopete/protocols/yahoo/yahooprotocol.cpp index dc2e3cdc..fc132701 100644 --- a/kopete/protocols/yahoo/yahooprotocol.cpp +++ b/kopete/protocols/yahoo/yahooprotocol.cpp @@ -37,10 +37,10 @@ typedef KGenericFactory YahooProtocolFactory; K_EXPORT_COMPONENT_FACTORY( kopete_yahoo, YahooProtocolFactory( "kopete_yahoo" ) ) -YahooProtocol::YahooProtocol( TQObject *parent, const char *name, const TQStringList & ) - : Kopete::Protocol( YahooProtocolFactory::instance(), parent, name ), - Offline( Kopete::OnlineStatus::Offline, 0, this, 0x5a55aa56, TQString::null, i18n( "Offline" ), i18n( "Offline" ), Kopete::OnlineStatusManager::Offline ), - Online( Kopete::OnlineStatus::Online, 25, this, 0, TQString::null, i18n( "Online" ), i18n( "Online" ), Kopete::OnlineStatusManager::Online, Kopete::OnlineStatusManager::HasAwayMessage ), +YahooProtocol::YahooProtocol( TQObject *tqparent, const char *name, const TQStringList & ) + : Kopete::Protocol( YahooProtocolFactory::instance(), tqparent, name ), + Offline( Kopete::OnlineStatus::Offline, 0, this, 0x5a55aa56, TQString(), i18n( "Offline" ), i18n( "Offline" ), Kopete::OnlineStatusManager::Offline ), + Online( Kopete::OnlineStatus::Online, 25, this, 0, TQString(), i18n( "Online" ), i18n( "Online" ), Kopete::OnlineStatusManager::Online, Kopete::OnlineStatusManager::HasAwayMessage ), BeRightBack( Kopete::OnlineStatus::Away, 22, this, 1, "contact_away_overlay", i18n( "Be right back" ), i18n( "Be right back" ) ), Busy( Kopete::OnlineStatus::Away, 20, this, 2, "contact_busy_overlay", i18n( "Busy" ), i18n( "Busy" ), Kopete::OnlineStatusManager::Busy, Kopete::OnlineStatusManager::HasAwayMessage ), NotAtHome( Kopete::OnlineStatus::Away, 17, this, 3, "contact_xa_overlay", i18n( "Not at home" ), i18n( "Not at home" ), Kopete::OnlineStatusManager::ExtendedAway ), @@ -55,51 +55,51 @@ YahooProtocol::YahooProtocol( TQObject *parent, const char *name, const TQString Idle( Kopete::OnlineStatus::Away, 15, this, 999, "yahoo_idle", i18n( "Idle" ), i18n( "Idle" ), Kopete::OnlineStatusManager::Idle ), Connecting( Kopete::OnlineStatus::Connecting,2, this, 555, "yahoo_connecting", i18n( "Connecting" ) ), awayMessage(Kopete::Global::Properties::self()->awayMessage()), - iconCheckSum("iconCheckSum", i18n("Buddy Icon Checksum"), TQString::null, true, false, true), - iconExpire("iconExpire", i18n("Buddy Icon Expire"), TQString::null, true, false, true), - iconRemoteUrl("iconRemoteUrl", i18n("Buddy Icon Remote Url"), TQString::null, true, false, true), + iconCheckSum("iconCheckSum", i18n("Buddy Icon Checksum"), TQString(), true, false, true), + iconExpire("iconExpire", i18n("Buddy Icon Expire"), TQString(), true, false, true), + iconRemoteUrl("iconRemoteUrl", i18n("Buddy Icon Remote Url"), TQString(), true, false, true), propfirstName(Kopete::Global::Properties::self()->firstName()), propSecondName(), propLastName(Kopete::Global::Properties::self()->lastName()), propNickName(Kopete::Global::Properties::self()->nickName()), - propTitle("YABTitle", i18n("Title"), TQString::null, true, false), + propTitle("YABTitle", i18n("Title"), TQString(), true, false), propPhoneMobile(Kopete::Global::Properties::self()->privateMobilePhone()), propEmail(Kopete::Global::Properties::self()->emailAddress()), - propYABId("YABId", i18n("YAB Id"), TQString::null, true, false, true), - propPager("YABPager", i18n("Pager number"), TQString::null, true, false), - propFax("YABFax", i18n("Fax number"), TQString::null, true, false), - propAdditionalNumber("YABAdditionalNumber", i18n("Additional number"), TQString::null, true, false), - propAltEmail1("YABAlternativeEmail1", i18n("Alternative email 1"), TQString::null, true, false), - propAltEmail2("YABAlternativeEmail2", i18n("Alternative email 1"), TQString::null, true, false), - propImAIM("YABIMAIM", i18n("AIM"), TQString::null, true, false), - propImICQ("YABIMICQ", i18n("ICQ"), TQString::null, true, false), - propImMSN("YABIMMSN", i18n("MSN"), TQString::null, true, false), - propImGoogleTalk("YABIMGoogleTalk", i18n("GoogleTalk"), TQString::null, true, false), - propImSkype("YABIMSkype", i18n("Skype"), TQString::null, true, false), - propImIRC("YABIMIRC", i18n("IRC"), TQString::null, true, false), - propImQQ("YABIMQQ", i18n("QQ"), TQString::null, true, false), - propPrivateAddress("YABPrivateAddress", i18n("Private Address"), TQString::null, true, false), - propPrivateCity("YABPrivateCity", i18n("Private City"), TQString::null, true, false), - propPrivateState("YABPrivateState", i18n("Private State"), TQString::null, true, false), - propPrivateZIP("YABPrivateZIP", i18n("Private ZIP"), TQString::null, true, false), - propPrivateCountry("YABPrivateCountry", i18n("Private Country"), TQString::null, true, false), + propYABId("YABId", i18n("YAB Id"), TQString(), true, false, true), + propPager("YABPager", i18n("Pager number"), TQString(), true, false), + propFax("YABFax", i18n("Fax number"), TQString(), true, false), + propAdditionalNumber("YABAdditionalNumber", i18n("Additional number"), TQString(), true, false), + propAltEmail1("YABAlternativeEmail1", i18n("Alternative email 1"), TQString(), true, false), + propAltEmail2("YABAlternativeEmail2", i18n("Alternative email 1"), TQString(), true, false), + propImAIM("YABIMAIM", i18n("AIM"), TQString(), true, false), + propImICQ("YABIMICQ", i18n("ICQ"), TQString(), true, false), + propImMSN("YABIMMSN", i18n("MSN"), TQString(), true, false), + propImGoogleTalk("YABIMGoogleTalk", i18n("GoogleTalk"), TQString(), true, false), + propImSkype("YABIMSkype", i18n("Skype"), TQString(), true, false), + propImIRC("YABIMIRC", i18n("IRC"), TQString(), true, false), + propImQQ("YABIMQQ", i18n("QQ"), TQString(), true, false), + propPrivateAddress("YABPrivateAddress", i18n("Private Address"), TQString(), true, false), + propPrivateCity("YABPrivateCity", i18n("Private City"), TQString(), true, false), + propPrivateState("YABPrivateState", i18n("Private State"), TQString(), true, false), + propPrivateZIP("YABPrivateZIP", i18n("Private ZIP"), TQString(), true, false), + propPrivateCountry("YABPrivateCountry", i18n("Private Country"), TQString(), true, false), propPrivatePhone(Kopete::Global::Properties::self()->privatePhone()), - propPrivateURL("YABPrivateURL", i18n("Private URL"), TQString::null, true, false), - propCorporation("YABCorporation", i18n("Corporation"), TQString::null, true, false), - propWorkAddress("YABWorkAddress", i18n("Work Address"), TQString::null, true, false), - propWorkCity("YABWorkCity", i18n("Work City"), TQString::null, true, false), - propWorkState("YABWorkState", i18n("Work State"), TQString::null, true, false), - propWorkZIP("YABWorkZIP", i18n("Work ZIP"), TQString::null, true, false), - propWorkCountry("YABWorkCountry", i18n("Work Country"), TQString::null, true, false), + propPrivateURL("YABPrivateURL", i18n("Private URL"), TQString(), true, false), + propCorporation("YABCorporation", i18n("Corporation"), TQString(), true, false), + propWorkAddress("YABWorkAddress", i18n("Work Address"), TQString(), true, false), + propWorkCity("YABWorkCity", i18n("Work City"), TQString(), true, false), + propWorkState("YABWorkState", i18n("Work State"), TQString(), true, false), + propWorkZIP("YABWorkZIP", i18n("Work ZIP"), TQString(), true, false), + propWorkCountry("YABWorkCountry", i18n("Work Country"), TQString(), true, false), propWorkPhone(Kopete::Global::Properties::self()->workPhone()), - propWorkURL("YABWorkURL", i18n("Work URL"), TQString::null, true, false), - propBirthday("YABBirthday", i18n("Birthday"), TQString::null, true, false), - propAnniversary("YABAnniversary", i18n("Anniversary"), TQString::null, true, false), - propNotes("YABNotes", i18n("Notes"), TQString::null, true, false), - propAdditional1("YABAdditional1", i18n("Additional 1"), TQString::null, true, false), - propAdditional2("YABAdditional2", i18n("Additional 2"), TQString::null, true, false), - propAdditional3("YABAdditional3", i18n("Additional 3"), TQString::null, true, false), - propAdditional4("YABAdditional4", i18n("Additional 4"), TQString::null, true, false) + propWorkURL("YABWorkURL", i18n("Work URL"), TQString(), true, false), + propBirthday("YABBirthday", i18n("Birthday"), TQString(), true, false), + propAnniversary("YABAnniversary", i18n("Anniversary"), TQString(), true, false), + propNotes("YABNotes", i18n("Notes"), TQString(), true, false), + propAdditional1("YABAdditional1", i18n("Additional 1"), TQString(), true, false), + propAdditional2("YABAdditional2", i18n("Additional 2"), TQString(), true, false), + propAdditional3("YABAdditional3", i18n("Additional 3"), TQString(), true, false), + propAdditional4("YABAdditional4", i18n("Additional 4"), TQString(), true, false) { kdDebug(YAHOO_GEN_DEBUG) << k_funcinfo << endl; @@ -187,15 +187,15 @@ Kopete::Contact *YahooProtocol::deserializeContact( Kopete::MetaContact *metaCon return theAccount->contacts()[contactId]; } -AddContactPage *YahooProtocol::createAddContactWidget( TQWidget * parent , Kopete::Account* ) +AddContactPage *YahooProtocol::createAddContactWidget( TQWidget * tqparent , Kopete::Account* ) { - kdDebug(YAHOO_GEN_DEBUG) << "YahooProtocol::createAddContactWidget()" << endl; - return new YahooAddContact(this, parent); + kdDebug(YAHOO_GEN_DEBUG) << "YahooProtocol::createAddContactWidget()" << endl; + return new YahooAddContact(this, tqparent); } -KopeteEditAccountWidget *YahooProtocol::createEditAccountWidget(Kopete::Account *account, TQWidget *parent) +KopeteEditAccountWidget *YahooProtocol::createEditAccountWidget(Kopete::Account *account, TQWidget *tqparent) { - return new YahooEditAccount(this, account, parent); + return new YahooEditAccount(this, account, tqparent); } Kopete::Account *YahooProtocol::createNewAccount(const TQString &accountId) -- cgit v1.2.1