1 files changed, 16 insertions, 16 deletions

diff --git a/kexi/kexidb/drivers/pqxx/pqxxcursor.h b/kexi/kexidb/drivers/pqxx/pqxxcursor.h
index d596acca..637a33f3 100644
--- a/kexi/kexidb/drivers/pqxx/pqxxcursor.h
+++ b/kexi/kexidb/drivers/pqxx/pqxxcursor.h
@@ -17,8 +17,8 @@
  * Boston, MA 02110-1301, USA.
 */
 
-#ifndef KEXIDB_CURSOR_PQXX_H
-#define KEXIDB_CURSOR_PQXX_H
+#ifndef KEXIDB_CURSOR_PTQXX_H
+#define KEXIDB_CURSOR_PTQXX_H
 
 #include <kexidb/cursor.h>
 #include <kexidb/connection.h>
@@ -39,7 +39,7 @@ class pqxxSqlCursor: public Cursor {
 public:
 	virtual ~pqxxSqlCursor();
 
-	virtual QVariant value(uint i);
+	virtual TQVariant value(uint i);
 	virtual const char** rowData() const;
 	virtual void storeCurrentRow(RowData &data) const;
 
@@ -47,18 +47,18 @@ public:
 		
 //TODO	virtual int serverResult() const;
 		
-//TODO	virtual QString serverResultName() const;
+//TODO	virtual TQString serverResultName() const;
 
-//TODO	virtual QString serverErrorMsg() const;
+//TODO	virtual TQString serverErrorMsg() const;
 		
 protected:
-	pqxxSqlCursor(Connection* conn, const QString& statement = QString::null, uint options = NoOptions );
+	pqxxSqlCursor(Connection* conn, const TQString& statement = TQString(), uint options = NoOptions );
 	pqxxSqlCursor(Connection* conn, QuerySchema& query, uint options = NoOptions );
 	virtual void drv_clearServerResult();
 	virtual void drv_appendCurrentRecordToBuffer();
 	virtual void drv_bufferMovePointerNext();
 	virtual void drv_bufferMovePointerPrev();
-	virtual void drv_bufferMovePointerTo(Q_LLONG to);
+	virtual void drv_bufferMovePointerTo(TQ_LLONG to);
 	virtual bool drv_open();
 	virtual bool drv_close();
 	virtual void drv_getNextRecord();
@@ -68,18 +68,18 @@ private:
 	pqxx::result* m_res;
 //	pqxx::nontransaction* m_tran;
 	pqxx::connection* my_conn;
-	QVariant pValue(uint pos)const;
+	TQVariant pValue(uint pos)const;
 	bool m_implicityStarted : 1;
-	//QByteArray processBinaryData(pqxx::binarystring*) const;
+	//TQByteArray processBinaryData(pqxx::binarystring*) const;
 	friend class pqxxSqlConnection;
 };
 
-inline QVariant pgsqlCStrToVariant(const pqxx::result::field& r)
+inline TQVariant pgsqlCStrToVariant(const pqxx::result::field& r)
 {
 	switch(r.type())
 	{
 		case BOOLOID:
-			return QString::fromLatin1(r.c_str(), r.size())=="true"; //TODO check formatting
+			return TQString::tqfromLatin1(r.c_str(), r.size())=="true"; //TODO check formatting
 		case INT2OID:
 		case INT4OID:
 		case INT8OID:
@@ -89,19 +89,19 @@ inline QVariant pgsqlCStrToVariant(const pqxx::result::field& r)
 		case NUMERICOID:
 			return r.as(double());
 		case DATEOID:
-			return QString::fromUtf8(r.c_str(), r.size()); //TODO check formatting
+			return TQString::fromUtf8(r.c_str(), r.size()); //TODO check formatting
 		case TIMEOID:
-			return QString::fromUtf8(r.c_str(), r.size()); //TODO check formatting
+			return TQString::fromUtf8(r.c_str(), r.size()); //TODO check formatting
 		case TIMESTAMPOID:
-			return QString::fromUtf8(r.c_str(), r.size()); //TODO check formatting
+			return TQString::fromUtf8(r.c_str(), r.size()); //TODO check formatting
 		case BYTEAOID:
 			return KexiDB::pgsqlByteaToByteArray(r.c_str(), r.size());
 		case BPCHAROID:
 		case VARCHAROID:
 		case TEXTOID:
-			return QString::fromUtf8(r.c_str(), r.size()); //utf8?
+			return TQString::fromUtf8(r.c_str(), r.size()); //utf8?
 		default:
-			return QString::fromUtf8(r.c_str(), r.size()); //utf8?
+			return TQString::fromUtf8(r.c_str(), r.size()); //utf8?
 	}
 }