Initial conversion for TQt for Qt4 3.4.0 TP2

This will also compile with TQt for Qt3, and should not cause any problems
with dependent modules such as kdebase.  If it does then it needs to be fixed!


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

5 files changed, 11 insertions, 11 deletions

diff --git a/kutils/ksettings/componentsdialog.cpp b/kutils/ksettings/componentsdialog.cpp
index cb3695e05..cdf18c934 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->setAlignment( Qt::WordBreak );
+    d->commentwidget->tqsetAlignment( TQt::WordBreak );
     d->descriptionwidget = new TQLabel( d->infowidget );
-    d->descriptionwidget->setAlignment( Qt::WordBreak );
+    d->descriptionwidget->tqsetAlignment( TQt::WordBreak );
 
     d->listview->addColumn( TQString::null );
     d->listview->header()->hide();
diff --git a/kutils/ksettings/dialog.cpp b/kutils/ksettings/dialog.cpp
index 35ad153ef..aedfee9d4 100644
--- a/kutils/ksettings/dialog.cpp
+++ b/kutils/ksettings/dialog.cpp
@@ -108,7 +108,7 @@ class PageNode
 					if( **i < **j )
 					{
 						finished = false;
-						qSwap( *i, *j );
+						tqSwap( *i, *j );
 						lastswapped = j;
 					}
 					--i;
@@ -225,7 +225,7 @@ class PageNode
 				TQVBox * page = dlg->addVBoxPage( m_value.group->name,
 						TQString::null, icon );
 				TQLabel * comment = new TQLabel( m_value.group->comment, page );
-				comment->setTextFormat( Qt::RichText );
+				comment->setTextFormat( TQt::RichText );
 				m_value.group->page = page;
 			}
 			List::Iterator end = m_children.end();
@@ -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.find( *pcit ) ==
+		if( d->registeredComponents.tqfind( *pcit ) ==
 				d->registeredComponents.end() )
 			continue;
 
 		// we check if the parent component is a plugin
-		if( ! d->plugininfomap.contains( *pcit ) )
+		if( ! d->plugininfomap.tqcontains( *pcit ) )
 		{
 			// if not the KCModule must be enabled
 			enabled = true;
diff --git a/kutils/ksettings/dialog.h b/kutils/ksettings/dialog.h
index c83caeeff..13f348287 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 QObject
+class KUTILS_EXPORT Dialog : public TQObject
 {
     friend class PageNode;
     Q_OBJECT
diff --git a/kutils/ksettings/dispatcher.cpp b/kutils/ksettings/dispatcher.cpp
index 7f20c1bc3..b3a92f600 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.contains( instanceName ) )
+    if( m_instanceInfo.tqcontains( 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.contains( instanceName ) )
+    if( m_instanceInfo.tqcontains( 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.contains( instanceName ) )
+    if( ! m_instanceInfo.tqcontains( 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 55e30412e..8bbe79fca 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 QObject
+class KUTILS_EXPORT Dispatcher : public TQObject
 {
     friend class KStaticDeleter<Dispatcher>;