summaryrefslogtreecommitdiffstats
path: root/kioslave/media/libmediacommon
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-25 00:30:47 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-25 00:30:47 -0600
commitcc74f360bb40da3d79f58048f8e8611804980aa6 (patch)
treec4385d2c16b904757b1c8bb998a4aec6993373f7 /kioslave/media/libmediacommon
parent79b21d47bce1ee428affc97534cd8b257232a871 (diff)
downloadtdebase-cc74f360bb40da3d79f58048f8e8611804980aa6.tar.gz
tdebase-cc74f360bb40da3d79f58048f8e8611804980aa6.zip
Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4
Diffstat (limited to 'kioslave/media/libmediacommon')
-rw-r--r--kioslave/media/libmediacommon/medium.cpp4
-rw-r--r--kioslave/media/libmediacommon/notifiersettings.cpp2
2 files changed, 3 insertions, 3 deletions
diff --git a/kioslave/media/libmediacommon/medium.cpp b/kioslave/media/libmediacommon/medium.cpp
index 031e56788..38d68725b 100644
--- a/kioslave/media/libmediacommon/medium.cpp
+++ b/kioslave/media/libmediacommon/medium.cpp
@@ -147,7 +147,7 @@ void Medium::setHidden(bool state)
void Medium::setUserLabel(const TQString &label)
{
- KConfig cfg("mediamanagerrc");
+ TDEConfig cfg("mediamanagerrc");
cfg.setGroup("UserLabels");
TQString entry_name = m_properties[UUID];
@@ -166,7 +166,7 @@ void Medium::setUserLabel(const TQString &label)
void Medium::loadUserLabel()
{
- KConfig cfg("mediamanagerrc");
+ TDEConfig cfg("mediamanagerrc");
cfg.setGroup("UserLabels");
TQString entry_name = m_properties[UUID];
diff --git a/kioslave/media/libmediacommon/notifiersettings.cpp b/kioslave/media/libmediacommon/notifiersettings.cpp
index cc90e5ef7..254e591cb 100644
--- a/kioslave/media/libmediacommon/notifiersettings.cpp
+++ b/kioslave/media/libmediacommon/notifiersettings.cpp
@@ -227,7 +227,7 @@ void NotifierSettings::reload()
m_actions.append( nothing );
m_idMap[ nothing->id() ] = nothing;
- KConfig config( "medianotifierrc", true );
+ TDEConfig config( "medianotifierrc", true );
TQMap<TQString,TQString> auto_actions_map = config.entryMap( "Auto Actions" );
TQMap<TQString,TQString>::iterator auto_it = auto_actions_map.begin();