diff options
Diffstat (limited to 'tdeutils')
39 files changed, 195 insertions, 192 deletions
diff --git a/tdeutils/kcmultidialog.cpp b/tdeutils/kcmultidialog.cpp index 742e78eef..3cc3c70ae 100644 --- a/tdeutils/kcmultidialog.cpp +++ b/tdeutils/kcmultidialog.cpp @@ -33,7 +33,7 @@ #include <klibloader.h> #include <tdelocale.h> #include <tdemessagebox.h> -#include <kprocess.h> +#include <tdeprocess.h> #include <krun.h> #include <kstdguiitem.h> #include <kuser.h> @@ -89,11 +89,11 @@ KCMultiDialog::KCMultiDialog( int dialogFace, const KGuiItem &user2, inline void KCMultiDialog::init() { - connect( this, TQT_SIGNAL( finished()), TQT_SLOT( dialogClosed())); + connect( this, TQ_SIGNAL( finished()), TQ_SLOT( dialogClosed())); showButton( User1, false ); showButton( User2, false ); enableButton(Apply, false); - connect(this, TQT_SIGNAL(aboutToShowPage(TQWidget *)), this, TQT_SLOT(slotAboutToShow(TQWidget *))); + connect(this, TQ_SIGNAL(aboutToShowPage(TQWidget *)), this, TQ_SLOT(slotAboutToShow(TQWidget *))); setInitialSize(TQSize(640,480)); moduleParentComponents.setAutoDelete( true ); @@ -250,7 +250,7 @@ void KCMultiDialog::addModule(const TDECModuleInfo& moduleinfo, if( !moduleinfo.service() ) return; - if ( !kapp->authorizeControlModule( moduleinfo.service()->menuId() )) + if ( !tdeApp->authorizeControlModule( moduleinfo.service()->menuId() )) return; if( !TDECModuleLoader::testModule( moduleinfo )) @@ -310,7 +310,7 @@ void KCMultiDialog::addModule(const TDECModuleInfo& moduleinfo, moduleParentComponents.insert( module, new TQStringList( parentComponents ) ); - connect(module, TQT_SIGNAL(changed(bool)), this, TQT_SLOT(clientChanged(bool))); + connect(module, TQ_SIGNAL(changed(bool)), this, TQ_SLOT(clientChanged(bool))); if( m_modules.count() == 0 ) aboutToShowPage( page ); @@ -338,7 +338,7 @@ void KCMultiDialog::removeAllModules() { kdDebug( 710 ) << "remove 2" << endl; TDECModuleProxy * kcm = ( *it ).kcm; - TQObject * page = TQT_TQOBJECT(kcm->parent()); + TQObject * page = kcm->parent(); kcm->hide(); if( page ) { @@ -368,7 +368,7 @@ void KCMultiDialog::slotAboutToShow(TQWidget *page) if( ! obj ) return; - TDECModuleProxy * module = ::tqqt_cast<TDECModuleProxy*>(obj); + TDECModuleProxy * module = ::tqt_cast<TDECModuleProxy*>(obj); if( ! module ) return; d->currentModule = module; @@ -378,15 +378,15 @@ void KCMultiDialog::slotAboutToShow(TQWidget *page) enableButton( KDialogBase::Default, d->currentModule->buttons() & TDECModule::Default ); - disconnect( this, TQT_SIGNAL(user2Clicked()), 0, 0 ); + disconnect( this, TQ_SIGNAL(user2Clicked()), 0, 0 ); if (d->currentModule->moduleInfo().needsRootPrivileges()) { if ( !d->currentModule->rootMode() ) { /* Enable the Admin Mode button */ enableButton( User2, true ); - connect( this, TQT_SIGNAL(user2Clicked()), d->currentModule, TQT_SLOT( runAsRoot() )); - connect( this, TQT_SIGNAL(user2Clicked()), TQT_SLOT( disableRModeButton() )); + connect( this, TQ_SIGNAL(user2Clicked()), d->currentModule, TQ_SLOT( runAsRoot() )); + connect( this, TQ_SIGNAL(user2Clicked()), TQ_SLOT( disableRModeButton() )); } else enableButton( User2, false); @@ -401,7 +401,7 @@ void KCMultiDialog::rootExit() void KCMultiDialog::disableRModeButton() { enableButton( User2, false ); - connect ( d->currentModule, TQT_SIGNAL( childClosed() ), TQT_SLOT( rootExit() )); + connect ( d->currentModule, TQ_SIGNAL( childClosed() ), TQ_SLOT( rootExit() )); } void KCMultiDialog::dialogClosed() diff --git a/tdeutils/kcmultidialog.h b/tdeutils/kcmultidialog.h index 8f30603e6..2226eaf0d 100644 --- a/tdeutils/kcmultidialog.h +++ b/tdeutils/kcmultidialog.h @@ -42,7 +42,7 @@ class TDECModuleInfo; */ class TDEUTILS_EXPORT KCMultiDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: /** @@ -102,7 +102,7 @@ public: KCMultiDialog( int dialogFace, const KGuiItem &user2, const KGuiItem &user3=KGuiItem(), int buttonMask=User2, const TQString &caption=i18n("Configure"), TQWidget *parent=0, - const char *name=0, bool modal=false ) KDE_DEPRECATED; + const char *name=0, bool modal=false ) TDE_DEPRECATED; // KDE4 remove the user3 argument, and instead initialize it to KStdGuiItem::adminMode. /** diff --git a/tdeutils/kfind.cpp b/tdeutils/kfind.cpp index 74fb46e9a..f306fa254 100644 --- a/tdeutils/kfind.cpp +++ b/tdeutils/kfind.cpp @@ -212,8 +212,8 @@ KDialogBase* KFind::findNextDialog( bool create ) if ( !m_dialog && create ) { m_dialog = new KFindNextDialog( m_pattern, parentWidget() ); - connect( m_dialog, TQT_SIGNAL( user1Clicked() ), this, TQT_SLOT( slotFindNext() ) ); - connect( m_dialog, TQT_SIGNAL( finished() ), this, TQT_SLOT( slotDialogClosed() ) ); + connect( m_dialog, TQ_SIGNAL( user1Clicked() ), this, TQ_SLOT( slotFindNext() ) ); + connect( m_dialog, TQ_SIGNAL( finished() ), this, TQ_SLOT( slotDialogClosed() ) ); } return m_dialog; } diff --git a/tdeutils/kfind.h b/tdeutils/kfind.h index 054eeb259..c71f2a41e 100644 --- a/tdeutils/kfind.h +++ b/tdeutils/kfind.h @@ -50,11 +50,11 @@ * * // Connect highlight signal to code which handles highlighting * // of found text. - * connect( m_find, TQT_SIGNAL( highlight( const TQString &, int, int ) ), - * this, TQT_SLOT( slotHighlight( const TQString &, int, int ) ) ); + * connect( m_find, TQ_SIGNAL( highlight( const TQString &, int, int ) ), + * this, TQ_SLOT( slotHighlight( const TQString &, int, int ) ) ); * // Connect findNext signal - called when pressing the button in the dialog - * connect( m_find, TQT_SIGNAL( findNext() ), - * this, TQT_SLOT( slotFindNext() ) ); + * connect( m_find, TQ_SIGNAL( findNext() ), + * this, TQ_SLOT( slotFindNext() ) ); * \endcode * * If you are using a non-modal find dialog (the recommended new way @@ -103,7 +103,7 @@ class TDEUTILS_EXPORT KFind : public TQObject { - Q_OBJECT + TQ_OBJECT public: diff --git a/tdeutils/kfinddialog.cpp b/tdeutils/kfinddialog.cpp index 31e502eb6..529043a16 100644 --- a/tdeutils/kfinddialog.cpp +++ b/tdeutils/kfinddialog.cpp @@ -116,7 +116,7 @@ void KFindDialog::init(bool forReplace, const TQStringList &findStrings, bool ha topLayout->setSpacing( KDialog::spacingHint() ); topLayout->setMargin( 0 ); - m_findGrp = new TQGroupBox(0, Qt::Vertical, i18n("Find"), page); + m_findGrp = new TQGroupBox(0, TQt::Vertical, i18n("Find"), page); m_findGrp->layout()->setSpacing( KDialog::spacingHint() ); // m_findGrp->layout()->setMargin( KDialog::marginHint() ); m_findLayout = new TQGridLayout(m_findGrp->layout()); @@ -137,7 +137,7 @@ void KFindDialog::init(bool forReplace, const TQStringList &findStrings, bool ha m_findLayout->addWidget(m_regExpItem, 2, 1); topLayout->addWidget(m_findGrp); - m_replaceGrp = new TQGroupBox(0, Qt::Vertical, i18n("Replace With"), page); + m_replaceGrp = new TQGroupBox(0, TQt::Vertical, i18n("Replace With"), page); m_replaceGrp->layout()->setSpacing( KDialog::spacingHint() ); // m_replaceGrp->layout()->setMargin( KDialog::marginHint() ); m_replaceLayout = new TQGridLayout(m_replaceGrp->layout()); @@ -159,7 +159,7 @@ void KFindDialog::init(bool forReplace, const TQStringList &findStrings, bool ha m_replaceLayout->addWidget(m_backRefItem, 2, 1); topLayout->addWidget(m_replaceGrp); - m_optionGrp = new TQGroupBox(0, Qt::Vertical, i18n("Options"), page); + m_optionGrp = new TQGroupBox(0, TQt::Vertical, i18n("Options"), page); m_optionGrp->layout()->setSpacing(KDialog::spacingHint()); // m_optionGrp->layout()->setMargin(KDialog::marginHint()); optionsLayout = new TQGridLayout(m_optionGrp->layout()); @@ -193,13 +193,13 @@ void KFindDialog::init(bool forReplace, const TQStringList &findStrings, bool ha m_placeholders = 0L; // signals and slots connections - connect(m_selectedText, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotSelectedTextToggled(bool))); - connect(m_regExp, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotRegexCheckBoxToggled(bool))); - connect(m_backRef, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotPlaceholdersCheckBoxToggled(bool))); - connect(m_regExpItem, TQT_SIGNAL(clicked()), this, TQT_SLOT(showPatterns())); - connect(m_backRefItem, TQT_SIGNAL(clicked()), this, TQT_SLOT(showPlaceholders())); + connect(m_selectedText, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotSelectedTextToggled(bool))); + connect(m_regExp, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotRegexCheckBoxToggled(bool))); + connect(m_backRef, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotPlaceholdersCheckBoxToggled(bool))); + connect(m_regExpItem, TQ_SIGNAL(clicked()), this, TQ_SLOT(showPatterns())); + connect(m_backRefItem, TQ_SIGNAL(clicked()), this, TQ_SLOT(showPlaceholders())); - connect(m_find, TQT_SIGNAL(textChanged ( const TQString & )),this, TQT_SLOT(textSearchChanged( const TQString & ))); + connect(m_find, TQ_SIGNAL(textChanged ( const TQString & )),this, TQ_SLOT(textSearchChanged( const TQString & ))); // tab order setTabOrder(m_find, m_regExp); @@ -439,13 +439,13 @@ void KFindDialog::showPatterns() { if ( !d->m_regexpDialogQueryDone ) { - d->m_regexpDialog = KParts::ComponentFactory::createInstanceFromQuery<TQDialog>( "KRegExpEditor/KRegExpEditor", TQString(), TQT_TQOBJECT(this) ); + d->m_regexpDialog = KParts::ComponentFactory::createInstanceFromQuery<TQDialog>( "KRegExpEditor/KRegExpEditor", TQString(), this ); d->m_regexpDialogQueryDone = true; } if ( d->m_regexpDialog ) { - KRegExpEditorInterface *iface = tqt_dynamic_cast<KRegExpEditorInterface *>( d->m_regexpDialog ); + KRegExpEditorInterface *iface = dynamic_cast<KRegExpEditorInterface *>( d->m_regexpDialog ); assert( iface ); iface->setRegExp( pattern() ); @@ -508,7 +508,7 @@ void KFindDialog::showPlaceholders() if (!m_placeholders) { m_placeholders = new TQPopupMenu(this); - connect( m_placeholders, TQT_SIGNAL(aboutToShow()), this, TQT_SLOT(slotPlaceholdersAboutToShow()) ); + connect( m_placeholders, TQ_SIGNAL(aboutToShow()), this, TQ_SLOT(slotPlaceholdersAboutToShow()) ); } // Insert the selection into the edit control. diff --git a/tdeutils/kfinddialog.h b/tdeutils/kfinddialog.h index 687939e05..35710d72d 100644 --- a/tdeutils/kfinddialog.h +++ b/tdeutils/kfinddialog.h @@ -62,7 +62,7 @@ class TQCheckBox; * else * { * m_findDia = new KFindDialog(false,...); - * connect( m_findDia, TQT_SIGNAL(okClicked()), this, TQT_SLOT(findTextNext()) ); + * connect( m_findDia, TQ_SIGNAL(okClicked()), this, TQ_SLOT(findTextNext()) ); * } * \endcode * Don't forget to delete and reset m_findDia when closed. @@ -74,7 +74,7 @@ class TQCheckBox; class TDEUTILS_EXPORT KFindDialog: public KDialogBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/tdeutils/kplugininfo.cpp b/tdeutils/kplugininfo.cpp index 95a37ae53..c1b30307c 100644 --- a/tdeutils/kplugininfo.cpp +++ b/tdeutils/kplugininfo.cpp @@ -18,13 +18,13 @@ */ #include "kplugininfo.h" -#include <ksimpleconfig.h> +#include <tdesimpleconfig.h> #include <ktrader.h> #include <kdebug.h> #include <tdeconfigbase.h> #include <tdeglobal.h> -#include <kstandarddirs.h> -#include <kdesktopfile.h> +#include <tdestandarddirs.h> +#include <tdedesktopfile.h> #include <kservice.h> class KPluginInfo::KPluginInfoPrivate @@ -70,7 +70,7 @@ class KPluginInfo::KPluginInfoPrivate KPluginInfo::KPluginInfo( const TQString & filename, const char* resource ) : d( new KPluginInfoPrivate ) { - KDesktopFile file( filename, true, resource ); + TDEDesktopFile file( filename, true, resource ); d->specfile = filename; diff --git a/tdeutils/kpluginselector.cpp b/tdeutils/kpluginselector.cpp index 6afa7c8d3..84d1629ea 100644 --- a/tdeutils/kpluginselector.cpp +++ b/tdeutils/kpluginselector.cpp @@ -37,11 +37,11 @@ #include <kdebug.h> #include <tdelocale.h> #include <tdelistview.h> -#include <ksimpleconfig.h> +#include <tdesimpleconfig.h> #include <kdialog.h> #include <tdeglobal.h> #include <tdeglobalsettings.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <ktabctl.h> #include <tdecmoduleinfo.h> #include <tqvaluelist.h> @@ -55,7 +55,7 @@ #include <tqsplitter.h> #include <tqframe.h> #include "kplugininfo.h" -#include <kinstance.h> +#include <tdeinstance.h> #include <tqptrdict.h> #include <tqstringlist.h> #include "tdecmoduleproxy.h" @@ -184,14 +184,14 @@ void KPluginSelectionWidget::init( const TQValueList<KPluginInfo*> & plugininfos ( new TQVBoxLayout( this, 0, KDialog::spacingHint() ) )->setAutoAdd( true ); TDEListView * listview = new TDEListView( this ); d->tooltip = new KPluginListViewToolTip( listview->viewport(), listview ); - connect( listview, TQT_SIGNAL( pressed( TQListViewItem * ) ), this, - TQT_SLOT( executed( TQListViewItem * ) ) ); - connect( listview, TQT_SIGNAL( spacePressed( TQListViewItem * ) ), this, - TQT_SLOT( executed( TQListViewItem * ) ) ); - connect( listview, TQT_SIGNAL( returnPressed( TQListViewItem * ) ), this, - TQT_SLOT( executed( TQListViewItem * ) ) ); - connect( listview, TQT_SIGNAL( selectionChanged( TQListViewItem * ) ), this, - TQT_SLOT( executed( TQListViewItem * ) ) ); + connect( listview, TQ_SIGNAL( pressed( TQListViewItem * ) ), this, + TQ_SLOT( executed( TQListViewItem * ) ) ); + connect( listview, TQ_SIGNAL( spacePressed( TQListViewItem * ) ), this, + TQ_SLOT( executed( TQListViewItem * ) ) ); + connect( listview, TQ_SIGNAL( returnPressed( TQListViewItem * ) ), this, + TQ_SLOT( executed( TQListViewItem * ) ) ); + connect( listview, TQ_SIGNAL( selectionChanged( TQListViewItem * ) ), this, + TQ_SLOT( executed( TQListViewItem * ) ) ); listview->setSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Preferred ); listview->setAcceptDrops( false ); listview->setFullWidth( true ); @@ -246,7 +246,7 @@ TQWidget * KPluginSelectionWidget::insertKCM( TQWidget * parent, { //FIXME: not very verbose TQLabel * label = new TQLabel( i18n( "Error" ), parent ); - label->setAlignment( Qt::AlignCenter ); + label->setAlignment( TQt::AlignCenter ); return label; } @@ -256,7 +256,7 @@ TQWidget * KPluginSelectionWidget::insertKCM( TQWidget * parent, moduleinfo.service()->property( "X-TDE-ParentComponents" ).toStringList() ); d->moduleParentComponents.insert( module, parentComponents ); - connect( module, TQT_SIGNAL( changed( bool ) ), TQT_SLOT( clientChanged( bool ) ) ); + connect( module, TQ_SIGNAL( changed( bool ) ), TQ_SLOT( clientChanged( bool ) ) ); return module; } @@ -264,7 +264,7 @@ void KPluginSelectionWidget::embeddPluginKCMs( KPluginInfo * plugininfo, bool ch { //if we have Services for the plugin we should be able to //create KCM(s) - TQApplication::setOverrideCursor( Qt::WaitCursor ); + TQApplication::setOverrideCursor( TQt::WaitCursor ); if( plugininfo->kcmServices().size() > 1 ) { // we need a tabwidget @@ -523,7 +523,7 @@ KPluginSelector::KPluginSelector( TQWidget * parent, const char * name ) TQBoxLayout * hbox = new TQHBoxLayout( this, 0, KDialog::spacingHint() ); hbox->setAutoAdd( true ); - TQSplitter* splitter = new TQSplitter( Qt::Horizontal, this ); + TQSplitter* splitter = new TQSplitter( TQt::Horizontal, this ); d->frame = new TQFrame( splitter, "KPluginSelector left frame" ); d->frame->setFrameStyle( TQFrame::NoFrame ); ( new TQVBoxLayout( d->frame, 0, KDialog::spacingHint() ) )->setAutoAdd( true ); @@ -536,7 +536,7 @@ KPluginSelector::KPluginSelector( TQWidget * parent, const char * name ) TQLabel * label = new TQLabel( i18n( "(This plugin is not configurable)" ), d->widgetstack ); ( new TQVBoxLayout( label, 0, KDialog::spacingHint() ) )->setAutoAdd( true ); - label->setAlignment( Qt::AlignCenter ); + label->setAlignment( TQt::AlignCenter ); label->setMinimumSize( 200, 200 ); d->widgetstack->addWidget( label, 1 ); @@ -564,8 +564,8 @@ void KPluginSelector::checkNeedForTabWidget() "KPluginSelector TabWidget" ); w->reparent( d->tabwidget, TQPoint( 0, 0 ) ); d->tabwidget->addTab( w, w->catName() ); - connect( d->tabwidget, TQT_SIGNAL( currentChanged( TQWidget * ) ), w, - TQT_SLOT( tabWidgetChanged( TQWidget * ) ) ); + connect( d->tabwidget, TQ_SIGNAL( currentChanged( TQWidget * ) ), w, + TQ_SLOT( tabWidgetChanged( TQWidget * ) ) ); } } } @@ -589,7 +589,7 @@ void KPluginSelector::addPlugins( const TQString & instanceName, checkNeedForTabWidget(); Q_ASSERT( config ); // please set config, or use addPlugins( instance, ... ) which takes care of it if ( !config ) // KDE4: ensure that config is always set; make it second in the arg list? - config = new KSimpleConfig( instanceName ); // memleak! + config = new TDESimpleConfig( instanceName ); // memleak! TDEConfigGroup * cfgGroup = new TDEConfigGroup( config, "KParts Plugins" ); kdDebug( 702 ) << k_funcinfo << "cfgGroup = " << cfgGroup << endl; addPluginsInternal( plugininfos, catname, category, cfgGroup ); @@ -605,16 +605,16 @@ void KPluginSelector::addPluginsInternal( const TQValueList<KPluginInfo*> plugin w = new KPluginSelectionWidget( plugininfos, this, d->tabwidget, catname, category, cfgGroup ); d->tabwidget->addTab( w, catname ); - connect( d->tabwidget, TQT_SIGNAL( currentChanged( TQWidget * ) ), w, - TQT_SLOT( tabWidgetChanged( TQWidget * ) ) ); + connect( d->tabwidget, TQ_SIGNAL( currentChanged( TQWidget * ) ), w, + TQ_SLOT( tabWidgetChanged( TQWidget * ) ) ); } else w = new KPluginSelectionWidget( plugininfos, this, d->frame, catname, category, cfgGroup ); w->setMinimumSize( 200, 200 ); - connect( w, TQT_SIGNAL( changed( bool ) ), this, TQT_SIGNAL( changed( bool ) ) ); - connect( w, TQT_SIGNAL( configCommitted( const TQCString & ) ), this, - TQT_SIGNAL( configCommitted( const TQCString & ) ) ); + connect( w, TQ_SIGNAL( changed( bool ) ), this, TQ_SIGNAL( changed( bool ) ) ); + connect( w, TQ_SIGNAL( configCommitted( const TQCString & ) ), this, + TQ_SIGNAL( configCommitted( const TQCString & ) ) ); d->pswidgets += w; } @@ -696,7 +696,7 @@ void KPluginSelector::defaults() // tabwidget - defaults() will be called for all of them) TQWidget * pluginconfig = d->widgetstack->visibleWidget(); - TDECModuleProxy * kcm = ::tqqt_cast<TDECModuleProxy*>(pluginconfig); + TDECModuleProxy * kcm = ::tqt_cast<TDECModuleProxy*>(pluginconfig); if( kcm ) { kdDebug( 702 ) << "call TDECModule::defaults() for the plugins KCM" diff --git a/tdeutils/kpluginselector.h b/tdeutils/kpluginselector.h index 111abfe0d..212e8737f 100644 --- a/tdeutils/kpluginselector.h +++ b/tdeutils/kpluginselector.h @@ -61,7 +61,7 @@ class TDEUTILS_EXPORT KPluginSelector : public TQWidget { friend class KPluginSelectionWidget; - Q_OBJECT + TQ_OBJECT public: /** * Create a new KPluginSelector. @@ -95,7 +95,7 @@ class TDEUTILS_EXPORT KPluginSelector : public TQWidget * always pass a TDEConfig object if you use * KSettings::PluginPage since you never know from where the * page will be called (think global config app). - * For example KViewCanvas passes KSimpleConfig( + * For example KViewCanvas passes TDESimpleConfig( * "kviewcanvas" ). */ void addPlugins( const TQString & instanceName, @@ -134,7 +134,7 @@ class TDEUTILS_EXPORT KPluginSelector : public TQWidget * always pass a TDEConfig object if you use * KSettings::PluginPage since you never know from where the * page will be called (think global config app). - * For example KViewCanvas passes KSimpleConfig( + * For example KViewCanvas passes TDESimpleConfig( * "kviewcanvas" ). */ void addPlugins( const TQValueList<KPluginInfo*> & plugininfos, diff --git a/tdeutils/kpluginselector_p.h b/tdeutils/kpluginselector_p.h index 79a39ca94..1983a6468 100644 --- a/tdeutils/kpluginselector_p.h +++ b/tdeutils/kpluginselector_p.h @@ -41,7 +41,7 @@ class TDECModuleInfo; */ class KPluginSelectionWidget : public TQWidget { - Q_OBJECT + TQ_OBJECT public: /** * Create a new Plugin Selector widget. diff --git a/tdeutils/kreplace.cpp b/tdeutils/kreplace.cpp index 98e3ce93c..9540d2d7a 100644 --- a/tdeutils/kreplace.cpp +++ b/tdeutils/kreplace.cpp @@ -91,10 +91,10 @@ KReplaceNextDialog* KReplace::dialog() if ( !m_dialog ) { m_dialog = new KReplaceNextDialog( parentWidget() ); - connect( m_dialog, TQT_SIGNAL( user1Clicked() ), this, TQT_SLOT( slotReplaceAll() ) ); - connect( m_dialog, TQT_SIGNAL( user2Clicked() ), this, TQT_SLOT( slotSkip() ) ); - connect( m_dialog, TQT_SIGNAL( user3Clicked() ), this, TQT_SLOT( slotReplace() ) ); - connect( m_dialog, TQT_SIGNAL( finished() ), this, TQT_SLOT( slotDialogClosed() ) ); + connect( m_dialog, TQ_SIGNAL( user1Clicked() ), this, TQ_SLOT( slotReplaceAll() ) ); + connect( m_dialog, TQ_SIGNAL( user2Clicked() ), this, TQ_SLOT( slotSkip() ) ); + connect( m_dialog, TQ_SIGNAL( user3Clicked() ), this, TQ_SLOT( slotReplace() ) ); + connect( m_dialog, TQ_SIGNAL( finished() ), this, TQ_SLOT( slotDialogClosed() ) ); } return static_cast<KReplaceNextDialog *>(m_dialog); } diff --git a/tdeutils/kreplace.h b/tdeutils/kreplace.h index e30e20b44..f14887e25 100644 --- a/tdeutils/kreplace.h +++ b/tdeutils/kreplace.h @@ -50,14 +50,14 @@ class KReplaceNextDialog; * * // Connect signals to code which handles highlighting * // of found text, and on-the-fly replacement. - * connect( m_replace, TQT_SIGNAL( highlight( const TQString &, int, int ) ), - * this, TQT_SLOT( slotHighlight( const TQString &, int, int ) ) ); + * connect( m_replace, TQ_SIGNAL( highlight( const TQString &, int, int ) ), + * this, TQ_SLOT( slotHighlight( const TQString &, int, int ) ) ); * // Connect findNext signal - called when pressing the button in the dialog - * connect( m_replace, TQT_SIGNAL( findNext() ), - * this, TQT_SLOT( slotReplaceNext() ) ); + * connect( m_replace, TQ_SIGNAL( findNext() ), + * this, TQ_SLOT( slotReplaceNext() ) ); * // Connect replace signal - called when doing a replacement - * connect( m_replace, TQT_SIGNAL( replace(const TQString &, int, int, int) ), - * this, TQT_SLOT( slotReplace(const TQString &, int, int, int) ) ); + * connect( m_replace, TQ_SIGNAL( replace(const TQString &, int, int, int) ), + * this, TQ_SLOT( slotReplace(const TQString &, int, int, int) ) ); * \endcode * Then initialize the variables determining the "current position" * (to the cursor, if the option FromCursor is set, @@ -97,7 +97,7 @@ class KReplaceNextDialog; class TDEUTILS_EXPORT KReplace : public KFind { - Q_OBJECT + TQ_OBJECT public: diff --git a/tdeutils/kreplacedialog.h b/tdeutils/kreplacedialog.h index 573a059f2..9e787730e 100644 --- a/tdeutils/kreplacedialog.h +++ b/tdeutils/kreplacedialog.h @@ -59,7 +59,7 @@ class TQRect; class TDEUTILS_EXPORT KReplaceDialog: public KFindDialog { - Q_OBJECT + TQ_OBJECT public: diff --git a/tdeutils/ksettings/README.dox b/tdeutils/ksettings/README.dox index 40d54ee3d..96da18a26 100644 --- a/tdeutils/ksettings/README.dox +++ b/tdeutils/ksettings/README.dox @@ -15,7 +15,7 @@ the following: create the 'Configure MyApp' StdAction like this: \code -KStdAction::preferences( this, SLOT( showConfigDialog() ), actionCollection ); +KStdAction::preferences( this, TQ_SLOT( showConfigDialog() ), actionCollection ); \endcode and the slot looks like this: @@ -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. @@ -47,9 +47,9 @@ Every page is a KCM. This is what you need for creating a page: \code class MyAppConfig : public TDECModule { - Q_OBJECT + TQ_OBJECT public: - MyAppConfig( QWidget *parent, const char *name = 0, const QStringList &args = + MyAppConfig( TQWidget *parent, const char *name = 0, const QStringList &args = QStringList() ); ~MyAppConfig(); @@ -62,11 +62,11 @@ public: and in the cpp file: \code -typedef KGenericFactory<MyAppConfig, QWidget> MyAppConfigFactory; +typedef KGenericFactory<MyAppConfig, TQWidget> MyAppConfigFactory; K_EXPORT_COMPONENT_FACTORY( kcm_myappconfig, MyAppConfigFactory( "kcm_myappconfig" ) ); -MyAppConfig::MyAppConfig( QWidget *parent, const char *, const QStringList &args ) +MyAppConfig::MyAppConfig( TQWidget *parent, const char *, const QStringList &args ) : TDECModule( MyAppConfigFactory::instance(), parent, args ) { // create the pages GUI @@ -77,7 +77,7 @@ MyAppConfig::MyAppConfig( QWidget *parent, const char *, const QStringList &args \endcode For the TDEConfig object you can either use -TDEGlobal::config() (I don't recommend it) or KSimpleConfig( "myapprc" ). +TDEGlobal::config() (I don't recommend it) or TDESimpleConfig( "myapprc" ). I added a method to KSettings::Dispatcher that gives you the TDEConfig object for every registered instance name: \ref KSettings::Dispatcher::configForInstanceName @@ -191,10 +191,10 @@ for the first. To create a plugin page you need the following code: \code -typedef KGenericFactory<MyAppPluginConfig, QWidget> MyAppPluginConfigFactory; +typedef KGenericFactory<MyAppPluginConfig, TQWidget> MyAppPluginConfigFactory; K_EXPORT_COMPONENT_FACTORY( kcm_myapppluginconfig, MyAppPluginConfigFactory( "kcm_myapppluginconfig" ) ); -MyAppPluginConfig( QWidget * parent, const char *, const QStringList & args ) +MyAppPluginConfig( TQWidget * parent, const char *, const QStringList & args ) : PluginPage( MyAppPluginConfigFactory::instance(), parent, args ) { pluginSelector()->addPlugins( ... ); diff --git a/tdeutils/ksettings/componentsdialog.cpp b/tdeutils/ksettings/componentsdialog.cpp index ad3fa81cc..164ea19a5 100644 --- a/tdeutils/ksettings/componentsdialog.cpp +++ b/tdeutils/ksettings/componentsdialog.cpp @@ -71,14 +71,14 @@ ComponentsDialog::ComponentsDialog( TQWidget * parent, const char * name ) d->listview->setSelectionModeExt( TDEListView::Single ); d->listview->setAllColumnsShowFocus( true ); - connect( d->listview, TQT_SIGNAL( pressed( TQListViewItem * ) ), this, - TQT_SLOT( executed( TQListViewItem * ) ) ); - connect( d->listview, TQT_SIGNAL( spacePressed( TQListViewItem * ) ), this, - TQT_SLOT( executed( TQListViewItem * ) ) ); - connect( d->listview, TQT_SIGNAL( returnPressed( TQListViewItem * ) ), this, - TQT_SLOT( executed( TQListViewItem * ) ) ); - connect( d->listview, TQT_SIGNAL( selectionChanged( TQListViewItem * ) ), this, - TQT_SLOT( executed( TQListViewItem * ) ) ); + connect( d->listview, TQ_SIGNAL( pressed( TQListViewItem * ) ), this, + TQ_SLOT( executed( TQListViewItem * ) ) ); + connect( d->listview, TQ_SIGNAL( spacePressed( TQListViewItem * ) ), this, + TQ_SLOT( executed( TQListViewItem * ) ) ); + connect( d->listview, TQ_SIGNAL( returnPressed( TQListViewItem * ) ), this, + TQ_SLOT( executed( TQListViewItem * ) ) ); + connect( d->listview, TQ_SIGNAL( selectionChanged( TQListViewItem * ) ), this, + TQ_SLOT( executed( TQListViewItem * ) ) ); } ComponentsDialog::~ComponentsDialog() diff --git a/tdeutils/ksettings/componentsdialog.h b/tdeutils/ksettings/componentsdialog.h index 49e5a26e9..ca6d029a9 100644 --- a/tdeutils/ksettings/componentsdialog.h +++ b/tdeutils/ksettings/componentsdialog.h @@ -39,7 +39,7 @@ namespace KSettings */ class TDEUTILS_EXPORT ComponentsDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: /** Create Dialog. diff --git a/tdeutils/ksettings/dialog.cpp b/tdeutils/ksettings/dialog.cpp index 83af48fcb..cf84b0753 100644 --- a/tdeutils/ksettings/dialog.cpp +++ b/tdeutils/ksettings/dialog.cpp @@ -28,8 +28,8 @@ #include <kplugininfo.h> #include "ksettings/dispatcher.h" #include "ksettings/componentsdialog.h" -#include <ksimpleconfig.h> -#include <kstandarddirs.h> +#include <tdesimpleconfig.h> +#include <tdestandarddirs.h> #include <kiconloader.h> #include <tqvbox.h> #include <tqlabel.h> @@ -511,7 +511,7 @@ bool Dialog::isPluginForKCMEnabled( TDECModuleInfo * moduleinfo ) const void Dialog::parseGroupFile( const TQString & filename ) { - KSimpleConfig file( filename ); + TDESimpleConfig file( filename ); TQStringList groups = file.groupList(); for( TQStringList::ConstIterator it = groups.begin(); it != groups.end(); ++it ) @@ -588,14 +588,14 @@ void Dialog::createDialogFromServices() if( ! d->staticlistview ) d->dlg->addButtonBelowList( i18n( "Select Components..." ), this, - TQT_SLOT( configureTree() ) ); + TQ_SLOT( configureTree() ) ); - connect( d->dlg, TQT_SIGNAL( okClicked() ), Dispatcher::self(), - TQT_SLOT( syncConfiguration() ) ); - connect( d->dlg, TQT_SIGNAL( applyClicked() ), Dispatcher::self(), - TQT_SLOT( syncConfiguration() ) ); - connect( d->dlg, TQT_SIGNAL( configCommitted( const TQCString & ) ), - Dispatcher::self(), TQT_SLOT( reparseConfiguration( const TQCString & ) ) ); + connect( d->dlg, TQ_SIGNAL( okClicked() ), Dispatcher::self(), + TQ_SLOT( syncConfiguration() ) ); + connect( d->dlg, TQ_SIGNAL( applyClicked() ), Dispatcher::self(), + TQ_SLOT( syncConfiguration() ) ); + connect( d->dlg, TQ_SIGNAL( configCommitted( const TQCString & ) ), + Dispatcher::self(), TQ_SLOT( reparseConfiguration( const TQCString & ) ) ); d->pagetree.addToDialog( d->dlg ); @@ -609,13 +609,13 @@ void Dialog::configureTree() ComponentsDialog * subdlg = new ComponentsDialog( d->dlg ); subdlg->setPluginInfos( d->plugininfomap ); subdlg->show(); - connect( subdlg, TQT_SIGNAL( okClicked() ), this, TQT_SLOT( updateTreeList() ) ); - connect( subdlg, TQT_SIGNAL( applyClicked() ), this, TQT_SLOT( updateTreeList() ) ); - connect( subdlg, TQT_SIGNAL( okClicked() ), this, - TQT_SIGNAL( pluginSelectionChanged() ) ); - connect( subdlg, TQT_SIGNAL( applyClicked() ), this, - TQT_SIGNAL( pluginSelectionChanged() ) ); - connect( subdlg, TQT_SIGNAL( finished() ), subdlg, TQT_SLOT( delayedDestruct() ) ); + connect( subdlg, TQ_SIGNAL( okClicked() ), this, TQ_SLOT( updateTreeList() ) ); + connect( subdlg, TQ_SIGNAL( applyClicked() ), this, TQ_SLOT( updateTreeList() ) ); + connect( subdlg, TQ_SIGNAL( okClicked() ), this, + TQ_SIGNAL( pluginSelectionChanged() ) ); + connect( subdlg, TQ_SIGNAL( applyClicked() ), this, + TQ_SIGNAL( pluginSelectionChanged() ) ); + connect( subdlg, TQ_SIGNAL( finished() ), subdlg, TQ_SLOT( delayedDestruct() ) ); } void Dialog::updateTreeList() diff --git a/tdeutils/ksettings/dialog.h b/tdeutils/ksettings/dialog.h index f42558b26..619c05749 100644 --- a/tdeutils/ksettings/dialog.h +++ b/tdeutils/ksettings/dialog.h @@ -59,7 +59,7 @@ namespace KSettings * \endcode * and the action for the config dialog is connected to the show slot: * \code - * KStdAction::preferences( m_cfgdlg, TQT_SLOT( show() ), actionCollection() ); + * KStdAction::preferences( m_cfgdlg, TQ_SLOT( show() ), actionCollection() ); * \endcode * * If you need to be informed when the config was changed and applied in the @@ -73,7 +73,7 @@ namespace KSettings class TDEUTILS_EXPORT Dialog : public TQObject { friend class PageNode; - Q_OBJECT + TQ_OBJECT public: /** * Tells the dialog whether the entries in the listview are all static diff --git a/tdeutils/ksettings/dispatcher.cpp b/tdeutils/ksettings/dispatcher.cpp index 6d87e4cde..869cd86df 100644 --- a/tdeutils/ksettings/dispatcher.cpp +++ b/tdeutils/ksettings/dispatcher.cpp @@ -80,7 +80,7 @@ void Dispatcher::registerInstance( TDEInstance * instance, TQObject * recv, cons sig->connect( recv, slot ); ++m_instanceInfo[ instanceName ].count; - connect( recv, TQT_SIGNAL( destroyed( TQObject * ) ), this, TQT_SLOT( unregisterInstance( TQObject * ) ) ); + connect( recv, TQ_SIGNAL( destroyed( TQObject * ) ), this, TQ_SLOT( unregisterInstance( TQObject * ) ) ); } TDEConfig * Dispatcher::configForInstanceName( const TQCString & instanceName ) @@ -93,7 +93,7 @@ TDEConfig * Dispatcher::configForInstanceName( const TQCString & instanceName ) return inst->config(); } //if( fallback ) - //return new KSimpleConfig( instanceName ); + //return new TDESimpleConfig( instanceName ); return 0; } diff --git a/tdeutils/ksettings/dispatcher.h b/tdeutils/ksettings/dispatcher.h index ec5a540b1..2cb0cdc2a 100644 --- a/tdeutils/ksettings/dispatcher.h +++ b/tdeutils/ksettings/dispatcher.h @@ -42,7 +42,7 @@ namespace KSettings * into the TDEConfigureDialog you need a way to get notified. This is what you * do: * \code - * Dispatcher::self()->registerInstance( instance(), this, TQT_SLOT( loadSettings() ) ); + * Dispatcher::self()->registerInstance( instance(), this, TQ_SLOT( loadSettings() ) ); * \endcode * * @author Matthias Kretz <kretz@kde.org> @@ -52,7 +52,7 @@ class TDEUTILS_EXPORT Dispatcher : public TQObject { friend class KStaticDeleter<Dispatcher>; - Q_OBJECT + TQ_OBJECT public: /** * Get a reference the the Dispatcher object. @@ -69,7 +69,7 @@ class TDEUTILS_EXPORT Dispatcher : public TQObject * * @param instance The TDEInstance object * @param recv The object that should receive the signal - * @param slot The slot to be called: TQT_SLOT( slotName() ) + * @param slot The slot to be called: TQ_SLOT( slotName() ) */ void registerInstance( TDEInstance * instance, TQObject * recv, const char * slot ); diff --git a/tdeutils/ksettings/pluginpage.cpp b/tdeutils/ksettings/pluginpage.cpp index ddb58fb03..39af821e7 100644 --- a/tdeutils/ksettings/pluginpage.cpp +++ b/tdeutils/ksettings/pluginpage.cpp @@ -43,7 +43,7 @@ class PluginPage::PluginPagePrivate { ( new TQVBoxLayout( this, 0, KDialog::spacingHint() ) )->setAutoAdd( true ); d->selwid = new KPluginSelector( this ); - connect( d->selwid, TQT_SIGNAL( changed( bool ) ), this, TQT_SIGNAL( changed( bool ) ) ); + connect( d->selwid, TQ_SIGNAL( changed( bool ) ), this, TQ_SIGNAL( changed( bool ) ) ); } PluginPage::PluginPage( TDEInstance * instance, TQWidget * parent, const TQStringList & args ) @@ -52,9 +52,9 @@ class PluginPage::PluginPagePrivate { ( new TQVBoxLayout( this, 0, KDialog::spacingHint() ) )->setAutoAdd( true ); d->selwid = new KPluginSelector( this ); - connect( d->selwid, TQT_SIGNAL( changed( bool ) ), this, TQT_SIGNAL( changed( bool ) ) ); - connect( d->selwid, TQT_SIGNAL( configCommitted( const TQCString & ) ), - Dispatcher::self(), TQT_SLOT( reparseConfiguration( const TQCString & ) ) ); + connect( d->selwid, TQ_SIGNAL( changed( bool ) ), this, TQ_SIGNAL( changed( bool ) ) ); + connect( d->selwid, TQ_SIGNAL( configCommitted( const TQCString & ) ), + Dispatcher::self(), TQ_SLOT( reparseConfiguration( const TQCString & ) ) ); } PluginPage::~PluginPage() diff --git a/tdeutils/ksettings/pluginpage.h b/tdeutils/ksettings/pluginpage.h index e9a23fcd8..f3dc1c946 100644 --- a/tdeutils/ksettings/pluginpage.h +++ b/tdeutils/ksettings/pluginpage.h @@ -72,7 +72,7 @@ namespace KSettings */ class TDEUTILS_EXPORT PluginPage : public TDECModule { - Q_OBJECT + TQ_OBJECT public: /** * Standart TDECModule constructor. Automatically creates the the diff --git a/tdeutils/tdecmodulecontainer.cpp b/tdeutils/tdecmodulecontainer.cpp index 2df7a0421..7a0337615 100644 --- a/tdeutils/tdecmodulecontainer.cpp +++ b/tdeutils/tdecmodulecontainer.cpp @@ -91,7 +91,7 @@ void TDECModuleContainer::init() d->topLayout = new TQVBoxLayout( this, 0, KDialog::spacingHint(), "topLayout" ); d->tabWidget = new TQTabWidget(this, "tabWidget"); d->tabWidget->setMargin(KDialog::marginHint()); - connect( d->tabWidget, TQT_SIGNAL( currentChanged( TQWidget* ) ), TQT_SLOT( tabSwitched( TQWidget* ) )); + connect( d->tabWidget, TQ_SIGNAL( currentChanged( TQWidget* ) ), TQ_SLOT( tabSwitched( TQWidget* ) )); d->topLayout->addWidget( d->tabWidget ); if ( !d->modules.isEmpty() ) @@ -152,7 +152,7 @@ void TDECModuleContainer::addModule( const TQString& module ) d->tabWidget->setTabToolTip( proxy, proxy->moduleInfo().comment() ); - connect( proxy, TQT_SIGNAL(changed(TDECModuleProxy *)), TQT_SLOT(moduleChanged(TDECModuleProxy *))); + connect( proxy, TQ_SIGNAL(changed(TDECModuleProxy *)), TQ_SLOT(moduleChanged(TDECModuleProxy *))); /* Collect our buttons - we go for the common deliminator */ d->buttons = d->buttons | proxy->realModule()->buttons(); @@ -178,10 +178,10 @@ void TDECModuleContainer::tabSwitched( TQWidget * module ) if ( mod->moduleInfo().needsRootPrivileges() && !mod->rootMode() ) { d->btnRootMode->setEnabled( true ); - connect( d->btnRootMode, TQT_SIGNAL( clicked() ), - TQT_SLOT( runAsRoot() )); - connect( mod, TQT_SIGNAL( childClosed() ), - TQT_SLOT ( rootExited() )); + connect( d->btnRootMode, TQ_SIGNAL( clicked() ), + TQ_SLOT( runAsRoot() )); + connect( mod, TQ_SIGNAL( childClosed() ), + TQ_SLOT ( rootExited() )); } else { d->btnRootMode->setEnabled( false ); @@ -205,7 +205,7 @@ void TDECModuleContainer::runAsRoot() void TDECModuleContainer::rootExited() { - connect( d->btnRootMode, TQT_SIGNAL( clicked() ), TQT_SLOT( runAsRoot() )); + connect( d->btnRootMode, TQ_SIGNAL( clicked() ), TQ_SLOT( runAsRoot() )); d->btnRootMode->setEnabled( true ); } diff --git a/tdeutils/tdecmodulecontainer.h b/tdeutils/tdecmodulecontainer.h index 31961ab7f..4cfb2ca03 100644 --- a/tdeutils/tdecmodulecontainer.h +++ b/tdeutils/tdecmodulecontainer.h @@ -52,7 +52,7 @@ class TDECModuleProxy; */ class TDEUTILS_EXPORT TDECModuleContainer : public TDECModule { - Q_OBJECT + TQ_OBJECT public: /** * Creates a TDECModuleContainer with tabs, each one containing one of the diff --git a/tdeutils/tdecmoduleinfo.cpp b/tdeutils/tdecmoduleinfo.cpp index 9eeac6585..dada2ad3b 100644 --- a/tdeutils/tdecmoduleinfo.cpp +++ b/tdeutils/tdecmoduleinfo.cpp @@ -23,10 +23,10 @@ #include <tqvariant.h> -#include <kdesktopfile.h> +#include <tdedesktopfile.h> #include <kdebug.h> #include <tdeglobal.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdelocale.h> #include "tdecmoduleinfo.h" @@ -227,8 +227,11 @@ TDECModuleInfo::isHiddenByDefault() const return _isHiddenByDefault; } -bool TDECModuleInfo::needsTest() const +bool TDECModuleInfo::needsTest() const { + if (!_allLoaded) + const_cast<TDECModuleInfo*>(this)->loadAll(); + return d->testModule; } diff --git a/tdeutils/tdecmoduleinfo.h b/tdeutils/tdecmoduleinfo.h index 634dacace..563d8b677 100644 --- a/tdeutils/tdecmoduleinfo.h +++ b/tdeutils/tdecmoduleinfo.h @@ -176,7 +176,7 @@ public: * @deprecated * @return the isHiddenByDefault attribute. */ - bool isHiddenByDefault() const KDE_DEPRECATED; + bool isHiddenByDefault() const TDE_DEPRECATED; /** diff --git a/tdeutils/tdecmoduleloader.cpp b/tdeutils/tdecmoduleloader.cpp index 174226ed2..907060ec7 100644 --- a/tdeutils/tdecmoduleloader.cpp +++ b/tdeutils/tdecmoduleloader.cpp @@ -72,7 +72,7 @@ TDECModule* TDECModuleLoader::load(const TDECModuleInfo &mod, const TQString &li KLibFactory *factory = lib->factory(); if ( factory ) { - TDECModule *module = KParts::ComponentFactory::createInstanceFromFactory<TDECModule>( factory, TQT_TQOBJECT(parent), name ? name : mod.handle().latin1(), args ); + TDECModule *module = KParts::ComponentFactory::createInstanceFromFactory<TDECModule>( factory, parent, name ? name : mod.handle().latin1(), args ); if (module) return module; } diff --git a/tdeutils/tdecmoduleloader.h b/tdeutils/tdecmoduleloader.h index a96d23e66..7b93d3498 100644 --- a/tdeutils/tdecmoduleloader.h +++ b/tdeutils/tdecmoduleloader.h @@ -62,7 +62,7 @@ class TDEUTILS_EXPORT TDECModuleLoader */ static TDECModule *loadModule(const TDECModuleInfo &module, bool withFallback=true, TQWidget * parent = 0, const char * name = 0, - const TQStringList & args = TQStringList() ) KDE_DEPRECATED; + const TQStringList & args = TQStringList() ) TDE_DEPRECATED; /** * Loads a @ref TDECModule. If loading fails a zero pointer is returned. @@ -76,7 +76,7 @@ class TDEUTILS_EXPORT TDECModuleLoader * method */ static TDECModule *loadModule(const TQString &module, TQWidget *parent = 0, - const char *name = 0, const TQStringList & args = TQStringList()) KDE_DEPRECATED; + const char *name = 0, const TQStringList & args = TQStringList()) TDE_DEPRECATED; /** * Determines the way errors are reported @@ -147,7 +147,7 @@ class TDEUTILS_EXPORT TDECModuleLoader * @deprecated Use a constructor with ErrorReporting set to Dialog to show a * message box like this function did. */ - static void showLastLoaderError(TQWidget *parent) KDE_DEPRECATED; + static void showLastLoaderError(TQWidget *parent) TDE_DEPRECATED; /** diff --git a/tdeutils/tdecmoduleproxy.cpp b/tdeutils/tdecmoduleproxy.cpp index 487280e39..17ebd94b2 100644 --- a/tdeutils/tdecmoduleproxy.cpp +++ b/tdeutils/tdecmoduleproxy.cpp @@ -43,9 +43,9 @@ #include <kdebug.h> #include <kdialog.h> #include <tdelocale.h> -#include <kprocess.h> +#include <tdeprocess.h> #include <kservice.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kuser.h> #include <X11/Xlib.h> @@ -155,7 +155,7 @@ TDECModule * TDECModuleProxy::realModule() const if( d->rootMode ) return 0; - TQApplication::setOverrideCursor( Qt::WaitCursor ); + TQApplication::setOverrideCursor( TQt::WaitCursor ); TDECModuleProxy * that = const_cast<TDECModuleProxy*>( this ); @@ -185,12 +185,12 @@ TDECModule * TDECModuleProxy::realModule() const d->kcm = TDECModuleLoader::loadModule( moduleInfo(), TDECModuleLoader::Inline, d->withFallback, that, name(), d->args ); - connect( d->kcm, TQT_SIGNAL( changed( bool ) ), - TQT_SLOT(moduleChanged(bool)) ); - connect( d->kcm, TQT_SIGNAL( destroyed() ), - TQT_SLOT( moduleDestroyed() ) ); - connect( d->kcm, TQT_SIGNAL(quickHelpChanged()), - TQT_SIGNAL(quickHelpChanged())); + connect( d->kcm, TQ_SIGNAL( changed( bool ) ), + TQ_SLOT(moduleChanged(bool)) ); + connect( d->kcm, TQ_SIGNAL( destroyed() ), + TQ_SLOT( moduleDestroyed() ) ); + connect( d->kcm, TQ_SIGNAL(quickHelpChanged()), + TQ_SIGNAL(quickHelpChanged())); TQWhatsThis::add( that, d->kcm->quickHelp() ); d->topLayout->addWidget( d->kcm ); @@ -234,8 +234,8 @@ TDECModule * TDECModuleProxy::realModule() const d->dcopClient->attach(); d->dcopClient->setNotifications( true ); - connect( d->dcopClient, TQT_SIGNAL( applicationRemoved( const TQCString& )), - TQT_SLOT( applicationRemoved( const TQCString& ))); + connect( d->dcopClient, TQ_SIGNAL( applicationRemoved( const TQCString& )), + TQ_SLOT( applicationRemoved( const TQCString& ))); /* Figure out the name of where the module is already loaded */ TQByteArray replyData, data; @@ -301,7 +301,7 @@ void TDECModuleProxy::runAsRoot() if ( !moduleInfo().needsRootPrivileges() ) return; - TQApplication::setOverrideCursor( Qt::WaitCursor ); + TQApplication::setOverrideCursor( TQt::WaitCursor ); delete d->rootProcess; delete d->embedWidget; @@ -367,7 +367,7 @@ void TDECModuleProxy::runAsRoot() *d->rootProcess << TQString("%1 %2 --embed-proxy %3 --lang %4").arg(locate("exe", "tdecmshell")) .arg(cmd).arg(d->embedWidget->winId()).arg(TDEGlobal::locale()->language()); - connect(d->rootProcess, TQT_SIGNAL(processExited(TDEProcess*)), TQT_SLOT(rootExited())); + connect(d->rootProcess, TQ_SIGNAL(processExited(TDEProcess*)), TQ_SLOT(rootExited())); if ( !d->rootProcess->start( TDEProcess::NotifyOnExit )) { @@ -377,7 +377,7 @@ void TDECModuleProxy::runAsRoot() else { d->rootMode = true; - kapp->dcopClient(); + tdeApp->dcopClient(); d->rootCommunicator = new TDECModuleProxyRootCommunicatorImpl( d->dcopName + "-RootCommunicator", this ); } @@ -452,7 +452,7 @@ void TDECModuleProxy::deleteClient() delete d->dcopClient; d->dcopClient = 0; - kapp->syncX(); + tdeApp->syncX(); } @@ -543,7 +543,7 @@ void TDECModuleProxy::callRootModule( const TQCString& function ) /* Note, we don't use d->dcopClient here, because it's used for * the loaded module(and it's not "us" when this function is called) */ - if( !kapp->dcopClient()->call( d->dcopName, d->dcopName, function, sendData, + if( !tdeApp->dcopClient()->call( d->dcopName, d->dcopName, function, sendData, replyType, replyData, true, -1 )) kdDebug(711) << "Calling function '" << function << "' failed." << endl; @@ -567,7 +567,7 @@ TQString TDECModuleProxy::quickHelp() const TQByteArray data, replyData; TQCString replyType; - if (kapp->dcopClient()->call(d->dcopName, d->dcopName, "quickHelp()", + if (tdeApp->dcopClient()->call(d->dcopName, d->dcopName, "quickHelp()", data, replyType, replyData)) kdDebug(711) << "Calling DCOP function bool changed() failed." << endl; else diff --git a/tdeutils/tdecmoduleproxy.h b/tdeutils/tdecmoduleproxy.h index 11bbca987..1aa337a23 100644 --- a/tdeutils/tdecmoduleproxy.h +++ b/tdeutils/tdecmoduleproxy.h @@ -67,7 +67,7 @@ class TDEProcess; */ class TDEUTILS_EXPORT TDECModuleProxy : public TQWidget { -Q_OBJECT +TQ_OBJECT friend class TDECModuleProxyRootCommunicatorImpl; diff --git a/tdeutils/tdecmoduleproxyIfaceImpl.cpp b/tdeutils/tdecmoduleproxyIfaceImpl.cpp index 5b1bcc339..77291bd3e 100644 --- a/tdeutils/tdecmoduleproxyIfaceImpl.cpp +++ b/tdeutils/tdecmoduleproxyIfaceImpl.cpp @@ -35,10 +35,10 @@ TDECModuleProxyIfaceImpl::TDECModuleProxyIfaceImpl( const TQCString& name, : DCOPObject( name ), TQObject( 0, name ), p( const_cast<TDECModuleProxy *>( client )) { - connect( p, TQT_SIGNAL( changed(bool)), - TQT_SLOT( changedRelay(bool))); - connect( p, TQT_SIGNAL( quickHelpChanged()), - TQT_SLOT( quickHelpRelay())); + connect( p, TQ_SIGNAL( changed(bool)), + TQ_SLOT( changedRelay(bool))); + connect( p, TQ_SIGNAL( quickHelpChanged()), + TQ_SLOT( quickHelpRelay())); } void TDECModuleProxyIfaceImpl::save() @@ -61,7 +61,7 @@ void TDECModuleProxyIfaceImpl::defaults() TQString TDECModuleProxyIfaceImpl::applicationName() { - return kapp->caption(); + return tdeApp->caption(); } TQString TDECModuleProxyIfaceImpl::quickHelp() @@ -106,10 +106,10 @@ TDECModuleProxyRootCommunicatorImpl::TDECModuleProxyRootCommunicatorImpl */ /* Note, we don't use TDECModuleProxy::d->dcopClient */ - kapp->dcopClient()->connectDCOPSignal( 0, p->dcopName(), + tdeApp->dcopClient()->connectDCOPSignal( 0, p->dcopName(), "changed(bool)", objId(), "changed(bool)", false ); - kapp->dcopClient()->connectDCOPSignal( 0, p->dcopName(), + tdeApp->dcopClient()->connectDCOPSignal( 0, p->dcopName(), "quickHelpChanged()", objId(), "quickHelpChanged()", false ); } diff --git a/tdeutils/tdecmoduleproxyIfaceImpl.h b/tdeutils/tdecmoduleproxyIfaceImpl.h index a8a80f23b..ca77a966e 100644 --- a/tdeutils/tdecmoduleproxyIfaceImpl.h +++ b/tdeutils/tdecmoduleproxyIfaceImpl.h @@ -33,7 +33,7 @@ class TDECModuleProxyIfaceImpl: public TQObject, virtual public TDECModuleProxyI * Update: This is probably not possible, since we don't want the DCOPObject when * we're running in root mode. */ - Q_OBJECT + TQ_OBJECT public: @@ -79,7 +79,7 @@ private: class TDECModuleProxyRootCommunicatorImpl: public TQObject, virtual public TDECModuleProxyRootDispatcher { - Q_OBJECT + TQ_OBJECT public: TDECModuleProxyRootCommunicatorImpl( const TQCString& name, TDECModuleProxy* const client ); diff --git a/tdeutils/tdemultitabbar.cpp b/tdeutils/tdemultitabbar.cpp index b2246e104..6ffb8e00a 100644 --- a/tdeutils/tdemultitabbar.cpp +++ b/tdeutils/tdemultitabbar.cpp @@ -74,8 +74,8 @@ KMultiTabBarInternal::KMultiTabBarInternal(TQWidget *parent, KMultiTabBar::KMult addChild(box); setFrameStyle(NoFrame); viewport()->setBackgroundMode(TQt::PaletteBackground); -/* box->setPaletteBackgroundColor(Qt::red); - setPaletteBackgroundColor(Qt::green);*/ +/* box->setPaletteBackgroundColor(TQt::red); + setPaletteBackgroundColor(TQt::green);*/ } void KMultiTabBarInternal::setStyle(enum KMultiTabBar::KMultiTabBarStyle style) @@ -394,7 +394,7 @@ KMultiTabBarButton::KMultiTabBarButton(const TQPixmap& pic,const TQString& text, setFixedWidth(24); m_id=id; TQToolTip::add(this,text); - connect(this,TQT_SIGNAL(clicked()),this,TQT_SLOT(slotClicked())); + connect(this,TQ_SIGNAL(clicked()),this,TQ_SLOT(slotClicked())); } KMultiTabBarButton::KMultiTabBarButton(const TQString& text, TQPopupMenu *popup, @@ -409,7 +409,7 @@ KMultiTabBarButton::KMultiTabBarButton(const TQString& text, TQPopupMenu *popup, setFixedWidth(24); m_id=id; TQToolTip::add(this,text); - connect(this,TQT_SIGNAL(clicked()),this,TQT_SLOT(slotClicked())); + connect(this,TQ_SIGNAL(clicked()),this,TQ_SLOT(slotClicked())); } KMultiTabBarButton::~KMultiTabBarButton() { @@ -445,13 +445,13 @@ void KMultiTabBarButton::setStyle(KMultiTabBar::KMultiTabBarStyle style) void KMultiTabBarButton::hideEvent( TQHideEvent* he) { TQPushButton::hideEvent(he); - KMultiTabBar *tb=tqt_dynamic_cast<KMultiTabBar*>(parentWidget()); + KMultiTabBar *tb=dynamic_cast<KMultiTabBar*>(parentWidget()); if (tb) tb->updateSeparator(); } void KMultiTabBarButton::showEvent( TQShowEvent* he) { TQPushButton::showEvent(he); - KMultiTabBar *tb=tqt_dynamic_cast<KMultiTabBar*>(parentWidget()); + KMultiTabBar *tb=dynamic_cast<KMultiTabBar*>(parentWidget()); if (tb) tb->updateSeparator(); } @@ -491,7 +491,7 @@ TQSize KMultiTabBarButton::sizeHint() const h = TQMAX(h, sz.height()); } - return (style().tqsizeFromContents(TQStyle::CT_ToolButton, this, TQSize(w, h)). + return (style().sizeFromContents(TQStyle::CT_ToolButton, this, TQSize(w, h)). expandedTo(TQApplication::globalStrut())); } diff --git a/tdeutils/tdemultitabbar.h b/tdeutils/tdemultitabbar.h index eca4695ff..3d7785842 100644 --- a/tdeutils/tdemultitabbar.h +++ b/tdeutils/tdemultitabbar.h @@ -55,7 +55,7 @@ class KMultiTabBarInternal; */ class TDEUTILS_EXPORT KMultiTabBar: public TQWidget { - Q_OBJECT + TQ_OBJECT public: /** * The tab bar's orientation. Also constraints the bar's position. @@ -204,7 +204,7 @@ private: */ class TDEUTILS_EXPORT KMultiTabBarButton: public TQPushButton { - Q_OBJECT + TQ_OBJECT public: /** @internal */ KMultiTabBarButton(const TQPixmap& pic,const TQString&, TQPopupMenu *popup, @@ -267,7 +267,7 @@ protected slots: */ class TDEUTILS_EXPORT KMultiTabBarTab: public KMultiTabBarButton { - Q_OBJECT + TQ_OBJECT public: /** @internal */ KMultiTabBarTab(const TQPixmap& pic,const TQString&,int id,TQWidget *parent, diff --git a/tdeutils/tdemultitabbar_p.h b/tdeutils/tdemultitabbar_p.h index 353a33260..61f8e82c7 100644 --- a/tdeutils/tdemultitabbar_p.h +++ b/tdeutils/tdemultitabbar_p.h @@ -29,7 +29,7 @@ class KMultiTabBarInternal: public TQScrollView { - Q_OBJECT + TQ_OBJECT public: KMultiTabBarInternal(TQWidget *parent,KMultiTabBar::KMultiTabBarMode bm); int appendTab(const TQPixmap &,int=-1,const TQString& =TQString::null); diff --git a/tdeutils/tests/kfindtest.cpp b/tdeutils/tests/kfindtest.cpp index c913e5ec6..6a724d6a3 100644 --- a/tdeutils/tests/kfindtest.cpp +++ b/tdeutils/tests/kfindtest.cpp @@ -59,10 +59,10 @@ void KFindTest::find(const TQString &pattern, long options) delete m_find; m_find = new KFind(pattern, options, 0); - connect(m_find, TQT_SIGNAL(highlight(const TQString &, int, int)), - TQT_SLOT(slotHighlight(const TQString &, int, int))); - connect(m_find, TQT_SIGNAL(highlight(int, int, int)), - TQT_SLOT(slotHighlight(int, int, int))); + connect(m_find, TQ_SIGNAL(highlight(const TQString &, int, int)), + TQ_SLOT(slotHighlight(const TQString &, int, int))); + connect(m_find, TQ_SIGNAL(highlight(int, int, int)), + TQ_SLOT(slotHighlight(int, int, int))); m_line = 0; KFind::Result result = KFind::NoMatch; diff --git a/tdeutils/tests/kfindtest.h b/tdeutils/tests/kfindtest.h index 847d9579c..09526c1b0 100644 --- a/tdeutils/tests/kfindtest.h +++ b/tdeutils/tests/kfindtest.h @@ -27,7 +27,7 @@ class KFind; class KFindTest : public TQObject { - Q_OBJECT + TQ_OBJECT public: KFindTest(const TQStringList &text) : diff --git a/tdeutils/tests/kreplacetest.cpp b/tdeutils/tests/kreplacetest.cpp index 19ead8e77..df21d0c81 100644 --- a/tdeutils/tests/kreplacetest.cpp +++ b/tdeutils/tests/kreplacetest.cpp @@ -38,14 +38,14 @@ void KReplaceTest::replace( const TQString &pattern, const TQString &replacement // Connect highlight signal to code which handles highlighting // of found text. - connect(m_replace, TQT_SIGNAL( highlight( const TQString &, int, int ) ), - this, TQT_SLOT( slotHighlight( const TQString &, int, int ) ) ); + connect(m_replace, TQ_SIGNAL( highlight( const TQString &, int, int ) ), + this, TQ_SLOT( slotHighlight( const TQString &, int, int ) ) ); // Connect findNext signal - called when pressing the button in the dialog - connect(m_replace, TQT_SIGNAL( findNext() ), - this, TQT_SLOT( slotReplaceNext() ) ); + connect(m_replace, TQ_SIGNAL( findNext() ), + this, TQ_SLOT( slotReplaceNext() ) ); // Connect replace signal - called when doing a replacement - connect(m_replace, TQT_SIGNAL( replace(const TQString &, int, int, int) ), - this, TQT_SLOT( slotReplace(const TQString &, int, int, int) ) ); + connect(m_replace, TQ_SIGNAL( replace(const TQString &, int, int, int) ), + this, TQ_SLOT( slotReplace(const TQString &, int, int, int) ) ); // Go to initial position if ( (options & KReplaceDialog::FromCursor) == 0 ) diff --git a/tdeutils/tests/kreplacetest.h b/tdeutils/tests/kreplacetest.h index b8fb8120b..71aa8cebb 100644 --- a/tdeutils/tests/kreplacetest.h +++ b/tdeutils/tests/kreplacetest.h @@ -27,7 +27,7 @@ class KReplace; class KReplaceTest : public TQObject { - Q_OBJECT + TQ_OBJECT public: KReplaceTest( const TQStringList& text, int button ) : TQObject( 0L ), m_text( text ), m_replace( 0 ), m_button( button ) {} |