Revert "Rename a number of old tq methods that are no longer tq specific"

This reverts commit 73c08b592db45af554b9f21029bc549d70f683ab.

11 files changed, 58 insertions, 58 deletions

diff --git a/kpersonalizer/kcountrypage.cpp b/kpersonalizer/kcountrypage.cpp
index 71e58ce39..113928a8b 100644
--- a/kpersonalizer/kcountrypage.cpp
+++ b/kpersonalizer/kcountrypage.cpp
@@ -76,7 +76,7 @@ KCountryPage::~KCountryPage(){
 
 void KCountryPage::loadCountryList(KLanguageButton *combo) {
 
-	TQString sub = TQString::fromLatin1("l10n/");
+	TQString sub = TQString::tqfromLatin1("l10n/");
 
 	// clear the list
 	combo->clear();
@@ -86,8 +86,8 @@ void KCountryPage::loadCountryList(KLanguageButton *combo) {
 
 	for ( TQStringList::ConstIterator it = regionfiles.begin(); it != regionfiles.end(); ++it ) {
 		KSimpleConfig entry(*it);
-		entry.setGroup(TQString::fromLatin1("KCM Locale"));
-		TQString name = entry.readEntry(TQString::fromLatin1("Name"), i18n("without name"));
+		entry.setGroup(TQString::tqfromLatin1("KCM Locale"));
+		TQString name = entry.readEntry(TQString::tqfromLatin1("Name"), i18n("without name"));
 
 		TQString tag = *it;
 		int index;
@@ -113,8 +113,8 @@ void KCountryPage::loadCountryList(KLanguageButton *combo) {
 
 	for ( TQStringList::ConstIterator it = countrylist.begin(); it != countrylist.end(); ++it ) {
 		KSimpleConfig entry(*it);
-		entry.setGroup(TQString::fromLatin1("KCM Locale"));
-		TQString name = entry.readEntry(TQString::fromLatin1("Name"), i18n("without name"));
+		entry.setGroup(TQString::tqfromLatin1("KCM Locale"));
+		TQString name = entry.readEntry(TQString::tqfromLatin1("Name"), i18n("without name"));
 		TQString submenu = '-' + entry.readEntry("Region");
 
 		TQString tag = *it;
@@ -123,7 +123,7 @@ void KCountryPage::loadCountryList(KLanguageButton *combo) {
 		index = tag.findRev('/');
 		tag = tag.mid(index+1);
 
-		TQPixmap flag( locate( "locale", TQString::fromLatin1("l10n/%1/flag.png").arg(tag) ) );
+		TQPixmap flag( locate( "locale", TQString::tqfromLatin1("l10n/%1/flag.png").arg(tag) ) );
 		TQIconSet icon( flag );
 		combo->insertItem( icon, name, tag, submenu );
 	}
@@ -138,7 +138,7 @@ void KCountryPage::fillLanguageMenu(KLanguageButton *combo) {
 	for ( it = langlist.begin(); it != langlist.end(); ++it ) {
 		if ((*it).isNull()) {
 			combo->insertSeparator();
-			submenu = TQString::fromLatin1("all");
+			submenu = TQString::tqfromLatin1("all");
 			combo->insertSubmenu(i18n("All"), submenu, TQString::null);
 			continue;
 		}
@@ -151,9 +151,9 @@ bool KCountryPage::save(KLanguageButton *comboCountry, KLanguageButton *comboLan
 	kdDebug() << "KCountryPage::save()" << endl;
 	KConfigBase *config = KGlobal::config();
 
-	config->setGroup(TQString::fromLatin1("Locale"));
-	config->writeEntry(TQString::fromLatin1("Country"), comboCountry->current(), true, true);
-	config->writeEntry(TQString::fromLatin1("Language"), comboLang->current(), true, true);
+	config->setGroup(TQString::tqfromLatin1("Locale"));
+	config->writeEntry(TQString::tqfromLatin1("Country"), comboCountry->current(), true, true);
+	config->writeEntry(TQString::tqfromLatin1("Language"), comboLang->current(), true, true);
 	config->sync();
 
 	// only make the system reload the language, if the selected one deferes from the old saved one.
@@ -167,7 +167,7 @@ bool KCountryPage::save(KLanguageButton *comboCountry, KLanguageButton *comboLan
 			kapp->dcopClient()->attach();
 		// ksycoca needs to be rebuilt
 		KProcess proc;
-		proc << TQString::fromLatin1("kbuildsycoca");
+		proc << TQString::tqfromLatin1("kbuildsycoca");
 		proc.start(KProcess::DontCare);
 		kdDebug() << "KLocaleConfig::save : sending signal to kdesktop" << endl;
 		// inform kicker and kdeskop about the new language
@@ -182,10 +182,10 @@ bool KCountryPage::save(KLanguageButton *comboCountry, KLanguageButton *comboLan
 
 void KCountryPage::setLangForCountry(const TQString &country) {
 	KSimpleConfig ent(locate("locale", "l10n/" + country + "/entry.desktop"), true);
-	ent.setGroup(TQString::fromLatin1("KCM Locale"));
-	langs = ent.readListEntry(TQString::fromLatin1("Languages"));
+	ent.setGroup(TQString::tqfromLatin1("KCM Locale"));
+	langs = ent.readListEntry(TQString::tqfromLatin1("Languages"));
 
-	TQString lang = TQString::fromLatin1("en_US");
+	TQString lang = TQString::tqfromLatin1("en_US");
 	// use the first INSTALLED langauge in the list, or default to C
 	for ( TQStringList::Iterator it = langs.begin(); it != langs.end(); ++it ) {
 		if (cb_language->contains(*it)) {
diff --git a/kpersonalizer/kcountrypagedlg.ui b/kpersonalizer/kcountrypagedlg.ui
index ddab51247..168c0d014 100644
--- a/kpersonalizer/kcountrypagedlg.ui
+++ b/kpersonalizer/kcountrypagedlg.ui
@@ -36,7 +36,7 @@
                             <verstretch>0</verstretch>
                         </sizepolicy>
                     </property>
-                    <property name="minimumSize">
+                    <property name="tqminimumSize">
                         <size>
                             <width>150</width>
                             <height>0</height>
@@ -84,7 +84,7 @@
             <property name="textFormat">
                 <enum>RichText</enum>
             </property>
-            <property name="alignment">
+            <property name="tqalignment">
                 <set>WordBreak|AlignTop|AlignLeft</set>
             </property>
             <property name="vAlign" stdset="0">
@@ -120,7 +120,7 @@
                             <verstretch>0</verstretch>
                         </sizepolicy>
                     </property>
-                    <property name="minimumSize">
+                    <property name="tqminimumSize">
                         <size>
                             <width>150</width>
                             <height>0</height>
@@ -160,7 +160,7 @@
                     <verstretch>0</verstretch>
                 </sizepolicy>
             </property>
-            <property name="minimumSize">
+            <property name="tqminimumSize">
                 <size>
                     <width>170</width>
                     <height>430</height>
@@ -189,7 +189,7 @@
             <property name="sizeType">
                 <enum>Fixed</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>30</height>
diff --git a/kpersonalizer/keyecandypagedlg.ui b/kpersonalizer/keyecandypagedlg.ui
index 5301c118a..c988c1607 100644
--- a/kpersonalizer/keyecandypagedlg.ui
+++ b/kpersonalizer/keyecandypagedlg.ui
@@ -28,7 +28,7 @@
                     <verstretch>0</verstretch>
                 </sizepolicy>
             </property>
-            <property name="minimumSize">
+            <property name="tqminimumSize">
                 <size>
                     <width>170</width>
                     <height>430</height>
@@ -63,7 +63,7 @@
                 <string>&lt;P&gt;Trinity offers many visually appealing special effects, such as smoothed fonts, previews in the file manager and animated menus. All this beauty, however, comes at a small performance cost. &lt;/P&gt;
 If you have a fast, new processor, you might want to turn them all on, but for those of us with slower processors, starting off with less eye candy helps to keep your desktop more responsive.</string>
             </property>
-            <property name="alignment">
+            <property name="tqalignment">
                 <set>WordBreak|AlignTop|AlignLeft</set>
             </property>
             <property name="vAlign" stdset="0">
@@ -98,7 +98,7 @@ If you have a fast, new processor, you might want to turn them all on, but for t
                     <property name="textFormat">
                         <enum>PlainText</enum>
                     </property>
-                    <property name="alignment">
+                    <property name="tqalignment">
                         <set>AlignCenter</set>
                     </property>
                     <property name="hAlign" stdset="0">
@@ -136,7 +136,7 @@ If you have a fast, new processor, you might want to turn them all on, but for t
                         <string>Fast Processor
 (more effects)</string>
                     </property>
-                    <property name="alignment">
+                    <property name="tqalignment">
                         <set>AlignCenter</set>
                     </property>
                     <property name="hAlign" stdset="0">
@@ -222,7 +222,7 @@ If you have a fast, new processor, you might want to turn them all on, but for t
                     <verstretch>0</verstretch>
                 </sizepolicy>
             </property>
-            <property name="minimumSize">
+            <property name="tqminimumSize">
                 <size>
                     <width>0</width>
                     <height>120</height>
diff --git a/kpersonalizer/kfindlanguage.cpp b/kpersonalizer/kfindlanguage.cpp
index a23f98322..4e3537206 100644
--- a/kpersonalizer/kfindlanguage.cpp
+++ b/kpersonalizer/kfindlanguage.cpp
@@ -38,7 +38,7 @@ KFindLanguage::KFindLanguage() {
 
 	m_country = config->readEntry("Country", "C");
 	if (m_country == "C") {
-		m_country = TQString::fromLatin1(getenv("LANG"));
+		m_country = TQString::tqfromLatin1(getenv("LANG"));
 		if(m_country.left(5) == "nn_NO") // glibc's nn_NO is KDE's no_NY
 			m_country = "no";
 		if(m_country.contains("_"))
@@ -54,7 +54,7 @@ KFindLanguage::KFindLanguage() {
 	}
 
 	// get the users primary Languages
-	KSimpleConfig ent(locate("locale", TQString::fromLatin1("l10n/%1/entry.desktop").arg(m_country)), true);
+	KSimpleConfig ent(locate("locale", TQString::tqfromLatin1("l10n/%1/entry.desktop").arg(m_country)), true);
 	ent.setGroup("KCM Locale");
 	TQStringList langs = ent.readListEntry("Languages");
 	if (langs.isEmpty())
@@ -96,7 +96,7 @@ KFindLanguage::KFindLanguage() {
 	if (m_oldlang.isEmpty()) {
 		compare = langs.first();
 		for(TQStringList::Iterator it = langs.begin(); it != langs.end(); ++it) {
-			if (*it == TQString::fromLatin1(getenv("LANG")).mid(3, 2).lower())
+			if (*it == TQString::tqfromLatin1(getenv("LANG")).mid(3, 2).lower())
 				compare = *it;
 		}
 	}
diff --git a/kpersonalizer/kospage.cpp b/kpersonalizer/kospage.cpp
index 9d772c0d9..30841aefe 100644
--- a/kpersonalizer/kospage.cpp
+++ b/kpersonalizer/kospage.cpp
@@ -18,7 +18,7 @@
 #include <tqlabel.h>
 #include <tqcheckbox.h>
 #include <tqradiobutton.h>
-#include <textview.h>
+#include <tqtextview.h>
 #include <tqmap.h>
 
 #include <ksimpleconfig.h>
diff --git a/kpersonalizer/kospagedlg.ui b/kpersonalizer/kospagedlg.ui
index 87ff64d5f..7e8a8a63c 100644
--- a/kpersonalizer/kospagedlg.ui
+++ b/kpersonalizer/kospagedlg.ui
@@ -33,7 +33,7 @@
                     <verstretch>0</verstretch>
                 </sizepolicy>
             </property>
-            <property name="minimumSize">
+            <property name="tqminimumSize">
                 <size>
                     <width>170</width>
                     <height>430</height>
@@ -136,7 +136,7 @@ Trinity allows you to customize its behavior according to your needs.</string>
             <property name="sizeType">
                 <enum>Fixed</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>22</width>
                     <height>10</height>
@@ -153,7 +153,7 @@ Trinity allows you to customize its behavior according to your needs.</string>
             <property name="sizeType">
                 <enum>Fixed</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>22</width>
                     <height>16</height>
@@ -167,7 +167,7 @@ Trinity allows you to customize its behavior according to your needs.</string>
             <property name="text">
                 <string>For motion impaired users, Trinity provides keyboard gestures to activate special keyboard settings.</string>
             </property>
-            <property name="alignment">
+            <property name="tqalignment">
                 <set>WordBreak|AlignVCenter</set>
             </property>
         </widget>
diff --git a/kpersonalizer/kpersonalizer.cpp b/kpersonalizer/kpersonalizer.cpp
index e28848cc0..71349d2e9 100644
--- a/kpersonalizer/kpersonalizer.cpp
+++ b/kpersonalizer/kpersonalizer.cpp
@@ -232,11 +232,11 @@ void KPersonalizer::setBeforeSession(){
 
 /** there seems to be a bug in TQWizard, that makes this evil hack necessary */
 void KPersonalizer::setPosition() {
-	TQSize hint = countrypage->sizeHint();
-	TQSize os_size = ospage->sizeHint();
-	TQSize candy_size = eyecandy->sizeHint();
-	TQSize style_size = stylepage->sizeHint();
-	TQSize refine_size = refinepage->sizeHint();
+	TQSize hint = countrypage->tqsizeHint();
+	TQSize os_size = ospage->tqsizeHint();
+	TQSize candy_size = eyecandy->tqsizeHint();
+	TQSize style_size = stylepage->tqsizeHint();
+	TQSize refine_size = refinepage->tqsizeHint();
 
 	// get the width of the broadest child-widget
 	if ( hint.width() < os_size.width() )
diff --git a/kpersonalizer/krefinepagedlg.ui b/kpersonalizer/krefinepagedlg.ui
index 8b96fd43e..a13e3364b 100644
--- a/kpersonalizer/krefinepagedlg.ui
+++ b/kpersonalizer/krefinepagedlg.ui
@@ -32,7 +32,7 @@
                 <string>&lt;h3&gt;Finished&lt;/h3&gt;
 &lt;p&gt;After closing this dialog you can always restart this Wizard by choosing the entry &lt;b&gt;Desktop Settings Wizard&lt;/b&gt; from the Settings menu.&lt;/p&gt;</string>
             </property>
-            <property name="alignment">
+            <property name="tqalignment">
                 <set>WordBreak|AlignVCenter|AlignLeft</set>
             </property>
             <property name="wordwrap" stdset="0">
@@ -80,7 +80,7 @@
                     <property name="text">
                         <string>You can refine the settings you made by starting the Trinity Control Center by choosing the entry &lt;b&gt;Control Center&lt;/b&gt; in the K menu.</string>
                     </property>
-                    <property name="alignment">
+                    <property name="tqalignment">
                         <set>WordBreak|AlignTop|AlignLeft</set>
                     </property>
                 </widget>
@@ -98,7 +98,7 @@
                     <verstretch>0</verstretch>
                 </sizepolicy>
             </property>
-            <property name="minimumSize">
+            <property name="tqminimumSize">
                 <size>
                     <width>170</width>
                     <height>430</height>
@@ -132,7 +132,7 @@
             <property name="text">
                 <string>You can also start the Trinity Control Center using the button below.</string>
             </property>
-            <property name="alignment">
+            <property name="tqalignment">
                 <set>WordBreak|AlignCenter</set>
             </property>
         </widget>
@@ -146,7 +146,7 @@
             <property name="sizeType">
                 <enum>Fixed</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>30</width>
                     <height>16</height>
@@ -163,7 +163,7 @@
             <property name="sizeType">
                 <enum>Fixed</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>16</height>
@@ -188,7 +188,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
@@ -213,7 +213,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
@@ -232,7 +232,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>20</height>
diff --git a/kpersonalizer/kstylepage.cpp b/kpersonalizer/kstylepage.cpp
index 88b10edf8..e125796a9 100644
--- a/kpersonalizer/kstylepage.cpp
+++ b/kpersonalizer/kstylepage.cpp
@@ -238,7 +238,7 @@ void KStylePage::saveIcons(bool curSettings) {
 	for (KIcon::Group i=KIcon::FirstGroup; i<KIcon::LastGroup; i++) {
 		if (groups[i] == 0L)
 			break;
-		KGlobal::config()->setGroup(TQString::fromLatin1(groups[i]) + "Icons");
+		KGlobal::config()->setGroup(TQString::tqfromLatin1(groups[i]) + "Icons");
 		KGlobal::config()->writeEntry("Size", icontheme.defaultSize(i));
 	}
 	KGlobal::config()->sync();
@@ -428,12 +428,12 @@ void KStylePage::getAvailability() {
 		else if (*it == "Light, 3rd revision") kde_light_exist = true;
 	}
 	// and disable the ListItems, if they are not.
-	if ( !(kde_plastik_exist || kde_light_exist) ) kde->setVisible(false);
-	if ( !(kde_hc_exist || kde_def_exist) ) classic->setVisible(false);
-	if (!kde_keramik_exist || TQPixmap::defaultDepth() <= 8) keramik->setVisible(false);
-	if (!cde_exist) cde->setVisible(false);
-	if (!win_exist) win->setVisible(false);
-	if (!platinum_exist) platinum->setVisible(false);
+	if ( !(kde_plastik_exist || kde_light_exist) ) kde->tqsetVisible(false);
+	if ( !(kde_hc_exist || kde_def_exist) ) classic->tqsetVisible(false);
+	if (!kde_keramik_exist || TQPixmap::defaultDepth() <= 8) keramik->tqsetVisible(false);
+	if (!cde_exist) cde->tqsetVisible(false);
+	if (!win_exist) win->tqsetVisible(false);
+	if (!platinum_exist) platinum->tqsetVisible(false);
 
 	// test, wich KWin-styles are available
 	twin_keramik_exist = twin_system_exist = twin_plastik_exist
@@ -542,7 +542,7 @@ void KStylePage::switchPrevStyle() {
 	// go ahead
 	setStyleRecursive( stylePreview, palette, style );
 	// this flickers, but reliably draws the widgets corretly.
-	stylePreview->resize( stylePreview->sizeHint() );
+	stylePreview->resize( stylePreview->tqsizeHint() );
 
 	delete appliedStyle;
 	appliedStyle = style;
diff --git a/kpersonalizer/kstylepagedlg.ui b/kpersonalizer/kstylepagedlg.ui
index d7db08975..58890bb36 100644
--- a/kpersonalizer/kstylepagedlg.ui
+++ b/kpersonalizer/kstylepagedlg.ui
@@ -31,7 +31,7 @@
             <property name="text">
                 <string>Please choose the way your computer should look by selecting one of the items below.</string>
             </property>
-            <property name="alignment">
+            <property name="tqalignment">
                 <set>WordBreak|AlignVCenter|AlignLeft</set>
             </property>
             <property name="wordwrap" stdset="0">
@@ -49,7 +49,7 @@
                     <verstretch>0</verstretch>
                 </sizepolicy>
             </property>
-            <property name="minimumSize">
+            <property name="tqminimumSize">
                 <size>
                     <width>170</width>
                     <height>430</height>
diff --git a/kpersonalizer/ksysinfo.cpp b/kpersonalizer/ksysinfo.cpp
index 20a089b8f..e5f143229 100644
--- a/kpersonalizer/ksysinfo.cpp
+++ b/kpersonalizer/ksysinfo.cpp
@@ -99,12 +99,12 @@ bool KSysInfo::getRenderSupport(){
 
 void KSysInfo::initFontFamilies() {
 	TQFontDatabase fdb;
-	TQStringList families = fdb.families();
+	TQStringList families = fdb.tqfamilies();
 	m_normal_font = TQString::null;
 	m_fixed_font = TQString::null;
 	int normal_priority = 0, fixed_priority = 0;
 	for (uint i=0; i < families.count(); i++) {
-		TQString font = *families.at(i);
+		TQString font = *families.tqat(i);
 		//add further NORMAL fonts here
 		if ( (font.contains("Arial [") || font=="Arial") && normal_priority < 15 ) {
 			m_normal_font = font;