summaryrefslogtreecommitdiffstats
path: root/tdeioslave/media
diff options
context:
space:
mode:
Diffstat (limited to 'tdeioslave/media')
-rw-r--r--tdeioslave/media/mediaimpl.cpp16
-rw-r--r--tdeioslave/media/mediamanager/dialog.cpp2
-rw-r--r--tdeioslave/media/mediamanager/fstabbackend.cpp8
-rw-r--r--tdeioslave/media/mediamanager/linuxcdpolling.cpp14
-rw-r--r--tdeioslave/media/mediamanager/mediamanager.cpp14
-rw-r--r--tdeioslave/media/mediamanager/removablebackend.cpp4
-rw-r--r--tdeioslave/media/mediamanager/tdehardwarebackend.cpp10
-rw-r--r--tdeioslave/media/medianotifier/medianotifier.cpp12
-rw-r--r--tdeioslave/media/medianotifier/notificationdialog.cpp22
-rw-r--r--tdeioslave/media/mounthelper/dialog.cpp2
-rw-r--r--tdeioslave/media/mounthelper/tdeio_media_mounthelper.cpp6
-rw-r--r--tdeioslave/media/propsdlgplugin/propertiespage.cpp28
-rw-r--r--tdeioslave/media/propsdlgplugin/propsdlgshareplugin.cpp6
-rw-r--r--tdeioslave/media/tdecmodule/main.cpp8
-rw-r--r--tdeioslave/media/tdecmodule/managermodule.cpp20
-rw-r--r--tdeioslave/media/tdecmodule/notifiermodule.cpp24
-rw-r--r--tdeioslave/media/tdecmodule/serviceconfigdialog.cpp8
-rw-r--r--tdeioslave/media/tdeio_media.cpp4
18 files changed, 104 insertions, 104 deletions
diff --git a/tdeioslave/media/mediaimpl.cpp b/tdeioslave/media/mediaimpl.cpp
index aacbcc5e2..510437072 100644
--- a/tdeioslave/media/mediaimpl.cpp
+++ b/tdeioslave/media/mediaimpl.cpp
@@ -242,10 +242,10 @@ bool MediaImpl::ensureMediumMounted(Medium &medium)
medium.deviceNode(),
medium.mountPoint());
job->setAutoWarningHandlingEnabled(false);
- connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ),
- this, TQT_SLOT( slotMountResult( TDEIO::Job * ) ) );
- connect( job, TQT_SIGNAL( warning( TDEIO::Job *, const TQString & ) ),
- this, TQT_SLOT( slotWarning( TDEIO::Job *, const TQString & ) ) );
+ connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ),
+ this, TQ_SLOT( slotMountResult( TDEIO::Job * ) ) );
+ connect( job, TQ_SIGNAL( warning( TDEIO::Job *, const TQString & ) ),
+ this, TQ_SLOT( slotWarning( TDEIO::Job *, const TQString & ) ) );
*/
kapp->dcopClient()
->connectDCOPSignal("kded", "mediamanager",
@@ -365,10 +365,10 @@ TDEIO::UDSEntry MediaImpl::extractUrlInfos(const KURL &url)
TDEIO::StatJob *job = TDEIO::stat(url, false);
job->setAutoWarningHandlingEnabled( false );
- connect( job, TQT_SIGNAL( result(TDEIO::Job *) ),
- this, TQT_SLOT( slotStatResult(TDEIO::Job *) ) );
- connect( job, TQT_SIGNAL( warning( TDEIO::Job *, const TQString & ) ),
- this, TQT_SLOT( slotWarning( TDEIO::Job *, const TQString & ) ) );
+ connect( job, TQ_SIGNAL( result(TDEIO::Job *) ),
+ this, TQ_SLOT( slotStatResult(TDEIO::Job *) ) );
+ connect( job, TQ_SIGNAL( warning( TDEIO::Job *, const TQString & ) ),
+ this, TQ_SLOT( slotWarning( TDEIO::Job *, const TQString & ) ) );
tqApp->eventLoop()->enterLoop();
TDEIO::UDSEntry::iterator it = m_entryBuffer.begin();
diff --git a/tdeioslave/media/mediamanager/dialog.cpp b/tdeioslave/media/mediamanager/dialog.cpp
index b2e9ff5f5..ddfd041a0 100644
--- a/tdeioslave/media/mediamanager/dialog.cpp
+++ b/tdeioslave/media/mediamanager/dialog.cpp
@@ -37,7 +37,7 @@ Dialog::Dialog(TQString url, TQString iconName) :
TQPixmap pixmap = TDEGlobal::iconLoader()->loadIcon(iconName, TDEIcon::NoGroup, TDEIcon::SizeLarge);
unlockDialog->encryptedIcon->setPixmap( pixmap );
- connect(unlockDialog->passwordEdit, TQT_SIGNAL (textChanged(const TQString &)), this, TQT_SLOT (slotPasswordChanged(const TQString &)));
+ connect(unlockDialog->passwordEdit, TQ_SIGNAL (textChanged(const TQString &)), this, TQ_SLOT (slotPasswordChanged(const TQString &)));
setMainWidget(unlockDialog);
}
diff --git a/tdeioslave/media/mediamanager/fstabbackend.cpp b/tdeioslave/media/mediamanager/fstabbackend.cpp
index 6549723fe..2bd528c19 100644
--- a/tdeioslave/media/mediamanager/fstabbackend.cpp
+++ b/tdeioslave/media/mediamanager/fstabbackend.cpp
@@ -61,8 +61,8 @@ FstabBackend::FstabBackend(MediaList &list, bool networkSharesOnly)
KDirWatch::self()->addFile(MTAB);
KDirWatch::self()->addFile(FSTAB);
- connect( KDirWatch::self(), TQT_SIGNAL( dirty(const TQString&) ),
- this, TQT_SLOT( slotDirty(const TQString&) ) );
+ connect( KDirWatch::self(), TQ_SIGNAL( dirty(const TQString&) ),
+ this, TQ_SLOT( slotDirty(const TQString&) ) );
handleFstabChange(false);
handleMtabChange(false);
@@ -70,8 +70,8 @@ FstabBackend::FstabBackend(MediaList &list, bool networkSharesOnly)
KDirWatch::self()->startScan();
#if defined(Q_OS_FREEBSD) || defined(Q_OS_NETBSD)
- connect( &m_mtabTimer, TQT_SIGNAL( timeout() ),
- this, TQT_SLOT( handleMtabChange() ) );
+ connect( &m_mtabTimer, TQ_SIGNAL( timeout() ),
+ this, TQ_SLOT( handleMtabChange() ) );
m_mtabTimer.start(250);
#endif
}
diff --git a/tdeioslave/media/mediamanager/linuxcdpolling.cpp b/tdeioslave/media/mediamanager/linuxcdpolling.cpp
index 9a5a0a223..66074f40e 100644
--- a/tdeioslave/media/mediamanager/linuxcdpolling.cpp
+++ b/tdeioslave/media/mediamanager/linuxcdpolling.cpp
@@ -176,19 +176,19 @@ private:
LinuxCDPolling::LinuxCDPolling(MediaList &list)
: TQObject(), BackendBase(list)
{
- connect(&m_mediaList, TQT_SIGNAL(mediumAdded(const TQString &,
+ connect(&m_mediaList, TQ_SIGNAL(mediumAdded(const TQString &,
const TQString &, bool)),
- this, TQT_SLOT(slotMediumAdded(const TQString &)) );
+ this, TQ_SLOT(slotMediumAdded(const TQString &)) );
- connect(&m_mediaList, TQT_SIGNAL(mediumRemoved(const TQString &,
+ connect(&m_mediaList, TQ_SIGNAL(mediumRemoved(const TQString &,
const TQString &, bool)),
- this, TQT_SLOT(slotMediumRemoved(const TQString &)) );
+ this, TQ_SLOT(slotMediumRemoved(const TQString &)) );
- connect(&m_mediaList, TQT_SIGNAL(mediumStateChanged(const TQString &,
+ connect(&m_mediaList, TQ_SIGNAL(mediumStateChanged(const TQString &,
const TQString &, bool, bool)),
- this, TQT_SLOT(slotMediumStateChanged(const TQString &)) );
+ this, TQ_SLOT(slotMediumStateChanged(const TQString &)) );
- connect(&m_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotTimeout()));
+ connect(&m_timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotTimeout()));
}
LinuxCDPolling::~LinuxCDPolling()
diff --git a/tdeioslave/media/mediamanager/mediamanager.cpp b/tdeioslave/media/mediamanager/mediamanager.cpp
index f8c2a574b..66c456a24 100644
--- a/tdeioslave/media/mediamanager/mediamanager.cpp
+++ b/tdeioslave/media/mediamanager/mediamanager.cpp
@@ -43,15 +43,15 @@
MediaManager::MediaManager(const TQCString &obj)
: KDEDModule(obj), m_dirNotify(m_mediaList)
{
- connect( &m_mediaList, TQT_SIGNAL(mediumAdded(const TQString&, const TQString&, bool)),
- TQT_SLOT(slotMediumAdded(const TQString&, const TQString&, bool)) );
- connect( &m_mediaList, TQT_SIGNAL(mediumRemoved(const TQString&, const TQString&, bool)),
- TQT_SLOT(slotMediumRemoved(const TQString&, const TQString&, bool)) );
+ connect( &m_mediaList, TQ_SIGNAL(mediumAdded(const TQString&, const TQString&, bool)),
+ TQ_SLOT(slotMediumAdded(const TQString&, const TQString&, bool)) );
+ connect( &m_mediaList, TQ_SIGNAL(mediumRemoved(const TQString&, const TQString&, bool)),
+ TQ_SLOT(slotMediumRemoved(const TQString&, const TQString&, bool)) );
connect( &m_mediaList,
- TQT_SIGNAL(mediumStateChanged(const TQString&, const TQString&, bool, bool)),
- TQT_SLOT(slotMediumChanged(const TQString&, const TQString&, bool, bool)) );
+ TQ_SIGNAL(mediumStateChanged(const TQString&, const TQString&, bool, bool)),
+ TQ_SLOT(slotMediumChanged(const TQString&, const TQString&, bool, bool)) );
- TQTimer::singleShot( 10, this, TQT_SLOT( loadBackends() ) );
+ TQTimer::singleShot( 10, this, TQ_SLOT( loadBackends() ) );
}
MediaManager::~MediaManager()
diff --git a/tdeioslave/media/mediamanager/removablebackend.cpp b/tdeioslave/media/mediamanager/removablebackend.cpp
index dacb9b704..a9207cd92 100644
--- a/tdeioslave/media/mediamanager/removablebackend.cpp
+++ b/tdeioslave/media/mediamanager/removablebackend.cpp
@@ -37,8 +37,8 @@ RemovableBackend::RemovableBackend(MediaList &list)
{
KDirWatch::self()->addFile(MTAB);
- connect( KDirWatch::self(), TQT_SIGNAL( dirty(const TQString&) ),
- this, TQT_SLOT( slotDirty(const TQString&) ) );
+ connect( KDirWatch::self(), TQ_SIGNAL( dirty(const TQString&) ),
+ this, TQ_SLOT( slotDirty(const TQString&) ) );
KDirWatch::self()->startScan();
}
diff --git a/tdeioslave/media/mediamanager/tdehardwarebackend.cpp b/tdeioslave/media/mediamanager/tdehardwarebackend.cpp
index b12aa6ea9..3a38f5abb 100644
--- a/tdeioslave/media/mediamanager/tdehardwarebackend.cpp
+++ b/tdeioslave/media/mediamanager/tdehardwarebackend.cpp
@@ -55,9 +55,9 @@ TDEBackend::TDEBackend(MediaList &list, TQObject* parent)
TDEHardwareDevices *hwdevices = TDEGlobal::hardwareDevices();
// Connect device monitoring signals/slots
- connect(hwdevices, TQT_SIGNAL(hardwareAdded(TDEGenericDevice*)), this, TQT_SLOT(AddDeviceHandler(TDEGenericDevice*)));
- connect(hwdevices, TQT_SIGNAL(hardwareRemoved(TDEGenericDevice*)), this, TQT_SLOT(RemoveDeviceHandler(TDEGenericDevice*)));
- connect(hwdevices, TQT_SIGNAL(hardwareUpdated(TDEGenericDevice*)), this, TQT_SLOT(ModifyDeviceHandler(TDEGenericDevice*)));
+ connect(hwdevices, TQ_SIGNAL(hardwareAdded(TDEGenericDevice*)), this, TQ_SLOT(AddDeviceHandler(TDEGenericDevice*)));
+ connect(hwdevices, TQ_SIGNAL(hardwareRemoved(TDEGenericDevice*)), this, TQ_SLOT(RemoveDeviceHandler(TDEGenericDevice*)));
+ connect(hwdevices, TQ_SIGNAL(hardwareUpdated(TDEGenericDevice*)), this, TQ_SLOT(ModifyDeviceHandler(TDEGenericDevice*)));
// List devices at startup
ListDevices();
@@ -1235,7 +1235,7 @@ TQStringVariantMap TDEBackend::mount(const Medium *medium)
data.medium = medium;
TDEIO::Job *job = TDEIO::mount(false, 0, medium->deviceNode(), mountPoint);
- connect(job, TQT_SIGNAL(result(TDEIO::Job*)), TQT_SLOT(slotResult(TDEIO::Job*)));
+ connect(job, TQ_SIGNAL(result(TDEIO::Job*)), TQ_SLOT(slotResult(TDEIO::Job*)));
mount_jobs[job] = &data;
// The caller expects the device to be mounted when the function
// completes. Thus block until the job completes.
@@ -1346,7 +1346,7 @@ TQStringVariantMap TDEBackend::unmount(const TQString &id)
data.medium = medium;
TDEIO::Job *job = TDEIO::unmount( medium->mountPoint(), false );
- connect(job, TQT_SIGNAL(result(TDEIO::Job*)), TQT_SLOT(slotResult(TDEIO::Job*)));
+ connect(job, TQ_SIGNAL(result(TDEIO::Job*)), TQ_SLOT(slotResult(TDEIO::Job*)));
mount_jobs[job] = &data;
// The caller expects the device to be unmounted when the function
// completes. Thus block until the job completes.
diff --git a/tdeioslave/media/medianotifier/medianotifier.cpp b/tdeioslave/media/medianotifier/medianotifier.cpp
index 1e75b2501..2510019f2 100644
--- a/tdeioslave/media/medianotifier/medianotifier.cpp
+++ b/tdeioslave/media/medianotifier/medianotifier.cpp
@@ -69,7 +69,7 @@ MediaNotifier::MediaNotifier(const TQCString &name) : KDEDModule(name)
m_notificationDialogList.setAutoDelete(FALSE);
m_freeTimer = new TQTimer( this );
- connect( m_freeTimer, TQT_SIGNAL( timeout() ), TQT_SLOT( checkFreeDiskSpace() ) );
+ connect( m_freeTimer, TQ_SIGNAL( timeout() ), TQ_SLOT( checkFreeDiskSpace() ) );
m_freeTimer->start( 1000*6*2 /* 20 minutes */ );
m_freeDialog = 0;
}
@@ -123,8 +123,8 @@ void MediaNotifier::onMediumChange( const TQString &name, bool allowNotification
m_allowNotificationMap[job] = allowNotification;
- connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ),
- this, TQT_SLOT( slotStatResult( TDEIO::Job * ) ) );
+ connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ),
+ this, TQ_SLOT( slotStatResult( TDEIO::Job * ) ) );
}
void MediaNotifier::slotStatResult( TDEIO::Job *job )
@@ -347,7 +347,7 @@ void MediaNotifier::notify( KFileItem &medium )
if ( actions.size()>1 )
{
NotificationDialog* notifier = new NotificationDialog( medium, settings );
- connect(notifier, TQT_SIGNAL(destroyed(TQObject*)), this, TQT_SLOT(notificationDialogDestroyed(TQObject*)));
+ connect(notifier, TQ_SIGNAL(destroyed(TQObject*)), this, TQ_SLOT(notificationDialogDestroyed(TQObject*)));
m_notificationDialogList.append(notifier);
notifier->show();
}
@@ -407,8 +407,8 @@ void MediaNotifier::checkFreeDiskSpace()
i18n("Do not ask again"),
&checkboxResult, KMessageBox::Notify | KMessageBox::NoExec);
m_freeDialog->show();
- connect( m_freeDialog, TQT_SIGNAL( yesClicked() ), TQT_SLOT( slotFreeContinue() ) );
- connect( m_freeDialog, TQT_SIGNAL( noClicked() ), TQT_SLOT( slotFreeCancel() ) );
+ connect( m_freeDialog, TQ_SIGNAL( yesClicked() ), TQ_SLOT( slotFreeContinue() ) );
+ connect( m_freeDialog, TQ_SIGNAL( noClicked() ), TQ_SLOT( slotFreeCancel() ) );
}
}
}
diff --git a/tdeioslave/media/medianotifier/notificationdialog.cpp b/tdeioslave/media/medianotifier/notificationdialog.cpp
index fc6d87647..a8bb81ea5 100644
--- a/tdeioslave/media/medianotifier/notificationdialog.cpp
+++ b/tdeioslave/media/medianotifier/notificationdialog.cpp
@@ -71,17 +71,17 @@ NotificationDialog::NotificationDialog( KFileItem medium, NotifierSettings *sett
setButtonText( User1, i18n("Configure...") );
- connect( m_actionWatcher, TQT_SIGNAL( dirty( const TQString & ) ),
- this, TQT_SLOT( slotActionsChanged( const TQString & ) ) );
- connect( this , TQT_SIGNAL( okClicked() ),
- this, TQT_SLOT( slotOk() ) );
- connect( this, TQT_SIGNAL( user1Clicked() ),
- this, TQT_SLOT( slotConfigure() ) );
- connect( m_view->actionsList, TQT_SIGNAL( doubleClicked ( TQListBoxItem*, const TQPoint & ) ),
- this, TQT_SLOT( slotOk() ) );
-
- connect( this, TQT_SIGNAL( finished() ),
- this, TQT_SLOT( delayedDestruct() ) );
+ connect( m_actionWatcher, TQ_SIGNAL( dirty( const TQString & ) ),
+ this, TQ_SLOT( slotActionsChanged( const TQString & ) ) );
+ connect( this , TQ_SIGNAL( okClicked() ),
+ this, TQ_SLOT( slotOk() ) );
+ connect( this, TQ_SIGNAL( user1Clicked() ),
+ this, TQ_SLOT( slotConfigure() ) );
+ connect( m_view->actionsList, TQ_SIGNAL( doubleClicked ( TQListBoxItem*, const TQPoint & ) ),
+ this, TQ_SLOT( slotOk() ) );
+
+ connect( this, TQ_SIGNAL( finished() ),
+ this, TQ_SLOT( delayedDestruct() ) );
m_actionWatcher->startScan();
TQPushButton * btn = actionButton( Ok );
diff --git a/tdeioslave/media/mounthelper/dialog.cpp b/tdeioslave/media/mounthelper/dialog.cpp
index d16c6d974..a257ca6d8 100644
--- a/tdeioslave/media/mounthelper/dialog.cpp
+++ b/tdeioslave/media/mounthelper/dialog.cpp
@@ -36,7 +36,7 @@ Dialog::Dialog(TQString url, TQString iconName) :
TQPixmap pixmap = TDEGlobal::iconLoader()->loadIcon(iconName, TDEIcon::NoGroup, TDEIcon::SizeLarge);
unlockDialog->encryptedIcon->setPixmap( pixmap );
- connect(unlockDialog->passwordEdit, TQT_SIGNAL (textChanged(const TQString &)), this, TQT_SLOT (slotPasswordChanged(const TQString &)));
+ connect(unlockDialog->passwordEdit, TQ_SIGNAL (textChanged(const TQString &)), this, TQ_SLOT (slotPasswordChanged(const TQString &)));
setMainWidget(unlockDialog);
}
diff --git a/tdeioslave/media/mounthelper/tdeio_media_mounthelper.cpp b/tdeioslave/media/mounthelper/tdeio_media_mounthelper.cpp
index 457c2cc55..90f3caa3f 100644
--- a/tdeioslave/media/mounthelper/tdeio_media_mounthelper.cpp
+++ b/tdeioslave/media/mounthelper/tdeio_media_mounthelper.cpp
@@ -102,8 +102,8 @@ void MountHelper::unlock(const Medium &medium)
}
m_mediumId = medium.id();
m_dialog = new Dialog(device, iconName);
- connect(m_dialog, TQT_SIGNAL(user1Clicked()), this, TQT_SLOT(slotSendPassword()));
- connect(m_dialog, TQT_SIGNAL(cancelClicked()), this, TQT_SLOT(slotCancel()));
+ connect(m_dialog, TQ_SIGNAL(user1Clicked()), this, TQ_SLOT(slotSendPassword()));
+ connect(m_dialog, TQ_SIGNAL(cancelClicked()), this, TQ_SLOT(slotCancel()));
m_dialog->show();
}
@@ -146,7 +146,7 @@ void MountHelper::eject(const Medium &medium)
TDEProcess *proc = new TDEProcess(this);
*proc << "tdeeject";
*proc << medium.deviceNode();
- connect(proc, TQT_SIGNAL(processExited(TDEProcess*)), this, TQT_SLOT(ejectFinished(TDEProcess*)));
+ connect(proc, TQ_SIGNAL(processExited(TDEProcess*)), this, TQ_SLOT(ejectFinished(TDEProcess*)));
proc->start();
}
diff --git a/tdeioslave/media/propsdlgplugin/propertiespage.cpp b/tdeioslave/media/propsdlgplugin/propertiespage.cpp
index 5b54c8c5a..57fff8573 100644
--- a/tdeioslave/media/propsdlgplugin/propertiespage.cpp
+++ b/tdeioslave/media/propsdlgplugin/propertiespage.cpp
@@ -64,43 +64,43 @@ PropertiesPage::PropertiesPage(TQWidget* parent, const TQString &_id)
option_ro->hide();
else
option_ro->setChecked(options["ro"] == "true");
- connect( option_ro, TQT_SIGNAL( stateChanged(int) ), TQT_SIGNAL( changed() ) );
+ connect( option_ro, TQ_SIGNAL( stateChanged(int) ), TQ_SIGNAL( changed() ) );
if (!options.contains("quiet"))
option_quiet->hide();
else
option_quiet->setChecked(options["quiet"] == "true");
- connect( option_quiet, TQT_SIGNAL( stateChanged(int) ), TQT_SIGNAL( changed() ) );
+ connect( option_quiet, TQ_SIGNAL( stateChanged(int) ), TQ_SIGNAL( changed() ) );
if (!options.contains("sync"))
option_sync->hide();
else
option_sync->setChecked(options["sync"] == "true");
- connect( option_sync, TQT_SIGNAL( stateChanged(int) ), TQT_SIGNAL( changed() ) );
+ connect( option_sync, TQ_SIGNAL( stateChanged(int) ), TQ_SIGNAL( changed() ) );
if (!options.contains("atime"))
option_atime->hide();
else
option_atime->setChecked(options["atime"] == "true");
- connect( option_atime, TQT_SIGNAL( stateChanged(int) ), TQT_SIGNAL( changed() ) );
+ connect( option_atime, TQ_SIGNAL( stateChanged(int) ), TQ_SIGNAL( changed() ) );
if (!options.contains("flush"))
option_flush->hide();
else
option_flush->setChecked(options["flush"] == "true");
- connect( option_flush, TQT_SIGNAL( stateChanged(int) ), TQT_SIGNAL( changed() ) );
+ connect( option_flush, TQ_SIGNAL( stateChanged(int) ), TQ_SIGNAL( changed() ) );
if (!options.contains("utf8"))
option_utf8->hide();
else
option_utf8->setChecked(options["utf8"] == "true");
- connect( option_utf8, TQT_SIGNAL( stateChanged(int) ), TQT_SIGNAL( changed() ) );
+ connect( option_utf8, TQ_SIGNAL( stateChanged(int) ), TQ_SIGNAL( changed() ) );
if (!options.contains("uid"))
option_uid->hide();
else
option_uid->setChecked(options["uid"] == "true");
- connect( option_uid, TQT_SIGNAL( stateChanged(int) ), TQT_SIGNAL( changed() ) );
+ connect( option_uid, TQ_SIGNAL( stateChanged(int) ), TQ_SIGNAL( changed() ) );
if (!options.contains("shortname"))
{
@@ -115,7 +115,7 @@ PropertiesPage::PropertiesPage(TQWidget* parent, const TQString &_id)
option_shortname->setCurrentItem(index);
break;
}
- connect( option_shortname, TQT_SIGNAL( activated(int) ), TQT_SIGNAL( changed() ) );
+ connect( option_shortname, TQ_SIGNAL( activated(int) ), TQ_SIGNAL( changed() ) );
}
if (!options.contains("journaling"))
@@ -131,14 +131,14 @@ PropertiesPage::PropertiesPage(TQWidget* parent, const TQString &_id)
option_journaling->setCurrentItem(index);
break;
}
- connect( option_journaling, TQT_SIGNAL( activated(int) ), TQT_SIGNAL( changed() ) );
+ connect( option_journaling, TQ_SIGNAL( activated(int) ), TQ_SIGNAL( changed() ) );
}
label_filesystem->setText(i18n("Filesystem: %1").arg(options["filesystem"]));
option_mountpoint->setText(options["mountpoint"]);
- connect( option_mountpoint, TQT_SIGNAL( textChanged( const TQString &) ), TQT_SIGNAL( changed() ) );
+ connect( option_mountpoint, TQ_SIGNAL( textChanged( const TQString &) ), TQ_SIGNAL( changed() ) );
option_automount->setChecked(options["automount"] == "true");
- connect( option_automount, TQT_SIGNAL( stateChanged(int) ), TQT_SIGNAL( changed() ) );
+ connect( option_automount, TQ_SIGNAL( stateChanged(int) ), TQ_SIGNAL( changed() ) );
bool has_groupbox_specific = true;
if (!options.contains("journaling") &&
@@ -152,11 +152,11 @@ PropertiesPage::PropertiesPage(TQWidget* parent, const TQString &_id)
// The order is important - we want groupboxes to hide automatically depending on use_defaults
// but don't want to emit changed() until user actually changes something.
- connect( option_defaults, TQT_SIGNAL( toggled(bool) ), groupbox_generic, SLOT( setHidden(bool) ) );
+ connect( option_defaults, TQ_SIGNAL( toggled(bool) ), groupbox_generic, TQ_SLOT( setHidden(bool) ) );
if (has_groupbox_specific)
- connect( option_defaults, TQT_SIGNAL( toggled(bool) ), groupbox_specific, SLOT( setHidden(bool) ) );
+ connect( option_defaults, TQ_SIGNAL( toggled(bool) ), groupbox_specific, TQ_SLOT( setHidden(bool) ) );
option_defaults->setChecked(options["use_defaults"] == "true");
- connect( option_defaults, TQT_SIGNAL( stateChanged(int) ), TQT_SIGNAL( changed() ) );
+ connect( option_defaults, TQ_SIGNAL( stateChanged(int) ), TQ_SIGNAL( changed() ) );
} else {
diff --git a/tdeioslave/media/propsdlgplugin/propsdlgshareplugin.cpp b/tdeioslave/media/propsdlgplugin/propsdlgshareplugin.cpp
index ea830d2e1..dce33d786 100644
--- a/tdeioslave/media/propsdlgplugin/propsdlgshareplugin.cpp
+++ b/tdeioslave/media/propsdlgplugin/propsdlgshareplugin.cpp
@@ -70,10 +70,10 @@ PropsDlgSharePlugin::PropsDlgSharePlugin( KPropertiesDialog *dlg,
d = new Private();
d->page = new PropertiesPage(vbox, Medium::create(reply).id());
- connect(d->page, TQT_SIGNAL(changed()),
- TQT_SLOT(slotChanged()));
+ connect(d->page, TQ_SIGNAL(changed()),
+ TQ_SLOT(slotChanged()));
- // TQTimer::singleShot(100, this, TQT_SLOT(slotChanged()));
+ // TQTimer::singleShot(100, this, TQ_SLOT(slotChanged()));
}
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 9a443e551..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();
}
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/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/tdeio_media.cpp b/tdeioslave/media/tdeio_media.cpp
index 9124568c1..c68bc25d5 100644
--- a/tdeioslave/media/tdeio_media.cpp
+++ b/tdeioslave/media/tdeio_media.cpp
@@ -62,8 +62,8 @@ MediaProtocol::MediaProtocol(const TQCString &protocol,
const TQCString &pool, const TQCString &app)
: ForwardingSlaveBase(protocol, pool, app)
{
- connect( &m_impl, TQT_SIGNAL( warning( const TQString & ) ),
- this, TQT_SLOT( slotWarning( const TQString & ) ) );
+ connect( &m_impl, TQ_SIGNAL( warning( const TQString & ) ),
+ this, TQ_SLOT( slotWarning( const TQString & ) ) );
}
MediaProtocol::~MediaProtocol()