Revert automated changes

Sorry guys, they are just not ready for prime time
Work will continue as always


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1212480 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

14 files changed, 94 insertions, 94 deletions

diff --git a/kpersonalizer/Makefile.am b/kpersonalizer/Makefile.am
index 7b9c81d9e..d6ec8281a 100644
--- a/kpersonalizer/Makefile.am
+++ b/kpersonalizer/Makefile.am
@@ -19,12 +19,12 @@ install-data-local: uninstall.desktop
 SUBDIRS		= pics
 
 # this 10 paths are KDE specific. Use them:
-# kde_htmldir       Where your docs should go to. (tqcontains lang subdirs)
+# kde_htmldir       Where your docs should go to. (contains lang subdirs)
 # kde_appsdir       Where your application file (.kdelnk) should go to. 
 # kde_icondir       Where your icon should go to.
 # kde_minidir       Where your mini icon should go to.
 # kde_datadir       Where you install application data. (Use a subdir)
-# kde_locale        Where translation files should go to.(tqcontains lang subdirs)
+# kde_locale        Where translation files should go to.(contains lang subdirs)
 # kde_cgidir        Where cgi-bin executables should go to.
 # kde_confdir       Where config files should go to.
 # kde_mimedir       Where mimetypes should go to.
diff --git a/kpersonalizer/README b/kpersonalizer/README
index 5b404870a..96224a955 100644
--- a/kpersonalizer/README
+++ b/kpersonalizer/README
@@ -85,7 +85,7 @@ Microsoft Windows (TM):
 - WindowList-menu on MMB
 - Walk trough windows mode: KDE
 - NOT underline IconText
-- NOT change pointer tqshape over an icon
+- NOT change pointer shape over an icon
 
 UNIX (TM):
 - Single Click
@@ -97,7 +97,7 @@ UNIX (TM):
 - Application-menu on MMB like in FVWM
 - Walk trough windows mode: CDE
 - NOT underline IconText
-- NOT change pointer tqshape over an icon
+- NOT change pointer shape over an icon
 
 MacOS:
 - Single Click
@@ -110,7 +110,7 @@ MacOS:
 - WindowList-menu on MMB
 - Walk trough windows mode: KDE
 - NOT underline IconText
-- change pointer tqshape over an icon
+- change pointer shape over an icon
 
 Step 3: Eyecandy-O-Meter
 ===================
