summaryrefslogtreecommitdiffstats
path: root/kioslave/media/mediamanager/halbackend.cpp
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-01-19 01:42:14 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-01-19 01:42:14 +0000
commit8155225c9be993acc0512956416d195edfef4eb9 (patch)
treede4f3cd17614fc67e47eefabcdbe2fbe170c9be7 /kioslave/media/mediamanager/halbackend.cpp
parent364641b8e0279758d236af39abd138d379328a19 (diff)
downloadtdebase-8155225c9be993acc0512956416d195edfef4eb9.tar.gz
tdebase-8155225c9be993acc0512956416d195edfef4eb9.zip
Enable compilation with TQt for Qt4 3.4.0 TP2
This should not break compatibility with TQt for Qt3; if it does please fix it ASAP! git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1215552 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kioslave/media/mediamanager/halbackend.cpp')
-rw-r--r--kioslave/media/mediamanager/halbackend.cpp42
1 files changed, 21 insertions, 21 deletions
diff --git a/kioslave/media/mediamanager/halbackend.cpp b/kioslave/media/mediamanager/halbackend.cpp
index 7b56d46ad..d44826590 100644
--- a/kioslave/media/mediamanager/halbackend.cpp
+++ b/kioslave/media/mediamanager/halbackend.cpp
@@ -447,7 +447,7 @@ const char* HALBackend::findMediumUdiFromUdi(const char* udi)
void HALBackend::ResetProperties(const char* mediumUdi, bool allowNotification)
{
kdDebug(1219) << "HALBackend::setProperties" << endl;
- if ( TQString::fromLatin1( mediumUdi ).startsWith( "/org/kde/" ) )
+ if ( TQString::tqfromLatin1( mediumUdi ).startsWith( "/org/kde/" ) )
{
const Medium *cmedium = m_mediaList.findById(mediumUdi);
if ( cmedium )
@@ -942,7 +942,7 @@ TQStringList HALBackend::mountoptions(const TQString &name)
result << TQString("automount=%1").arg(value ? "true" : "false");
- if (valids.contains("ro"))
+ if (valids.tqcontains("ro"))
{
value = config.readBoolEntry("ro", false);
tmp = TQString("ro=%1").arg(value ? "true" : "false");
@@ -950,7 +950,7 @@ TQStringList HALBackend::mountoptions(const TQString &name)
result << tmp;
}
- if (valids.contains("quiet"))
+ if (valids.tqcontains("quiet"))
{
value = config.readBoolEntry("quiet", false);
tmp = TQString("quiet=%1").arg(value ? "true" : "false");
@@ -958,28 +958,28 @@ TQStringList HALBackend::mountoptions(const TQString &name)
result << tmp;
}
- if (valids.contains("flush"))
+ if (valids.tqcontains("flush"))
{
value = config.readBoolEntry("flush", fstype.endsWith("fat"));
tmp = TQString("flush=%1").arg(value ? "true" : "false");
result << tmp;
}
- if (valids.contains("uid"))
+ if (valids.tqcontains("uid"))
{
value = config.readBoolEntry("uid", true);
tmp = TQString("uid=%1").arg(value ? "true" : "false");
result << tmp;
}
- if (valids.contains("utf8"))
+ if (valids.tqcontains("utf8"))
{
value = config.readBoolEntry("utf8", true);
tmp = TQString("utf8=%1").arg(value ? "true" : "false");
result << tmp;
}
- if (valids.contains("shortname"))
+ if (valids.tqcontains("shortname"))
{
TQString svalue = config.readEntry("shortname", "lower").lower();
if (svalue == "winnt")
@@ -993,7 +993,7 @@ TQStringList HALBackend::mountoptions(const TQString &name)
}
// pass our locale to the ntfs-3g driver so it can translate local characters
- if (valids.contains("locale") && fstype == "ntfs-3g")
+ if (valids.tqcontains("locale") && fstype == "ntfs-3g")
{
// have to obtain LC_CTYPE as returned by the `locale` command
// check in the same order as `locale` does
@@ -1003,15 +1003,15 @@ TQStringList HALBackend::mountoptions(const TQString &name)
}
}
- if (valids.contains("sync"))
+ if (valids.tqcontains("sync"))
{
- value = config.readBoolEntry("sync", ( valids.contains("flush") && !fstype.endsWith("fat") ) && removable);
+ value = config.readBoolEntry("sync", ( valids.tqcontains("flush") && !fstype.endsWith("fat") ) && removable);
tmp = TQString("sync=%1").arg(value ? "true" : "false");
if (fstype != "iso9660") // makes no sense
result << tmp;
}
- if (valids.contains("noatime"))
+ if (valids.tqcontains("noatime"))
{
value = config.readBoolEntry("atime", !fstype.endsWith("fat"));
tmp = TQString("atime=%1").arg(value ? "true" : "false");
@@ -1031,7 +1031,7 @@ TQStringList HALBackend::mountoptions(const TQString &name)
result << TQString("mountpoint=%1").arg(mount_point);
result << TQString("filesystem=%1").arg(fstype);
- if (valids.contains("data"))
+ if (valids.tqcontains("data"))
{
TQString svalue = config.readEntry("journaling").lower();
if (svalue == "ordered")
@@ -1058,19 +1058,19 @@ bool HALBackend::setMountoptions(const TQString &name, const TQStringList &optio
const char *names[] = { "ro", "quiet", "atime", "uid", "utf8", "flush", "sync", 0 };
for (int index = 0; names[index]; ++index)
- if (valids.contains(names[index]))
+ if (valids.tqcontains(names[index]))
config.writeEntry(names[index], valids[names[index]] == "true");
- if (valids.contains("shortname"))
+ if (valids.tqcontains("shortname"))
config.writeEntry("shortname", valids["shortname"]);
- if (valids.contains("journaling"))
+ if (valids.tqcontains("journaling"))
config.writeEntry("journaling", valids["journaling"]);
- if (!mountoptions(name).contains(TQString("mountpoint=%1").arg(valids["mountpoint"])))
+ if (!mountoptions(name).tqcontains(TQString("mountpoint=%1").arg(valids["mountpoint"])))
config.writeEntry("mountpoint", valids["mountpoint"]);
- if (valids.contains("automount")) {
+ if (valids.tqcontains("automount")) {
TQString drive_udi = libhal_device_get_property_QString(m_halContext, name.latin1(), "block.storage_device");
config.setGroup(drive_udi);
config.writeEntry("automount", valids["automount"]);
@@ -1376,7 +1376,7 @@ TQString HALBackend::isInFstab(const Medium *medium)
if ((*it)->mountedFrom() == medium->deviceNode() || ( !medium->deviceNode().isEmpty() && reald == medium->deviceNode() ) )
{
TQStringList opts = (*it)->mountOptions();
- if (opts.contains("user") || opts.contains("users"))
+ if (opts.tqcontains("user") || opts.tqcontains("users"))
return (*it)->mountPoint();
}
}
@@ -1451,17 +1451,17 @@ TQString HALBackend::mount(const Medium *medium)
if (mount_point.startsWith("/media/"))
mount_point = mount_point.mid(7);
- if (valids.contains("shortname"))
+ if (valids.tqcontains("shortname"))
{
soptions << TQString("shortname=%1").arg(valids["shortname"]);
}
- if (valids.contains("locale"))
+ if (valids.tqcontains("locale"))
{
soptions << TQString("locale=%1").arg(valids["locale"]);
}
- if (valids.contains("journaling"))
+ if (valids.tqcontains("journaling"))
{
TQString option = valids["journaling"];
if (option == "data")