summaryrefslogtreecommitdiffstats
path: root/kioslave/media/mediamanager
diff options
context:
space:
mode:
Diffstat (limited to 'kioslave/media/mediamanager')
-rw-r--r--kioslave/media/mediamanager/fstabbackend.cpp8
-rw-r--r--kioslave/media/mediamanager/halbackend.cpp20
-rw-r--r--kioslave/media/mediamanager/halbackend.h8
-rw-r--r--kioslave/media/mediamanager/tdehardwarebackend.cpp12
-rw-r--r--kioslave/media/mediamanager/tdehardwarebackend.h6
5 files changed, 27 insertions, 27 deletions
diff --git a/kioslave/media/mediamanager/fstabbackend.cpp b/kioslave/media/mediamanager/fstabbackend.cpp
index 0ae99228e..b15e26683 100644
--- a/kioslave/media/mediamanager/fstabbackend.cpp
+++ b/kioslave/media/mediamanager/fstabbackend.cpp
@@ -102,8 +102,8 @@ TQString FstabBackend::mount( const TQString &_udi )
const Medium* medium = m_mediaList.findById(_udi);
if (!medium)
return i18n("No such medium: %1").arg(_udi);
- KIO::Job* job = KIO::mount( false, 0, medium->deviceNode(), medium->mountPoint());
- KIO::NetAccess::synchronousRun( job, 0 );
+ TDEIO::Job* job = TDEIO::mount( false, 0, medium->deviceNode(), medium->mountPoint());
+ TDEIO::NetAccess::synchronousRun( job, 0 );
return TQString::null;
}
@@ -112,8 +112,8 @@ TQString FstabBackend::unmount( const TQString &_udi )
const Medium* medium = m_mediaList.findById(_udi);
if (!medium)
return i18n("No such medium: %1").arg(_udi);
- KIO::Job* job = KIO::unmount( medium->mountPoint(), false);
- KIO::NetAccess::synchronousRun( job, 0 );
+ TDEIO::Job* job = TDEIO::unmount( medium->mountPoint(), false);
+ TDEIO::NetAccess::synchronousRun( job, 0 );
return TQString::null;
}
diff --git a/kioslave/media/mediamanager/halbackend.cpp b/kioslave/media/mediamanager/halbackend.cpp
index 9ebf0ade7..072c6cc3a 100644
--- a/kioslave/media/mediamanager/halbackend.cpp
+++ b/kioslave/media/mediamanager/halbackend.cpp
@@ -927,7 +927,7 @@ TQStringList HALBackend::mountoptions(const TQString &name)
}
}
- KConfig config("mediamanagerrc");
+ TDEConfig config("mediamanagerrc");
bool use_defaults = true;
if (config.hasGroup(name))
@@ -1097,7 +1097,7 @@ bool HALBackend::setMountoptions(const TQString &name, const TQStringList &optio
{
kdDebug() << "setMountoptions " << name << " " << options << endl;
- KConfig config("mediamanagerrc");
+ TDEConfig config("mediamanagerrc");
config.setGroup(name);
TQMap<TQString,TQString> valids = MediaManagerUtils::splitOptions(options);
@@ -1368,7 +1368,7 @@ TQString HALBackend::killUsingProcesses(const Medium* medium)
}
}
-void HALBackend::slotResult(KIO::Job *job)
+void HALBackend::slotResult(TDEIO::Job *job)
{
kdDebug() << "slotResult " << mount_jobs[job] << endl;
@@ -1376,7 +1376,7 @@ void HALBackend::slotResult(KIO::Job *job)
TQString& qerror = data->errorMessage;
const Medium* medium = data->medium;
- if (job->error() == KIO::ERR_COULD_NOT_UNMOUNT) {
+ if (job->error() == TDEIO::ERR_COULD_NOT_UNMOUNT) {
TQString proclist(listUsingProcesses(medium));
qerror = "<qt>";
@@ -1443,9 +1443,9 @@ TQString HALBackend::mount(const Medium *medium)
data.medium = medium;
kdDebug() << "triggering user mount " << medium->deviceNode() << " " << mountPoint << " " << medium->id() << endl;
- KIO::Job *job = KIO::mount( false, 0, medium->deviceNode(), mountPoint );
- connect(job, TQT_SIGNAL( result (KIO::Job *)),
- TQT_SLOT( slotResult( KIO::Job *)));
+ TDEIO::Job *job = TDEIO::mount( false, 0, medium->deviceNode(), mountPoint );
+ connect(job, TQT_SIGNAL( result (TDEIO::Job *)),
+ TQT_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.
@@ -1608,9 +1608,9 @@ TQString HALBackend::unmount(const TQString &_udi)
data.medium = medium;
kdDebug() << "triggering user unmount " << medium->deviceNode() << " " << mountPoint << endl;
- KIO::Job *job = KIO::unmount( medium->mountPoint(), false );
- connect(job, TQT_SIGNAL( result (KIO::Job *)),
- TQT_SLOT( slotResult( KIO::Job *)));
+ TDEIO::Job *job = TDEIO::unmount( medium->mountPoint(), false );
+ connect(job, TQT_SIGNAL( result (TDEIO::Job *)),
+ TQT_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/kioslave/media/mediamanager/halbackend.h b/kioslave/media/mediamanager/halbackend.h
index 18de7ea3c..8c8bbfce6 100644
--- a/kioslave/media/mediamanager/halbackend.h
+++ b/kioslave/media/mediamanager/halbackend.h
@@ -45,7 +45,7 @@
#include <libhal.h>
#include <libhal-storage.h>
-namespace KIO {
+namespace TDEIO {
class Job;
}
@@ -148,7 +148,7 @@ private:
static TQString killUsingProcesses(const Medium *medium);
private slots:
- void slotResult(KIO::Job *job);
+ void slotResult(TDEIO::Job *job);
/* Hal call-backs -- from gvm*/
public:
@@ -220,13 +220,13 @@ private:
const Medium* medium;
// [in,out] Should be set to true when the job completes
bool completed;
- // [out] KIO::Error if an error occured during operation. Otherwise, 0
+ // [out] TDEIO::Error if an error occured during operation. Otherwise, 0
int error;
// [out] Error message to be displayed to the user
TQString errorMessage;
};
- TQMap<KIO::Job *, struct mount_job_data*> mount_jobs;
+ TQMap<TDEIO::Job *, struct mount_job_data*> mount_jobs;
};
#endif /* _HALBACKEND_H_ */
diff --git a/kioslave/media/mediamanager/tdehardwarebackend.cpp b/kioslave/media/mediamanager/tdehardwarebackend.cpp
index 1086a3e77..65c6431cf 100644
--- a/kioslave/media/mediamanager/tdehardwarebackend.cpp
+++ b/kioslave/media/mediamanager/tdehardwarebackend.cpp
@@ -728,7 +728,7 @@ TQStringList TDEBackend::mountoptions(const TQString &name)
TQString drive_udi = driveUDIFromDeviceUID(medium->id());
- KConfig config("mediamanagerrc");
+ TDEConfig config("mediamanagerrc");
bool use_defaults = true;
if (config.hasGroup(drive_udi)) {
@@ -893,7 +893,7 @@ bool TDEBackend::setMountoptions(const TQString &name, const TQStringList &optio
kdDebug(1219) << "setMountoptions " << name << " " << options << endl;
- KConfig config("mediamanagerrc");
+ TDEConfig config("mediamanagerrc");
config.setGroup(drive_udi);
TQMap<TQString,TQString> valids = MediaManagerUtils::splitOptions(options);
@@ -948,8 +948,8 @@ TQString TDEBackend::mount(const Medium *medium)
data.completed = false;
data.medium = medium;
- KIO::Job *job = KIO::mount( false, 0, medium->deviceNode(), mountPoint );
- connect(job, TQT_SIGNAL( result (KIO::Job *)), TQT_SLOT( slotResult( KIO::Job *)));
+ TDEIO::Job *job = TDEIO::mount( false, 0, medium->deviceNode(), mountPoint );
+ connect(job, TQT_SIGNAL( result (TDEIO::Job *)), TQT_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.
@@ -1148,8 +1148,8 @@ TQString TDEBackend::unmount(const TQString &_udi)
data.completed = false;
data.medium = medium;
- KIO::Job *job = KIO::unmount( medium->mountPoint(), false );
- connect(job, TQT_SIGNAL( result (KIO::Job *)), TQT_SLOT( slotResult( KIO::Job *)));
+ TDEIO::Job *job = TDEIO::unmount( medium->mountPoint(), false );
+ connect(job, TQT_SIGNAL( result (TDEIO::Job *)), TQT_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/kioslave/media/mediamanager/tdehardwarebackend.h b/kioslave/media/mediamanager/tdehardwarebackend.h
index 190d06e41..9b5407d8f 100644
--- a/kioslave/media/mediamanager/tdehardwarebackend.h
+++ b/kioslave/media/mediamanager/tdehardwarebackend.h
@@ -36,7 +36,7 @@
#include <tdehardwaredevices.h>
-namespace KIO {
+namespace TDEIO {
class Job;
}
@@ -157,13 +157,13 @@ private:
const Medium* medium;
// [in,out] Should be set to true when the job completes
bool completed;
- // [out] KIO::Error if an error occured during operation. Otherwise, 0
+ // [out] TDEIO::Error if an error occured during operation. Otherwise, 0
int error;
// [out] Error message to be displayed to the user
TQString errorMessage;
};
- TQMap<KIO::Job *, struct mount_job_data*> mount_jobs;
+ TQMap<TDEIO::Job *, struct mount_job_data*> mount_jobs;
TQStringList m_ignoreDeviceChangeEvents;
};
generated by cgit v1.2.1 (git 2.18.0) at 2024-12-16 23:37:50 +0000