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 | |
| 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')
| -rw-r--r-- | kexi/tests/altertable/altertable.cpp | 2 | ||||
| -rw-r--r-- | kexi/tests/gui/finddialog/main.cpp | 2 | ||||
| -rw-r--r-- | kexi/tests/newapi/main.cpp | 8 | ||||
| -rw-r--r-- | kexi/tests/newapi/mysqlcursor.cpp | 2 | ||||
| -rw-r--r-- | kexi/tests/parser/main.cpp | 2 |
5 files changed, 8 insertions, 8 deletions
diff --git a/kexi/tests/altertable/altertable.cpp b/kexi/tests/altertable/altertable.cpp index 7e8af75b..39e8e684 100644 --- a/kexi/tests/altertable/altertable.cpp +++ b/kexi/tests/altertable/altertable.cpp @@ -690,7 +690,7 @@ int main(int argc, char *argv[]) newArgv[0] = tqstrdup(argv[0]); newArgv[1] = tqstrdup( "--skip-startup-dialog" ); - KAboutData* aboutdata = Kexi::createAboutData(); + TDEAboutData* aboutdata = Kexi::createAboutData(); aboutdata->setProgramName( "Kexi Alter Table Test" ); int result = KexiMainWindowImpl::create(newArgc, newArgv, aboutdata); if (!tqApp) diff --git a/kexi/tests/gui/finddialog/main.cpp b/kexi/tests/gui/finddialog/main.cpp index 4dbcb5a6..838fd5ea 100644 --- a/kexi/tests/gui/finddialog/main.cpp +++ b/kexi/tests/gui/finddialog/main.cpp @@ -26,7 +26,7 @@ int main( int argc, char ** argv ) { - KAboutData aboutData( "test", I18N_NOOP("KFind"), "0", "", KAboutData::License_LGPL ); + TDEAboutData aboutData( "test", I18N_NOOP("KFind"), "0", "", TDEAboutData::License_LGPL ); TDECmdLineArgs::init( argc, argv, &aboutData ); TDEApplication app; diff --git a/kexi/tests/newapi/main.cpp b/kexi/tests/newapi/main.cpp index a87c49db..95e2c0b3 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); diff --git a/kexi/tests/newapi/mysqlcursor.cpp b/kexi/tests/newapi/mysqlcursor.cpp index 091cc8a1..426c65aa 100644 --- a/kexi/tests/newapi/mysqlcursor.cpp +++ b/kexi/tests/newapi/mysqlcursor.cpp @@ -9,7 +9,7 @@ int main(int argc, char * argv[]) { - KInstance instance("newapi"); + TDEInstance instance("newapi"); KexiDB::DriverManager manager; TQStringList names = manager.driverNames(); kdDebug() << "DRIVERS: " << endl; diff --git a/kexi/tests/parser/main.cpp b/kexi/tests/parser/main.cpp index 803e0193..1b5f8099 100644 --- a/kexi/tests/parser/main.cpp +++ b/kexi/tests/parser/main.cpp @@ -20,7 +20,7 @@ int main(int argc, char **argv) kdDebug() << "main()" << endl; TQFileInfo info=TQFileInfo(argv[0]); prgname = info.baseName().latin1(); - KInstance instance( prgname ); + TDEInstance instance( prgname ); if (argc<2) { return 1; } |