diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-25 00:30:47 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-25 00:30:47 -0600 |
| commit | cc74f360bb40da3d79f58048f8e8611804980aa6 (patch) | |
| tree | c4385d2c16b904757b1c8bb998a4aec6993373f7 /twin/data | |
| parent | 79b21d47bce1ee428affc97534cd8b257232a871 (diff) | |
| download | tdebase-cc74f360bb40da3d79f58048f8e8611804980aa6.tar.gz tdebase-cc74f360bb40da3d79f58048f8e8611804980aa6.zip | |
Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4
Diffstat (limited to 'twin/data')
| -rw-r--r-- | twin/data/update_default_rules.cpp | 4 | ||||
| -rw-r--r-- | twin/data/update_window_settings.cpp | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/twin/data/update_default_rules.cpp b/twin/data/update_default_rules.cpp index 349c0c6e5..61b03d3c4 100644 --- a/twin/data/update_default_rules.cpp +++ b/twin/data/update_default_rules.cpp @@ -27,8 +27,8 @@ int main( int argc, char* argv[] ) kdWarning() << "File " << argv[ 1 ] << " not found!" << endl; return 1; } - KConfig src_cfg( file ); - KConfig dest_cfg( "twinrulesrc" ); + TDEConfig src_cfg( file ); + TDEConfig dest_cfg( "twinrulesrc" ); src_cfg.setGroup( "General" ); dest_cfg.setGroup( "General" ); int count = src_cfg.readNumEntry( "count", 0 ); diff --git a/twin/data/update_window_settings.cpp b/twin/data/update_window_settings.cpp index 0cbd28353..40b25db9c 100644 --- a/twin/data/update_window_settings.cpp +++ b/twin/data/update_window_settings.cpp @@ -62,7 +62,7 @@ NET::WindowType txtToWindowType( const char* txt ) return static_cast< NET::WindowType >( -2 ); // undefined } -void loadFakeSessionInfo( KConfig* config ) +void loadFakeSessionInfo( TDEConfig* config ) { fakeSession.clear(); config->setGroup("FakeSession" ); @@ -97,7 +97,7 @@ void loadFakeSessionInfo( KConfig* config ) config->deleteGroup( "FakeSession" ); } -void writeRules( KConfig& cfg ) +void writeRules( TDEConfig& cfg ) { cfg.setGroup( "General" ); int pos = cfg.readNumEntry( "count" ); @@ -156,8 +156,8 @@ void writeRules( KConfig& cfg ) int main() { TDEInstance inst( "twin_update_window_settings" ); - KConfig src_cfg( "twinrc" ); - KConfig dest_cfg( "twinrulesrc" ); + TDEConfig src_cfg( "twinrc" ); + TDEConfig dest_cfg( "twinrulesrc" ); loadFakeSessionInfo( &src_cfg ); writeRules( dest_cfg ); src_cfg.sync(); |