From fff95e7274ecee374f7471866d1587298d168d6e Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Thu, 22 Dec 2011 12:29:54 +0200
Subject: Rename *_chunk to chunk_* enumerators in Oracle for consistency

---
 odb/qt/basic/oracle/qbyte-array-traits.hxx | 10 +++++-----
 odb/qt/basic/oracle/qstring-traits.hxx     | 16 ++++++++--------
 2 files changed, 13 insertions(+), 13 deletions(-)

(limited to 'odb/qt')

diff --git a/odb/qt/basic/oracle/qbyte-array-traits.hxx b/odb/qt/basic/oracle/qbyte-array-traits.hxx
index 0d63fec..2b8340e 100644
--- a/odb/qt/basic/oracle/qbyte-array-traits.hxx
+++ b/odb/qt/basic/oracle/qbyte-array-traits.hxx
@@ -116,15 +116,15 @@ namespace odb
 
         switch (p)
         {
-        case one_chunk:
-        case first_chunk:
+        case chunk_one:
+        case chunk_first:
           {
             v.clear ();
 
             // Falling through.
           }
-        case next_chunk:
-        case last_chunk:
+        case chunk_next:
+        case chunk_last:
           {
             v.append (static_cast<char*> (b), static_cast<int> (s));
             break;
@@ -145,7 +145,7 @@ namespace odb
       {
         const QByteArray& v (*static_cast<const QByteArray*> (context));
 
-        *p = one_chunk;
+        *p = chunk_one;
         *s = static_cast<ub4> (v.size ());
         *b = v.constData ();
 
diff --git a/odb/qt/basic/oracle/qstring-traits.hxx b/odb/qt/basic/oracle/qstring-traits.hxx
index a0be38d..06c9c93 100644
--- a/odb/qt/basic/oracle/qstring-traits.hxx
+++ b/odb/qt/basic/oracle/qstring-traits.hxx
@@ -122,15 +122,15 @@ namespace odb
 
         switch (p)
         {
-        case one_chunk:
-        case first_chunk:
+        case chunk_one:
+        case chunk_first:
           {
             v.clear ();
 
             // Falling through.
           }
-        case next_chunk:
-        case last_chunk:
+        case chunk_next:
+        case chunk_last:
           {
             v += QString::fromUtf8(static_cast<char*> (b),
                                    static_cast<int> (s));
@@ -157,11 +157,11 @@ namespace odb
         if (*position_context == 0)
         {
           if (*s <= capacity)
-            *p = one_chunk;
+            *p = chunk_one;
           else
           {
             *s = capacity;
-            *p = first_chunk;
+            *p = chunk_first;
           }
         }
         else
@@ -169,11 +169,11 @@ namespace odb
           *s -= *position_context;
 
           if (*s <= capacity)
-            *p = last_chunk;
+            *p = chunk_last;
           else
           {
             *s = capacity;
-            *p = next_chunk;
+            *p = chunk_next;
           }
         }
 
-- 
cgit v1.1