diff options
Diffstat (limited to 'kopete/protocols/jabber/jabberprotocol.cpp')
| -rw-r--r-- | kopete/protocols/jabber/jabberprotocol.cpp | 90 |
1 files changed, 45 insertions, 45 deletions
diff --git a/kopete/protocols/jabber/jabberprotocol.cpp b/kopete/protocols/jabber/jabberprotocol.cpp index df8dba7d..c88b8841 100644 --- a/kopete/protocols/jabber/jabberprotocol.cpp +++ b/kopete/protocols/jabber/jabberprotocol.cpp @@ -69,14 +69,14 @@ typedef KGenericFactory<JabberProtocol> JabberProtocolFactory; K_EXPORT_COMPONENT_FACTORY( kopete_jabber, JabberProtocolFactory( "kopete_jabber" ) ) -JabberProtocol::JabberProtocol (TQObject * parent, const char *name, const TQStringList &) -: Kopete::Protocol( JabberProtocolFactory::instance(), parent, name ), +JabberProtocol::JabberProtocol (TQObject * tqparent, const char *name, const TQStringList &) +: Kopete::Protocol( JabberProtocolFactory::instance(), tqparent, name ), JabberKOSChatty(Kopete::OnlineStatus::Online, 100, this, JabberFreeForChat, "jabber_chatty", i18n ("Free for Chat"), i18n ("Free for Chat"), Kopete::OnlineStatusManager::FreeForChat, Kopete::OnlineStatusManager::HasAwayMessage ), - JabberKOSOnline(Kopete::OnlineStatus::Online, 90, this, JabberOnline, TQString::null, i18n ("Online"), i18n ("Online"), Kopete::OnlineStatusManager::Online, Kopete::OnlineStatusManager::HasAwayMessage ), + JabberKOSOnline(Kopete::OnlineStatus::Online, 90, this, JabberOnline, TQString(), i18n ("Online"), i18n ("Online"), Kopete::OnlineStatusManager::Online, Kopete::OnlineStatusManager::HasAwayMessage ), JabberKOSAway(Kopete::OnlineStatus::Away, 80, this, JabberAway, "contact_away_overlay", i18n ("Away"), i18n ("Away"), Kopete::OnlineStatusManager::Away, Kopete::OnlineStatusManager::HasAwayMessage), JabberKOSXA(Kopete::OnlineStatus::Away, 70, this, JabberXA, "contact_xa_overlay", i18n ("Extended Away"), i18n ("Extended Away"), 0, Kopete::OnlineStatusManager::HasAwayMessage), JabberKOSDND(Kopete::OnlineStatus::Away, 60, this, JabberDND, "contact_busy_overlay", i18n ("Do not Disturb"), i18n ("Do not Disturb"), Kopete::OnlineStatusManager::Busy, Kopete::OnlineStatusManager::HasAwayMessage), - JabberKOSOffline(Kopete::OnlineStatus::Offline, 50, this, JabberOffline, TQString::null, i18n ("Offline") ,i18n ("Offline"), Kopete::OnlineStatusManager::Offline, Kopete::OnlineStatusManager::HasAwayMessage ), + JabberKOSOffline(Kopete::OnlineStatus::Offline, 50, this, JabberOffline, TQString(), i18n ("Offline") ,i18n ("Offline"), Kopete::OnlineStatusManager::Offline, Kopete::OnlineStatusManager::HasAwayMessage ), JabberKOSInvisible(Kopete::OnlineStatus::Invisible, 40, this, JabberInvisible, "contact_invisible_overlay", i18n ("Invisible") ,i18n ("Invisible"), Kopete::OnlineStatusManager::Invisible), JabberKOSConnecting(Kopete::OnlineStatus::Connecting, 30, this, JabberConnecting, "jabber_connecting", i18n("Connecting")), propLastSeen(Kopete::Global::Properties::self()->lastSeen()), @@ -90,34 +90,34 @@ JabberProtocol::JabberProtocol (TQObject * parent, const char *name, const TQStr propWorkPhone(Kopete::Global::Properties::self()->workPhone()), propWorkMobilePhone(Kopete::Global::Properties::self()->workMobilePhone()), propNickName(Kopete::Global::Properties::self()->nickName()), - propSubscriptionStatus("jabberSubscriptionStatus", i18n ("Subscription"), TQString::null, true, false), - propAuthorizationStatus("jabberAuthorizationStatus", i18n ("Authorization Status"), TQString::null, true, false), + propSubscriptiontqStatus("jabberSubscriptiontqStatus", i18n ("Subscription"), TQString(), true, false), + propAuthorizationtqStatus("jabberAuthorizationtqStatus", i18n ("Authorization tqStatus"), TQString(), true, false), propAvailableResources("jabberAvailableResources", i18n ("Available Resources"), "jabber_chatty", false, true), - propVCardCacheTimeStamp("jabberVCardCacheTimeStamp", i18n ("vCard Cache Timestamp"), TQString::null, true, false, true), + propVCardCacheTimeStamp("jabberVCardCacheTimeStamp", i18n ("vCard Cache Timestamp"), TQString(), true, false, true), propPhoto(Kopete::Global::Properties::self()->photo()), - propJid("jabberVCardJid", i18n("Jabber ID"), TQString::null, true, false), - propBirthday("jabberVCardBirthday", i18n("Birthday"), TQString::null, true, false), - propTimezone("jabberVCardTimezone", i18n("Timezone"), TQString::null, true, false), - propHomepage("jabberVCardHomepage", i18n("Homepage"), TQString::null, true, false), - propCompanyName("jabberVCardCompanyName", i18n("Company name"), TQString::null, true, false), - propCompanyDepartement("jabberVCardCompanyDepartement", i18n("Company Departement"), TQString::null, true, false), - propCompanyPosition("jabberVCardCompanyPosition", i18n("Company Position"), TQString::null, true, false), - propCompanyRole("jabberVCardCompanyRole", i18n("Company Role"), TQString::null, true, false), - propWorkStreet("jabberVCardWorkStreet", i18n("Work Street"), TQString::null, true, false), - propWorkExtAddr("jabberVCardWorkExtAddr", i18n("Work Extra Address"), TQString::null, true, false), - propWorkPOBox("jabberVCardWorkPOBox", i18n("Work PO Box"), TQString::null, true, false), - propWorkCity("jabberVCardWorkCity", i18n("Work City"), TQString::null, true, false), - propWorkPostalCode("jabberVCardWorkPostalCode", i18n("Work Postal Code"), TQString::null, true, false), - propWorkCountry("jabberVCardWorkCountry", i18n("Work Country"), TQString::null, true, false), - propWorkEmailAddress("jabberVCardWorkEmailAddress", i18n("Work Email Address"), TQString::null, true, false), - propHomeStreet("jabberVCardHomeStreet", i18n("Home Street"), TQString::null, true, false), - propHomeExtAddr("jabberVCardHomeExt", i18n("Home Extra Address"), TQString::null, true, false), - propHomePOBox("jabberVCardHomePOBox", i18n("Home PO Box"), TQString::null, true, false), - propHomeCity("jabberVCardHomeCity", i18n("Home City"), TQString::null, true, false), - propHomePostalCode("jabberVCardHomePostalCode", i18n("Home Postal Code"), TQString::null, true, false), - propHomeCountry("jabberVCardHomeCountry", i18n("Home Country"), TQString::null, true, false), - propPhoneFax("jabberVCardPhoneFax", i18n("Fax"), TQString::null, true, false), - propAbout("jabberVCardAbout", i18n("About"), TQString::null, true, false) + propJid("jabberVCardJid", i18n("Jabber ID"), TQString(), true, false), + propBirthday("jabberVCardBirthday", i18n("Birthday"), TQString(), true, false), + propTimezone("jabberVCardTimezone", i18n("Timezone"), TQString(), true, false), + propHomepage("jabberVCardHomepage", i18n("Homepage"), TQString(), true, false), + propCompanyName("jabberVCardCompanyName", i18n("Company name"), TQString(), true, false), + propCompanyDepartement("jabberVCardCompanyDepartement", i18n("Company Departement"), TQString(), true, false), + propCompanyPosition("jabberVCardCompanyPosition", i18n("Company Position"), TQString(), true, false), + propCompanyRole("jabberVCardCompanyRole", i18n("Company Role"), TQString(), true, false), + propWorkStreet("jabberVCardWorkStreet", i18n("Work Street"), TQString(), true, false), + propWorkExtAddr("jabberVCardWorkExtAddr", i18n("Work Extra Address"), TQString(), true, false), + propWorkPOBox("jabberVCardWorkPOBox", i18n("Work PO Box"), TQString(), true, false), + propWorkCity("jabberVCardWorkCity", i18n("Work City"), TQString(), true, false), + propWorkPostalCode("jabberVCardWorkPostalCode", i18n("Work Postal Code"), TQString(), true, false), + propWorkCountry("jabberVCardWorkCountry", i18n("Work Country"), TQString(), true, false), + propWorkEmailAddress("jabberVCardWorkEmailAddress", i18n("Work Email Address"), TQString(), true, false), + propHomeStreet("jabberVCardHomeStreet", i18n("Home Street"), TQString(), true, false), + propHomeExtAddr("jabberVCardHomeExt", i18n("Home Extra Address"), TQString(), true, false), + propHomePOBox("jabberVCardHomePOBox", i18n("Home PO Box"), TQString(), true, false), + propHomeCity("jabberVCardHomeCity", i18n("Home City"), TQString(), true, false), + propHomePostalCode("jabberVCardHomePostalCode", i18n("Home Postal Code"), TQString(), true, false), + propHomeCountry("jabberVCardHomeCountry", i18n("Home Country"), TQString(), true, false), + propPhoneFax("jabberVCardPhoneFax", i18n("Fax"), TQString(), true, false), + propAbout("jabberVCardAbout", i18n("About"), TQString(), true, false) { @@ -155,18 +155,18 @@ JabberProtocol::~JabberProtocol () -AddContactPage *JabberProtocol::createAddContactWidget (TQWidget * parent, Kopete::Account * i) +AddContactPage *JabberProtocol::createAddContactWidget (TQWidget * tqparent, Kopete::Account * i) { kdDebug (JABBER_DEBUG_GLOBAL) << "[Jabber Protocol] Create Add Contact Widget\n" << endl; - return new JabberAddContactPage (i, parent); + return new JabberAddContactPage (i, tqparent); } -KopeteEditAccountWidget *JabberProtocol::createEditAccountWidget (Kopete::Account * account, TQWidget * parent) +KopeteEditAccountWidget *JabberProtocol::createEditAccountWidget (Kopete::Account * account, TQWidget * tqparent) { kdDebug (JABBER_DEBUG_GLOBAL) << "[Jabber Protocol] Edit Account Widget\n" << endl; JabberAccount *ja=dynamic_cast < JabberAccount * >(account); if(ja || !account) - return new JabberEditAccountWidget (this,ja , parent); + return new JabberEditAccountWidget (this,ja , tqparent); else { JabberTransport *transport = dynamic_cast < JabberTransport * >(account); @@ -185,7 +185,7 @@ Kopete::Account *JabberProtocol::createNewAccount (const TQString & accountId) if( Kopete::AccountManager::self()->findAccount( pluginId() , accountId ) ) return 0L; //the account may already exist if greated just above - int slash=accountId.find('/'); + int slash=accountId.tqfind('/'); if(slash>=0) { TQString realAccountId=accountId.left(slash); @@ -304,42 +304,42 @@ Kopete::Contact *JabberProtocol::deserializeContact (Kopete::MetaContact * metaC return account->contacts()[contactId]; } -XMPP::Status JabberProtocol::kosToStatus( const Kopete::OnlineStatus & status , const TQString & message ) +XMPP::tqStatus JabberProtocol::kosTotqStatus( const Kopete::OnlineStatus & status , const TQString & message ) { - XMPP::Status xmppStatus ( "", message ); + XMPP::tqStatus xmpptqStatus ( "", message ); if( status.status() == Kopete::OnlineStatus::Offline ) { - xmppStatus.setIsAvailable( false ); + xmpptqStatus.setIsAvailable( false ); } switch ( status.internalStatus () ) { case JabberProtocol::JabberFreeForChat: - xmppStatus.setShow ( "chat" ); + xmpptqStatus.setShow ( "chat" ); break; case JabberProtocol::JabberOnline: - xmppStatus.setShow ( "" ); + xmpptqStatus.setShow ( "" ); break; case JabberProtocol::JabberAway: - xmppStatus.setShow ( "away" ); + xmpptqStatus.setShow ( "away" ); break; case JabberProtocol::JabberXA: - xmppStatus.setShow ( "xa" ); + xmpptqStatus.setShow ( "xa" ); break; case JabberProtocol::JabberDND: - xmppStatus.setShow ( "dnd" ); + xmpptqStatus.setShow ( "dnd" ); break; case JabberProtocol::JabberInvisible: - xmppStatus.setIsInvisible ( true ); + xmpptqStatus.setIsInvisible ( true ); break; } - return xmppStatus; + return xmpptqStatus; } #include "jabberprotocol.moc" |