Fix inadvertent TQt string conversions

This closes Bug 782

27 files changed, 89 insertions, 89 deletions

diff --git a/kexi/kexidb/connection.cpp b/kexi/kexidb/connection.cpp
index a5b962da..9037b041 100644
--- a/kexi/kexidb/connection.cpp
+++ b/kexi/kexidb/connection.cpp
@@ -671,7 +671,7 @@ TQString Connection::currentDatabase() const
 
 bool Connection::useTemporaryDatabaseIfNeeded(TQString &tmpdbName)
 {
-	if (!m_driver->isFileDriver() && m_driver->beh->USING_DATABASE_RETQUIRED_TO_CONNECT
+	if (!m_driver->isFileDriver() && m_driver->beh->USING_DATABASE_REQUIRED_TO_CONNECT
 	 && !isDatabaseUsed()) {
 		//we have no db used, but it is required by engine to have used any!
 		tmpdbName = anyAvailableDatabaseName();
@@ -884,8 +884,8 @@ TQString Connection::createTableStatement( const KexiDB::TableSchema& tableSchem
 			sql += ", ";
 		TQString v = escapeIdentifier(field->name()) + " ";
 		const bool autoinc = field->isAutoIncrement();
-		const bool pk = field->isPrimaryKey() || (autoinc && m_driver->beh->AUTO_INCREMENT_RETQUIRES_PK);
-//TODO: warning: ^^^^^ this allows only one autonumber per table when AUTO_INCREMENT_RETQUIRES_PK==true!
+		const bool pk = field->isPrimaryKey() || (autoinc && m_driver->beh->AUTO_INCREMENT_REQUIRES_PK);
+//TODO: warning: ^^^^^ this allows only one autonumber per table when AUTO_INCREMENT_REQUIRES_PK==true!
 		if (autoinc && m_driver->beh->SPECIAL_AUTO_INCREMENT_DEF) {
 			if (pk)
 				v += m_driver->beh->AUTO_INCREMENT_TYPE + " " + m_driver->beh->AUTO_INCREMENT_PK_FIELD_OPTION;
@@ -918,7 +918,7 @@ TQString Connection::createTableStatement( const KexiDB::TableSchema& tableSchem
 				if (pk)
 					v += " PRIMARY KEY";
 			if (!pk && field->isUniqueKey())
-				v += " UNITQUE";
+				v += " UNIQUE";
 ///@todo IS this ok for all engines?: if (!autoinc && !field->isPrimaryKey() && field->isNotNull())
 			if (!autoinc && !pk && field->isNotNull())
 				v += " NOT NULL"; //only add not null option if no autocommit is set
@@ -2481,7 +2481,7 @@ bool Connection::resultExists(const TQString& sql, bool &success, bool addLimitT
 {
 	KexiDB::Cursor *cursor;
 	//optimization
-	if (m_driver->beh->SELECT_1_SUBTQUERY_SUPPORTED) {
+	if (m_driver->beh->SELECT_1_SUBQUERY_SUPPORTED) {
 		//this is at least for sqlite
 		if (addLimitTo1 && sql.left(6).upper() == "SELECT")
 			m_sql = TQString("SELECT 1 FROM (") + sql + ") LIMIT 1"; // is this safe?;
@@ -3279,7 +3279,7 @@ bool Connection::insertRow(QuerySchema &query, RowData& data, RowEditBuffer& buf
 	if (b.isEmpty()) {
 		// empty row inserting requested:
 		if (!getROWID && !pkey) {
-			KexiDBWarn << "MASTER TABLE's PKEY RETQUIRED FOR INSERTING EMPTY ROWS: INSERT CANCELLED" << endl;
+			KexiDBWarn << "MASTER TABLE's PKEY REQUIRED FOR INSERTING EMPTY ROWS: INSERT CANCELLED" << endl;
 			setError(ERR_INSERT_NO_MASTER_TABLES_PKEY,
 				i18n("Could not insert row because master table has no primary key defined."));
 			return false;
diff --git a/kexi/kexidb/cursor.cpp b/kexi/kexidb/cursor.cpp
index 75c30cfa..b5f095e2 100644
--- a/kexi/kexidb/cursor.cpp
+++ b/kexi/kexidb/cursor.cpp
@@ -166,7 +166,7 @@ bool Cursor::open()
 
 //luci:	WHAT_EXACTLY_SHOULD_THAT_BE?
 //	if (!m_readAhead) // jowenn: to ensure before first state, without cluttering implementation code
-	if (m_conn->driver()->beh->_1ST_ROW_READ_AHEAD_RETQUIRED_TO_KNOW_IF_THE_RESULT_IS_EMPTY) {
+	if (m_conn->driver()->beh->_1ST_ROW_READ_AHEAD_REQUIRED_TO_KNOW_IF_THE_RESULT_IS_EMPTY) {
 //		KexiDBDbg << "READ AHEAD:" << endl;
 		m_readAhead = getNextRecord(); //true if any record in this query
 //		KexiDBDbg << "READ AHEAD = " << m_readAhead << endl;
diff --git a/kexi/kexidb/driver.cpp b/kexi/kexidb/driver.cpp
index d760a004..8e08b83f 100644
--- a/kexi/kexidb/driver.cpp
+++ b/kexi/kexidb/driver.cpp
@@ -49,12 +49,12 @@ DriverBehaviour::DriverBehaviour()
 	, AUTO_INCREMENT_FIELD_OPTION("AUTO_INCREMENT")
 	, AUTO_INCREMENT_PK_FIELD_OPTION("AUTO_INCREMENT PRIMARY KEY")
 	, SPECIAL_AUTO_INCREMENT_DEF(false)
-	, AUTO_INCREMENT_RETQUIRES_PK(false)
+	, AUTO_INCREMENT_REQUIRES_PK(false)
 	, ROW_ID_FIELD_RETURNS_LAST_AUTOINCREMENTED_VALUE(false)
-	, TQUOTATION_MARKS_FOR_IDENTIFIER('"')
-	, USING_DATABASE_RETQUIRED_TO_CONNECT(true)
-	, _1ST_ROW_READ_AHEAD_RETQUIRED_TO_KNOW_IF_THE_RESULT_IS_EMPTY(false)
-	, SELECT_1_SUBTQUERY_SUPPORTED(false)
+	, QUOTATION_MARKS_FOR_IDENTIFIER('"')
+	, USING_DATABASE_REQUIRED_TO_CONNECT(true)
+	, _1ST_ROW_READ_AHEAD_REQUIRED_TO_KNOW_IF_THE_RESULT_IS_EMPTY(false)
+	, SELECT_1_SUBQUERY_SUPPORTED(false)
 	, SQL_KEYWORDS(0)
 {
 }
@@ -350,7 +350,7 @@ TQCString Driver::escapeIdentifier(const TQCString& str, int options) const
 		return quote + TQCString(str).replace( quote, "\"\"" ) + quote;
 	}
 	else if (needOuterQuotes) {
-		const char quote = beh->TQUOTATION_MARKS_FOR_IDENTIFIER.latin1();
+		const char quote = beh->QUOTATION_MARKS_FOR_IDENTIFIER.latin1();
 		return quote + drv_escapeIdentifier(str) + quote;
 	} else {
 		return drv_escapeIdentifier(str);
diff --git a/kexi/kexidb/driver.h b/kexi/kexidb/driver.h
index 3c69a687..96f271b2 100644
--- a/kexi/kexidb/driver.h
+++ b/kexi/kexidb/driver.h
@@ -319,7 +319,7 @@ class KEXI_DB_EXPORT Driver : public TQObject, public KexiDB::Object
 		 Implement escaping for any character like " or ' as your 
 		 database engine requires. Do not append or prepend any quotation 
 		 marks characters - it is automatically done by escapeIdentifier() using
-		 DriverBehaviour::TQUOTATION_MARKS_FOR_IDENTIFIER.
+		 DriverBehaviour::QUOTATION_MARKS_FOR_IDENTIFIER.
 		*/
 		virtual TQString drv_escapeIdentifier( const TQString& str ) const = 0;
 		
diff --git a/kexi/kexidb/driver_p.h b/kexi/kexidb/driver_p.h
index 7a9be4ee..daf34a2c 100644
--- a/kexi/kexidb/driver_p.h
+++ b/kexi/kexidb/driver_p.h
@@ -72,7 +72,7 @@ class KEXI_DB_EXPORT DriverBehaviour
 
 	/*! True if autoincrement requires field to be declared as primary key.
 	 This is true for SQLite. False by default. */
-	bool AUTO_INCREMENT_RETQUIRES_PK : 1;
+	bool AUTO_INCREMENT_REQUIRES_PK : 1;
 
 	/*! Name of a field (or built-in function) with autoincremented unique value,
 	 typically returned by Connection::drv_lastInsertRowID().
@@ -114,7 +114,7 @@ class KEXI_DB_EXPORT DriverBehaviour
 	/*! Quotation marks used for escaping identifier (see Driver::escapeIdentifier()).
 	 Default value is '"'. Change it for your driver.
 	*/
-	TQChar TQUOTATION_MARKS_FOR_IDENTIFIER;
+	TQChar QUOTATION_MARKS_FOR_IDENTIFIER;
 	
 	/*! True if using database is requied to perform real connection.
 	 This is true for may engines, e.g. for PostgreSQL, where connections 
@@ -122,16 +122,16 @@ class KEXI_DB_EXPORT DriverBehaviour
 	 This flag is unused for file-based db drivers,
 	 by default set to true and used for all other db drivers.
 	*/
-	bool USING_DATABASE_RETQUIRED_TO_CONNECT : 1;
+	bool USING_DATABASE_REQUIRED_TO_CONNECT : 1;
 
 	/*! True if before we know whether the fetched result of executed query
 	 is empty or not, we need to fetch first record. Particularly, it's true for SQLite.
 	 The flag is used in Cursor::open(). By default this flag is false. */
-	bool _1ST_ROW_READ_AHEAD_RETQUIRED_TO_KNOW_IF_THE_RESULT_IS_EMPTY : 1;
+	bool _1ST_ROW_READ_AHEAD_REQUIRED_TO_KNOW_IF_THE_RESULT_IS_EMPTY : 1;
 
 	/*! True if "SELECT 1 from (subquery)" is supported. False by default.
 	 Used in Connection::resultExists() for optimization. It's set to true for SQLite driver. */
-	bool SELECT_1_SUBTQUERY_SUPPORTED : 1;
+	bool SELECT_1_SUBQUERY_SUPPORTED : 1;
 
 	/*! Keywords that need to be escaped for the driver.  Set this before calling
 	    Driver::initSQLKeywords. */
diff --git a/kexi/kexidb/drivers/mySQL/mysqldriver.cpp b/kexi/kexidb/drivers/mySQL/mysqldriver.cpp
index 0f2bcf9b..0d2fe99b 100644
--- a/kexi/kexidb/drivers/mySQL/mysqldriver.cpp
+++ b/kexi/kexidb/drivers/mySQL/mysqldriver.cpp
@@ -63,9 +63,9 @@ MySqlDriver::MySqlDriver(TQObject *parent, const char *name, const TQStringList
 
 	beh->ROW_ID_FIELD_NAME="LAST_INSERT_ID()";
 	beh->ROW_ID_FIELD_RETURNS_LAST_AUTOINCREMENTED_VALUE=true;
-	beh->_1ST_ROW_READ_AHEAD_RETQUIRED_TO_KNOW_IF_THE_RESULT_IS_EMPTY=false;
-	beh->USING_DATABASE_RETQUIRED_TO_CONNECT=false;
-	beh->TQUOTATION_MARKS_FOR_IDENTIFIER='`';
+	beh->_1ST_ROW_READ_AHEAD_REQUIRED_TO_KNOW_IF_THE_RESULT_IS_EMPTY=false;
+	beh->USING_DATABASE_REQUIRED_TO_CONNECT=false;
+	beh->QUOTATION_MARKS_FOR_IDENTIFIER='`';
 	beh->SQL_KEYWORDS = keywords;
 	initSQLKeywords(331);
 	
diff --git a/kexi/kexidb/drivers/mySQL/mysqlkeywords.cpp b/kexi/kexidb/drivers/mySQL/mysqlkeywords.cpp
index 89aad061..e06adb5e 100644
--- a/kexi/kexidb/drivers/mySQL/mysqlkeywords.cpp
+++ b/kexi/kexidb/drivers/mySQL/mysqlkeywords.cpp
@@ -177,7 +177,7 @@ namespace KexiDB {
 		"MASTER_SSL_KEY",
 		"MASTER_USER",
 		"MAX_CONNECTIONS_PER_HOUR",
-		"MAX_TQUERIES_PER_HOUR",
+		"MAX_QUERIES_PER_HOUR",
 		"MAX_ROWS",
 		"MAX_UPDATES_PER_HOUR",
 		"MEDIUM",
@@ -246,7 +246,7 @@ namespace KexiDB {
 		"REPAIR",
 		"REPEATABLE",
 		"REPLICATION",
-		"RETQUIRE",
+		"REQUIRE",
 		"RESET",
 		"RESTORE",
 		"RETURNS",
diff --git a/kexi/kexidb/drivers/pqxx/pqxxconnection.h b/kexi/kexidb/drivers/pqxx/pqxxconnection.h
index 7e7cdf69..2773e08d 100644
--- a/kexi/kexidb/drivers/pqxx/pqxxconnection.h
+++ b/kexi/kexidb/drivers/pqxx/pqxxconnection.h
@@ -17,8 +17,8 @@
  * Boston, MA 02110-1301, USA.
 */
 
-#ifndef PTQXXCONNECTION_H
-#define PTQXXCONNECTION_H
+#ifndef PQXXCONNECTION_H
+#define PQXXCONNECTION_H
 
 #include <tqstringlist.h>
 
diff --git a/kexi/kexidb/drivers/pqxx/pqxxconnection_p.h b/kexi/kexidb/drivers/pqxx/pqxxconnection_p.h
index 2d33e410..3adf09d9 100644
--- a/kexi/kexidb/drivers/pqxx/pqxxconnection_p.h
+++ b/kexi/kexidb/drivers/pqxx/pqxxconnection_p.h
@@ -27,8 +27,8 @@
 // Copyright: See COPYING file that comes with this distribution
 //
 //
-#ifndef PTQXXSQLCONNECTIONINTERNAL_H
-#define PTQXXSQLCONNECTIONINTERNAL_H
+#ifndef PQXXSQLCONNECTIONINTERNAL_H
+#define PQXXSQLCONNECTIONINTERNAL_H
 
 #include <kexidb/connection_p.h>
 #include <pqxx/pqxx>
diff --git a/kexi/kexidb/drivers/pqxx/pqxxcursor.cpp b/kexi/kexidb/drivers/pqxx/pqxxcursor.cpp
index 3b5de6f9..4ae03ced 100644
--- a/kexi/kexidb/drivers/pqxx/pqxxcursor.cpp
+++ b/kexi/kexidb/drivers/pqxx/pqxxcursor.cpp
@@ -44,7 +44,7 @@ static TQByteArray pgsqlByteaToByteArray(const pqxx::result::field& r)
 pqxxSqlCursor::pqxxSqlCursor(KexiDB::Connection* conn, const TQString& statement, uint options):
 	Cursor(conn,statement, options)
 {
-//	KexiDBDrvDbg << "PTQXXSQLCURSOR: constructor for query statement" << endl;
+//	KexiDBDrvDbg << "PQXXSQLCURSOR: constructor for query statement" << endl;
 	my_conn = static_cast<pqxxSqlConnection*>(conn)->d->pqxxsql;
 	m_options = Buffered;
 	m_res = 0;
@@ -57,7 +57,7 @@ pqxxSqlCursor::pqxxSqlCursor(KexiDB::Connection* conn, const TQString& statement
 pqxxSqlCursor::pqxxSqlCursor(Connection* conn, QuerySchema& query, uint options )
 	: Cursor( conn, query, options )
 {
-//	KexiDBDrvDbg << "PTQXXSQLCURSOR: constructor for query schema" << endl;
+//	KexiDBDrvDbg << "PQXXSQLCURSOR: constructor for query schema" << endl;
 	my_conn = static_cast<pqxxSqlConnection*>(conn)->d->pqxxsql;
 	m_options = Buffered;
 	m_res = 0;
diff --git a/kexi/kexidb/drivers/pqxx/pqxxcursor.h b/kexi/kexidb/drivers/pqxx/pqxxcursor.h
index 8a61978d..0a0fb2d5 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_PTQXX_H
-#define KEXIDB_CURSOR_PTQXX_H
+#ifndef KEXIDB_CURSOR_PQXX_H
+#define KEXIDB_CURSOR_PQXX_H
 
 #include <kexidb/cursor.h>
 #include <kexidb/connection.h>
diff --git a/kexi/kexidb/drivers/pqxx/pqxxdriver.cpp b/kexi/kexidb/drivers/pqxx/pqxxdriver.cpp
index 8967bc5e..fea3fa57 100644
--- a/kexi/kexidb/drivers/pqxx/pqxxdriver.cpp
+++ b/kexi/kexidb/drivers/pqxx/pqxxdriver.cpp
@@ -47,7 +47,7 @@ pqxxSqlDriver::pqxxSqlDriver( TQObject *parent, const char *name, const TQString
 	beh->AUTO_INCREMENT_FIELD_OPTION = "";
 	beh->AUTO_INCREMENT_PK_FIELD_OPTION = "PRIMARY KEY";
 	beh->ALWAYS_AVAILABLE_DATABASE_NAME = "template1";
-	beh->TQUOTATION_MARKS_FOR_IDENTIFIER = '"';
+	beh->QUOTATION_MARKS_FOR_IDENTIFIER = '"';
 	beh->SQL_KEYWORDS = keywords;
 	initSQLKeywords(233);
 
diff --git a/kexi/kexidb/drivers/pqxx/pqxxdriver.h b/kexi/kexidb/drivers/pqxx/pqxxdriver.h
index 8ea7b1fa..c7a0fed9 100644
--- a/kexi/kexidb/drivers/pqxx/pqxxdriver.h
+++ b/kexi/kexidb/drivers/pqxx/pqxxdriver.h
@@ -17,8 +17,8 @@
  * Boston, MA 02110-1301, USA.
 */
 
-#ifndef KEXIDB_DRIVER_PTQXX_H
-#define KEXIDB_DRIVER_PTQXX_H
+#ifndef KEXIDB_DRIVER_PQXX_H
+#define KEXIDB_DRIVER_PQXX_H
 
 #include <tqstringlist.h>
 
diff --git a/kexi/kexidb/drivers/pqxx/pqxxpreparedstatement.h b/kexi/kexidb/drivers/pqxx/pqxxpreparedstatement.h
index 1421f5a4..232454d3 100644
--- a/kexi/kexidb/drivers/pqxx/pqxxpreparedstatement.h
+++ b/kexi/kexidb/drivers/pqxx/pqxxpreparedstatement.h
@@ -22,8 +22,8 @@
 // Description: 
 //
 //
-#ifndef PTQXXPREPAREDSTATEMENT_H
-#define PTQXXPREPAREDSTATEMENT_H
+#ifndef PQXXPREPAREDSTATEMENT_H
+#define PQXXPREPAREDSTATEMENT_H
 #include <kexidb/preparedstatement.h>
 #include <kexidb/connection_p.h>
 
diff --git a/kexi/kexidb/drivers/sqlite/sqlitedriver.cpp b/kexi/kexidb/drivers/sqlite/sqlitedriver.cpp
index fc356558..d0b7cf45 100644
--- a/kexi/kexidb/drivers/sqlite/sqlitedriver.cpp
+++ b/kexi/kexidb/drivers/sqlite/sqlitedriver.cpp
@@ -66,11 +66,11 @@ SQLiteDriver::SQLiteDriver( TQObject *parent, const char *name, const TQStringLi
 	beh->AUTO_INCREMENT_FIELD_OPTION = ""; //not available
 	beh->AUTO_INCREMENT_TYPE = "INTEGER";
 	beh->AUTO_INCREMENT_PK_FIELD_OPTION = "PRIMARY KEY";
-	beh->AUTO_INCREMENT_RETQUIRES_PK = true;
+	beh->AUTO_INCREMENT_REQUIRES_PK = true;
 	beh->ROW_ID_FIELD_NAME = "OID";
-	beh->_1ST_ROW_READ_AHEAD_RETQUIRED_TO_KNOW_IF_THE_RESULT_IS_EMPTY=true;
-	beh->TQUOTATION_MARKS_FOR_IDENTIFIER='"';
-	beh->SELECT_1_SUBTQUERY_SUPPORTED = true;
+	beh->_1ST_ROW_READ_AHEAD_REQUIRED_TO_KNOW_IF_THE_RESULT_IS_EMPTY=true;
+	beh->QUOTATION_MARKS_FOR_IDENTIFIER='"';
+	beh->SELECT_1_SUBQUERY_SUPPORTED = true;
 	beh->SQL_KEYWORDS = keywords;
 	initSQLKeywords(29);
 
diff --git a/kexi/kexidb/expression.cpp b/kexi/kexidb/expression.cpp
index b60cd505..fabdf603 100644
--- a/kexi/kexidb/expression.cpp
+++ b/kexi/kexidb/expression.cpp
@@ -564,7 +564,7 @@ bool ConstExpr::validate(ParseInfo& parseInfo)
 
 //=========================================
 QueryParameterExpr::QueryParameterExpr(const TQString& message)
-: ConstExpr( TQUERY_PARAMETER, message )
+: ConstExpr( QUERY_PARAMETER, message )
 , m_type(Field::Text)
 {
 	m_cl = KexiDBExpr_QueryParameter;
diff --git a/kexi/kexidb/field.cpp b/kexi/kexidb/field.cpp
index b12000ac..79b38aca 100644
--- a/kexi/kexidb/field.cpp
+++ b/kexi/kexidb/field.cpp
@@ -598,7 +598,7 @@ TQString Field::debugString() const
 	if (m_constraints & Field::AutoInc)
 		dbg += " AUTOINC";
 	if (m_constraints & Field::Unique)
-		dbg += " UNITQUE";
+		dbg += " UNIQUE";
 	if (m_constraints & Field::PrimaryKey)
 		dbg += " PKEY";
 	if (m_constraints & Field::ForeignKey)
diff --git a/kexi/kexidb/indexschema.cpp b/kexi/kexidb/indexschema.cpp
index dc01ae0e..def58c65 100644
--- a/kexi/kexidb/indexschema.cpp
+++ b/kexi/kexidb/indexschema.cpp
@@ -157,7 +157,7 @@ TQString IndexSchema::debugString()
 		+ (m_isForeignKey ? "FOREIGN KEY " : "")
 		+ (m_isAutoGenerated ? "AUTOGENERATED " : "")
 		+ (m_primary ? "PRIMARY " : "")
-		+ ((!m_primary) && m_unique ? "UNITQUE " : "")
+		+ ((!m_primary) && m_unique ? "UNIQUE " : "")
 		+ FieldList::debugString();
 }
 
diff --git a/kexi/kexidb/indexschema.h b/kexi/kexidb/indexschema.h
index 54306af2..b93a88a4 100644
--- a/kexi/kexidb/indexschema.h
+++ b/kexi/kexidb/indexschema.h
@@ -118,7 +118,7 @@ class KEXI_DB_EXPORT IndexSchema : public FieldList, public SchemaData
 			Auto-generated index is one-field index
 			that was automatically generated 
 			for CREATE TABLE statement when the field has 
-			UNITQUE or PRIMARY KEY constraint enabled.
+			UNIQUE or PRIMARY KEY constraint enabled.
 			
 			Any newly created IndexSchema object 
 			has this flag set to false.
@@ -137,16 +137,16 @@ class KEXI_DB_EXPORT IndexSchema : public FieldList, public SchemaData
 		
 		/*! Sets PRIMARY KEY flag. \sa isPrimary().
 		 Note: Setting PRIMARY KEY on (true), 
-		 UNITQUE flag will be also implicity set. */
+		 UNIQUE flag will be also implicity set. */
 		void setPrimaryKey(bool set);
 
 		/*! \return true if this is unique index. 
 		 This can be one or multifield. */
 		bool isUnique() const;
 		
-		/*! Sets UNITQUE flag. \sa isUnique(). 
-		 Note: Setting UNITQUE off (false), PRIMARY KEY flag will 
-		 be also implicity set off, because this UNITQUE 
+		/*! Sets UNIQUE flag. \sa isUnique(). 
+		 Note: Setting UNIQUE off (false), PRIMARY KEY flag will 
+		 be also implicity set off, because this UNIQUE 
 		 is the requirement for PRIMARY KEYS. */
 		void setUnique(bool set);
 
diff --git a/kexi/kexidb/keywords.cpp b/kexi/kexidb/keywords.cpp
index b1680097..05563497 100644
--- a/kexi/kexidb/keywords.cpp
+++ b/kexi/kexidb/keywords.cpp
@@ -82,7 +82,7 @@ namespace KexiDB {
 		"THEN",
 		"TRANSACTION",
 		"UNION",
-		"UNITQUE",
+		"UNIQUE",
 		"UPDATE",
 		"USING",
 		"VALUES",
diff --git a/kexi/kexidb/lookupfieldschema.cpp b/kexi/kexidb/lookupfieldschema.cpp
index 05728d00..a15f8017 100644
--- a/kexi/kexidb/lookupfieldschema.cpp
+++ b/kexi/kexidb/lookupfieldschema.cpp
@@ -169,7 +169,7 @@ LookupFieldSchema *LookupFieldSchema::loadFromDom(const TQDomElement& lookupEl)
 				| <type>table|query|sql|valuelist|fieldlist</type>  #required because there can be table and query with the same name
 									"fieldlist" (basically a list of column names of a table/query,
 											  "Field List" as in MSA)
-				<name>string</name> #table/query name, etc. or KEXISQL SELECT TQUERY
+				<name>string</name> #table/query name, etc. or KEXISQL SELECT QUERY
 				<values><value>...</value> #for "valuelist" type
 					<value>...</value>
 				</values>
diff --git a/kexi/kexidb/parser/sqlparser.cpp b/kexi/kexidb/parser/sqlparser.cpp
index c7c3aa99..c3d2f53d 100644
--- a/kexi/kexidb/parser/sqlparser.cpp
+++ b/kexi/kexidb/parser/sqlparser.cpp
@@ -174,12 +174,12 @@
      DISTINCT = 363,
      DOMAIN_TOKEN = 364,
      SQL_DOUBLE = 365,
-     DOUBLE_TQUOTED_STRING = 366,
+     DOUBLE_QUOTED_STRING = 366,
      DROP = 367,
      ELSE = 368,
      END = 369,
      END_EXEC = 370,
-     ETQUAL = 371,
+     EQUAL = 371,
      ESCAPE = 372,
      EXCEPT = 373,
      SQL_EXCEPTION = 374,
@@ -296,7 +296,7 @@
      PARTIAL = 485,
      SQL_PASCAL = 486,
      PERSISTENT = 487,
-     CTQL_PI = 488,
+     CQL_PI = 488,
      PLI = 489,
      POSITION = 490,
      PRECISION = 491,
@@ -308,8 +308,8 @@
      PROCEDURE = 497,
      PRODUCT = 498,
      PUBLIC = 499,
-     TQUARTER = 500,
-     TQUIT = 501,
+     QUARTER = 500,
+     QUIT = 501,
      RAND = 502,
      READ_ONLY = 503,
      REAL = 504,
@@ -381,7 +381,7 @@
      TWO_DIGITS = 570,
      UCASE = 571,
      UNION = 572,
-     UNITQUE = 573,
+     UNIQUE = 573,
      SQL_UNKNOWN = 574,
      UPDATE = 575,
      UPPER = 576,
@@ -389,7 +389,7 @@
      USER = 578,
      IDENTIFIER = 579,
      IDENTIFIER_DOT_ASTERISK = 580,
-     TQUERY_PARAMETER = 581,
+     QUERY_PARAMETER = 581,
      USING = 582,
      VALUE = 583,
      VALUES = 584,
@@ -524,12 +524,12 @@
 #define DISTINCT 363
 #define DOMAIN_TOKEN 364
 #define SQL_DOUBLE 365
-#define DOUBLE_TQUOTED_STRING 366
+#define DOUBLE_QUOTED_STRING 366
 #define DROP 367
 #define ELSE 368
 #define END 369
 #define END_EXEC 370
-#define ETQUAL 371
+#define EQUAL 371
 #define ESCAPE 372
 #define EXCEPT 373
 #define SQL_EXCEPTION 374
@@ -646,7 +646,7 @@
 #define PARTIAL 485
 #define SQL_PASCAL 486
 #define PERSISTENT 487
-#define CTQL_PI 488
+#define CQL_PI 488
 #define PLI 489
 #define POSITION 490
 #define PRECISION 491
@@ -658,8 +658,8 @@
 #define PROCEDURE 497
 #define PRODUCT 498
 #define PUBLIC 499
-#define TQUARTER 500
-#define TQUIT 501
+#define QUARTER 500
+#define QUIT 501
 #define RAND 502
 #define READ_ONLY 503
 #define REAL 504
@@ -731,7 +731,7 @@
 #define TWO_DIGITS 570
 #define UCASE 571
 #define UNION 572
-#define UNITQUE 573
+#define UNIQUE 573
 #define SQL_UNKNOWN 574
 #define UPDATE 575
 #define UPPER 576
@@ -739,7 +739,7 @@
 #define USER 578
 #define IDENTIFIER 579
 #define IDENTIFIER_DOT_ASTERISK 580
-#define TQUERY_PARAMETER 581
+#define QUERY_PARAMETER 581
 #define USING 582
 #define VALUE 583
 #define VALUES 584
@@ -1290,8 +1290,8 @@ static const char *const yytname[] =
   "DEC", "DECLARE", "DEFAULT", "DEFERRABLE", "DEFERRED", "SQL_DELETE",
   "DESC", "DESCRIBE", "DESCRIPTOR", "DIAGNOSTICS", "DICTIONARY",
   "DIRECTORY", "DISCONNECT", "DISPLACEMENT", "DISTINCT", "DOMAIN_TOKEN",
-  "SQL_DOUBLE", "DOUBLE_TQUOTED_STRING", "DROP", "ELSE", "END", "END_EXEC",
-  "ETQUAL", "ESCAPE", "EXCEPT", "SQL_EXCEPTION", "EXEC", "EXECUTE",
+  "SQL_DOUBLE", "DOUBLE_QUOTED_STRING", "DROP", "ELSE", "END", "END_EXEC",
+  "EQUAL", "ESCAPE", "EXCEPT", "SQL_EXCEPTION", "EXEC", "EXECUTE",
   "EXISTS", "EXP", "EXPONENT", "EXTERNAL", "EXTRACT", "SQL_FALSE", "FETCH",
   "FIRST", "SQL_FLOAT", "FLOOR", "FN", "FOR", "FOREIGN", "FORTRAN",
   "FOUND", "FOUR_DIGITS", "FROM", "FULL", "GET", "GLOBAL", "GO", "GOTO",
@@ -1308,7 +1308,7 @@ static const char *const yytname[] =
   "NOW", "SQL_NULL", "SQL_IS", "SQL_IS_NULL", "SQL_IS_NOT_NULL", "NULLIF",
   "NUMERIC", "OCTET_LENGTH", "ODBC", "OF", "SQL_OFF", "SQL_ON", "ONLY",
   "OPEN", "OPTION", "OR", "ORDER", "OUTER", "OUTPUT", "OVERLAPS", "PAGE",
-  "PARTIAL", "SQL_PASCAL", "PERSISTENT", "CTQL_PI", "PLI", "POSITION",
+  "PARTIAL", "SQL_PASCAL", "PERSISTENT", "CQL_PI", "PLI", "POSITION",
   "PRECISION", "PREPARE", "PRESERVE", "PRIMARY", "PRIOR", "PRIVILEGES",
   "PROCEDURE", "PRODUCT", "PUBLIC", "QUARTER", "QUIT", "RAND", "READ_ONLY",
   "REAL", "REFERENCES", "REPEAT", "REPLACE", "RESTRICT", "REVOKE", "RIGHT",
@@ -1322,7 +1322,7 @@ static const char *const yytname[] =
   "TAN", "TEMPORARY", "THEN", "THREE_DIGITS", "TIME", "TIMESTAMP",
   "TIMEZONE_HOUR", "TIMEZONE_MINUTE", "TINYINT", "TO", "TO_CHAR",
   "TO_DATE", "TRANSACTION", "TRANSLATE", "TRANSLATION", "TRUNCATE",
-  "GENERAL_TITLE", "TWO_DIGITS", "UCASE", "UNION", "UNITQUE", "SQL_UNKNOWN",
+  "GENERAL_TITLE", "TWO_DIGITS", "UCASE", "UNION", "UNIQUE", "SQL_UNKNOWN",
   "UPDATE", "UPPER", "USAGE", "USER", "IDENTIFIER",
   "IDENTIFIER_DOT_ASTERISK", "QUERY_PARAMETER", "USING", "VALUE", "VALUES",
   "VARBINARY", "VARCHAR", "VARYING", "VENDOR", "VIEW", "WEEK", "WHEN",
diff --git a/kexi/kexidb/parser/sqlparser.h b/kexi/kexidb/parser/sqlparser.h
index 6f2b6534..f9bd290e 100644
--- a/kexi/kexidb/parser/sqlparser.h
+++ b/kexi/kexidb/parser/sqlparser.h
@@ -154,12 +154,12 @@ bool parseData(KexiDB::Parser *p, const char *data);
      DISTINCT = 363,
      DOMAIN_TOKEN = 364,
      SQL_DOUBLE = 365,
-     DOUBLE_TQUOTED_STRING = 366,
+     DOUBLE_QUOTED_STRING = 366,
      DROP = 367,
      ELSE = 368,
      END = 369,
      END_EXEC = 370,
-     ETQUAL = 371,
+     EQUAL = 371,
      ESCAPE = 372,
      EXCEPT = 373,
      SQL_EXCEPTION = 374,
@@ -276,7 +276,7 @@ bool parseData(KexiDB::Parser *p, const char *data);
      PARTIAL = 485,
      SQL_PASCAL = 486,
      PERSISTENT = 487,
-     CTQL_PI = 488,
+     CQL_PI = 488,
      PLI = 489,
      POSITION = 490,
      PRECISION = 491,
@@ -288,8 +288,8 @@ bool parseData(KexiDB::Parser *p, const char *data);
      PROCEDURE = 497,
      PRODUCT = 498,
      PUBLIC = 499,
-     TQUARTER = 500,
-     TQUIT = 501,
+     QUARTER = 500,
+     QUIT = 501,
      RAND = 502,
      READ_ONLY = 503,
      REAL = 504,
@@ -361,7 +361,7 @@ bool parseData(KexiDB::Parser *p, const char *data);
      TWO_DIGITS = 570,
      UCASE = 571,
      UNION = 572,
-     UNITQUE = 573,
+     UNIQUE = 573,
      SQL_UNKNOWN = 574,
      UPDATE = 575,
      UPPER = 576,
@@ -369,7 +369,7 @@ bool parseData(KexiDB::Parser *p, const char *data);
      USER = 578,
      IDENTIFIER = 579,
      IDENTIFIER_DOT_ASTERISK = 580,
-     TQUERY_PARAMETER = 581,
+     QUERY_PARAMETER = 581,
      USING = 582,
      VALUE = 583,
      VALUES = 584,
@@ -504,12 +504,12 @@ bool parseData(KexiDB::Parser *p, const char *data);
 #define DISTINCT 363
 #define DOMAIN_TOKEN 364
 #define SQL_DOUBLE 365
-#define DOUBLE_TQUOTED_STRING 366
+#define DOUBLE_QUOTED_STRING 366
 #define DROP 367
 #define ELSE 368
 #define END 369
 #define END_EXEC 370
-#define ETQUAL 371
+#define EQUAL 371
 #define ESCAPE 372
 #define EXCEPT 373
 #define SQL_EXCEPTION 374
@@ -626,7 +626,7 @@ bool parseData(KexiDB::Parser *p, const char *data);
 #define PARTIAL 485
 #define SQL_PASCAL 486
 #define PERSISTENT 487
-#define CTQL_PI 488
+#define CQL_PI 488
 #define PLI 489
 #define POSITION 490
 #define PRECISION 491
@@ -638,8 +638,8 @@ bool parseData(KexiDB::Parser *p, const char *data);
 #define PROCEDURE 497
 #define PRODUCT 498
 #define PUBLIC 499
-#define TQUARTER 500
-#define TQUIT 501
+#define QUARTER 500
+#define QUIT 501
 #define RAND 502
 #define READ_ONLY 503
 #define REAL 504
@@ -711,7 +711,7 @@ bool parseData(KexiDB::Parser *p, const char *data);
 #define TWO_DIGITS 570
 #define UCASE 571
 #define UNION 572
-#define UNITQUE 573
+#define UNIQUE 573
 #define SQL_UNKNOWN 574
 #define UPDATE 575
 #define UPPER 576
@@ -719,7 +719,7 @@ bool parseData(KexiDB::Parser *p, const char *data);
 #define USER 578
 #define IDENTIFIER 579
 #define IDENTIFIER_DOT_ASTERISK 580
-#define TQUERY_PARAMETER 581
+#define QUERY_PARAMETER 581
 #define USING 582
 #define VALUE 583
 #define VALUES 584
diff --git a/kexi/kexidb/parser/sqlscanner.cpp b/kexi/kexidb/parser/sqlscanner.cpp
index 10fe70a2..f59b5096 100644
--- a/kexi/kexidb/parser/sqlscanner.cpp
+++ b/kexi/kexidb/parser/sqlscanner.cpp
@@ -1125,7 +1125,7 @@ YY_RULE_SETUP
 	KexiDBDbg << "yytext: '" << yytext << "' (" << yyleng << ")" << endl;
 	ECOUNT;
 	yylval.stringValue = new TQString(TQString::fromUtf8(yytext+1, yyleng-2));
-	return TQUERY_PARAMETER;
+	return QUERY_PARAMETER;
 }
 	YY_BREAK
 case 41:
diff --git a/kexi/kexidb/queryschema.cpp b/kexi/kexidb/queryschema.cpp
index 8c5f1a1f..31727bd5 100644
--- a/kexi/kexidb/queryschema.cpp
+++ b/kexi/kexidb/queryschema.cpp
@@ -1600,7 +1600,7 @@ TQValueVector<int> QuerySchema::pkeyFieldsOrder()
 		}
 	}
 	KexiDBDbg << "QuerySchema::pkeyFieldsOrder(): " << d->pkeyFieldsCount
-		<< " OUT OF " << pkey->fieldCount() << " PKEY'S FIELDS FOUND IN TQUERY " << name() << endl;
+		<< " OUT OF " << pkey->fieldCount() << " PKEY'S FIELDS FOUND IN QUERY " << name() << endl;
 	return *d->pkeyFieldsOrder;
 }
 
diff --git a/kexi/kexidb/queryschema.h b/kexi/kexidb/queryschema.h
index 6681ddd3..eedcb6a1 100644
--- a/kexi/kexidb/queryschema.h
+++ b/kexi/kexidb/queryschema.h
@@ -17,8 +17,8 @@
  * Boston, MA 02110-1301, USA.
 */
 
-#ifndef KEXIDB_TQUERY_H
-#define KEXIDB_TQUERY_H
+#ifndef KEXIDB_QUERY_H
+#define KEXIDB_QUERY_H
 
 #include <tqvaluevector.h>
 #include <tqstring.h>
diff --git a/kexi/kexidb/queryschemaparameter.h b/kexi/kexidb/queryschemaparameter.h
index 96168719..5d8eb77c 100644
--- a/kexi/kexidb/queryschemaparameter.h
+++ b/kexi/kexidb/queryschemaparameter.h
@@ -17,8 +17,8 @@
  * Boston, MA 02110-1301, USA.
 */
 
-#ifndef KEXIDB_TQUERYSCHEMAPARAMETER_H
-#define KEXIDB_TQUERYSCHEMAPARAMETER_H
+#ifndef KEXIDB_QUERYSCHEMAPARAMETER_H
+#define KEXIDB_QUERYSCHEMAPARAMETER_H
 
 #include "queryschema.h"