diff options
| -rw-r--r-- | kexi/kexidb/drivers/pqxx/pqxxcursor.cpp | 2 | ||||
| -rw-r--r-- | kexi/kexidb/parser/sqlparser.y | 28 | ||||
| -rw-r--r-- | kexi/migration/pqxx/pqxxmigrate.cpp | 2 | ||||
| -rw-r--r-- | lib/kross/test/testkexidb.py | 2 |
4 files changed, 17 insertions, 17 deletions
diff --git a/kexi/kexidb/drivers/pqxx/pqxxcursor.cpp b/kexi/kexidb/drivers/pqxx/pqxxcursor.cpp index 4ae03ced..b7219e71 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" ? QVariant(true, 1) : QVariant(false, 1); + return QString((*m_res)[at()][pos].c_str()).lower() == "t" ? TQVariant(true, 1) : TQVariant(false, 1); } else if (f->typeGroup() == Field::BLOBGroup) { diff --git a/kexi/kexidb/parser/sqlparser.y b/kexi/kexidb/parser/sqlparser.y index 5a8357f2..ee8bba6b 100644 --- a/kexi/kexidb/parser/sqlparser.y +++ b/kexi/kexidb/parser/sqlparser.y @@ -464,12 +464,12 @@ # include <malloc.h> #endif -#include <qobject.h> +#include <tqobject.h> #include <kdebug.h> #include <klocale.h> -#include <qptrlist.h> -#include <qcstring.h> -#include <qvariant.h> +#include <tqptrlist.h> +#include <tqcstring.h> +#include <tqvariant.h> #include <connection.h> #include <queryschema.h> @@ -500,7 +500,7 @@ using namespace KexiDB; #if 0 struct yyval { - QString parserUserName; + TQString parserUserName; int integerValue; KexiDBField::ColumnType coltype; } @@ -509,7 +509,7 @@ using namespace KexiDB; %} %union { - QString* stringValue; + TQString* stringValue; Q_LLONG integerValue; bool booleanValue; struct realType realValue; @@ -742,7 +742,7 @@ SELECT KexiDBDbg << "SELECT" << endl; // parser->createSelect(); // parser->setOperation(Parser::OP_Select); - $$ = new QuerySchema(); + $$ = new TQuerySchema(); } ; @@ -826,20 +826,20 @@ OrderByColumnId OrderByColumnId: IDENTIFIER { - $$ = new QVariant( *$1 ); + $$ = new TQVariant( *$1 ); KexiDBDbg << "OrderByColumnId: " << *$$ << endl; delete $1; } | IDENTIFIER '.' IDENTIFIER { - $$ = new QVariant( *$1 + "." + *$3 ); + $$ = new TQVariant( *$1 + "." + *$3 ); KexiDBDbg << "OrderByColumnId: " << *$$ << endl; delete $1; delete $3; } | INTEGER_CONST { - $$ = new QVariant($1); + $$ = new TQVariant($1); KexiDBDbg << "OrderByColumnId: " << *$$ << endl; } @@ -1052,10 +1052,10 @@ aExpr9: } | SQL_NULL { - $$ = new ConstExpr( SQL_NULL, QVariant() ); + $$ = new ConstExpr( SQL_NULL, TQVariant() ); KexiDBDbg << " + NULL" << endl; // $$ = new Field(); - //$$->setName(QString::null); + //$$->setName(TQString::null); } | CHARACTER_STRING_LITERAL { @@ -1082,7 +1082,7 @@ aExpr9: } | REAL_CONST { - $$ = new ConstExpr( REAL_CONST, QPoint( $1.integer, $1.fractional ) ); + $$ = new ConstExpr( REAL_CONST, TQPoint( $1.integer, $1.fractional ) ); KexiDBDbg << " + real constant: " << $1.integer << "." << $1.fractional << endl; } | @@ -1350,7 +1350,7 @@ ColWildCard: } | IDENTIFIER '.' '*' { - QString s( *$1 ); + TQString s( *$1 ); s += ".*"; $$ = new VariableExpr(s); KexiDBDbg << " + all columns from " << s << endl; diff --git a/kexi/migration/pqxx/pqxxmigrate.cpp b/kexi/migration/pqxx/pqxxmigrate.cpp index 2ca476d4..9460462c 100644 --- a/kexi/migration/pqxx/pqxxmigrate.cpp +++ b/kexi/migration/pqxx/pqxxmigrate.cpp @@ -543,7 +543,7 @@ bool PqxxMigrate::drv_copyTable(const TQString& srcTable, KexiDB::Connection *de } else if (fieldsExpanded.at(index)->field->type()==KexiDB::Field::Boolean ) { - vals.append(QString((*i).c_str()).lower() == "t" ? QVariant(true, 1) : QVariant(false, 1)); + vals.append(QString((*i).c_str()).lower() == "t" ? TQVariant(true, 1) : TQVariant(false, 1)); } else { diff --git a/lib/kross/test/testkexidb.py b/lib/kross/test/testkexidb.py index 048b7e19..803d6548 100644 --- a/lib/kross/test/testkexidb.py +++ b/lib/kross/test/testkexidb.py @@ -202,7 +202,7 @@ def testKexiDB(): #mykexidbclass.addField(ts2, "MyField 111111111") #print "myfileconnection.alterTable = %s" % myfileconnection.alterTable(ts1, ts2) #TEST - #bool Connection::insertRecord(TableSchema &tableSchema, QValueList<QVariant>& values) + #bool Connection::insertRecord(TableSchema &tableSchema, TQValueList<TQVariant>& values) #myfileconnection.insertRecord(KexiDBField, ("field1", "field2")) #del(mycursor) #del(myfileconnection) |