diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-22 19:55:40 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-22 19:55:40 -0600 |
| commit | 73ff676f11662d6178c8854a7832ebffe2ae409d (patch) | |
| tree | 9e89ea7d87940087d2d3c5db9b378ef989dd1346 /kexi/tests/newapi/main.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/tests/newapi/main.cpp')
| -rw-r--r-- | kexi/tests/newapi/main.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/kexi/tests/newapi/main.cpp b/kexi/tests/newapi/main.cpp index a87c49dbb..95e2c0b3e 100644 --- a/kexi/tests/newapi/main.cpp +++ b/kexi/tests/newapi/main.cpp @@ -52,7 +52,7 @@ KexiDB::ConnectionData conn_data; TQGuardedPtr<KexiDB::Connection> conn; TQGuardedPtr<KexiDB::Driver> driver; TDEApplication *app = 0; -KInstance *instance = 0; +TDEInstance *instance = 0; static KCmdLineOptions options[] = { @@ -116,8 +116,8 @@ int main(int argc, char** argv) prgname = info.baseName().latin1(); TDECmdLineArgs::init(argc, argv, - new KAboutData( prgname, "KexiDBTest", - "0.1.2", "", KAboutData::License_GPL, + new TDEAboutData( prgname, "KexiDBTest", + "0.1.2", "", TDEAboutData::License_GPL, "(c) 2003-2006, Kexi Team\n" "(c) 2003-2006, OpenOffice Polska Ltd.\n", "", @@ -162,7 +162,7 @@ int main(int argc, char** argv) KGlobal::iconLoader()->addAppDir("kexi"); } else { - instance = new KInstance(prgname); + instance = new TDEInstance(prgname); } drv_name = args->arg(0); |