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/libkopete/kopeteglobal.cpp | 84 +++++++++++++++++++-------------------- 1 file changed, 42 insertions(+), 42 deletions(-) (limited to 'kopete/libkopete/kopeteglobal.cpp') diff --git a/kopete/libkopete/kopeteglobal.cpp b/kopete/libkopete/kopeteglobal.cpp index 093be4df..2dae6117 100644 --- a/kopete/libkopete/kopeteglobal.cpp +++ b/kopete/libkopete/kopeteglobal.cpp @@ -69,7 +69,7 @@ Properties::~Properties() const ContactPropertyTmpl &Properties::tmpl(const TQString &key) const { - if(d->mTemplates.contains(key)) + if(d->mTemplates.tqcontains(key)) { /*kdDebug(14000) << k_funcinfo << "Found template for key = '" << key << "'" << endl;*/ @@ -82,7 +82,7 @@ const ContactPropertyTmpl &Properties::tmpl(const TQString &key) const bool Properties::registerTemplate(const TQString &key, const ContactPropertyTmpl &tmpl) { - if(d->mTemplates.contains(key)) + if(d->mTemplates.tqcontains(key)) { kdDebug(14000) << k_funcinfo << "Called for EXISTING key = '" << key << "'" << endl; @@ -103,91 +103,91 @@ void Properties::unregisterTemplate(const TQString &key) bool Properties::isRegistered(const TQString &key) { - return d->mTemplates.contains(key); + return d->mTemplates.tqcontains(key); } const ContactPropertyTmpl &Properties::fullName() const { - return createProp(TQString::fromLatin1("FormattedName"), + return createProp(TQString::tqfromLatin1("FormattedName"), i18n("Full Name")); } const ContactPropertyTmpl &Properties::idleTime() const { - return createProp(TQString::fromLatin1("idleTime"), + return createProp(TQString::tqfromLatin1("idleTime"), i18n("Idle Time")); } const ContactPropertyTmpl &Properties::onlineSince() const { - return createProp(TQString::fromLatin1("onlineSince"), + return createProp(TQString::tqfromLatin1("onlineSince"), i18n("Online Since")); } const ContactPropertyTmpl &Properties::lastSeen() const { - return createProp(TQString::fromLatin1("lastSeen"), - i18n("Last Seen"), TQString::null, true); + return createProp(TQString::tqfromLatin1("lastSeen"), + i18n("Last Seen"), TQString(), true); } const ContactPropertyTmpl &Properties::awayMessage() const { - return createProp(TQString::fromLatin1("awayMessage"), + return createProp(TQString::tqfromLatin1("awayMessage"), i18n("Away Message")); } const ContactPropertyTmpl &Properties::firstName() const { - return createProp(TQString::fromLatin1("firstName"), - i18n("First Name"), TQString::null, true); + return createProp(TQString::tqfromLatin1("firstName"), + i18n("First Name"), TQString(), true); } const ContactPropertyTmpl &Properties::lastName() const { - return createProp(TQString::fromLatin1("lastName"), - i18n("Last Name"), TQString::null, true); + return createProp(TQString::tqfromLatin1("lastName"), + i18n("Last Name"), TQString(), true); } const ContactPropertyTmpl &Properties::privatePhone() const { - return createProp(TQString::fromLatin1("privatePhoneNumber"), - i18n("Private Phone"), TQString::null, true); + return createProp(TQString::tqfromLatin1("privatePhoneNumber"), + i18n("Private Phone"), TQString(), true); } const ContactPropertyTmpl &Properties::privateMobilePhone() const { - return createProp(TQString::fromLatin1("privateMobilePhoneNumber"), - i18n("Private Mobile Phone"), TQString::null, true); + return createProp(TQString::tqfromLatin1("privateMobilePhoneNumber"), + i18n("Private Mobile Phone"), TQString(), true); } const ContactPropertyTmpl &Properties::workPhone() const { - return createProp(TQString::fromLatin1("workPhoneNumber"), - i18n("Work Phone"), TQString::null, true); + return createProp(TQString::tqfromLatin1("workPhoneNumber"), + i18n("Work Phone"), TQString(), true); } const ContactPropertyTmpl &Properties::workMobilePhone() const { - return createProp(TQString::fromLatin1("workMobilePhoneNumber"), - i18n("Work Mobile Phone"), TQString::null, true); + return createProp(TQString::tqfromLatin1("workMobilePhoneNumber"), + i18n("Work Mobile Phone"), TQString(), true); } const ContactPropertyTmpl &Properties::emailAddress() const { - return createProp(TQString::fromLatin1("emailAddress"), - i18n("Email Address"), TQString::fromLatin1("mail_generic"), true); + return createProp(TQString::tqfromLatin1("emailAddress"), + i18n("Email Address"), TQString::tqfromLatin1("mail_generic"), true); } const ContactPropertyTmpl &Properties::nickName() const { - return createProp(TQString::fromLatin1("nickName"), - i18n("Nick Name"), TQString::null, true); + return createProp(TQString::tqfromLatin1("nickName"), + i18n("Nick Name"), TQString(), true); } const ContactPropertyTmpl &Properties::photo() const { - return createProp(TQString::fromLatin1("photo"), - i18n("Photo"), TQString::null, true); + return createProp(TQString::tqfromLatin1("photo"), + i18n("Photo"), TQString(), true); } @@ -197,7 +197,7 @@ const ContactPropertyTmpl &Properties::createProp(const TQString &key, /*kdDebug(14000) << k_funcinfo << "key = " << key << ", label = " << label << endl;*/ - if(!d->mTemplates.contains(key)) + if(!d->mTemplates.tqcontains(key)) { /* kdDebug(14000) << k_funcinfo << "CREATING NEW ContactPropertyTmpl WITH key = " << key << @@ -224,7 +224,7 @@ void installEmoticonTheme(const TQString &archiveName) KProgressDialog *progressDlg = 0L; KArchive *archive = 0L; - TQString localThemesDir(locateLocal("emoticons", TQString::null) ); + TQString localThemesDir(locateLocal("emoticons", TQString()) ); if(localThemesDir.isEmpty()) { @@ -235,20 +235,20 @@ void installEmoticonTheme(const TQString &archiveName) } progressDlg = new KProgressDialog(0 , "emoticonInstProgress", - i18n("Installing Emoticon Themes..."), TQString::null, true); + i18n("Installing Emoticon Themes..."), TQString(), true); progressDlg->progressBar()->setTotalSteps(foundThemes.count()); progressDlg->show(); kapp->processEvents(); TQString currentBundleMimeType = KMimeType::findByPath(archiveName, 0, false)->name(); - if( currentBundleMimeType == TQString::fromLatin1("application/x-zip") ) + if( currentBundleMimeType == TQString::tqfromLatin1("application/x-zip") ) archive = new KZip(archiveName); - else if( currentBundleMimeType == TQString::fromLatin1("application/x-tgz") || - currentBundleMimeType == TQString::fromLatin1("application/x-tbz") || - currentBundleMimeType == TQString::fromLatin1("application/x-gzip") || - currentBundleMimeType == TQString::fromLatin1("application/x-bzip2") ) + else if( currentBundleMimeType == TQString::tqfromLatin1("application/x-tgz") || + currentBundleMimeType == TQString::tqfromLatin1("application/x-tbz") || + currentBundleMimeType == TQString::tqfromLatin1("application/x-gzip") || + currentBundleMimeType == TQString::tqfromLatin1("application/x-bzip2") ) archive = new KTar(archiveName); - else if(archiveName.endsWith(TQString::fromLatin1("jisp")) || archiveName.endsWith(TQString::fromLatin1("zip")) ) + else if(archiveName.endsWith(TQString::tqfromLatin1("jisp")) || archiveName.endsWith(TQString::tqfromLatin1("zip")) ) archive = new KZip(archiveName); else archive = new KTar(archiveName); @@ -257,7 +257,7 @@ void installEmoticonTheme(const TQString &archiveName) { KMessageBox::queuedMessageBox(Kopete::UI::Global::mainWidget(), KMessageBox::Error, - i18n("Could not open \"%1\" for unpacking.").arg(archiveName)); + i18n("Could not open \"%1\" for unpacking.").tqarg(archiveName)); delete archive; delete progressDlg; return; @@ -273,8 +273,8 @@ void installEmoticonTheme(const TQString &archiveName) if (currentEntry->isDirectory()) { currentDir = dynamic_cast( currentEntry ); - if (currentDir && ( currentDir->entry(TQString::fromLatin1("emoticons.xml")) != NULL || - currentDir->entry(TQString::fromLatin1("icondef.xml")) != NULL ) ) + if (currentDir && ( currentDir->entry(TQString::tqfromLatin1("emoticons.xml")) != NULL || + currentDir->entry(TQString::tqfromLatin1("icondef.xml")) != NULL ) ) foundThemes.append(currentDir->name()); } } @@ -283,7 +283,7 @@ void installEmoticonTheme(const TQString &archiveName) { KMessageBox::queuedMessageBox(Kopete::UI::Global::mainWidget(), KMessageBox::Error, i18n("The file \"%1\" is not a valid" \ - " emoticon theme archive.").arg(archiveName)); + " emoticon theme archive.").tqarg(archiveName)); archive->close(); delete archive; delete progressDlg; @@ -294,8 +294,8 @@ void installEmoticonTheme(const TQString &archiveName) { progressDlg->setLabel( i18n("Installing %1 emoticon theme") - .arg(*it)); - progressDlg->resize(progressDlg->sizeHint()); + .tqarg(*it)); + progressDlg->resize(progressDlg->tqsizeHint()); kapp->processEvents(); if (progressDlg->wasCancelled()) -- cgit v1.2.1