summaryrefslogtreecommitdiffstats
path: root/tdeutils
diff options
context:
space:
mode:
Diffstat (limited to 'tdeutils')
-rw-r--r--tdeutils/kcmultidialog.cpp14
-rw-r--r--tdeutils/kfind.cpp4
-rw-r--r--tdeutils/kfind.h8
-rw-r--r--tdeutils/kfinddialog.cpp14
-rw-r--r--tdeutils/kfinddialog.h2
-rw-r--r--tdeutils/kpluginselector.cpp32
-rw-r--r--tdeutils/kreplace.cpp8
-rw-r--r--tdeutils/kreplace.h12
-rw-r--r--tdeutils/ksettings/README.dox2
-rw-r--r--tdeutils/ksettings/componentsdialog.cpp16
-rw-r--r--tdeutils/ksettings/dialog.cpp28
-rw-r--r--tdeutils/ksettings/dialog.h2
-rw-r--r--tdeutils/ksettings/dispatcher.cpp2
-rw-r--r--tdeutils/ksettings/dispatcher.h4
-rw-r--r--tdeutils/ksettings/pluginpage.cpp8
-rw-r--r--tdeutils/tdecmodulecontainer.cpp14
-rw-r--r--tdeutils/tdecmoduleproxy.cpp18
-rw-r--r--tdeutils/tdecmoduleproxyIfaceImpl.cpp8
-rw-r--r--tdeutils/tdemultitabbar.cpp4
-rw-r--r--tdeutils/tests/kfindtest.cpp8
-rw-r--r--tdeutils/tests/kreplacetest.cpp12
21 files changed, 110 insertions, 110 deletions
diff --git a/tdeutils/kcmultidialog.cpp b/tdeutils/kcmultidialog.cpp
index 73f6c471c..3d4fd5556 100644
--- a/tdeutils/kcmultidialog.cpp
+++ b/tdeutils/kcmultidialog.cpp
@@ -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 );
@@ -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 );
@@ -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/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 11ce20d83..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
diff --git a/tdeutils/kfinddialog.cpp b/tdeutils/kfinddialog.cpp
index 9162d0ffc..529043a16 100644
--- a/tdeutils/kfinddialog.cpp
+++ b/tdeutils/kfinddialog.cpp
@@ -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);
@@ -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 0494f7861..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.
diff --git a/tdeutils/kpluginselector.cpp b/tdeutils/kpluginselector.cpp
index fe7bda75a..af771bd8f 100644
--- a/tdeutils/kpluginselector.cpp
+++ b/tdeutils/kpluginselector.cpp
@@ -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 );
@@ -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;
}
@@ -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 * ) ) );
}
}
}
@@ -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;
}
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 2ecbd3990..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,
diff --git a/tdeutils/ksettings/README.dox b/tdeutils/ksettings/README.dox
index faedcd2d3..83a71767e 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:
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/dialog.cpp b/tdeutils/ksettings/dialog.cpp
index 83af48fcb..609d8cb16 100644
--- a/tdeutils/ksettings/dialog.cpp
+++ b/tdeutils/ksettings/dialog.cpp
@@ -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 7f87b861b..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
diff --git a/tdeutils/ksettings/dispatcher.cpp b/tdeutils/ksettings/dispatcher.cpp
index 6d87e4cde..5cd5a4208 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 )
diff --git a/tdeutils/ksettings/dispatcher.h b/tdeutils/ksettings/dispatcher.h
index aa3b50c41..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>
@@ -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/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/tdecmoduleproxy.cpp b/tdeutils/tdecmoduleproxy.cpp
index c2c2ca372..b79e774cd 100644
--- a/tdeutils/tdecmoduleproxy.cpp
+++ b/tdeutils/tdecmoduleproxy.cpp
@@ -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;
@@ -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 ))
{
diff --git a/tdeutils/tdecmoduleproxyIfaceImpl.cpp b/tdeutils/tdecmoduleproxyIfaceImpl.cpp
index 5b1bcc339..6e6f1b286 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()
diff --git a/tdeutils/tdemultitabbar.cpp b/tdeutils/tdemultitabbar.cpp
index 2661893d6..6ffb8e00a 100644
--- a/tdeutils/tdemultitabbar.cpp
+++ b/tdeutils/tdemultitabbar.cpp
@@ -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() {
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/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 )