summaryrefslogtreecommitdiffstats
path: root/kopete/libkopete/avdevice
diff options
context:
space:
mode:
authorTimothy Pearson <[email protected]>2013-01-24 13:48:31 -0600
committerTimothy Pearson <[email protected]>2013-01-24 13:48:31 -0600
commitc48e769eb275917717e2b55eb869f7e559293ac8 (patch)
tree8f650b907e21c918b826f854dbe1c8174cc2c0c6 /kopete/libkopete/avdevice
parent8011d84f483f3628f3f04ea5cb2c1c3c86b2dba7 (diff)
downloadtdenetwork-c48e769eb275917717e2b55eb869f7e559293ac8.tar.gz
tdenetwork-c48e769eb275917717e2b55eb869f7e559293ac8.zip
Rename KGlobal, KProcess, and KClipboard 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 cbfe7cb1..a229937c 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 = KGlobal::config();
+ KConfig *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 = KGlobal::config();
+ KConfig *config = TDEGlobal::config();
config->setGroup("Video Device Settings");
/* if(m_modelvector.size())