diff --git a/kpersonalizer/kcountrypage.cpp b/kpersonalizer/kcountrypage.cpp
index bb7b5e6e7..4e30c7363 100644
--- a/kpersonalizer/kcountrypage.cpp
+++ b/kpersonalizer/kcountrypage.cpp
@@ -76,7 +76,7 @@ KCountryPage::~KCountryPage(){
 
 void KCountryPage::loadCountryList(KLanguageButton *combo) {
 
-	TQString sub = TQString::tqfromLatin1("l10n/");
+	TQString sub = TQString::fromLatin1("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::tqfromLatin1("KCM Locale"));
-		TQString name = entry.readEntry(TQString::tqfromLatin1("Name"), i18n("without name"));
+		entry.setGroup(TQString::fromLatin1("KCM Locale"));
+		TQString name = entry.readEntry(TQString::fromLatin1("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::tqfromLatin1("KCM Locale"));
-		TQString name = entry.readEntry(TQString::tqfromLatin1("Name"), i18n("without name"));
+		entry.setGroup(TQString::fromLatin1("KCM Locale"));
+		TQString name = entry.readEntry(TQString::fromLatin1("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::tqfromLatin1("l10n/%1/flag.png").arg(tag) ) );
+		TQPixmap flag( locate( "locale", TQString::fromLatin1("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::tqfromLatin1("all");
+			submenu = TQString::fromLatin1("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::tqfromLatin1("Locale"));
-	config->writeEntry(TQString::tqfromLatin1("Country"), comboCountry->current(), true, true);
-	config->writeEntry(TQString::tqfromLatin1("Language"), comboLang->current(), true, true);
+	config->setGroup(TQString::fromLatin1("Locale"));
+	config->writeEntry(TQString::fromLatin1("Country"), comboCountry->current(), true, true);
+	config->writeEntry(TQString::fromLatin1("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::tqfromLatin1("kbuildsycoca");
+		proc << TQString::fromLatin1("kbuildsycoca");
 		proc.start(KProcess::DontCare);
 		kdDebug() << "KLocaleConfig::save : sending signal to kdesktop" << endl;
 		// inform kicker and kdeskop about the new language
@@ -182,13 +182,13 @@ 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::tqfromLatin1("KCM Locale"));
-	langs = ent.readListEntry(TQString::tqfromLatin1("Languages"));
+	ent.setGroup(TQString::fromLatin1("KCM Locale"));
+	langs = ent.readListEntry(TQString::fromLatin1("Languages"));
 
-	TQString lang = TQString::tqfromLatin1("en_US");
+	TQString lang = TQString::fromLatin1("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->tqcontains(*it)) {
+		if (cb_language->contains(*it)) {
 			lang = *it;
 			break;
 		}
diff --git a/kpersonalizer/kcountrypagedlg.ui b/kpersonalizer/kcountrypagedlg.ui
index e5ffc93c6..72ab5f5cd 100644
--- a/kpersonalizer/kcountrypagedlg.ui
+++ b/kpersonalizer/kcountrypagedlg.ui
@@ -4,7 +4,7 @@
     <property name="name">
         <cstring>KCountryPageDlg</cstring>
     </property>
-    <property name="tqgeometry">
+    <property name="geometry">
         <rect>
             <x>0</x>
             <y>0</y>
@@ -36,7 +36,7 @@
                             <verstretch>0</verstretch>
                         </sizepolicy>
                     </property>
-                    <property name="tqminimumSize">
+                    <property name="minimumSize">
                         <size>
                             <width>150</width>
                             <height>0</height>
@@ -84,7 +84,7 @@
             <property name="textFormat">
                 <enum>RichText</enum>
             </property>
-            <property name="tqalignment">
+            <property name="alignment">
                 <set>WordBreak|AlignTop|AlignLeft</set>
             </property>
             <property name="vAlign" stdset="0">
@@ -120,7 +120,7 @@
                             <verstretch>0</verstretch>
                         </sizepolicy>
                     </property>
-                    <property name="tqminimumSize">
+                    <property name="minimumSize">
                         <size>
                             <width>150</width>
                             <height>0</height>
@@ -160,7 +160,7 @@
                     <verstretch>0</verstretch>
                 </sizepolicy>
             </property>
-            <property name="tqminimumSize">
+            <property name="minimumSize">
                 <size>
                     <width>170</width>
                     <height>430</height>
@@ -189,7 +189,7 @@
             <property name="sizeType">
                 <enum>Fixed</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>20</width>
                     <height>30</height>
@@ -237,6 +237,6 @@
 <includes>
     <include location="local" impldecl="in implementation">kdialog.h</include>
 </includes>
-<tqlayoutdefaults spacing="3" margin="6"/>
-<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+<layoutdefaults spacing="3" margin="6"/>
+<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 </UI>
diff --git a/kpersonalizer/keyecandypagedlg.ui b/kpersonalizer/keyecandypagedlg.ui
index 67f7f9ad3..4f94df4ed 100644
--- a/kpersonalizer/keyecandypagedlg.ui
+++ b/kpersonalizer/keyecandypagedlg.ui
@@ -4,7 +4,7 @@
     <property name="name">
         <cstring>KEyeCandyPageDlg</cstring>
     </property>
-    <property name="tqgeometry">
+    <property name="geometry">
         <rect>
             <x>0</x>
             <y>0</y>
@@ -28,7 +28,7 @@
                     <verstretch>0</verstretch>
                 </sizepolicy>
             </property>
-            <property name="tqminimumSize">
+            <property name="minimumSize">
                 <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="tqalignment">
+            <property name="alignment">
                 <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="tqalignment">
+                    <property name="alignment">
                         <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="tqalignment">
+                    <property name="alignment">
                         <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="tqminimumSize">
+            <property name="minimumSize">
                 <size>
                     <width>0</width>
                     <height>120</height>
@@ -258,6 +258,6 @@ If you have a fast, new processor, you might want to turn them all on, but for t
 <includes>
     <include location="local" impldecl="in implementation">kdialog.h</include>
 </includes>
-<tqlayoutdefaults spacing="3" margin="6"/>
-<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+<layoutdefaults spacing="3" margin="6"/>
+<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 </UI>
diff --git a/kpersonalizer/kfindlanguage.cpp b/kpersonalizer/kfindlanguage.cpp
index 3c3193c95..a23f98322 100644
--- a/kpersonalizer/kfindlanguage.cpp
+++ b/kpersonalizer/kfindlanguage.cpp
@@ -38,14 +38,14 @@ KFindLanguage::KFindLanguage() {
 
 	m_country = config->readEntry("Country", "C");
 	if (m_country == "C") {
-		m_country = TQString::tqfromLatin1(getenv("LANG"));
+		m_country = TQString::fromLatin1(getenv("LANG"));
 		if(m_country.left(5) == "nn_NO") // glibc's nn_NO is KDE's no_NY
 			m_country = "no";
-		if(m_country.tqcontains("_"))
+		if(m_country.contains("_"))
 			m_country = m_country.mid(m_country.find("_")+1);
-		if(m_country.tqcontains("."))
+		if(m_country.contains("."))
 			m_country = m_country.left(m_country.find("."));
-		if(m_country.tqcontains("@"))
+		if(m_country.contains("@"))
 			m_country = m_country.left(m_country.find("@"));
 		if(m_country != "C")
 			m_country = m_country.lower();
@@ -54,7 +54,7 @@ KFindLanguage::KFindLanguage() {
 	}
 
 	// get the users primary Languages
-	KSimpleConfig ent(locate("locale", TQString::tqfromLatin1("l10n/%1/entry.desktop").arg(m_country)), true);
+	KSimpleConfig ent(locate("locale", TQString::fromLatin1("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::tqfromLatin1(getenv("LANG")).mid(3, 2).lower())
+			if (*it == TQString::fromLatin1(getenv("LANG")).mid(3, 2).lower())
 				compare = *it;
 		}
 	}
@@ -112,7 +112,7 @@ KFindLanguage::KFindLanguage() {
 		TQString l = (*it).left((*it).find(";"));
 		if (l == "C")
 			match++;
-		if(l.tqcontains(compare))
+		if(l.contains(compare))
 			match+=2;
 		if(l.left(compare.length()) == compare)
 			match+=10;
diff --git a/kpersonalizer/kospage.cpp b/kpersonalizer/kospage.cpp
index f13cdf428..3d92f2f4e 100644
--- a/kpersonalizer/kospage.cpp
+++ b/kpersonalizer/kospage.cpp
@@ -134,7 +134,7 @@ void KOSPage::saveCheckState(bool currSettings){
 }
 
 
-	/** write the settings for KDE-Behavior (called by saveChecktqStatus) */
+	/** write the settings for KDE-Behavior (called by saveCheckStatus) */
 void KOSPage::writeKDE(){
 	kdDebug() << "KOSPage::writeKDE()" << endl;
 
@@ -175,7 +175,7 @@ void KOSPage::writeKDE(){
 }
 
 
-	/** write the settings for fvwm-like-behavior (called by saveChecktqStatus) */
+	/** write the settings for fvwm-like-behavior (called by saveCheckStatus) */
 void KOSPage::writeUNIX(){
 	kdDebug() << "KOSPage::writeUNIX()" << endl;
 
@@ -216,7 +216,7 @@ void KOSPage::writeUNIX(){
 }
 
 
-	/** write the settings for windows-like-behavior (called by saveChecktqStatus) */
+	/** write the settings for windows-like-behavior (called by saveCheckStatus) */
 void KOSPage::writeWindows(){
 	kdDebug() << "KOSPage::writeWindows()" << endl;
 
@@ -263,7 +263,7 @@ void KOSPage::writeWindows(){
 }
 
 
-	/** write the settings for MacOS-like-behavior (called by saveChecktqStatus) */
+	/** write the settings for MacOS-like-behavior (called by saveCheckStatus) */
 void KOSPage::writeMacOS(){
 	kdDebug() << "KOSPage::writeMacOS()" << endl;
 
diff --git a/kpersonalizer/kospagedlg.ui b/kpersonalizer/kospagedlg.ui
index f49039db4..e4c5fd4b3 100644
--- a/kpersonalizer/kospagedlg.ui
+++ b/kpersonalizer/kospagedlg.ui
@@ -4,7 +4,7 @@
     <property name="name">
         <cstring>KOSPageDlg</cstring>
     </property>
-    <property name="tqgeometry">
+    <property name="geometry">
         <rect>
             <x>0</x>
             <y>0</y>
@@ -33,7 +33,7 @@
                     <verstretch>0</verstretch>
                 </sizepolicy>
             </property>
-            <property name="tqminimumSize">
+            <property name="minimumSize">
                 <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="tqsizeHint">
+            <property name="sizeHint">
                 <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="tqsizeHint">
+            <property name="sizeHint">
                 <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="tqalignment">
+            <property name="alignment">
                 <set>WordBreak|AlignVCenter</set>
             </property>
         </widget>
@@ -216,6 +216,6 @@ Trinity allows you to customize its behavior according to your needs.</string>
 <includes>
     <include location="local" impldecl="in implementation">kdialog.h</include>
 </includes>
-<tqlayoutdefaults spacing="3" margin="6"/>
-<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+<layoutdefaults spacing="3" margin="6"/>
+<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 </UI>
diff --git a/kpersonalizer/kpersonalizer.cpp b/kpersonalizer/kpersonalizer.cpp
index 9d7fa2e0a..e28848cc0 100644
--- a/kpersonalizer/kpersonalizer.cpp
+++ b/kpersonalizer/kpersonalizer.cpp
@@ -97,7 +97,7 @@ KPersonalizer::KPersonalizer(TQWidget *parent, const char *name)
 	setPosition();
 
 	/* hide the detail-box on eyecandypage. we need to call it from here, to be
-	   able, to call it at last. Else we would run into tqlayout-problems later. */
+	   able, to call it at last. Else we would run into layout-problems later. */
 	eyecandy->klv_features->hide();
 }
 
@@ -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->tqsizeHint();
-	TQSize os_size = ospage->tqsizeHint();
-	TQSize candy_size = eyecandy->tqsizeHint();
-	TQSize style_size = stylepage->tqsizeHint();
-	TQSize refine_size = refinepage->tqsizeHint();
+	TQSize hint = countrypage->sizeHint();
+	TQSize os_size = ospage->sizeHint();
+	TQSize candy_size = eyecandy->sizeHint();
+	TQSize style_size = stylepage->sizeHint();
+	TQSize refine_size = refinepage->sizeHint();
 
 	// 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 32c88fd8e..8d5b58357 100644
--- a/kpersonalizer/krefinepagedlg.ui
+++ b/kpersonalizer/krefinepagedlg.ui
@@ -4,7 +4,7 @@
     <property name="name">
         <cstring>KRefinePageDlg</cstring>
     </property>
-    <property name="tqgeometry">
+    <property name="geometry">
         <rect>
             <x>0</x>
             <y>0</y>
@@ -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="tqalignment">
+            <property name="alignment">
                 <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="tqalignment">
+                    <property name="alignment">
                         <set>WordBreak|AlignTop|AlignLeft</set>
                     </property>
                 </widget>
@@ -98,7 +98,7 @@
                     <verstretch>0</verstretch>
                 </sizepolicy>
             </property>
-            <property name="tqminimumSize">
+            <property name="minimumSize">
                 <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="tqalignment">
+            <property name="alignment">
                 <set>WordBreak|AlignCenter</set>
             </property>
         </widget>
@@ -146,7 +146,7 @@
             <property name="sizeType">
                 <enum>Fixed</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>30</width>
                     <height>16</height>
@@ -163,7 +163,7 @@
             <property name="sizeType">
                 <enum>Fixed</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>20</width>
                     <height>16</height>
@@ -188,7 +188,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
@@ -213,7 +213,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
@@ -232,7 +232,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>20</width>
                     <height>20</height>
@@ -244,6 +244,6 @@
 <includes>
     <include location="local" impldecl="in implementation">kdialog.h</include>
 </includes>
-<tqlayoutdefaults spacing="3" margin="6"/>
-<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+<layoutdefaults spacing="3" margin="6"/>
+<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 </UI>
diff --git a/kpersonalizer/kstylepage.cpp b/kpersonalizer/kstylepage.cpp
index 7479947b7..1323d94fe 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::tqfromLatin1(groups[i]) + "Icons");
+		KGlobal::config()->setGroup(TQString::fromLatin1(groups[i]) + "Icons");
 		KGlobal::config()->writeEntry("Size", icontheme.defaultSize(i));
 	}
 	KGlobal::config()->sync();
@@ -542,7 +542,7 @@ void KStylePage::switchPrevStyle() {
 	// go ahead
 	setStyleRecursive( stylePreview, palette, style );
 	// this flickers, but reliably draws the widgets corretly.
-	stylePreview->resize( stylePreview->tqsizeHint() );
+	stylePreview->resize( stylePreview->sizeHint() );
 
 	delete appliedStyle;
 	appliedStyle = style;
diff --git a/kpersonalizer/kstylepagedlg.ui b/kpersonalizer/kstylepagedlg.ui
index 12d80d7a1..e32074ca3 100644
--- a/kpersonalizer/kstylepagedlg.ui
+++ b/kpersonalizer/kstylepagedlg.ui
@@ -4,7 +4,7 @@
     <property name="name">
         <cstring>KStylePageDlg</cstring>
     </property>
-    <property name="tqgeometry">
+    <property name="geometry">
         <rect>
             <x>0</x>
             <y>0</y>
@@ -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="tqalignment">
+            <property name="alignment">
                 <set>WordBreak|AlignVCenter|AlignLeft</set>
             </property>
             <property name="wordwrap" stdset="0">
@@ -49,7 +49,7 @@
                     <verstretch>0</verstretch>
                 </sizepolicy>
             </property>
-            <property name="tqminimumSize">
+            <property name="minimumSize">
                 <size>
                     <width>170</width>
                     <height>430</height>
@@ -123,5 +123,5 @@
     <include location="global" impldecl="in declaration">klistview.h</include>
     <include location="local" impldecl="in implementation">kdialog.h</include>
 </includes>
-<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 </UI>
diff --git a/kpersonalizer/ksysinfo.cpp b/kpersonalizer/ksysinfo.cpp
index 297d726c5..20a089b8f 100644
--- a/kpersonalizer/ksysinfo.cpp
+++ b/kpersonalizer/ksysinfo.cpp
@@ -57,9 +57,9 @@ void KSysInfo::initXInfo() {
 	// vendor
 	m_xvendor = !dpy ? TQString::null : (TQString)ServerVendor(dpy);
 	// XFree-Inc?
-	m_xfree_inc = m_xvendor.tqcontains("XFree86");
+	m_xfree_inc = m_xvendor.contains("XFree86");
 	// X.org ?
-	m_xorg = m_xvendor.tqcontains("X.Org");
+	m_xorg = m_xvendor.contains("X.Org");
 	// release-number
 	m_xrelease = !dpy ? 0 : VendorRelease(dpy);
 	// RENDER-support
@@ -106,22 +106,22 @@ void KSysInfo::initFontFamilies() {
 	for (uint i=0; i < families.count(); i++) {
 		TQString font = *families.at(i);
 		//add further NORMAL fonts here
-		if ( (font.tqcontains("Arial [") || font=="Arial") && normal_priority < 15 ) {
+		if ( (font.contains("Arial [") || font=="Arial") && normal_priority < 15 ) {
 			m_normal_font = font;
 			normal_priority = 15;
-		} else if ( font.tqcontains("Vera Sans") && normal_priority < 12 ) {
+		} else if ( font.contains("Vera Sans") && normal_priority < 12 ) {
 			m_normal_font = font;
 			normal_priority = 12;
-		} else if ( (font.tqcontains("Luxi Sans") || font.tqcontains("Lucidux Sans")) && normal_priority < 10 ) {
+		} else if ( (font.contains("Luxi Sans") || font.contains("Lucidux Sans")) && normal_priority < 10 ) {
 			m_normal_font = font;
 			normal_priority = 10;
-		} else if ( font.tqcontains("Helmet") && normal_priority < 7 ) {
+		} else if ( font.contains("Helmet") && normal_priority < 7 ) {
 			m_normal_font = font;
 			normal_priority = 7;
-		} else if ( font.tqcontains("Nimbus Sans") && normal_priority < 5 ) {
+		} else if ( font.contains("Nimbus Sans") && normal_priority < 5 ) {
 			m_normal_font = font;
 			normal_priority = 5;
-		} else if ( font.tqcontains("Sans") & m_fdb->isSmoothlyScalable(font) && normal_priority < 3 ) {
+		} else if ( font.contains("Sans") & m_fdb->isSmoothlyScalable(font) && normal_priority < 3 ) {
 			m_normal_font = font;
 			normal_priority = 3;
 		} else if ( m_fdb->isSmoothlyScalable(font) && !(m_fdb->isFixedPitch(font,"Normal") && m_fdb->isFixedPitch(font,"Bold")) && normal_priority < 2) {
@@ -132,16 +132,16 @@ void KSysInfo::initFontFamilies() {
 			normal_priority = 1;
 		}
 		//add further FIXED fonts here
-		if (font.tqcontains("Courier New") && fixed_priority < 15){
+		if (font.contains("Courier New") && fixed_priority < 15){
 			m_fixed_font = font;
 			fixed_priority = 15;
-		} else if ( (font.tqcontains("Luxi Mono") || font.tqcontains("Lucidux Mono")) && fixed_priority < 10 ) {
+		} else if ( (font.contains("Luxi Mono") || font.contains("Lucidux Mono")) && fixed_priority < 10 ) {
 			m_fixed_font = font;
 			fixed_priority = 10;
-		} else if (font.tqcontains("Andale Mono") && fixed_priority < 5) {
+		} else if (font.contains("Andale Mono") && fixed_priority < 5) {
 			m_fixed_font = font;
 			fixed_priority = 5;
-		} else if ( font.tqcontains("Mono") && m_fdb->isSmoothlyScalable(font) && fixed_priority < 3 ) {
+		} else if ( font.contains("Mono") && m_fdb->isSmoothlyScalable(font) && fixed_priority < 3 ) {
 			m_fixed_font = font;
 			fixed_priority = 3;
 		} else if ( m_fdb->isSmoothlyScalable(font) && m_fdb->isFixedPitch(font,"Normal") && fixed_priority < 2 ) {
@@ -205,7 +205,7 @@ TQFont KSysInfo::getFixedWidthFont(){
 			s1.truncate(s1.find(":"));
 			s1=s1.stripWhiteSpace();
 			s2=s2.stripWhiteSpace();
-			if(s1.tqcontains("MHz")){
+			if(s1.contains("MHz")){
 				float fspeed = s2.toFloat(0);
 				fspeed = floor(fspeed);
 				m_cpu_speed = (int)fspeed;
diff --git a/kpersonalizer/stylepreview.ui b/kpersonalizer/stylepreview.ui
index f3b2ca16b..0f0972b8a 100644
--- a/kpersonalizer/stylepreview.ui
+++ b/kpersonalizer/stylepreview.ui
@@ -4,7 +4,7 @@
     <property name="name">
         <cstring>StylePreview</cstring>
     </property>
-    <property name="tqgeometry">
+    <property name="geometry">
         <rect>
             <x>0</x>
             <y>0</y>
@@ -181,6 +181,6 @@
     <slot returnType="bool">eventFilter( QObject * obj, QEvent * ev )</slot>
 </slots>
 
-<tqlayoutdefaults spacing="3" margin="6"/>
-<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+<layoutdefaults spacing="3" margin="6"/>
+<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 </UI>