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/kdelibs@1212479 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

6 files changed, 15 insertions, 15 deletions

diff --git a/kutils/ksettings/README.dox b/kutils/ksettings/README.dox
index 4f9803efc..0660324c1 100644
--- a/kutils/ksettings/README.dox
+++ b/kutils/ksettings/README.dox
@@ -35,7 +35,7 @@ KSettings::Dialog:
 m_dlg = new KSettings::Dialog( QStringList::split( ';', "component1;component2" ) );
 \endcode
 
-The KSettings::Dialog object will be destructed automatically by the TQObject
+The KSettings::Dialog object will be destructed automatically by the QObject
 mechanisms.
 
 
@@ -85,7 +85,7 @@ object for every registered instance name: \ref KSettings::Dispatcher::configFor
 <hr>
 <h3>3. The .desktop file for the page</h3>
 
-The .desktop file holds all the information for the dialog to tqfind the page and
+The .desktop file holds all the information for the dialog to find the page and
 insert it at the right place (with the right icon, name and comment).
 
 An example file:
@@ -123,7 +123,7 @@ Some explanation for those keys:
   is used by the first two \ref KSettings::Dialog constructors. The Dialog will
   use all modules that set X-KDE-ParentApp to
   KGlobal::instance()->instanceName(). It
-  should be pretty easy to tqfind out what name that is: look at the first
+  should be pretty easy to find out what name that is: look at the first
   argument to the KAboutData ctor.
 - X-KDE-ParentComponents is a list of the components (plugin/KPart/whatever)
   this config page belongs to. Normally there is only one component.
@@ -146,7 +146,7 @@ Some explanation for those keys:
 
 
 <hr>
-<h3>4. The .setdlg file for hierarchical (TreeList) page tqlayouts</h3>
+<h3>4. The .setdlg file for hierarchical (TreeList) page layouts</h3>
 
 If your config dialog should show a tree of pages in the config dialog you need
 to define that hierarchy with a .setdlg file.
@@ -155,7 +155,7 @@ The file should be installed in apps/&lt;appname&gt;/&lt;appname&gt;.setdlg. If
 plugins need to merge in they will install their file to
 apps/&lt;appname&gt;/ksettingsdialog/&lt;pluginname&gt;.setdlg.
 
-A .setdlg file tqcontains one or more blocks like the following:
+A .setdlg file contains one or more blocks like the following:
 
 \verbatim
 [id]
diff --git a/kutils/ksettings/componentsdialog.cpp b/kutils/ksettings/componentsdialog.cpp
index 04d6649fe..cb3695e05 100644
--- a/kutils/ksettings/componentsdialog.cpp
+++ b/kutils/ksettings/componentsdialog.cpp
@@ -59,9 +59,9 @@ ComponentsDialog::ComponentsDialog( TQWidget * parent, const char * name )
     d->iconwidget = new TQLabel( d->infowidget );
     ( void )new KSeparator( d->infowidget );
     d->commentwidget = new TQLabel( d->infowidget );
-    d->commentwidget->tqsetAlignment( Qt::WordBreak );
+    d->commentwidget->setAlignment( Qt::WordBreak );
     d->descriptionwidget = new TQLabel( d->infowidget );
-    d->descriptionwidget->tqsetAlignment( Qt::WordBreak );
+    d->descriptionwidget->setAlignment( Qt::WordBreak );
 
     d->listview->addColumn( TQString::null );
     d->listview->header()->hide();
diff --git a/kutils/ksettings/dialog.cpp b/kutils/ksettings/dialog.cpp
index f6913f194..35ad153ef 100644
--- a/kutils/ksettings/dialog.cpp
+++ b/kutils/ksettings/dialog.cpp
@@ -108,7 +108,7 @@ class PageNode
 					if( **i < **j )
 					{
 						finished = false;
-						tqSwap( *i, *j );
+						qSwap( *i, *j );
 						lastswapped = j;
 					}
 					--i;
@@ -484,12 +484,12 @@ bool Dialog::isPluginForKCMEnabled( KCModuleInfo * moduleinfo ) const
 			pcit != parentComponents.end(); ++pcit )
 	{
 		// if the parentComponent is not registered ignore it
-		if( d->registeredComponents.tqfind( *pcit ) ==
+		if( d->registeredComponents.find( *pcit ) ==
 				d->registeredComponents.end() )
 			continue;
 
 		// we check if the parent component is a plugin
-		if( ! d->plugininfomap.tqcontains( *pcit ) )
+		if( ! d->plugininfomap.contains( *pcit ) )
 		{
 			// if not the KCModule must be enabled
 			enabled = true;
diff --git a/kutils/ksettings/dialog.h b/kutils/ksettings/dialog.h
index 13f348287..c83caeeff 100644
--- a/kutils/ksettings/dialog.h
+++ b/kutils/ksettings/dialog.h
@@ -70,7 +70,7 @@ namespace KSettings
  * @author Matthias Kretz <kretz@kde.org>
  * @since 3.2
  */
-class KUTILS_EXPORT Dialog : public TQObject
+class KUTILS_EXPORT Dialog : public QObject
 {
     friend class PageNode;
     Q_OBJECT
diff --git a/kutils/ksettings/dispatcher.cpp b/kutils/ksettings/dispatcher.cpp
index b3a92f600..7f20c1bc3 100644
--- a/kutils/ksettings/dispatcher.cpp
+++ b/kutils/ksettings/dispatcher.cpp
@@ -67,7 +67,7 @@ void Dispatcher::registerInstance( KInstance * instance, TQObject * recv, const
     kdDebug( 701 ) << k_funcinfo << instanceName << endl;
     m_instanceName[ recv ] = instanceName;
     TQSignal * sig;
-    if( m_instanceInfo.tqcontains( instanceName ) )
+    if( m_instanceInfo.contains( instanceName ) )
     {
         sig = m_instanceInfo[ instanceName ].signal;
     }
@@ -86,7 +86,7 @@ void Dispatcher::registerInstance( KInstance * instance, TQObject * recv, const
 KConfig * Dispatcher::configForInstanceName( const TQCString & instanceName )
 {
     kdDebug( 701 ) << k_funcinfo << endl;
-    if( m_instanceInfo.tqcontains( instanceName ) )
+    if( m_instanceInfo.contains( instanceName ) )
     {
         KInstance * inst = m_instanceInfo[ instanceName ].instance;
         if( inst )
@@ -111,7 +111,7 @@ void Dispatcher::reparseConfiguration( const TQCString & instanceName )
 {
     kdDebug( 701 ) << k_funcinfo << instanceName << endl;
     // check if the instanceName is valid:
-    if( ! m_instanceInfo.tqcontains( instanceName ) )
+    if( ! m_instanceInfo.contains( instanceName ) )
         return;
     // first we reparse the config of the instance so that the KConfig object
     // will be up to date
diff --git a/kutils/ksettings/dispatcher.h b/kutils/ksettings/dispatcher.h
index 8bbe79fca..55e30412e 100644
--- a/kutils/ksettings/dispatcher.h
+++ b/kutils/ksettings/dispatcher.h
@@ -48,7 +48,7 @@ namespace KSettings
  * @author Matthias Kretz <kretz@kde.org>
  * @since 3.2
  */
-class KUTILS_EXPORT Dispatcher : public TQObject
+class KUTILS_EXPORT Dispatcher : public QObject
 {
     friend class KStaticDeleter<Dispatcher>;