summaryrefslogtreecommitdiffstats
path: root/tdeioslave/media/mediamanager
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-31 13:26:45 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-31 13:26:45 -0600
commit01c60a267846a8712bca34218ecf7da57566c049 (patch)
treee851781b4ff0487aad8a48739ac0061186343e49 /tdeioslave/media/mediamanager
parent5e5409d89552fa6839ab6cd52a47306eb4d650f0 (diff)
downloadtdebase-01c60a267846a8712bca34218ecf7da57566c049.tar.gz
tdebase-01c60a267846a8712bca34218ecf7da57566c049.zip
Rename KStandard for enhanced compatibility with KDE4
Diffstat (limited to 'tdeioslave/media/mediamanager')
-rw-r--r--tdeioslave/media/mediamanager/fstabbackend.cpp4
-rw-r--r--tdeioslave/media/mediamanager/halbackend.cpp8
-rw-r--r--tdeioslave/media/mediamanager/mediamanager.cpp2
-rw-r--r--tdeioslave/media/mediamanager/removablebackend.cpp2
4 files changed, 8 insertions, 8 deletions
diff --git a/tdeioslave/media/mediamanager/fstabbackend.cpp b/tdeioslave/media/mediamanager/fstabbackend.cpp
index 0069a8e8e..2f5bea220 100644
--- a/tdeioslave/media/mediamanager/fstabbackend.cpp
+++ b/tdeioslave/media/mediamanager/fstabbackend.cpp
@@ -313,8 +313,8 @@ void FstabBackend::handleFstabChange(bool allowNotification)
TQString FstabBackend::generateId(const TQString &devNode,
const TQString &mountPoint)
{
- TQString d = KStandardDirs::realFilePath(devNode);
- TQString m = KStandardDirs::realPath(mountPoint);
+ TQString d = TDEStandardDirs::realFilePath(devNode);
+ TQString m = TDEStandardDirs::realPath(mountPoint);
return "/org/kde/mediamanager/fstab/"
+d.replace("/", "")
diff --git a/tdeioslave/media/mediamanager/halbackend.cpp b/tdeioslave/media/mediamanager/halbackend.cpp
index 1022b36be..1e168e13f 100644
--- a/tdeioslave/media/mediamanager/halbackend.cpp
+++ b/tdeioslave/media/mediamanager/halbackend.cpp
@@ -1164,12 +1164,12 @@ TQString startPrivilegedProcess(const TQString& command, const TQString& dialogC
{
TQString error;
- TQString tdesudoPath = KStandardDirs::findExe("tdesudo");
+ TQString tdesudoPath = TDEStandardDirs::findExe("tdesudo");
if (!tdesudoPath.isEmpty())
error = startKdeSudoProcess(tdesudoPath, command, dialogCaption, dialogComment);
else {
- TQString tdesuPath = KStandardDirs::findExe("tdesu");
+ TQString tdesuPath = TDEStandardDirs::findExe("tdesu");
if (!tdesuPath.isEmpty())
error = startKdeSuProcess(tdesuPath, command, dialogCaption);
@@ -1184,7 +1184,7 @@ TQString privilegedMount(const char* udi, const char* mountPoint, const char** o
kdDebug() << "run privileged mount for " << udi << endl;
- TQString dbusSendPath = KStandardDirs::findExe("dbus-send");
+ TQString dbusSendPath = TDEStandardDirs::findExe("dbus-send");
// @todo return error message
if (dbusSendPath.isEmpty())
@@ -1219,7 +1219,7 @@ TQString privilegedUnmount(const char* udi)
kdDebug() << "run privileged unmount for " << udi << endl;
- TQString dbusSendPath = KStandardDirs::findExe("dbus-send");
+ TQString dbusSendPath = TDEStandardDirs::findExe("dbus-send");
// @todo return error message
if (dbusSendPath.isEmpty())
diff --git a/tdeioslave/media/mediamanager/mediamanager.cpp b/tdeioslave/media/mediamanager/mediamanager.cpp
index 511eb6c64..295f4269a 100644
--- a/tdeioslave/media/mediamanager/mediamanager.cpp
+++ b/tdeioslave/media/mediamanager/mediamanager.cpp
@@ -188,7 +188,7 @@ TQStringList MediaManager::properties(const TQString &name)
for (; it!=end; ++it)
{
- path = KStandardDirs::realFilePath(u.path());
+ path = TDEStandardDirs::realFilePath(u.path());
kdDebug() << "comparing " << (*it)->mountPoint() << " " << path << " " << (*it)->deviceNode() << endl;
if ((*it)->mountPoint() == path || (*it)->deviceNode() == path) {
m = *it;
diff --git a/tdeioslave/media/mediamanager/removablebackend.cpp b/tdeioslave/media/mediamanager/removablebackend.cpp
index 6b83ae1ea..dc619701a 100644
--- a/tdeioslave/media/mediamanager/removablebackend.cpp
+++ b/tdeioslave/media/mediamanager/removablebackend.cpp
@@ -166,7 +166,7 @@ void RemovableBackend::handleMtabChange()
TQString RemovableBackend::generateId(const TQString &devNode)
{
- TQString dev = KStandardDirs::realFilePath(devNode);
+ TQString dev = TDEStandardDirs::realFilePath(devNode);
return "/org/kde/mediamanager/removable/"
+dev.replace("/", "");