summaryrefslogtreecommitdiffstats
path: root/kexi
diff options
context:
space:
mode:
Diffstat (limited to 'kexi')
-rw-r--r--kexi/core/kexicmdlineargs.h4
-rwxr-xr-xkexi/doc/dev/CHANGELOG-Kexi-js2
-rw-r--r--kexi/formeditor/test/main.cpp4
-rw-r--r--kexi/kexidb/simplecommandlineapp.cpp22
-rw-r--r--kexi/kexidb/simplecommandlineapp.h4
-rw-r--r--kexi/plugins/macros/tests/komacrotest.cpp4
-rw-r--r--kexi/plugins/macros/tests/komacrotestgui.cpp4
-rw-r--r--kexi/tests/newapi/main.cpp4
8 files changed, 24 insertions, 24 deletions
diff --git a/kexi/core/kexicmdlineargs.h b/kexi/core/kexicmdlineargs.h
index d67c5e61..c1bf80b3 100644
--- a/kexi/core/kexicmdlineargs.h
+++ b/kexi/core/kexicmdlineargs.h
@@ -25,7 +25,7 @@
#include <kcmdlineargs.h>
#include <klocale.h>
-static KCmdLineOptions options[] =
+static TDECmdLineOptions options[] =
{
{ ":", I18N_NOOP("Options related to entire projects:"), 0 },
{ "createdb", I18N_NOOP(
@@ -174,7 +174,7 @@ static KCmdLineOptions options[] =
"or name of a Kexi database\n"
"project on a server to open."), 0 },
// INSERT YOUR COMMANDLINE OPTIONS HERE
- KCmdLineLastOption
+ TDECmdLineLastOption
};
#endif
diff --git a/kexi/doc/dev/CHANGELOG-Kexi-js b/kexi/doc/dev/CHANGELOG-Kexi-js
index 31c32980..4f7243c6 100755
--- a/kexi/doc/dev/CHANGELOG-Kexi-js
+++ b/kexi/doc/dev/CHANGELOG-Kexi-js
@@ -3592,7 +3592,7 @@ KexiDB/parser
- Connection::createTable() now also allows table replacing
- Connection::storeObjectSchemaData() now reuses schema's id if > 0
NEWAPI Test
-- now KCmdLineOptions are used, see README
+- now TDECmdLineOptions are used, see README
- "parser" test added
KexiTableView
- KexiTableViewPropertyBuffer: a fix for maintaining `dirty' flag
diff --git a/kexi/formeditor/test/main.cpp b/kexi/formeditor/test/main.cpp
index d0142ec6..1120acce 100644
--- a/kexi/formeditor/test/main.cpp
+++ b/kexi/formeditor/test/main.cpp
@@ -29,10 +29,10 @@ static const char *description =
static const char *version = "0.3";
-static KCmdLineOptions options[] =
+static TDECmdLineOptions options[] =
{
{ "+[URL]", I18N_NOOP( "Document to open" ), 0 },
- KCmdLineLastOption
+ TDECmdLineLastOption
};
int main(int argc, char **argv)
diff --git a/kexi/kexidb/simplecommandlineapp.cpp b/kexi/kexidb/simplecommandlineapp.cpp
index 5b3732a5..c1fdb861 100644
--- a/kexi/kexidb/simplecommandlineapp.cpp
+++ b/kexi/kexidb/simplecommandlineapp.cpp
@@ -29,7 +29,7 @@
using namespace KexiDB;
-static KCmdLineOptions predefinedOptions[] =
+static TDECmdLineOptions predefinedOptions[] =
{
{ "drv", 0, 0 },
{ "driver <name>", I18N_NOOP("Database driver name"), 0 },
@@ -42,7 +42,7 @@ static KCmdLineOptions predefinedOptions[] =
{ "port <number>", I18N_NOOP("Server's port number"), 0 },
{ "s", 0, 0 },
{ "local-socket <filename>", I18N_NOOP("Server's local socket filename"), 0 },
- KCmdLineLastOption
+ TDECmdLineLastOption
};
//-----------------------------------------
@@ -62,7 +62,7 @@ public:
}
delete instance;
- for (KCmdLineOptions *optionsPtr = allOptions; optionsPtr->name; optionsPtr++) {
+ for (TDECmdLineOptions *optionsPtr = allOptions; optionsPtr->name; optionsPtr++) {
delete optionsPtr->name;
delete optionsPtr->description;
delete optionsPtr->def;
@@ -71,7 +71,7 @@ public:
}
KexiDB::DriverManager manager;
- KCmdLineOptions *allOptions;
+ TDECmdLineOptions *allOptions;
TDEInstance* instance;
ConnectionData connData;
TQGuardedPtr<Connection> conn;
@@ -80,7 +80,7 @@ public:
//-----------------------------------------
SimpleCommandLineApp::SimpleCommandLineApp(
- int argc, char** argv, KCmdLineOptions *options,
+ int argc, char** argv, TDECmdLineOptions *options,
const char *programName, const char *version,
const char *shortDescription, int licenseType,
const char *copyrightStatement, const char *text,
@@ -96,18 +96,18 @@ SimpleCommandLineApp::SimpleCommandLineApp(
homePageAddress, bugsEmailAddress));
int predefinedOptionsCount = 0;
- for (KCmdLineOptions *optionsPtr = predefinedOptions; optionsPtr->name; optionsPtr++, predefinedOptionsCount++)
+ for (TDECmdLineOptions *optionsPtr = predefinedOptions; optionsPtr->name; optionsPtr++, predefinedOptionsCount++)
;
int userOptionsCount = 0;
- for (KCmdLineOptions *optionsPtr = options; optionsPtr->name; optionsPtr++, userOptionsCount++)
+ for (TDECmdLineOptions *optionsPtr = options; optionsPtr->name; optionsPtr++, userOptionsCount++)
;
d->instance = new TDEInstance(appName);
// join the predefined options and user options
- d->allOptions = new KCmdLineOptions[predefinedOptionsCount + userOptionsCount + 1];
- KCmdLineOptions *allOptionsPtr = d->allOptions;
- for (KCmdLineOptions *optionsPtr = predefinedOptions; optionsPtr->name; optionsPtr++, allOptionsPtr++) {
+ d->allOptions = new TDECmdLineOptions[predefinedOptionsCount + userOptionsCount + 1];
+ TDECmdLineOptions *allOptionsPtr = d->allOptions;
+ for (TDECmdLineOptions *optionsPtr = predefinedOptions; optionsPtr->name; optionsPtr++, allOptionsPtr++) {
allOptionsPtr->name = tqstrdup(optionsPtr->name);
allOptionsPtr->description = tqstrdup(optionsPtr->description);
if (optionsPtr == predefinedOptions) //first row == drv
@@ -115,7 +115,7 @@ SimpleCommandLineApp::SimpleCommandLineApp(
else
allOptionsPtr->def = tqstrdup(optionsPtr->def);
}
- for (KCmdLineOptions *optionsPtr = options; optionsPtr->name; optionsPtr++, allOptionsPtr++) {
+ for (TDECmdLineOptions *optionsPtr = options; optionsPtr->name; optionsPtr++, allOptionsPtr++) {
allOptionsPtr->name = tqstrdup(optionsPtr->name);
allOptionsPtr->description = tqstrdup(optionsPtr->description);
allOptionsPtr->def = tqstrdup(optionsPtr->def);
diff --git a/kexi/kexidb/simplecommandlineapp.h b/kexi/kexidb/simplecommandlineapp.h
index 64cc1382..fc189198 100644
--- a/kexi/kexidb/simplecommandlineapp.h
+++ b/kexi/kexidb/simplecommandlineapp.h
@@ -25,7 +25,7 @@
#include <kaboutdata.h>
-struct KCmdLineOptions;
+struct TDECmdLineOptions;
namespace KexiDB
{
@@ -47,7 +47,7 @@ namespace KexiDB
{
public:
SimpleCommandLineApp(
- int argc, char** argv, KCmdLineOptions *options, const char *programName,
+ int argc, char** argv, TDECmdLineOptions *options, const char *programName,
const char *version, const char *shortDescription=0,
int licenseType=TDEAboutData::License_Unknown,
const char *copyrightStatement=0, const char *text=0,
diff --git a/kexi/plugins/macros/tests/komacrotest.cpp b/kexi/plugins/macros/tests/komacrotest.cpp
index 15fc9db1..afc9c98b 100644
--- a/kexi/plugins/macros/tests/komacrotest.cpp
+++ b/kexi/plugins/macros/tests/komacrotest.cpp
@@ -25,9 +25,9 @@
static const char description[] =
I18N_NOOP("KoMacroTester");
static const char version[] = "0.1";
-static KCmdLineOptions options[] =
+static TDECmdLineOptions options[] =
{
- KCmdLineLastOption
+ TDECmdLineLastOption
};
int main( int argc, char** argv )
diff --git a/kexi/plugins/macros/tests/komacrotestgui.cpp b/kexi/plugins/macros/tests/komacrotestgui.cpp
index d651aa01..a0814f1f 100644
--- a/kexi/plugins/macros/tests/komacrotestgui.cpp
+++ b/kexi/plugins/macros/tests/komacrotestgui.cpp
@@ -28,9 +28,9 @@ static const char description[] =
static const char version[] = "0.1";
-static const KCmdLineOptions options[] =
+static const TDECmdLineOptions options[] =
{
- KCmdLineLastOption
+ TDECmdLineLastOption
};
int main( int argc, char** argv )
diff --git a/kexi/tests/newapi/main.cpp b/kexi/tests/newapi/main.cpp
index fce63501..fb0bd629 100644
--- a/kexi/tests/newapi/main.cpp
+++ b/kexi/tests/newapi/main.cpp
@@ -54,7 +54,7 @@ TQGuardedPtr<KexiDB::Driver> driver;
TDEApplication *app = 0;
TDEInstance *instance = 0;
-static KCmdLineOptions options[] =
+static TDECmdLineOptions options[] =
{
{ "test <test_name>",
"Available tests:\n"
@@ -89,7 +89,7 @@ static KCmdLineOptions options[] =
{ "+driver_name", "Driver name", 0},
{ "+[db_name]", "Database name", 0},
{ "+[sql_statement]", "Optional SQL statement (for parser test)", 0},
- KCmdLineLastOption
+ TDECmdLineLastOption
};
#include "dbcreation_test.h"
generated by cgit v1.2.1 (git 2.18.0) at 2024-12-18 15:55:12 +0000