From 195edca79b5331e3eb926d38894d2ccc8a9d28ee Mon Sep 17 00:00:00 2001
From: Mark Brand <mabrand@mabrand.nl>
Date: Thu, 19 Nov 2015 15:23:30 +0100
Subject: qsql_odbc: rename QODBCPrivate to QODBCResultPrivate

This naming pattern is consistent with the other drivers and prepares
for subsequent changes.

Change-Id: I77d1edcfd52727cd1126adbf70a808dfbf3255be
Reviewed-by: Andy Shaw <andy.shaw@theqtcompany.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
---
 src/sql/drivers/odbc/qsql_odbc.cpp | 18 +++++++++---------
 src/sql/drivers/odbc/qsql_odbc_p.h |  6 +++---
 2 files changed, 12 insertions(+), 12 deletions(-)

(limited to 'src/sql')

diff --git a/src/sql/drivers/odbc/qsql_odbc.cpp b/src/sql/drivers/odbc/qsql_odbc.cpp
index 8db06e6831..8c4ec484cc 100644
--- a/src/sql/drivers/odbc/qsql_odbc.cpp
+++ b/src/sql/drivers/odbc/qsql_odbc.cpp
@@ -143,10 +143,10 @@ private:
     QChar quote;
 };
 
-class QODBCPrivate
+class QODBCResultPrivate
 {
 public:
-    QODBCPrivate(QODBCDriverPrivate *dpp)
+    QODBCResultPrivate(QODBCDriverPrivate *dpp)
     : hStmt(0), useSchema(false), hasSQLFetchScroll(true), driverPrivate(dpp), userForwardOnly(false)
     {
         unicode = dpp->unicode;
@@ -177,13 +177,13 @@ public:
     void updateStmtHandleState(const QSqlDriver *driver);
 };
 
-bool QODBCPrivate::isStmtHandleValid(const QSqlDriver *driver)
+bool QODBCResultPrivate::isStmtHandleValid(const QSqlDriver *driver)
 {
     const QODBCDriver *odbcdriver = static_cast<const QODBCDriver*> (driver);
     return disconnectCount == odbcdriver->d_func()->disconnectCount;
 }
 
-void QODBCPrivate::updateStmtHandleState(const QSqlDriver *driver)
+void QODBCResultPrivate::updateStmtHandleState(const QSqlDriver *driver)
 {
     const QODBCDriver *odbcdriver = static_cast<const QODBCDriver*> (driver);
     disconnectCount = odbcdriver->d_func()->disconnectCount;
@@ -261,7 +261,7 @@ static QString qODBCWarn(const SQLHANDLE hStmt, const SQLHANDLE envHandle = 0,
     return result;
 }
 
-static QString qODBCWarn(const QODBCPrivate* odbc, int *nativeCode = 0)
+static QString qODBCWarn(const QODBCResultPrivate* odbc, int *nativeCode = 0)
 {
     return qODBCWarn(odbc->hStmt, odbc->dpEnv(), odbc->dpDbc(), nativeCode);
 }
@@ -271,7 +271,7 @@ static QString qODBCWarn(const QODBCDriverPrivate* odbc, int *nativeCode = 0)
     return qODBCWarn(0, odbc->hEnv, odbc->hDbc, nativeCode);
 }
 
-static void qSqlWarning(const QString& message, const QODBCPrivate* odbc)
+static void qSqlWarning(const QString& message, const QODBCResultPrivate* odbc)
 {
     qWarning() << message << "\tError:" << qODBCWarn(odbc);
 }
@@ -286,7 +286,7 @@ static void qSqlWarning(const QString &message, const SQLHANDLE hStmt)
     qWarning() << message << "\tError:" << qODBCWarn(hStmt);
 }
 
-static QSqlError qMakeError(const QString& err, QSqlError::ErrorType type, const QODBCPrivate* p)
+static QSqlError qMakeError(const QString& err, QSqlError::ErrorType type, const QODBCResultPrivate* p)
 {
     int nativeCode = -1;
     QString message = qODBCWarn(p, &nativeCode);
@@ -626,7 +626,7 @@ static QSqlField qMakeFieldInfo(const SQLHANDLE hStmt, const QODBCDriverPrivate*
     return f;
 }
 
-static QSqlField qMakeFieldInfo(const QODBCPrivate* p, int i )
+static QSqlField qMakeFieldInfo(const QODBCResultPrivate* p, int i )
 {
     QString errorMessage;
     const QSqlField result = qMakeFieldInfo(p->hStmt, i, &errorMessage);
@@ -914,7 +914,7 @@ QString QODBCDriverPrivate::adjustCase(const QString &identifier) const
 QODBCResult::QODBCResult(const QODBCDriver * db, QODBCDriverPrivate* p)
 : QSqlResult(db)
 {
-    d = new QODBCPrivate(p);
+    d = new QODBCResultPrivate(p);
 }
 
 QODBCResult::~QODBCResult()
diff --git a/src/sql/drivers/odbc/qsql_odbc_p.h b/src/sql/drivers/odbc/qsql_odbc_p.h
index 96e7abd7dd..9c864b467d 100644
--- a/src/sql/drivers/odbc/qsql_odbc_p.h
+++ b/src/sql/drivers/odbc/qsql_odbc_p.h
@@ -75,7 +75,7 @@
 
 QT_BEGIN_NAMESPACE
 
-class QODBCPrivate;
+class QODBCResultPrivate;
 class QODBCDriverPrivate;
 class QODBCDriver;
 class QSqlRecordInfo;
@@ -110,7 +110,7 @@ protected:
     bool nextResult();
 
 private:
-    QODBCPrivate *d;
+    QODBCResultPrivate *d;
 };
 
 class Q_EXPORT_SQLDRIVER_ODBC QODBCDriver : public QSqlDriver
@@ -149,7 +149,7 @@ protected:
 private:
     bool endTrans();
     void cleanup();
-    friend class QODBCPrivate;
+    friend class QODBCResultPrivate;
 };
 
 QT_END_NAMESPACE
-- 
cgit v1.2.3