summaryrefslogtreecommitdiffstats
path: root/kaffeine/src/player-parts/gstreamer-part/gstreamer_part.cpp
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-25 00:06:49 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-25 00:06:49 -0600
commitcd27173bf54c37fc8e7333e6c720c61fe6dcff0b (patch)
tree3380ef884810cd17ae6b5883c67bacaf5efc8cc5 /kaffeine/src/player-parts/gstreamer-part/gstreamer_part.cpp
parent73fd51d45ccea8e66e8c079d7e4e15b5d6d45432 (diff)
downloadkaffeine-cd27173bf54c37fc8e7333e6c720c61fe6dcff0b.tar.gz
kaffeine-cd27173bf54c37fc8e7333e6c720c61fe6dcff0b.zip
Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4
Diffstat (limited to 'kaffeine/src/player-parts/gstreamer-part/gstreamer_part.cpp')
-rw-r--r--kaffeine/src/player-parts/gstreamer-part/gstreamer_part.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/kaffeine/src/player-parts/gstreamer-part/gstreamer_part.cpp b/kaffeine/src/player-parts/gstreamer-part/gstreamer_part.cpp
index 4893a32..86f9e09 100644
--- a/kaffeine/src/player-parts/gstreamer-part/gstreamer_part.cpp
+++ b/kaffeine/src/player-parts/gstreamer-part/gstreamer_part.cpp
@@ -193,7 +193,7 @@ bool GStreamerPart::openURL(const MRL& mrl)
{
kdDebug() << "GStreamerPart: Check for kaffeine/noatun/m3u/pls/asx playlist\n";
TQString localFile;
- if ( KIO::NetAccess::download(m_mrl.kurl(), localFile, widget()) ) {
+ if ( TDEIO::NetAccess::download(m_mrl.kurl(), localFile, widget()) ) {
TQFile file( localFile );
file.open( IO_ReadOnly );
TQTextStream stream( &file );
@@ -223,7 +223,7 @@ bool GStreamerPart::openURL(const MRL& mrl)
}
}
else
- kdError() << "GStreamerPart: " << KIO::NetAccess::lastErrorString() << endl;
+ kdError() << "GStreamerPart: " << TDEIO::NetAccess::lastErrorString() << endl;
}
/* check for ram playlist */
if ( (ext == "ra") || (ext == "rm") || (ext == "ram") || (ext == "lsc") || (ext == "pl") ) {
@@ -652,7 +652,7 @@ void GStreamerPart::slotContextMenu( const TQPoint& pos )
void GStreamerPart::loadConfig()
{
kdDebug() << "GStreamerPart: Load config" << endl;
- KConfig* config = instance()->config();
+ TDEConfig* config = instance()->config();
config->setGroup("General Options");
m_audioSinkName = config->readEntry("Audio Sink", "alsasink");
@@ -668,7 +668,7 @@ void GStreamerPart::saveConfig()
{
kdDebug() << "GStreamerPart: Save config" << endl;
- KConfig* config = instance()->config();
+ TDEConfig* config = instance()->config();
config->setGroup("General Options");
config->writeEntry( "Audio Sink", m_audioSinkName );