summaryrefslogtreecommitdiffstats
path: root/libk3b/core/k3bcore.cpp
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-25 00:06:28 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-25 00:06:28 -0600
commit83b79bb29aaa412caec6abcdb42ca21d248b3b3a (patch)
treef48e8ae855d4a0be0c3ecf912a92168a829ff8c5 /libk3b/core/k3bcore.cpp
parent2a3ced9fbd85b4fdbfa9b0a91f8d22e35ceaf6b5 (diff)
downloadk3b-83b79bb29aaa412caec6abcdb42ca21d248b3b3a.tar.gz
k3b-83b79bb29aaa412caec6abcdb42ca21d248b3b3a.zip
Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4
Diffstat (limited to 'libk3b/core/k3bcore.cpp')
-rw-r--r--libk3b/core/k3bcore.cpp14
1 files changed, 7 insertions, 7 deletions
diff --git a/libk3b/core/k3bcore.cpp b/libk3b/core/k3bcore.cpp
index 20ed3c7..4af572f 100644
--- a/libk3b/core/k3bcore.cpp
+++ b/libk3b/core/k3bcore.cpp
@@ -104,7 +104,7 @@ public:
}
K3bVersion version;
- KConfig* config;
+ TDEConfig* config;
bool deleteConfig;
K3bDevice::DeviceManager* deviceManager;
K3bExternalBinManager* externalBinManager;
@@ -178,13 +178,13 @@ const K3bVersion& K3bCore::version() const
}
-KConfig* K3bCore::config() const
+TDEConfig* K3bCore::config() const
{
if( !d->config ) {
kdDebug() << "(K3bCore) opening k3b config file." << endl;
kdDebug() << "(K3bCore) while I am a " << className() << endl;
d->deleteConfig = true;
- d->config = new KConfig( "k3brc" );
+ d->config = new TDEConfig( "k3brc" );
}
return d->config;
@@ -251,9 +251,9 @@ void K3bCore::initPluginManager()
}
-void K3bCore::readSettings( KConfig* cnf )
+void K3bCore::readSettings( TDEConfig* cnf )
{
- KConfig* c = cnf;
+ TDEConfig* c = cnf;
if( !c )
c = config();
@@ -267,9 +267,9 @@ void K3bCore::readSettings( KConfig* cnf )
}
-void K3bCore::saveSettings( KConfig* cnf )
+void K3bCore::saveSettings( TDEConfig* cnf )
{
- KConfig* c = cnf;
+ TDEConfig* c = cnf;
if( !c )
c = config();