summaryrefslogtreecommitdiffstats
path: root/ksysv/IOCore.cpp
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-01 10:48:41 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-01 10:48:41 -0600
commit58cb2c2c17b1e6dd48cbfbcb69ec2f50f1ced9ee (patch)
treea66fccabf2b123f2887c3ed8af1ec543dc5d44c8 /ksysv/IOCore.cpp
parent64d4c5289ce80843c5e63580d1d21f98f5e04af7 (diff)
downloadtdeadmin-58cb2c2c17b1e6dd48cbfbcb69ec2f50f1ced9ee.tar.gz
tdeadmin-58cb2c2c17b1e6dd48cbfbcb69ec2f50f1ced9ee.zip
Rename KLock and KTrader to avoid conflicts with KDE4
Diffstat (limited to 'ksysv/IOCore.cpp')
-rw-r--r--ksysv/IOCore.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/ksysv/IOCore.cpp b/ksysv/IOCore.cpp
index 1951aa2..75af033 100644
--- a/ksysv/IOCore.cpp
+++ b/ksysv/IOCore.cpp
@@ -273,9 +273,9 @@ bool ksv::IO::saveConfiguration (TQDataStream& s,
return true;
}
-KTrader::OfferList ksv::IO::servicesForFile (const TQString& filename)
+TDETrader::OfferList ksv::IO::servicesForFile (const TQString& filename)
{
- static KTrader* trader = KTrader::self();
+ static TDETrader* trader = TDETrader::self();
static KMimeMagic* magic = KMimeMagic::self();
const TQString mimetype = magic->findFileType(filename)->mimeType();