pull/1/head
Timothy Pearson 13 years ago
parent 4ef89ad3fd
commit 47e6e18a1e

@ -239,7 +239,7 @@ TQVariant pqxxSqlCursor::pValue(uint pos)const
} }
else if (f->type() == Field::Boolean ) 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) else if (f->typeGroup() == Field::BLOBGroup)
{ {

@ -464,12 +464,12 @@
# include <malloc.h> # include <malloc.h>
#endif #endif
#include <qobject.h> #include <tqobject.h>
#include <kdebug.h> #include <kdebug.h>
#include <klocale.h> #include <klocale.h>
#include <qptrlist.h> #include <tqptrlist.h>
#include <qcstring.h> #include <tqcstring.h>
#include <qvariant.h> #include <tqvariant.h>
#include <connection.h> #include <connection.h>
#include <queryschema.h> #include <queryschema.h>
@ -500,7 +500,7 @@ using namespace KexiDB;
#if 0 #if 0
struct yyval struct yyval
{ {
QString parserUserName; TQString parserUserName;
int integerValue; int integerValue;
KexiDBField::ColumnType coltype; KexiDBField::ColumnType coltype;
} }
@ -509,7 +509,7 @@ using namespace KexiDB;
%} %}
%union { %union {
QString* stringValue; TQString* stringValue;
Q_LLONG integerValue; Q_LLONG integerValue;
bool booleanValue; bool booleanValue;
struct realType realValue; struct realType realValue;
@ -742,7 +742,7 @@ SELECT
KexiDBDbg << "SELECT" << endl; KexiDBDbg << "SELECT" << endl;
// parser->createSelect(); // parser->createSelect();
// parser->setOperation(Parser::OP_Select); // parser->setOperation(Parser::OP_Select);
$$ = new QuerySchema(); $$ = new TQuerySchema();
} }
; ;
@ -826,20 +826,20 @@ OrderByColumnId
OrderByColumnId: OrderByColumnId:
IDENTIFIER IDENTIFIER
{ {
$$ = new QVariant( *$1 ); $$ = new TQVariant( *$1 );
KexiDBDbg << "OrderByColumnId: " << *$$ << endl; KexiDBDbg << "OrderByColumnId: " << *$$ << endl;
delete $1; delete $1;
} }
| IDENTIFIER '.' IDENTIFIER | IDENTIFIER '.' IDENTIFIER
{ {
$$ = new QVariant( *$1 + "." + *$3 ); $$ = new TQVariant( *$1 + "." + *$3 );
KexiDBDbg << "OrderByColumnId: " << *$$ << endl; KexiDBDbg << "OrderByColumnId: " << *$$ << endl;
delete $1; delete $1;
delete $3; delete $3;
} }
| INTEGER_CONST | INTEGER_CONST
{ {
$$ = new QVariant($1); $$ = new TQVariant($1);
KexiDBDbg << "OrderByColumnId: " << *$$ << endl; KexiDBDbg << "OrderByColumnId: " << *$$ << endl;
} }
@ -1052,10 +1052,10 @@ aExpr9:
} }
| SQL_NULL | SQL_NULL
{ {
$$ = new ConstExpr( SQL_NULL, QVariant() ); $$ = new ConstExpr( SQL_NULL, TQVariant() );
KexiDBDbg << " + NULL" << endl; KexiDBDbg << " + NULL" << endl;
// $$ = new Field(); // $$ = new Field();
//$$->setName(QString::null); //$$->setName(TQString::null);
} }
| CHARACTER_STRING_LITERAL | CHARACTER_STRING_LITERAL
{ {
@ -1082,7 +1082,7 @@ aExpr9:
} }
| REAL_CONST | 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; KexiDBDbg << " + real constant: " << $1.integer << "." << $1.fractional << endl;
} }
| |
@ -1350,7 +1350,7 @@ ColWildCard:
} }
| IDENTIFIER '.' '*' | IDENTIFIER '.' '*'
{ {
QString s( *$1 ); TQString s( *$1 );
s += ".*"; s += ".*";
$$ = new VariableExpr(s); $$ = new VariableExpr(s);
KexiDBDbg << " + all columns from " << s << endl; KexiDBDbg << " + all columns from " << s << endl;

@ -543,7 +543,7 @@ bool PqxxMigrate::drv_copyTable(const TQString& srcTable, KexiDB::Connection *de
} }
else if (fieldsExpanded.at(index)->field->type()==KexiDB::Field::Boolean ) 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 else
{ {

@ -202,7 +202,7 @@ def testKexiDB():
#mykexidbclass.addField(ts2, "MyField 111111111") #mykexidbclass.addField(ts2, "MyField 111111111")
#print "myfileconnection.alterTable = %s" % myfileconnection.alterTable(ts1, ts2) #print "myfileconnection.alterTable = %s" % myfileconnection.alterTable(ts1, ts2)
#TEST #TEST
#bool Connection::insertRecord(TableSchema &tableSchema, QValueList<QVariant>& values) #bool Connection::insertRecord(TableSchema &tableSchema, TQValueList<TQVariant>& values)
#myfileconnection.insertRecord(KexiDBField, ("field1", "field2")) #myfileconnection.insertRecord(KexiDBField, ("field1", "field2"))
#del(mycursor) #del(mycursor)
#del(myfileconnection) #del(myfileconnection)

Loading…
Cancel
Save