1 files changed, 24 insertions, 24 deletions

diff --git a/kopete/libkopete/kopeteglobal.cpp b/kopete/libkopete/kopeteglobal.cpp
index e7643142..c8c21c25 100644
--- a/kopete/libkopete/kopeteglobal.cpp
+++ b/kopete/libkopete/kopeteglobal.cpp
@@ -108,85 +108,85 @@ bool Properties::isRegistered(const TQString &key)
 
 const ContactPropertyTmpl &Properties::fullName() const
 {
-	return createProp(TQString::tqfromLatin1("FormattedName"),
+	return createProp(TQString::fromLatin1("FormattedName"),
 		i18n("Full Name"));
 }
 
 const ContactPropertyTmpl &Properties::idleTime() const
 {
-	return createProp(TQString::tqfromLatin1("idleTime"),
+	return createProp(TQString::fromLatin1("idleTime"),
 		i18n("Idle Time"));
 }
 
 const ContactPropertyTmpl &Properties::onlineSince() const
 {
-	return createProp(TQString::tqfromLatin1("onlineSince"),
+	return createProp(TQString::fromLatin1("onlineSince"),
 		i18n("Online Since"));
 }
 
 const ContactPropertyTmpl &Properties::lastSeen() const
 {
-	return createProp(TQString::tqfromLatin1("lastSeen"),
+	return createProp(TQString::fromLatin1("lastSeen"),
 		i18n("Last Seen"), TQString(), true);
 }
 
 const ContactPropertyTmpl &Properties::awayMessage() const
 {
-	return createProp(TQString::tqfromLatin1("awayMessage"),
+	return createProp(TQString::fromLatin1("awayMessage"),
 		i18n("Away Message"));
 }
 
 const ContactPropertyTmpl &Properties::firstName() const
 {
-	return createProp(TQString::tqfromLatin1("firstName"),
+	return createProp(TQString::fromLatin1("firstName"),
 		i18n("First Name"), TQString(), true);
 }
 
 const ContactPropertyTmpl &Properties::lastName() const
 {
-	return createProp(TQString::tqfromLatin1("lastName"),
+	return createProp(TQString::fromLatin1("lastName"),
 		i18n("Last Name"), TQString(), true);
 }
 
 const ContactPropertyTmpl &Properties::privatePhone() const
 {
-	return createProp(TQString::tqfromLatin1("privatePhoneNumber"),
+	return createProp(TQString::fromLatin1("privatePhoneNumber"),
 		i18n("Private Phone"), TQString(), true);
 }
 
 const ContactPropertyTmpl &Properties::privateMobilePhone() const
 {
-	return createProp(TQString::tqfromLatin1("privateMobilePhoneNumber"),
+	return createProp(TQString::fromLatin1("privateMobilePhoneNumber"),
 		i18n("Private Mobile Phone"), TQString(), true);
 }
 
 const ContactPropertyTmpl &Properties::workPhone() const
 {
-	return createProp(TQString::tqfromLatin1("workPhoneNumber"),
+	return createProp(TQString::fromLatin1("workPhoneNumber"),
 		i18n("Work Phone"), TQString(), true);
 }
 
 const ContactPropertyTmpl &Properties::workMobilePhone() const
 {
-	return createProp(TQString::tqfromLatin1("workMobilePhoneNumber"),
+	return createProp(TQString::fromLatin1("workMobilePhoneNumber"),
 		i18n("Work Mobile Phone"), TQString(), true);
 }
 
 const ContactPropertyTmpl &Properties::emailAddress() const
 {
-	return createProp(TQString::tqfromLatin1("emailAddress"),
-		i18n("Email Address"), TQString::tqfromLatin1("mail_generic"), true);
+	return createProp(TQString::fromLatin1("emailAddress"),
+		i18n("Email Address"), TQString::fromLatin1("mail_generic"), true);
 }
 
 const ContactPropertyTmpl &Properties::nickName() const
 {
-	return createProp(TQString::tqfromLatin1("nickName"),
+	return createProp(TQString::fromLatin1("nickName"),
 		i18n("Nick Name"), TQString(), true);
 }
 
 const ContactPropertyTmpl &Properties::photo() const
 {
-	return createProp(TQString::tqfromLatin1("photo"),
+	return createProp(TQString::fromLatin1("photo"),
 					  i18n("Photo"), TQString(), true);
 }
 
@@ -241,14 +241,14 @@ void installEmoticonTheme(const TQString &archiveName)
 	kapp->processEvents();
 
 	TQString currentBundleMimeType = KMimeType::findByPath(archiveName, 0, false)->name();
-	if( currentBundleMimeType == TQString::tqfromLatin1("application/x-zip") )
+	if( currentBundleMimeType == TQString::fromLatin1("application/x-zip") )
 		archive = new KZip(archiveName);
-	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") )
+	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") )
 		archive = new KTar(archiveName);
-	else if(archiveName.endsWith(TQString::tqfromLatin1("jisp")) || archiveName.endsWith(TQString::tqfromLatin1("zip")) )
+	else if(archiveName.endsWith(TQString::fromLatin1("jisp")) || archiveName.endsWith(TQString::fromLatin1("zip")) )
 		archive = new KZip(archiveName);
 	else
 		archive = new KTar(archiveName);
@@ -273,8 +273,8 @@ void installEmoticonTheme(const TQString &archiveName)
 		if (currentEntry->isDirectory())
 		{
 			currentDir = dynamic_cast<KArchiveDirectory*>( currentEntry );
-			if (currentDir && ( currentDir->entry(TQString::tqfromLatin1("emoticons.xml")) != NULL ||
-						 		currentDir->entry(TQString::tqfromLatin1("icondef.xml")) != NULL ) )
+			if (currentDir && ( currentDir->entry(TQString::fromLatin1("emoticons.xml")) != NULL ||
+						 		currentDir->entry(TQString::fromLatin1("icondef.xml")) != NULL ) )
 				foundThemes.append(currentDir->name());
 		}
 	}
@@ -295,7 +295,7 @@ void installEmoticonTheme(const TQString &archiveName)
 		progressDlg->setLabel(
 			i18n("<qt>Installing <strong>%1</strong> emoticon theme</qt>")
 			.tqarg(*it));
-		progressDlg->resize(progressDlg->tqsizeHint());
+		progressDlg->resize(progressDlg->sizeHint());
 		kapp->processEvents();
 
 		if (progressDlg->wasCancelled())