diff options
| author | Timothy Pearson <[email protected]> | 2013-01-22 19:55:40 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2013-01-22 19:55:40 -0600 |
| commit | 73ff676f11662d6178c8854a7832ebffe2ae409d (patch) | |
| tree | 9e89ea7d87940087d2d3c5db9b378ef989dd1346 /kexi/kexidb/simplecommandlineapp.cpp | |
| parent | c2ba2f56121c21a762619faf195e8332ef5b224f (diff) | |
| download | koffice-73ff676f11662d6178c8854a7832ebffe2ae409d.tar.gz koffice-73ff676f11662d6178c8854a7832ebffe2ae409d.zip | |
Rename KInstance and KAboutData to avoid conflicts with KDE4
Diffstat (limited to 'kexi/kexidb/simplecommandlineapp.cpp')
| -rw-r--r-- | kexi/kexidb/simplecommandlineapp.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/kexi/kexidb/simplecommandlineapp.cpp b/kexi/kexidb/simplecommandlineapp.cpp index 6ba6624b..5b3732a5 100644 --- a/kexi/kexidb/simplecommandlineapp.cpp +++ b/kexi/kexidb/simplecommandlineapp.cpp @@ -72,7 +72,7 @@ public: KexiDB::DriverManager manager; KCmdLineOptions *allOptions; - KInstance* instance; + TDEInstance* instance; ConnectionData connData; TQGuardedPtr<Connection> conn; }; @@ -91,7 +91,7 @@ SimpleCommandLineApp::SimpleCommandLineApp( TQFileInfo fi(argv[0]); TQCString appName( fi.baseName().latin1() ); TDECmdLineArgs::init(argc, argv, - new KAboutData( appName, programName, + new TDEAboutData( appName, programName, version, shortDescription, licenseType, copyrightStatement, text, homePageAddress, bugsEmailAddress)); @@ -102,7 +102,7 @@ SimpleCommandLineApp::SimpleCommandLineApp( for (KCmdLineOptions *optionsPtr = options; optionsPtr->name; optionsPtr++, userOptionsCount++) ; - d->instance = new KInstance(appName); + d->instance = new TDEInstance(appName); // join the predefined options and user options d->allOptions = new KCmdLineOptions[predefinedOptionsCount + userOptionsCount + 1]; @@ -212,7 +212,7 @@ bool SimpleCommandLineApp::closeDatabase() return true; } -KInstance* SimpleCommandLineApp::instance() const +TDEInstance* SimpleCommandLineApp::instance() const { return d->instance; } |