1 files changed, 21 insertions, 21 deletions

diff --git a/kcontrol/componentchooser/componentchooser.cpp b/kcontrol/componentchooser/componentchooser.cpp
index e7b807327..3ad2073b1 100644
--- a/kcontrol/componentchooser/componentchooser.cpp
+++ b/kcontrol/componentchooser/componentchooser.cpp
@@ -33,11 +33,11 @@
 #include <tdelocale.h>
 #include <tdemessagebox.h>
 #include <kopenwith.h>
-#include <ksimpleconfig.h>
-#include <kstandarddirs.h>
+#include <tdesimpleconfig.h>
+#include <tdestandarddirs.h>
 #include <ktrader.h>
 #include <kurlrequester.h>
-#include <kprocess.h>
+#include <tdeprocess.h>
 
 class MyListBoxItem: public TQListBoxText
 {
@@ -53,7 +53,7 @@ public:
 CfgComponent::CfgComponent(TQWidget *parent):ComponentConfig_UI(parent),CfgPlugin(){
 	m_lookupDict.setAutoDelete(true);
 	m_revLookupDict.setAutoDelete(true);
-	connect(ComponentSelector,TQT_SIGNAL(activated(const TQString&)),this,TQT_SLOT(slotComponentChanged(const TQString&)));
+	connect(ComponentSelector,TQ_SIGNAL(activated(const TQString&)),this,TQ_SLOT(slotComponentChanged(const TQString&)));
 }
 
 CfgComponent::~CfgComponent(){}
@@ -126,9 +126,9 @@ void CfgComponent::defaults()
 CfgEmailClient::CfgEmailClient(TQWidget *parent):EmailClientConfig_UI(parent),CfgPlugin(){
 	pSettings = new KEMailSettings();
 
-	connect(kmailCB, TQT_SIGNAL(toggled(bool)), TQT_SLOT(configChanged()) );
-	connect(txtEMailClient, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(configChanged()) );
-	connect(chkRunTerminal, TQT_SIGNAL(clicked()), TQT_SLOT(configChanged()) );
+	connect(kmailCB, TQ_SIGNAL(toggled(bool)), TQ_SLOT(configChanged()) );
+	connect(txtEMailClient, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(configChanged()) );
+	connect(chkRunTerminal, TQ_SIGNAL(clicked()), TQ_SLOT(configChanged()) );
 }
 
 CfgEmailClient::~CfgEmailClient() {
@@ -203,7 +203,7 @@ void CfgEmailClient::save(TDEConfig *)
 	if (!cfgName.isEmpty())
 		::chmod(TQFile::encodeName(cfgName), 0600);
 
-	kapp->dcopClient()->emitDCOPSignal("KDE_emailSettingsChanged()", TQByteArray());
+	tdeApp->dcopClient()->emitDCOPSignal("KDE_emailSettingsChanged()", TQByteArray());
 
 	emit changed(false);
 }
@@ -252,9 +252,9 @@ void CfgFileManager::selectFileAssociations()
 //BEGIN Terminal Emulator Configuration
 
 CfgTerminalEmulator::CfgTerminalEmulator(TQWidget *parent):TerminalEmulatorConfig_UI(parent),CfgPlugin(){
-	connect(terminalLE,TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(configChanged()));
-	connect(terminalCB,TQT_SIGNAL(toggled(bool)),this,TQT_SLOT(configChanged()));
-	connect(otherCB,TQT_SIGNAL(toggled(bool)),this,TQT_SLOT(configChanged()));
+	connect(terminalLE,TQ_SIGNAL(textChanged(const TQString &)), this, TQ_SLOT(configChanged()));
+	connect(terminalCB,TQ_SIGNAL(toggled(bool)),this,TQ_SLOT(configChanged()));
+	connect(otherCB,TQ_SIGNAL(toggled(bool)),this,TQ_SLOT(configChanged()));
 }
 
 CfgTerminalEmulator::~CfgTerminalEmulator() {
@@ -298,7 +298,7 @@ void CfgTerminalEmulator::save(TDEConfig *) {
 	delete config;
 
 	KIPC::sendMessageAll(KIPC::SettingsChanged);
-	kapp->dcopClient()->send("tdelauncher", "tdelauncher","reparseConfiguration()", TQString::null);
+	tdeApp->dcopClient()->send("tdelauncher", "tdelauncher","reparseConfiguration()", TQString::null);
 
 	emit changed(false);
 }
@@ -323,9 +323,9 @@ void CfgTerminalEmulator::selectTerminalApp()
 //BEGIN Browser Configuration
 
 CfgBrowser::CfgBrowser(TQWidget *parent) : BrowserConfig_UI(parent),CfgPlugin(){
-        connect(lineExec,TQT_SIGNAL(textChanged(const TQString &)),this,TQT_SLOT(configChanged()));
-	connect(radioKIO,TQT_SIGNAL(toggled(bool)),this,TQT_SLOT(configChanged()));
-	connect(radioExec,TQT_SIGNAL(toggled(bool)),this,TQT_SLOT(configChanged()));
+        connect(lineExec,TQ_SIGNAL(textChanged(const TQString &)),this,TQ_SLOT(configChanged()));
+	connect(radioKIO,TQ_SIGNAL(toggled(bool)),this,TQ_SLOT(configChanged()));
+	connect(radioExec,TQ_SIGNAL(toggled(bool)),this,TQ_SLOT(configChanged()));
 }
 
 CfgBrowser::~CfgBrowser() {
@@ -425,13 +425,13 @@ ComponentChooser::ComponentChooser(TQWidget *parent, const char *name):
 	TQStringList services=TDEGlobal::dirs()->findAllResources( "data","kcm_componentchooser/*.desktop",false,true,dummy);
 	for (TQStringList::Iterator it=services.begin();it!=services.end();++it)
 	{
-		KSimpleConfig cfg(*it);
+		TDESimpleConfig cfg(*it);
 		ServiceChooser->insertItem(new MyListBoxItem(cfg.readEntry("Name",i18n("Unknown")),(*it)));
 
 	}
 	ServiceChooser->setFixedWidth(ServiceChooser->sizeHint().width());
 	ServiceChooser->sort();
-	connect(ServiceChooser,TQT_SIGNAL(highlighted(TQListBoxItem*)),this,TQT_SLOT(slotServiceSelected(TQListBoxItem*)));
+	connect(ServiceChooser,TQ_SIGNAL(highlighted(TQListBoxItem*)),this,TQ_SLOT(slotServiceSelected(TQListBoxItem*)));
 	ServiceChooser->setSelected(0,true);
 	slotServiceSelected(ServiceChooser->item(0));
 
@@ -443,7 +443,7 @@ void ComponentChooser::slotServiceSelected(TQListBoxItem* it) {
 	if (somethingChanged) {
 		if (KMessageBox::questionYesNo(this,i18n("<qt>You changed the default component of your choice. Do you want to save that change now?</qt>"),TQString::null,KStdGuiItem::save(),KStdGuiItem::discard())==KMessageBox::Yes) save();
 	}
-	KSimpleConfig cfg(static_cast<MyListBoxItem*>(it)->File);
+	TDESimpleConfig cfg(static_cast<MyListBoxItem*>(it)->File);
 
 	ComponentDescription->setText(cfg.readEntry("Comment",i18n("No description available")));
 	ComponentDescription->setMinimumSize(ComponentDescription->sizeHint());
@@ -504,7 +504,7 @@ void ComponentChooser::slotServiceSelected(TQListBoxItem* it) {
 		configContainer->removeWidget(configWidget);
 		delete configWidget;
 		configWidget=newConfigWidget;
-		connect(configWidget,TQT_SIGNAL(changed(bool)),this,TQT_SLOT(emitChanged(bool)));
+		connect(configWidget,TQ_SIGNAL(changed(bool)),this,TQ_SLOT(emitChanged(bool)));
 	        configContainer->setMinimumSize(configWidget->sizeHint());
 	}
 	
@@ -534,7 +534,7 @@ void ComponentChooser::load() {
 				configWidget->tqt_cast( "CfgPlugin" ) );
 		if( plugin )
 		{
-			KSimpleConfig cfg(latestEditedService);
+			TDESimpleConfig cfg(latestEditedService);
 			plugin->load( &cfg );
 		}
 	}
@@ -547,7 +547,7 @@ void ComponentChooser::save() {
 				configWidget->tqt_cast( "CfgPlugin" ) );
 		if( plugin )
 		{
-			KSimpleConfig cfg(latestEditedService);
+			TDESimpleConfig cfg(latestEditedService);
 			plugin->save( &cfg );
 		}
 	}