4 files changed, 32 insertions, 32 deletions

diff --git a/tdeioslave/media/tdecmodule/main.cpp b/tdeioslave/media/tdecmodule/main.cpp
index e2d367e7d..dabac39aa 100644
--- a/tdeioslave/media/tdecmodule/main.cpp
+++ b/tdeioslave/media/tdecmodule/main.cpp
@@ -49,13 +49,13 @@ MediaModule::MediaModule( TQWidget *parent, const char *name, const TQStringList
 	
 	m_notifierModule = new NotifierModule( this, "notifier" );
 	tab->addTab( m_notifierModule, i18n( "&Notifications" ) );
-	connect( m_notifierModule, TQT_SIGNAL( changed( bool ) ),
-	         this, TQT_SLOT( moduleChanged( bool ) ) );
+	connect( m_notifierModule, TQ_SIGNAL( changed( bool ) ),
+	         this, TQ_SLOT( moduleChanged( bool ) ) );
 
 	m_managerModule = new ManagerModule( this, "manager" );
 	tab->addTab( m_managerModule, i18n( "&Advanced" ) );
-	connect( m_managerModule, TQT_SIGNAL( changed( bool ) ),
-	         this, TQT_SLOT( moduleChanged( bool ) ) );
+	connect( m_managerModule, TQ_SIGNAL( changed( bool ) ),
+	         this, TQ_SLOT( moduleChanged( bool ) ) );
 
 
 
diff --git a/tdeioslave/media/tdecmodule/managermodule.cpp b/tdeioslave/media/tdecmodule/managermodule.cpp
index 813775cbd..03a5ea500 100644
--- a/tdeioslave/media/tdecmodule/managermodule.cpp
+++ b/tdeioslave/media/tdecmodule/managermodule.cpp
@@ -51,16 +51,16 @@ ManagerModule::ManagerModule( TQWidget* parent, const char* name )
 #endif
 	view->kcfg_CdPollingEnabled->setEnabled( false );
 
-	connect( view->option_automount, SIGNAL( stateChanged(int) ), this, SLOT( emitChanged() ) );
-	connect( view->option_ro, SIGNAL( stateChanged(int) ), this, SLOT( emitChanged() ) );
-	connect( view->option_quiet, SIGNAL( stateChanged(int) ), this, SLOT( emitChanged() ) );
-	connect( view->option_flush, SIGNAL( stateChanged(int) ), this, SLOT( emitChanged() ) );
-	connect( view->option_uid, SIGNAL( stateChanged(int) ), this, SLOT( emitChanged() ) );
-	connect( view->option_utf8, SIGNAL( stateChanged(int) ), this, SLOT( emitChanged() ) );
-	connect( view->option_sync, SIGNAL( stateChanged(int) ), this, SLOT( emitChanged() ) );
-	connect( view->option_atime, SIGNAL( stateChanged(int) ), this, SLOT( emitChanged() ) );
-	connect( view->option_shortname, SIGNAL( activated(int) ), this, SLOT( emitChanged() ) );
-	connect( view->option_journaling, SIGNAL( activated(int) ), this, SLOT( emitChanged() ) );	
+	connect( view->option_automount, TQ_SIGNAL( stateChanged(int) ), this, TQ_SLOT( emitChanged() ) );
+	connect( view->option_ro, TQ_SIGNAL( stateChanged(int) ), this, TQ_SLOT( emitChanged() ) );
+	connect( view->option_quiet, TQ_SIGNAL( stateChanged(int) ), this, TQ_SLOT( emitChanged() ) );
+	connect( view->option_flush, TQ_SIGNAL( stateChanged(int) ), this, TQ_SLOT( emitChanged() ) );
+	connect( view->option_uid, TQ_SIGNAL( stateChanged(int) ), this, TQ_SLOT( emitChanged() ) );
+	connect( view->option_utf8, TQ_SIGNAL( stateChanged(int) ), this, TQ_SLOT( emitChanged() ) );
+	connect( view->option_sync, TQ_SIGNAL( stateChanged(int) ), this, TQ_SLOT( emitChanged() ) );
+	connect( view->option_atime, TQ_SIGNAL( stateChanged(int) ), this, TQ_SLOT( emitChanged() ) );
+	connect( view->option_shortname, TQ_SIGNAL( activated(int) ), this, TQ_SLOT( emitChanged() ) );
+	connect( view->option_journaling, TQ_SIGNAL( activated(int) ), this, TQ_SLOT( emitChanged() ) );	
 
 	load();
 }	
