From 735d75d6ce19269dc5faa00abc8f88ff30ce2f23 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Fri, 13 Jan 2012 13:15:14 -0600
Subject: Fix inadvertent TQt string conversions This closes Bug 782

---
 kexi/kexidb/drivers/pqxx/pqxxconnection.h        | 4 ++--
 kexi/kexidb/drivers/pqxx/pqxxconnection_p.h      | 4 ++--
 kexi/kexidb/drivers/pqxx/pqxxcursor.cpp          | 4 ++--
 kexi/kexidb/drivers/pqxx/pqxxcursor.h            | 4 ++--
 kexi/kexidb/drivers/pqxx/pqxxdriver.cpp          | 2 +-
 kexi/kexidb/drivers/pqxx/pqxxdriver.h            | 4 ++--
 kexi/kexidb/drivers/pqxx/pqxxpreparedstatement.h | 4 ++--
 7 files changed, 13 insertions(+), 13 deletions(-)

(limited to 'kexi/kexidb/drivers/pqxx')

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>
 
-- 
cgit v1.2.1