summaryrefslogtreecommitdiffstats
path: root/tdeioslave/media/tdecmodule
diff options
context:
space:
mode:
Diffstat (limited to 'tdeioslave/media/tdecmodule')
-rw-r--r--tdeioslave/media/tdecmodule/main.cpp8
-rw-r--r--tdeioslave/media/tdecmodule/main.h2
-rw-r--r--tdeioslave/media/tdecmodule/managermodule.cpp40
-rw-r--r--tdeioslave/media/tdecmodule/managermodule.h2
-rw-r--r--tdeioslave/media/tdecmodule/managermoduleview.ui20
-rw-r--r--tdeioslave/media/tdecmodule/notifiermodule.cpp24
-rw-r--r--tdeioslave/media/tdecmodule/notifiermodule.h2
-rw-r--r--tdeioslave/media/tdecmodule/serviceconfigdialog.cpp8
-rw-r--r--tdeioslave/media/tdecmodule/serviceconfigdialog.h2
9 files changed, 40 insertions, 68 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/main.h b/tdeioslave/media/tdecmodule/main.h
index 5052d58eb..29d9eb21f 100644
--- a/tdeioslave/media/tdecmodule/main.h
+++ b/tdeioslave/media/tdecmodule/main.h
@@ -24,7 +24,7 @@
class MediaModule : public TDECModule
{
- Q_OBJECT
+ TQ_OBJECT
public:
MediaModule( TQWidget *parent, const char *name, const TQStringList& );
diff --git a/tdeioslave/media/tdecmodule/managermodule.cpp b/tdeioslave/media/tdecmodule/managermodule.cpp
index 6478ee2a8..03a5ea500 100644
--- a/tdeioslave/media/tdecmodule/managermodule.cpp
+++ b/tdeioslave/media/tdecmodule/managermodule.cpp
@@ -44,13 +44,6 @@ ManagerModule::ManagerModule( TQWidget* parent, const char* name )
addConfig( MediaManagerSettings::self(), view );
-#ifndef COMPILE_HALBACKEND
- TQString hal_text = view->kcfg_HalBackendEnabled->text();
- hal_text += " ("+i18n("No support for HAL on this system")+")";
- view->kcfg_HalBackendEnabled->setText( hal_text );
-#endif
- view->kcfg_HalBackendEnabled->setEnabled( false );
-
#ifndef COMPILE_LINUXCDPOLLING
TQString poll_text = view->kcfg_CdPollingEnabled->text();
poll_text += " ("+i18n("No support for CD polling on this system")+")";
@@ -58,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();
}
@@ -98,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++)
@@ -140,13 +133,12 @@ void ManagerModule::save()
rememberSettings();
- //Well... reloadBackends is buggy with HAL, it seems to be linked
- //to a bug in the unmaintained Qt3 DBUS binding ;-/
- //DCOPRef mediamanager( "kded", "mediamanager" );
- //DCOPReply reply = mediamanager.call( "reloadBackends" );
-
- // So we use this hack instead...
DCOPRef kded( "kded", "kded" );
+ // DCOPReply reply = mediamanager.call( "reloadBackends" );
+ // Well... reloadBackends had issues with HAL, it seems it was linked
+ // to a bug in the unmaintained Qt3 DBUS binding, but it is not quite clear.
+ // It may be ok now that HAL is no longer supported but needs to be tested.
+ // So we use this hack instead...
kded.call( "unloadModule", "mediamanager" );
kded.call( "loadModule", "mediamanager" );
diff --git a/tdeioslave/media/tdecmodule/managermodule.h b/tdeioslave/media/tdecmodule/managermodule.h
index a0a384675..ae79e8d78 100644
--- a/tdeioslave/media/tdecmodule/managermodule.h
+++ b/tdeioslave/media/tdecmodule/managermodule.h
@@ -27,7 +27,7 @@ class ManagerModuleView;
class ManagerModule : public TDECModule
{
- Q_OBJECT
+ TQ_OBJECT
public:
ManagerModule( TQWidget* parent = 0, const char* name = 0);
diff --git a/tdeioslave/media/tdecmodule/managermoduleview.ui b/tdeioslave/media/tdecmodule/managermoduleview.ui
index 6b477317b..748cd825c 100644
--- a/tdeioslave/media/tdecmodule/managermoduleview.ui
+++ b/tdeioslave/media/tdecmodule/managermoduleview.ui
@@ -21,17 +21,6 @@
</property>
<widget class="TQCheckBox">
<property name="name">
- <cstring>kcfg_HalBackendEnabled</cstring>
- </property>
- <property name="text">
- <string>Enable HAL backend</string>
- </property>
- <property name="whatsThis" stdset="0">
- <string>Select this if you want to enable the Hardware Abstraction Layer (http://hal.freedesktop.org/wiki/Software/hal) support.</string>
- </property>
- </widget>
- <widget class="TQCheckBox">
- <property name="name">
<cstring>kcfg_CdPollingEnabled</cstring>
</property>
<property name="text">
@@ -348,16 +337,7 @@ Display the short name as is; store a long name when the short name is not all u
</spacer>
</vbox>
</widget>
-<connections>
- <connection>
- <sender>kcfg_HalBackendEnabled</sender>
- <signal>toggled(bool)</signal>
- <receiver>groupbox_mount</receiver>
- <slot>setEnabled(bool)</slot>
- </connection>
-</connections>
<tabstops>
- <tabstop>kcfg_HalBackendEnabled</tabstop>
<tabstop>kcfg_CdPollingEnabled</tabstop>
<tabstop>kcfg_AutostartEnabled</tabstop>
<tabstop>kcfg_NotificationPopupsEnabled</tabstop>
diff --git a/tdeioslave/media/tdecmodule/notifiermodule.cpp b/tdeioslave/media/tdecmodule/notifiermodule.cpp
index 4364d93ad..2d2d53481 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()
diff --git a/tdeioslave/media/tdecmodule/notifiermodule.h b/tdeioslave/media/tdecmodule/notifiermodule.h
index d5d97a96d..2192c30a9 100644
--- a/tdeioslave/media/tdecmodule/notifiermodule.h
+++ b/tdeioslave/media/tdecmodule/notifiermodule.h
@@ -28,7 +28,7 @@
class NotifierModule : public TDECModule
{
- Q_OBJECT
+ TQ_OBJECT
public:
NotifierModule( TQWidget* parent = 0, const char* name = 0);
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 )
diff --git a/tdeioslave/media/tdecmodule/serviceconfigdialog.h b/tdeioslave/media/tdecmodule/serviceconfigdialog.h
index 24e907205..2f35bfb54 100644
--- a/tdeioslave/media/tdecmodule/serviceconfigdialog.h
+++ b/tdeioslave/media/tdecmodule/serviceconfigdialog.h
@@ -27,7 +27,7 @@
class ServiceConfigDialog : public KDialogBase
{
- Q_OBJECT
+ TQ_OBJECT
public:
ServiceConfigDialog(NotifierServiceAction *action,
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-27 17:12:39 +0000