@@ -91,7 +91,7 @@ void ManagerModule::load()
 	else
 	    view->option_atime->setNoChange();
 	
-	QString value;	
+	TQString value;	
 	
 	value = config.readEntry("shortname", "lower").lower();
 	for (int i = 0; i < view->option_shortname->count(); i++)
diff --git a/tdeioslave/media/tdecmodule/notifiermodule.cpp b/tdeioslave/media/tdecmodule/notifiermodule.cpp
index 4364d93ad..edce1789d 100644
--- a/tdeioslave/media/tdecmodule/notifiermodule.cpp
+++ b/tdeioslave/media/tdecmodule/notifiermodule.cpp
@@ -57,18 +57,18 @@ NotifierModule::NotifierModule(TQWidget *parent, const char *name)
 	
 	updateListBox();
 
-	connect( m_view->mimetypesCombo, TQT_SIGNAL( activated(int) ),
-	         this, TQT_SLOT( slotMimeTypeChanged(int) ) );
-	connect( m_view->actionsList, TQT_SIGNAL( selectionChanged(TQListBoxItem*) ),
-	         this, TQT_SLOT( slotActionSelected(TQListBoxItem*) ) );
-	connect( m_view->addButton, TQT_SIGNAL( clicked() ),
-	         this, TQT_SLOT( slotAdd() ) );
-	connect( m_view->editButton, TQT_SIGNAL( clicked() ),
-	         this, TQT_SLOT( slotEdit() ) );
-	connect( m_view->deleteButton, TQT_SIGNAL( clicked() ),
-	         this, TQT_SLOT( slotDelete() ) );
-	connect( m_view->toggleAutoButton, TQT_SIGNAL( clicked() ),
-	         this, TQT_SLOT( slotToggleAuto() ) );
+	connect( m_view->mimetypesCombo, TQ_SIGNAL( activated(int) ),
+	         this, TQ_SLOT( slotMimeTypeChanged(int) ) );
+	connect( m_view->actionsList, TQ_SIGNAL( selectionChanged(TQListBoxItem*) ),
+	         this, TQ_SLOT( slotActionSelected(TQListBoxItem*) ) );
+	connect( m_view->addButton, TQ_SIGNAL( clicked() ),
+	         this, TQ_SLOT( slotAdd() ) );
+	connect( m_view->editButton, TQ_SIGNAL( clicked() ),
+	         this, TQ_SLOT( slotEdit() ) );
+	connect( m_view->deleteButton, TQ_SIGNAL( clicked() ),
+	         this, TQ_SLOT( slotDelete() ) );
+	connect( m_view->toggleAutoButton, TQ_SIGNAL( clicked() ),
+	         this, TQ_SLOT( slotToggleAuto() ) );
 }
 
 NotifierModule::~NotifierModule()
@@ -129,7 +129,7 @@ void NotifierModule::slotActionSelected(TQListBoxItem *item)
 	bool isWritable = action!=0L && action->isWritable();
 	m_view->deleteButton->setEnabled( isWritable );
 	m_view->editButton->setEnabled( isWritable );
-	m_view->addButton->setEnabled( TRUE );
+	m_view->addButton->setEnabled( true );
 	m_view->toggleAutoButton->setEnabled( action!=0L && !m_mimetype.isEmpty() );
 }
 
diff --git a/tdeioslave/media/tdecmodule/serviceconfigdialog.cpp b/tdeioslave/media/tdecmodule/serviceconfigdialog.cpp
index 4147e437c..bcf533b9d 100644
--- a/tdeioslave/media/tdecmodule/serviceconfigdialog.cpp
+++ b/tdeioslave/media/tdecmodule/serviceconfigdialog.cpp
@@ -78,10 +78,10 @@ ServiceConfigDialog::ServiceConfigDialog(NotifierServiceAction *action,
 	setMainWidget(m_view);
 	setCaption( m_action->label() );
 
-	connect( m_view->iconButton, TQT_SIGNAL( iconChanged(TQString) ),
-	         this, TQT_SLOT( slotIconChanged() ) );
-	connect( m_view->commandButton, TQT_SIGNAL( clicked() ),
-	         this, TQT_SLOT( slotCommand() ) );
+	connect( m_view->iconButton, TQ_SIGNAL( iconChanged(TQString) ),
+	         this, TQ_SLOT( slotIconChanged() ) );
+	connect( m_view->commandButton, TQ_SIGNAL( clicked() ),
+	         this, TQ_SLOT( slotCommand() ) );
 }
 
 bool operator==( KDEDesktopMimeType::Service s1, KDEDesktopMimeType::Service s2 )