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 /konsole/konsole/main.cpp | |
| 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 'konsole/konsole/main.cpp')
| -rw-r--r-- | konsole/konsole/main.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/konsole/konsole/main.cpp b/konsole/konsole/main.cpp index 2ea4ff58b..f3dba695a 100644 --- a/konsole/konsole/main.cpp +++ b/konsole/konsole/main.cpp @@ -366,13 +366,13 @@ extern "C" int KDE_EXPORT kdemain(int argc, char* argv[]) if (args->isSet("schema")) schema = args->getOption("schema"); - KConfig * sessionconfig = 0; + TDEConfig * sessionconfig = 0; TQString profile = ""; if (args->isSet("profile")) { profile = args->getOption("profile"); TQString path = locate( "data", "konsole/profiles/" + profile ); if ( TQFile::exists( path ) ) - sessionconfig=new KConfig( path, true ); + sessionconfig=new TDEConfig( path, true ); else profile = ""; } |