diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-22 20:15:55 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-22 20:15:55 -0600 |
| commit | 1d061b286a8b183b39be60fe531f2b1c2915f03a (patch) | |
| tree | 0a4c6ee79918e366077094fb59e9c1196d7f4156 /twin/data | |
| parent | 1e0a98b8623428064963b1627e4e09ea02c1e87e (diff) | |
| download | tdebase-1d061b286a8b183b39be60fe531f2b1c2915f03a.tar.gz tdebase-1d061b286a8b183b39be60fe531f2b1c2915f03a.zip | |
Rename KInstance and KAboutData to avoid conflicts with KDE4
Diffstat (limited to 'twin/data')
| -rw-r--r-- | twin/data/update_default_rules.cpp | 2 | ||||
| -rw-r--r-- | twin/data/update_window_settings.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/twin/data/update_default_rules.cpp b/twin/data/update_default_rules.cpp index a5e018ba1..349c0c6e5 100644 --- a/twin/data/update_default_rules.cpp +++ b/twin/data/update_default_rules.cpp @@ -20,7 +20,7 @@ int main( int argc, char* argv[] ) { if( argc != 2 ) return 1; - KInstance inst( "twin_update_default_rules" ); + TDEInstance inst( "twin_update_default_rules" ); TQString file = locate( "data", TQString( "twin/default_rules/" ) + argv[ 1 ] ); if( file.isEmpty()) { diff --git a/twin/data/update_window_settings.cpp b/twin/data/update_window_settings.cpp index a82e26492..0cbd28353 100644 --- a/twin/data/update_window_settings.cpp +++ b/twin/data/update_window_settings.cpp @@ -155,7 +155,7 @@ void writeRules( KConfig& cfg ) int main() { - KInstance inst( "twin_update_window_settings" ); + TDEInstance inst( "twin_update_window_settings" ); KConfig src_cfg( "twinrc" ); KConfig dest_cfg( "twinrulesrc" ); loadFakeSessionInfo( &src_cfg ); |