From 560378aaca1784ba19806a0414a32b20c744de39 Mon Sep 17 00:00:00 2001 From: tpearson Date: Mon, 3 Jan 2011 04:12:51 +0000 Subject: Automated conversion for enhanced compatibility with TQt for Qt4 3.4.0 TP1 NOTE: This will not compile with Qt4 (yet), however it does compile with Qt3 git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdelibs@1211081 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- kutils/ksettings/README.dox | 10 +++++----- kutils/ksettings/componentsdialog.cpp | 4 ++-- kutils/ksettings/dialog.cpp | 6 +++--- kutils/ksettings/dialog.h | 2 +- kutils/ksettings/dispatcher.cpp | 6 +++--- kutils/ksettings/dispatcher.h | 2 +- 6 files changed, 15 insertions(+), 15 deletions(-) (limited to 'kutils/ksettings') diff --git a/kutils/ksettings/README.dox b/kutils/ksettings/README.dox index 0660324c1..4f9803efc 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 QObject +The KSettings::Dialog object will be destructed automatically by the TQObject mechanisms. @@ -85,7 +85,7 @@ object for every registered instance name: \ref KSettings::Dispatcher::configFor

3. The .desktop file for the page

-The .desktop file holds all the information for the dialog to find the page and +The .desktop file holds all the information for the dialog to tqfind 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 find out what name that is: look at the first + should be pretty easy to tqfind 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:
-

4. The .setdlg file for hierarchical (TreeList) page layouts

+

4. The .setdlg file for hierarchical (TreeList) page tqlayouts

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/<appname>/<appname>.setdlg. If plugins need to merge in they will install their file to apps/<appname>/ksettingsdialog/<pluginname>.setdlg. -A .setdlg file contains one or more blocks like the following: +A .setdlg file tqcontains one or more blocks like the following: \verbatim [id] diff --git a/kutils/ksettings/componentsdialog.cpp b/kutils/ksettings/componentsdialog.cpp index cb3695e05..04d6649fe 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( Qt::WordBreak ); d->descriptionwidget = new TQLabel( d->infowidget ); - d->descriptionwidget->setAlignment( Qt::WordBreak ); + d->descriptionwidget->tqsetAlignment( Qt::WordBreak ); d->listview->addColumn( TQString::null ); d->listview->header()->hide(); diff --git a/kutils/ksettings/dialog.cpp b/kutils/ksettings/dialog.cpp index 35ad153ef..f6913f194 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; @@ -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 * @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 * @since 3.2 */ -class KUTILS_EXPORT Dispatcher : public QObject +class KUTILS_EXPORT Dispatcher : public TQObject { friend class KStaticDeleter; -- cgit v1.2.1