summaryrefslogtreecommitdiffstats
path: root/src/k3bapplication.h
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 /src/k3bapplication.h
parent2a3ced9fbd85b4fdbfa9b0a91f8d22e35ceaf6b5 (diff)
downloadk3b-83b79bb29aaa412caec6abcdb42ca21d248b3b3a.tar.gz
k3b-83b79bb29aaa412caec6abcdb42ca21d248b3b3a.zip
Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4
Diffstat (limited to 'src/k3bapplication.h')
-rw-r--r--src/k3bapplication.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/k3bapplication.h b/src/k3bapplication.h
index a51dbc7..e0a50e1 100644
--- a/src/k3bapplication.h
+++ b/src/k3bapplication.h
@@ -87,10 +87,10 @@ class K3bApplication::Core : public K3bCore
// make sure the libk3b uses the same configuration
// needed since the lib still depends on K3bCore::config
// the goal is to make the lib independent from the config
- KConfig* config() const;
+ TDEConfig* config() const;
- void readSettings( KConfig* c = 0 );
- void saveSettings( KConfig* c = 0 );
+ void readSettings( TDEConfig* c = 0 );
+ void saveSettings( TDEConfig* c = 0 );
/**
* \reimplemented from K3bCore. We use our own devicemanager here.