From 83677e35509b4dafac63b76995652bdf3b49f209 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Fri, 16 Dec 2011 09:59:34 -0600
Subject: Revert "Rename a number of old tq methods that are no longer tq
 specific"

This reverts commit 808e453c56036211f57482ed847d54aca01bba68.
---
 kopete/libkopete/kopeteprefs.cpp | 48 ++++++++++++++++++++--------------------
 1 file changed, 24 insertions(+), 24 deletions(-)

(limited to 'kopete/libkopete/kopeteprefs.cpp')

diff --git a/kopete/libkopete/kopeteprefs.cpp b/kopete/libkopete/kopeteprefs.cpp
index 6e9072d0..644ded69 100644
--- a/kopete/libkopete/kopeteprefs.cpp
+++ b/kopete/libkopete/kopeteprefs.cpp
@@ -90,7 +90,7 @@ void KopetePrefs::load()
 	mBgOverride = config->readBoolEntry("ChatView Override Background", false);
 	mFgOverride = config->readBoolEntry("ChatView Override Foreground", false);
 	mRtfOverride = config->readBoolEntry("ChatView Override RTF", false);
-	mInterfacePreference = config->readEntry("View Plugin", TQString::fromLatin1("kopete_chatwindow") );
+	mInterfacePreference = config->readEntry("View Plugin", TQString::tqfromLatin1("kopete_chatwindow") );
 	tmpColor = KGlobalSettings::textColor();
 	mTextColor = config->readColorEntry("Text Color", &tmpColor );
 	tmpColor = KGlobalSettings::baseColor();
@@ -112,29 +112,29 @@ void KopetePrefs::load()
 	if(mToolTipContents.empty())
 	{
 		mToolTipContents
-			<< TQString::fromLatin1("FormattedName")
-			<< TQString::fromLatin1("userInfo")
-			<< TQString::fromLatin1("server")
-			<< TQString::fromLatin1("channels")
-			<< TQString::fromLatin1("FormattedIdleTime")
-			<< TQString::fromLatin1("channelMembers")
-			<< TQString::fromLatin1("channelTopic")
-			<< TQString::fromLatin1("emailAddress")
-			<< TQString::fromLatin1("homePage")
-			<< TQString::fromLatin1("onlineSince")
-			<< TQString::fromLatin1("lastOnline")
-			<< TQString::fromLatin1("awayMessage");
+			<< TQString::tqfromLatin1("FormattedName")
+			<< TQString::tqfromLatin1("userInfo")
+			<< TQString::tqfromLatin1("server")
+			<< TQString::tqfromLatin1("channels")
+			<< TQString::tqfromLatin1("FormattedIdleTime")
+			<< TQString::tqfromLatin1("channelMembers")
+			<< TQString::tqfromLatin1("channelTopic")
+			<< TQString::tqfromLatin1("emailAddress")
+			<< TQString::tqfromLatin1("homePage")
+			<< TQString::tqfromLatin1("onlineSince")
+			<< TQString::tqfromLatin1("lastOnline")
+			<< TQString::tqfromLatin1("awayMessage");
 	}
 
 	config->setGroup("ContactList");
 	setThemeURL(config->readEntry("ThemeURL"));
-	int n = metaObject()->findProperty( "contactListDisplayMode" );
-	TQString value = config->readEntry("DisplayMode",TQString::fromLatin1("Default"));
-	mContactListDisplayMode = (ContactDisplayMode)metaObject()->property( n )->keyToValue( value.latin1() );
-	n = metaObject()->findProperty( "contactListIconMode" );
+	int n = tqmetaObject()->findProperty( "contactListDisplayMode" );
+	TQString value = config->readEntry("DisplayMode",TQString::tqfromLatin1("Default"));
+	mContactListDisplayMode = (ContactDisplayMode)tqmetaObject()->property( n )->keyToValue( value.latin1() );
+	n = tqmetaObject()->findProperty( "contactListIconMode" );
 	value = config->readEntry("IconMode",
-                                  TQString::fromLatin1("IconDefault"));
-	mContactListIconMode = (IconDisplayMode) metaObject()->property( n )->keyToValue( value.latin1() );
+                                  TQString::tqfromLatin1("IconDefault"));
+	mContactListIconMode = (IconDisplayMode) tqmetaObject()->property( n )->keyToValue( value.latin1() );
 	mContactListIndentContacts = config->readBoolEntry("IndentContacts", false);
 	mContactListUseCustomFonts = config->readBoolEntry("UseCustomFonts", false);
 	TQFont font = KGlobalSettings::generalFont();
@@ -229,10 +229,10 @@ void KopetePrefs::save()
 
 	config->setGroup("ContactList");
 	config->writeEntry("ThemeURL", mThemeURL);
-	int n = metaObject()->findProperty( "contactListDisplayMode" );
-	config->writeEntry("DisplayMode", metaObject()->property( n )->valueToKey( mContactListDisplayMode ));
-	n = metaObject()->findProperty( "contactListIconMode" );
-	config->writeEntry("IconMode", metaObject()->property( n )->valueToKey( mContactListIconMode ));
+	int n = tqmetaObject()->findProperty( "contactListDisplayMode" );
+	config->writeEntry("DisplayMode", tqmetaObject()->property( n )->valueToKey( mContactListDisplayMode ));
+	n = tqmetaObject()->findProperty( "contactListIconMode" );
+	config->writeEntry("IconMode", tqmetaObject()->property( n )->valueToKey( mContactListIconMode ));
 	config->writeEntry("IndentContacts", mContactListIndentContacts);
 	config->writeEntry("UseCustomFonts", mContactListUseCustomFonts);
 	config->writeEntry("GroupFont", mContactListGroupFont);
@@ -439,7 +439,7 @@ void KopetePrefs::_setStylePath(const TQString &stylePath)
 	if( !TQFile::exists(stylePath) || stylePath.isEmpty() )
 	{
 		TQString fallback;
-		fallback = TQString(TQString::fromLatin1("styles/%1/")).arg(TQString::fromLatin1(KOPETE_DEFAULT_CHATSTYLE));
+		fallback = TQString(TQString::tqfromLatin1("styles/%1/")).tqarg(TQString::tqfromLatin1(KOPETE_DEFAULT_CHATSTYLE));
 		mStylePath = locate("appdata", fallback);
 	}
 }
-- 
cgit v1.2.1