summaryrefslogtreecommitdiffstats
path: root/kexi
diff options
context:
space:
mode:
Diffstat (limited to 'kexi')
-rw-r--r--kexi/doc/dev/TODO-Kexi-js4
-rw-r--r--kexi/doc/dev/kexi_guidelines.txt4
-rw-r--r--kexi/doc/dev/naming_conventions.txt4
-rw-r--r--kexi/doc/dev/sqlite_issues.txt2
-rw-r--r--kexi/examples/Simple_Database.kexi.sql6
-rw-r--r--kexi/kexidb/drivers/pqxx/pqxxcursor.cpp2
-rw-r--r--kexi/kexidb/parser/sqlscanner.l14
-rw-r--r--kexi/tests/altertable/defaultvalues.altertable8
8 files changed, 22 insertions, 22 deletions
diff --git a/kexi/doc/dev/TODO-Kexi-js b/kexi/doc/dev/TODO-Kexi-js
index 90b7d5f6..378e6b36 100644
--- a/kexi/doc/dev/TODO-Kexi-js
+++ b/kexi/doc/dev/TODO-Kexi-js
@@ -344,7 +344,7 @@ HINT: removing Qt::WStaticContents from KexiTableView ctor fixed repaint problem
- KTextEdit doesn't allow to set custom cursor (also in Qt Designer)
- support for multiple widgets selection in the property editor (requires changes to kexiproperty)
- handle older and newer formats in FormIO::loadFormFromDom()
-- TDEAcceleratorManager::setNoAccel(QWidget*) - use it in data mode,
+- TDEAcceleratorManager::setNoAccel(TQWidget*) - use it in data mode,
define "auto accels" form's property and if it's false
- find a way to create more meaningfull default names for widgets than button1, button2.
Maybe convert widget text (if available) using string2Identifier()?
@@ -375,7 +375,7 @@ HINT: removing Qt::WStaticContents from KexiTableView ctor fixed repaint problem
- tab widget: add color property for setting particular tab
- add a Scratchpad as in QtDesigner4, allows to drag&drop widgets between forms...
- Use RESET clause for TQ_PROPERTY, eg. RESET unsetPalette for paletteBackgroundColor.
- Then, use bool QMetaProperty::reset ( QObject * o ) const to reset property value in the propeditor.
+ Then, use bool QMetaProperty::reset ( TQObject * o ) const to reset property value in the propeditor.
- Autoforms: allow to define groups of fields so the fileds can be displayed with nice groupo boxes.
(e.g. http://www.glom.org/screenshots/glom_data_details.png)
This definition shgould be made during table design, so we can reuse groupping information also in
diff --git a/kexi/doc/dev/kexi_guidelines.txt b/kexi/doc/dev/kexi_guidelines.txt
index 7c2dfaba..cb1ea7b2 100644
--- a/kexi/doc/dev/kexi_guidelines.txt
+++ b/kexi/doc/dev/kexi_guidelines.txt
@@ -15,8 +15,8 @@ In fact many KexiDB features are compatible with QSQL.
Focus on:
- avoid loading all result data to client memory (fetch some records instead)
- avoid blocking operations (do asynchronously as many things as possible)
-- avoid memory copying (at low level try to store original char* data instead of QString,
- convert to QString only on data displaying)
+- avoid memory copying (at low level try to store original char* data instead of TQString,
+ convert to TQString only on data displaying)
Idea 3
Directories layout:
diff --git a/kexi/doc/dev/naming_conventions.txt b/kexi/doc/dev/naming_conventions.txt
index 8d34f97a..7c167a77 100644
--- a/kexi/doc/dev/naming_conventions.txt
+++ b/kexi/doc/dev/naming_conventions.txt
@@ -97,8 +97,8 @@ to recognise who marked given fragment.
4. Indentation
4.1 We can use the rule as in the rest of KDE code.
example:
- QString objectName(); //wrong
- QString objectName(); //ok
+ TQString objectName(); //wrong
+ TQString objectName(); //ok
rule: dont use tabs between words.
4.2 To avoid many indentation levels, we can use:
diff --git a/kexi/doc/dev/sqlite_issues.txt b/kexi/doc/dev/sqlite_issues.txt
index 9e9ebf56..d6a96236 100644
--- a/kexi/doc/dev/sqlite_issues.txt
+++ b/kexi/doc/dev/sqlite_issues.txt
@@ -72,7 +72,7 @@ These checks should be made in KexiDB SQLite engine driver. In fact for each dri
should be allocated for given query independently from the same field allocated for table schema.
The first field object can disallow editing while the latter can allow editing (because it is
component of regular table).
- B) Also add method for QString KexiDB::Field that returns i18n'd message about the reasons
+ B) Also add method for TQString KexiDB::Field that returns i18n'd message about the reasons
of disallowing for editing given field in a context of given query.
diff --git a/kexi/examples/Simple_Database.kexi.sql b/kexi/examples/Simple_Database.kexi.sql
index 97870fb2..024d8d22 100644
--- a/kexi/examples/Simple_Database.kexi.sql
+++ b/kexi/examples/Simple_Database.kexi.sql
@@ -22,7 +22,7 @@ INSERT INTO "kexi__objectdata" VALUES(4, '<!DOCTYPE UI>
<UI stdsetdef="1" version="3.1" >
<kfd:customHeader version="2" />
<pixmapinproject/>
-<class>QWidget</class>
+<class>TQWidget</class>
<widget class="TQWidget" >
<property name="name" >
<cstring>formularz1</cstring>
@@ -234,7 +234,7 @@ INSERT INTO "kexi__objectdata" VALUES(65, X'3C21444F43545950452055493E0A3C554920
INSERT INTO "kexi__objectdata" VALUES(96, '<!DOCTYPE UI>
<UI stdsetdef="1" version="3.1" >
<pixmapinproject/>
- <class>QWidget</class>
+ <class>TQWidget</class>
<widget class="TQWidget" >
<property name="name" >
<cstring>report2</cstring>
@@ -427,7 +427,7 @@ INSERT INTO "kexi__objectdata" VALUES(105, '<!DOCTYPE UI>
<UI stdsetdef="1" version="3.1" >
<kfd:customHeader version="2" />
<pixmapinproject/>
-<class>QWidget</class>
+<class>TQWidget</class>
<widget class="TQWidget" >
<property name="name" >
<cstring>form1</cstring>
diff --git a/kexi/kexidb/drivers/pqxx/pqxxcursor.cpp b/kexi/kexidb/drivers/pqxx/pqxxcursor.cpp
index 77746a13..4d5011f9 100644
--- a/kexi/kexidb/drivers/pqxx/pqxxcursor.cpp
+++ b/kexi/kexidb/drivers/pqxx/pqxxcursor.cpp
@@ -239,7 +239,7 @@ TQVariant pqxxSqlCursor::pValue(uint pos)const
}
else if (f->type() == Field::Boolean )
{
- return QString((*m_res)[at()][pos].c_str()).lower() == "t" ? TQVariant(true) : TQVariant(false);
+ return TQString((*m_res)[at()][pos].c_str()).lower() == "t" ? TQVariant(true) : TQVariant(false);
}
else if (f->typeGroup() == Field::BLOBGroup)
{
diff --git a/kexi/kexidb/parser/sqlscanner.l b/kexi/kexidb/parser/sqlscanner.l
index b16a615d..75e122c0 100644
--- a/kexi/kexidb/parser/sqlscanner.l
+++ b/kexi/kexidb/parser/sqlscanner.l
@@ -31,8 +31,8 @@
#define YY_NO_UNPUT
#define ECOUNT current += yyleng; ctoken = yytext
-extern void setError(const QString& errDesc);
-extern void setError(const QString& errName, const QString& errDesc);
+extern void setError(const TQString& errDesc);
+extern void setError(const TQString& errName, const TQString& errDesc);
%}
@@ -90,10 +90,10 @@ real ((({digit}*\.{digit}+)|({digit}+\.{digit}*)|({digit}+))([Ee][-+]?{digit}
{integer} {
//TODO: what about hex or octal values?
- //we're using QString:toLongLong() here because atoll() is not so portable:
+ //we're using TQString:toLongLong() here because atoll() is not so portable:
ECOUNT;
bool ok;
- yylval.integerValue = QString(yytext).toLongLong( &ok );
+ yylval.integerValue = TQString(yytext).toLongLong( &ok );
if (!ok) {
setError(i18n("Invalid integer number"),i18n("This integer number may be too large."));
return SCAN_ERROR;
@@ -272,7 +272,7 @@ real ((({digit}*\.{digit}+)|({digit}+\.{digit}*)|({digit}+))([Ee][-+]?{digit}
(['][^']*[']|["][^\"]*["]) {
ECOUNT;
- yylval.stringValue = new QString(QString::fromUtf8(yytext+1, yyleng-2));
+ yylval.stringValue = new TQString(TQString::fromUtf8(yytext+1, yyleng-2));
return CHARACTER_STRING_LITERAL;
/* "ZZZ" sentinel for script */
@@ -281,7 +281,7 @@ real ((({digit}*\.{digit}+)|({digit}+\.{digit}*)|({digit}+))([Ee][-+]?{digit}
{identifier} {
KexiDBDbg << "yytext: '" << yytext << "' (" << yyleng << ")" << endl;
ECOUNT;
- yylval.stringValue = new QString(QString::fromUtf8(yytext, yyleng));
+ yylval.stringValue = new TQString(TQString::fromUtf8(yytext, yyleng));
if (yytext[0]>='0' && yytext[0]<='9') {
setError(i18n("Invalid identifier"),
i18n("Identifiers should start with a letter or '_' character"));
@@ -293,7 +293,7 @@ real ((({digit}*\.{digit}+)|({digit}+\.{digit}*)|({digit}+))([Ee][-+]?{digit}
{query_parameter} {
KexiDBDbg << "yytext: '" << yytext << "' (" << yyleng << ")" << endl;
ECOUNT;
- yylval.stringValue = new QString(QString::fromUtf8(yytext+1, yyleng-2));
+ yylval.stringValue = new TQString(TQString::fromUtf8(yytext+1, yyleng-2));
return QUERY_PARAMETER;
}
diff --git a/kexi/tests/altertable/defaultvalues.altertable b/kexi/tests/altertable/defaultvalues.altertable
index c2b5d885..d5abe134 100644
--- a/kexi/tests/altertable/defaultvalues.altertable
+++ b/kexi/tests/altertable/defaultvalues.altertable
@@ -71,8 +71,8 @@ endDesign
checkSchema
id UNSIGNED Integer AUTOINC UNIQUE PKEY NOTNULL NOTEMPTY
- textfield Text(200) DEFAULT=[QString]abc,
- longtextfield LongText DEFAULT=[QString]def,
+ textfield Text(200) DEFAULT=[TQString]abc,
+ longtextfield LongText DEFAULT=[TQString]def,
bytefield Byte DEFAULT=[int]11,
shortintfield ShortInteger DEFAULT=[int]22,
intfield Integer DEFAULT=[int]333,
@@ -91,8 +91,8 @@ endDesign
checkActions
Remove table field "owner"
Remove table field "model"
-Insert table field "textfield" at position 1 (textfield Text(200) DEFAULT=[QString]abc)
-Insert table field "longtextfield" at position 2 (longtextfield LongText DEFAULT=[QString]def)
+Insert table field "textfield" at position 1 (textfield Text(200) DEFAULT=[TQString]abc)
+Insert table field "longtextfield" at position 2 (longtextfield LongText DEFAULT=[TQString]def)
Insert table field "bytefield" at position 3 (bytefield Byte DEFAULT=[int]11)
Insert table field "shortintfield" at position 4 (shortintfield ShortInteger DEFAULT=[int]22)
Insert table field "intfield" at position 5 (intfield Integer DEFAULT=[int]333)
generated by cgit v1.2.1 (git 2.18.0) at 2024-12-22 17:50:59 +0000