summaryrefslogtreecommitdiffstats
path: root/kopete/libkopete/avdevice
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-25 00:36:20 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-25 00:36:20 -0600
commitf21aaec952493cb5688c73de6e82a569ddbd7fb2 (patch)
tree78ccb5117063da3e08e3277e11054b912a9f2ae7 /kopete/libkopete/avdevice
parentc48e769eb275917717e2b55eb869f7e559293ac8 (diff)
downloadtdenetwork-f21aaec952493cb5688c73de6e82a569ddbd7fb2.tar.gz
tdenetwork-f21aaec952493cb5688c73de6e82a569ddbd7fb2.zip
Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4
Diffstat (limited to 'kopete/libkopete/avdevice')
-rw-r--r--kopete/libkopete/avdevice/videodevicepool.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/kopete/libkopete/avdevice/videodevicepool.cpp b/kopete/libkopete/avdevice/videodevicepool.cpp
index a229937c..4cc0af42 100644
--- a/kopete/libkopete/avdevice/videodevicepool.cpp
+++ b/kopete/libkopete/avdevice/videodevicepool.cpp
@@ -756,7 +756,7 @@ void VideoDevicePool::loadConfig()
kdDebug(14010) << k_funcinfo << "called" << endl;
if((hasDevices())&&(m_clients==0))
{
- KConfig *config = TDEGlobal::config();
+ TDEConfig *config = TDEGlobal::config();
config->setGroup("Video Device Settings");
const TQString currentdevice = config->readEntry("Current Device", TQString());
kdDebug(14010) << k_funcinfo << "Current device: " << currentdevice << endl;
@@ -817,7 +817,7 @@ void VideoDevicePool::saveConfig()
kdDebug(14010) << k_funcinfo << "called" << endl;
if(hasDevices())
{
- KConfig *config = TDEGlobal::config();
+ TDEConfig *config = TDEGlobal::config();
config->setGroup("Video Device Settings");
/* if(m_modelvector.size())