diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-25 00:06:28 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-25 00:06:28 -0600 |
| commit | 83b79bb29aaa412caec6abcdb42ca21d248b3b3a (patch) | |
| tree | f48e8ae855d4a0be0c3ecf912a92168a829ff8c5 /src/k3bapplication.cpp | |
| parent | 2a3ced9fbd85b4fdbfa9b0a91f8d22e35ceaf6b5 (diff) | |
| download | k3b-83b79bb29aaa412caec6abcdb42ca21d248b3b3a.tar.gz k3b-83b79bb29aaa412caec6abcdb42ca21d248b3b3a.zip | |
Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4
Diffstat (limited to 'src/k3bapplication.cpp')
| -rw-r--r-- | src/k3bapplication.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/k3bapplication.cpp b/src/k3bapplication.cpp index ee1d36a..09fbb30 100644 --- a/src/k3bapplication.cpp +++ b/src/k3bapplication.cpp @@ -93,7 +93,7 @@ K3bApplication::~K3bApplication() void K3bApplication::init() { - KConfigGroup generalOptions( config(), "General Options" ); + TDEConfigGroup generalOptions( config(), "General Options" ); TQGuardedPtr<K3bSplash> splash; if( !isRestored() ) { @@ -360,7 +360,7 @@ K3bDevice::DeviceManager* K3bApplication::Core::deviceManager() const } -KConfig* K3bApplication::Core::config() const +TDEConfig* K3bApplication::Core::config() const { return kapp->config(); } @@ -387,11 +387,11 @@ void K3bApplication::Core::init() } -void K3bApplication::Core::readSettings( KConfig* cnf ) +void K3bApplication::Core::readSettings( TDEConfig* cnf ) { K3bCore::readSettings( cnf ); - KConfig* c = cnf; + TDEConfig* c = cnf; if( !c ) c = config(); @@ -399,7 +399,7 @@ void K3bApplication::Core::readSettings( KConfig* cnf ) } -void K3bApplication::Core::saveSettings( KConfig* cnf ) +void K3bApplication::Core::saveSettings( TDEConfig* cnf ) { if( !cnf ) cnf = config(); |