MySQL Lists: commits: Connector/ODBC 5 commit: r833 - in trunk: Driver/Driver/Library Driver/Setup/Library SDK/C/Library SDK/C/include SDK/Dbg/Library SDK/Installer/Library...

List:	Commits	« Previous Message Next Message »
From:	ahristov	Date:	April 3 2007 12:18pm
Subject:	Connector/ODBC 5 commit: r833 - in trunk: Driver/Driver/Library Driver/Setup/Library SDK/C/Library SDK/C/include SDK/Dbg/Library SDK/Installer/Library...
View as plain text
Modified:
   trunk/Driver/Driver/Library/SQLAllocHandle.cpp
   trunk/Driver/Driver/Library/SQLEndTran.cpp
   trunk/Driver/Driver/Library/SQLFreeHandle.cpp
   trunk/Driver/Driver/Library/SQLFreeStmt.cpp
   trunk/Driver/Driver/Library/SQLGetDiagFieldW.cpp
   trunk/Driver/Driver/Library/SQLGetDiagRecW.cpp
   trunk/Driver/Driver/Library/SQLGetFunctions.cpp
   trunk/Driver/Setup/Library/ConfigDSNW.cpp
   trunk/SDK/C/Library/MYODBCC.cpp
   trunk/SDK/C/include/MYODBCC.h
   trunk/SDK/Dbg/Library/MYODBCDbg.cpp
   trunk/SDK/Installer/Library/MYODBCIns.cpp
   trunk/SDK/Installer/Tests/MYODBCInsTest.cpp
   trunk/SDK/MYSQLPlus/Library/MConnection.cpp
   trunk/SDK/MYSQLPlus/Library/MConnection_props.cpp
   trunk/SDK/MYSQLPlus/Library/MDescriptorARD.cpp
   trunk/SDK/MYSQLPlus/Library/MDescriptorRecord.cpp
   trunk/SDK/MYSQLPlus/Library/MEnvironment.cpp
   trunk/SDK/MYSQLPlus/Library/MResultStmt.cpp
   trunk/SDK/MYSQLPlus/Library/MResult_data_toC.cpp
   trunk/SDK/MYSQLPlus/Library/MResult_props.cpp
   trunk/SDK/MYSQLPlus/Library/MStatement.cpp
   trunk/SDK/MYSQLPlus/Library/MStatement_props.cpp
Log:
The left overs of MYODBCC were moved to MYODBCCMap class.
Next step will be to analyze which parts which classes use and
and not to include every header from every file thus increasing
the complexity of the build.


Modified: trunk/Driver/Driver/Library/SQLAllocHandle.cpp
===================================================================
--- trunk/Driver/Driver/Library/SQLAllocHandle.cpp	2007-04-03 09:55:44 UTC (rev 832)
+++ trunk/Driver/Driver/Library/SQLAllocHandle.cpp	2007-04-03 10:18:06 UTC (rev 833)
@@ -80,7 +80,7 @@
     MYODBCDbgEnter();
 
 #if MYODBC_DBG > 1
-    MYODBCDbgInfo( QString( "nHandleType=%1=%2" ).arg( nHandleType ).arg(
MYODBCC::getHandleTypeString( nHandleType ) ) );
+    MYODBCDbgInfo( QString( "nHandleType=%1=%2" ).arg( nHandleType ).arg(
MYODBCCMap::getHandleTypeString( nHandleType ) ) );
     MYODBCDbgInfo( QString( "hInputHandle=%1" ).arg( (qulonglong)hInputHandle ) );
     MYODBCDbgInfo( QString( "phOutputHandle=%1" ).arg( (qulonglong)phOutputHandle ) );
 #endif

Modified: trunk/Driver/Driver/Library/SQLEndTran.cpp
===================================================================
--- trunk/Driver/Driver/Library/SQLEndTran.cpp	2007-04-03 09:55:44 UTC (rev 832)
+++ trunk/Driver/Driver/Library/SQLEndTran.cpp	2007-04-03 10:18:06 UTC (rev 833)
@@ -57,7 +57,7 @@
     MYODBCDbgEnter();
 
 #if MYODBC_DBG > 1
-    MYODBCDbgInfo( QString( "nHandleType=%1=%2" ).arg( nHandleType ).arg(
MYODBCC::getHandleTypeString( nHandleType ) ) );
+    MYODBCDbgInfo( QString( "nHandleType=%1=%2" ).arg( nHandleType ).arg(
MYODBCCMap::getHandleTypeString( nHandleType ) ) );
     MYODBCDbgInfo( QString( "hHandle=%1" ).arg( (qulonglong)hHandle ) );
 #endif
 

Modified: trunk/Driver/Driver/Library/SQLFreeHandle.cpp
===================================================================
--- trunk/Driver/Driver/Library/SQLFreeHandle.cpp	2007-04-03 09:55:44 UTC (rev 832)
+++ trunk/Driver/Driver/Library/SQLFreeHandle.cpp	2007-04-03 10:18:06 UTC (rev 833)
@@ -52,7 +52,7 @@
     MYODBCDbgEnter();
 
 #if MYODBC_DBG > 1
-    MYODBCDbgInfo( QString( "nHandleType=%1=%2" ).arg( (qulonglong)nHandleType ).arg(
MYODBCC::getHandleTypeString( nHandleType ) ) );
+    MYODBCDbgInfo( QString( "nHandleType=%1=%2" ).arg( (qulonglong)nHandleType ).arg(
MYODBCCMap::getHandleTypeString( nHandleType ) ) );
     MYODBCDbgInfo( QString( "hHandle=%1" ).arg( (qulonglong)hHandle ) );
 #endif
 

Modified: trunk/Driver/Driver/Library/SQLFreeStmt.cpp
===================================================================
--- trunk/Driver/Driver/Library/SQLFreeStmt.cpp	2007-04-03 09:55:44 UTC (rev 832)
+++ trunk/Driver/Driver/Library/SQLFreeStmt.cpp	2007-04-03 10:18:06 UTC (rev 833)
@@ -60,7 +60,7 @@
 
 #if MYODBC_DBG > 1
     MYODBCDbgInfo( QString( "hStm=%1" ).arg( (qulonglong)hStm ) );
-    MYODBCDbgInfo( QString( "nOption=%1=%2" ).arg( nOption ).arg(
MYODBCC::getFreeStmtOptionString( nOption ) ) );
+    MYODBCDbgInfo( QString( "nOption=%1=%2" ).arg( nOption ).arg(
MYODBCCMap::getFreeStmtOptionString( nOption ) ) );
 #endif
 
 #if MYODBC_DEV > 0

Modified: trunk/Driver/Driver/Library/SQLGetDiagFieldW.cpp
===================================================================
--- trunk/Driver/Driver/Library/SQLGetDiagFieldW.cpp	2007-04-03 09:55:44 UTC (rev 832)
+++ trunk/Driver/Driver/Library/SQLGetDiagFieldW.cpp	2007-04-03 10:18:06 UTC (rev 833)
@@ -43,7 +43,7 @@
     MYODBCDbgEnter();
 
 #if MYODBC_DBG > 1
-    MYODBCDbgInfo( QString( "nHandleType=%1=%2" ).arg( nHandleType ).arg(
MYODBCC::getHandleTypeString( nHandleType ) ) );
+    MYODBCDbgInfo( QString( "nHandleType=%1=%2" ).arg( nHandleType ).arg(
MYODBCCMap::getHandleTypeString( nHandleType ) ) );
     MYODBCDbgInfo( QString( "hHandle=%1" ).arg( (qulonglong)hHandle ) );
 #endif
 

Modified: trunk/Driver/Driver/Library/SQLGetDiagRecW.cpp
===================================================================
--- trunk/Driver/Driver/Library/SQLGetDiagRecW.cpp	2007-04-03 09:55:44 UTC (rev 832)
+++ trunk/Driver/Driver/Library/SQLGetDiagRecW.cpp	2007-04-03 10:18:06 UTC (rev 833)
@@ -41,7 +41,7 @@
     MYODBCDbgEnter();
 
 #if MYODBC_DBG > 1
-    MYODBCDbgInfo( QString( "nHandleType=%1=%2" ).arg( nHandleType ).arg(
MYODBCC::getHandleTypeString( nHandleType ) ) );
+    MYODBCDbgInfo( QString( "nHandleType=%1=%2" ).arg( nHandleType ).arg(
MYODBCCMap::getHandleTypeString( nHandleType ) ) );
     MYODBCDbgInfo( QString( "hHandle=%1" ).arg( (qulonglong)hHandle ) );
 #endif
 

Modified: trunk/Driver/Driver/Library/SQLGetFunctions.cpp
===================================================================
--- trunk/Driver/Driver/Library/SQLGetFunctions.cpp	2007-04-03 09:55:44 UTC (rev 832)
+++ trunk/Driver/Driver/Library/SQLGetFunctions.cpp	2007-04-03 10:18:06 UTC (rev 833)
@@ -170,7 +170,7 @@
 
 #if MYODBC_DBG > 1
     MYODBCDbgInfo( QString( "hDbc=%1" ).arg( (qulonglong)hDbc ) );
-    MYODBCDbgInfo( QString("nFunctionID=%1=%2").arg( nFunctionID ).arg(
MYODBCC::getFunctionsString( nFunctionID ) ) );
+    MYODBCDbgInfo( QString("nFunctionID=%1=%2").arg( nFunctionID ).arg(
MYODBCCMap::getFunctionsString( nFunctionID ) ) );
 #endif
 
 #if MYODBC_DEV > 0

Modified: trunk/Driver/Setup/Library/ConfigDSNW.cpp
===================================================================
--- trunk/Driver/Setup/Library/ConfigDSNW.cpp	2007-04-03 09:55:44 UTC (rev 832)
+++ trunk/Driver/Setup/Library/ConfigDSNW.cpp	2007-04-03 10:18:06 UTC (rev 833)
@@ -74,7 +74,7 @@
     QHash<QString,QString> hashKeywordValues;
     if (!MYODBCIns::getKeywordValues(&hashKeywordValues,
                                     
MYODBCCString::QString_fromWCharArray(pszzAttributes,
-                                                                          
MYODBCC::getKeywordValuesLength(pszzAttributes) + 2),
+                                                                          
MYODBCCMap::getKeywordValuesLength(pszzAttributes) + 2),
                                      MYODBCIns::DELIM_NULL))
     {
         MYODBCIns::setError( "Data Source string seems invalid.",
ODBC_ERROR_INVALID_KEYWORD_VALUE );

Modified: trunk/SDK/C/Library/MYODBCC.cpp
===================================================================
--- trunk/SDK/C/Library/MYODBCC.cpp	2007-04-03 09:55:44 UTC (rev 832)
+++ trunk/SDK/C/Library/MYODBCC.cpp	2007-04-03 10:18:06 UTC (rev 833)
@@ -511,7 +511,7 @@
     return i;
 }
 
-int MYODBCC::getKeywordValuesLength( LPCWSTR pszzKeywordValues )
+int MYODBCCMap::getKeywordValuesLength( LPCWSTR pszzKeywordValues )
 {
     wchar_t *pc = (wchar_t*)pszzKeywordValues;
 
@@ -523,7 +523,7 @@
     return (pc - pszzKeywordValues);
 }
 
-int MYODBCC::getKeywordValuesLength( LPCSTR pszzKeywordValues )
+int MYODBCCMap::getKeywordValuesLength( LPCSTR pszzKeywordValues )
 {
     char *pc = (char*)pszzKeywordValues;
 
@@ -649,7 +649,7 @@
     return stringEscaped;
 }
 
-QString MYODBCC::getConnectAttrString( SQLINTEGER nAttribute )
+QString MYODBCCMap::getConnectAttrString( SQLINTEGER nAttribute )
 {
     switch ( nAttribute )
     {
@@ -694,7 +694,7 @@
     return "unknown";
 }
 
-QString MYODBCC::getConnectOptionString( SQLUSMALLINT nOption )
+QString MYODBCCMap::getConnectOptionString( SQLUSMALLINT nOption )
 {
     switch ( nOption )
     {
@@ -730,7 +730,7 @@
     return "unknown";
 }
 
-QString MYODBCC::getDescFieldString( SQLSMALLINT nField )
+QString MYODBCCMap::getDescFieldString( SQLSMALLINT nField )
 {
     switch ( nField )
     {
@@ -824,7 +824,7 @@
 }
 
 
-QString MYODBCC::getDriverCompletionString( SQLINTEGER nDriverCompletion )
+QString MYODBCCMap::getDriverCompletionString( SQLINTEGER nDriverCompletion )
 {
     switch ( nDriverCompletion )
     {
@@ -841,7 +841,7 @@
     return "unknown";
 }
 
-QString MYODBCC::getDiagFieldString( SQLSMALLINT nDiagField )
+QString MYODBCCMap::getDiagFieldString( SQLSMALLINT nDiagField )
 {
     switch ( nDiagField )
     {
@@ -893,7 +893,7 @@
     \sa     MYODBCDbgPrint
             MYODBCDbgPrint2
 */
-QString MYODBCC::getEnvAttrString( SQLINTEGER nAttribute )
+QString MYODBCCMap::getEnvAttrString( SQLINTEGER nAttribute )
 {
     switch ( nAttribute )
     {
@@ -910,7 +910,7 @@
     return "unknown";
 }
 
-QString MYODBCC::getFreeStmtOptionString( SQLUSMALLINT nOption )
+QString MYODBCCMap::getFreeStmtOptionString( SQLUSMALLINT nOption )
 {
     switch ( nOption )
     {
@@ -941,7 +941,7 @@
     \sa     MYODBCDbgPrint
             MYODBCDbgPrint2
 */
-QString MYODBCC::getFunctionsString( SQLUSMALLINT nFunction )
+QString MYODBCCMap::getFunctionsString( SQLUSMALLINT nFunction )
 {
     switch ( nFunction )
     {
@@ -1119,7 +1119,7 @@
     \sa     MYODBCDbgPrint
             MYODBCDbgPrint2
 */
-QString MYODBCC::getHandleTypeString( SQLSMALLINT nHandleType )
+QString MYODBCCMap::getHandleTypeString( SQLSMALLINT nHandleType )
 {
     switch ( nHandleType )
     {
@@ -1149,7 +1149,7 @@
     \sa     MYODBCDbgPrint
             MYODBCDbgPrint2
 */
-QString MYODBCC::getInfoTypeString( SQLUSMALLINT nInfoType )
+QString MYODBCCMap::getInfoTypeString( SQLUSMALLINT nInfoType )
 {
     switch ( nInfoType )
     {
@@ -1502,7 +1502,7 @@
     return "unknown";
 }
 
-QString MYODBCC::getInputOutputTypeString( SQLSMALLINT nInputOutputType )
+QString MYODBCCMap::getInputOutputTypeString( SQLSMALLINT nInputOutputType )
 {
     switch ( nInputOutputType )
     {
@@ -1529,7 +1529,7 @@
     
     \sa     MYODBCDbgReturn
 */
-QString MYODBCC::getReturnString( SQLRETURN nReturn )
+QString MYODBCCMap::getReturnString( SQLRETURN nReturn )
 {
     switch ( nReturn )
     {
@@ -1567,7 +1567,7 @@
     \sa     MYODBCDbgPrint
             MYODBCDbgPrint2
 */
-QString MYODBCC::getStmtAttrString( SQLINTEGER nAttribute )
+QString MYODBCCMap::getStmtAttrString( SQLINTEGER nAttribute )
 {
     switch ( nAttribute )
     {
@@ -1656,7 +1656,7 @@
     \sa     MYODBCDbgPrint
             MYODBCDbgPrint2
 */
-QString MYODBCC::getStmtOptionString( SQLUSMALLINT nOption )
+QString MYODBCCMap::getStmtOptionString( SQLUSMALLINT nOption )
 {
     switch ( nOption )
     {
@@ -1695,7 +1695,7 @@
     return "unknown";
 }
 
-QString MYODBCC::getTypeStringC( SQLSMALLINT nType )
+QString MYODBCCMap::getTypeStringC( SQLSMALLINT nType )
 {
     switch ( nType )
     {
@@ -1743,7 +1743,7 @@
     return "unknown";
 }
 
-QString MYODBCC::getTypeStringSQL( SQLSMALLINT nType )
+QString MYODBCCMap::getTypeStringSQL( SQLSMALLINT nType )
 {
     switch ( nType )
     {
@@ -1796,7 +1796,7 @@
     return "unknown";
 }
 
-QString MYODBCC::getConciseTypeStringC( SQLSMALLINT nType, SQLINTEGER nODBCVersion )
+QString MYODBCCMap::getConciseTypeStringC( SQLSMALLINT nType, SQLINTEGER nODBCVersion )
 {
     /*! 
         \internal ODBC RULE
@@ -1915,7 +1915,7 @@
     return "unknown";
 }
 
-QString MYODBCC::getConciseTypeStringSQL( SQLSMALLINT nType, SQLINTEGER nODBCVersion )
+QString MYODBCCMap::getConciseTypeStringSQL( SQLSMALLINT nType, SQLINTEGER nODBCVersion )
 {
     /*! 
         \internal ODBC RULE
@@ -2031,7 +2031,7 @@
     return "unknown";
 }
 
-QString MYODBCC::getIntervalConciseTypeStringC( SQLSMALLINT nType )
+QString MYODBCCMap::getIntervalConciseTypeStringC( SQLSMALLINT nType )
 {
     switch ( nType )
     {
@@ -2066,7 +2066,7 @@
     return "unknown";
 }
 
-QString MYODBCC::getIntervalConciseTypeStringSQL( SQLSMALLINT nType )
+QString MYODBCCMap::getIntervalConciseTypeStringSQL( SQLSMALLINT nType )
 {
     switch ( nType )
     {
@@ -2101,7 +2101,7 @@
     return "unknown";
 }
 
-QString MYODBCC::getDateTimeCodeString( SQLSMALLINT nCode )
+QString MYODBCCMap::getDateTimeCodeString( SQLSMALLINT nCode )
 {
     switch ( nCode )
     {
@@ -2116,7 +2116,7 @@
     return "unknown";
 }
 
-QString MYODBCC::getIntervalCodeString( SQLSMALLINT nCode )
+QString MYODBCCMap::getIntervalCodeString( SQLSMALLINT nCode )
 {
     switch ( nCode )
     {
@@ -2151,7 +2151,7 @@
     return "unknown";
 }
 
-QString MYODBCC::getInstallerErrorString( RETCODE nRetCode )
+QString MYODBCCMap::getInstallerErrorString( RETCODE nRetCode )
 {
     switch ( nRetCode )
     {
@@ -2204,7 +2204,7 @@
     return "unknown";
 }
 
-QString MYODBCC::getAsyncEnableString( SQLUINTEGER nAsyncEnable )
+QString MYODBCCMap::getAsyncEnableString( SQLUINTEGER nAsyncEnable )
 {
     switch ( nAsyncEnable )
     {
@@ -2217,7 +2217,7 @@
     return "unknown";
 }
 
-QString MYODBCC::getConcurrencyString( SQLUINTEGER nConcurrency )
+QString MYODBCCMap::getConcurrencyString( SQLUINTEGER nConcurrency )
 {
     switch ( nConcurrency )
     {
@@ -2234,7 +2234,7 @@
     return "unknown";
 }
 
-QString MYODBCC::getCursorScrollableString( SQLUINTEGER nCursorScrollable )
+QString MYODBCCMap::getCursorScrollableString( SQLUINTEGER nCursorScrollable )
 {
     switch ( nCursorScrollable )
     {
@@ -2247,7 +2247,7 @@
     return "unknown";
 }
 
-QString MYODBCC::getCursorSensitivityString( SQLUINTEGER nCursorSensitivity )
+QString MYODBCCMap::getCursorSensitivityString( SQLUINTEGER nCursorSensitivity )
 {
     switch ( nCursorSensitivity )
     {
@@ -2262,7 +2262,7 @@
     return "unknown";
 }
 
-QString MYODBCC::getCursorTypeString( SQLUINTEGER nCursorType )
+QString MYODBCCMap::getCursorTypeString( SQLUINTEGER nCursorType )
 {
     switch ( nCursorType )
     {
@@ -2279,7 +2279,7 @@
     return "unknown";
 }
 
-QString MYODBCC::getNoscanString( SQLUINTEGER nNoscan )
+QString MYODBCCMap::getNoscanString( SQLUINTEGER nNoscan )
 {
     switch ( nNoscan )
     {
@@ -2292,7 +2292,7 @@
     return "unknown";
 }
 
-QString MYODBCC::getRetrieveDataString( SQLUINTEGER nRetrieveData )
+QString MYODBCCMap::getRetrieveDataString( SQLUINTEGER nRetrieveData )
 {
     switch ( nRetrieveData )
     {
@@ -2305,7 +2305,7 @@
     return "unknown";
 }
 
-QString MYODBCC::getSimulateCursorString( SQLUINTEGER nSimulateCursor )
+QString MYODBCCMap::getSimulateCursorString( SQLUINTEGER nSimulateCursor )
 {
     switch ( nSimulateCursor )
     {
@@ -2320,7 +2320,7 @@
     return "unknown";
 }
 
-QString MYODBCC::getUseBookmarksString( SQLUINTEGER nUseBookmarks )
+QString MYODBCCMap::getUseBookmarksString( SQLUINTEGER nUseBookmarks )
 {
     switch ( nUseBookmarks )
     {
@@ -2354,7 +2354,7 @@
                 "Converting Data from SQL to C Data Types"
                
"http://msdn.microsoft.com/library/default.asp?url=/library/en-us/odbc/htm/odbcconverting_data_from_sql_to_c_data_types.asp"
 */
-SQLSMALLINT MYODBCC::getCDefault( SQLINTEGER nODBCVersion, SQLSMALLINT nSQLType,
SQLSMALLINT nUnsigned )
+SQLSMALLINT MYODBCCMap::getCDefault( SQLINTEGER nODBCVersion, SQLSMALLINT nSQLType,
SQLSMALLINT nUnsigned )
 {
     /*!
         \internal ODBC RULE
@@ -2499,7 +2499,7 @@
 /*!
     \brief  Map an ODBC V2 statement option to ODBC V3 statement attribute.
 */
-SQLINTEGER MYODBCC::getStmtAttrFromOption( SQLUSMALLINT nOption )
+SQLINTEGER MYODBCCMap::getStmtAttrFromOption( SQLUSMALLINT nOption )
 {
     switch ( nOption )
     {

Modified: trunk/SDK/C/include/MYODBCC.h
===================================================================
--- trunk/SDK/C/include/MYODBCC.h	2007-04-03 09:55:44 UTC (rev 832)
+++ trunk/SDK/C/include/MYODBCC.h	2007-04-03 10:18:06 UTC (rev 833)
@@ -505,7 +505,7 @@
             within this class we can safely provide C portability and some
             convenience features.
 */
-class MYODBCC
+class MYODBCCMap
 {
 public:
     static int getKeywordValuesLength( LPCWSTR pszKeywordValues );

Modified: trunk/SDK/Dbg/Library/MYODBCDbg.cpp
===================================================================
--- trunk/SDK/Dbg/Library/MYODBCDbg.cpp	2007-04-03 09:55:44 UTC (rev 832)
+++ trunk/SDK/Dbg/Library/MYODBCDbg.cpp	2007-04-03 10:18:06 UTC (rev 833)
@@ -259,7 +259,7 @@
     *this << QString( "[RETURN ] %1:%2: %3 " )
                 .arg( pszFile )
                 .arg( nLine )
-                .arg( pszFunction ) << MYODBCC::getReturnString( nReturn ) <<
 " " << stringMessage << endl;
+                .arg( pszFunction ) << MYODBCCMap::getReturnString( nReturn )
<<  " " << stringMessage << endl;
     return nReturn;
 }
 

Modified: trunk/SDK/Installer/Library/MYODBCIns.cpp
===================================================================
--- trunk/SDK/Installer/Library/MYODBCIns.cpp	2007-04-03 09:55:44 UTC (rev 832)
+++ trunk/SDK/Installer/Library/MYODBCIns.cpp	2007-04-03 10:18:06 UTC (rev 833)
@@ -317,7 +317,7 @@
     if ( SQL_SUCCEEDED(nRetCode) )
     {
         stringMessageEnhanced = QString( "[%1][%2] %3" )
-                                .arg( MYODBCC::getInstallerErrorString( nErrorCode ) )
+                                .arg( MYODBCCMap::getInstallerErrorString( nErrorCode ) )
                                 .arg( nErrorCode )
                                 .arg( stringMessage );
     }

Modified: trunk/SDK/Installer/Tests/MYODBCInsTest.cpp
===================================================================
--- trunk/SDK/Installer/Tests/MYODBCInsTest.cpp	2007-04-03 09:55:44 UTC (rev 832)
+++ trunk/SDK/Installer/Tests/MYODBCInsTest.cpp	2007-04-03 10:18:06 UTC (rev 833)
@@ -164,18 +164,18 @@
     /* empty, DELIM_NULL, string length */
     szzAttributes[0] = '\0';
     szzAttributes[1] = '\0';
-    nLength = MYODBCC::getKeywordValuesLength( szzAttributes );
+    nLength = MYODBCCMap::getKeywordValuesLength( szzAttributes );
     QVERIFY( nLength == 0 );
 
     /* DELIM_NULL string - as per ConfigDSN() (50 max chars to swprintf) */
     pszz += 1 + swprintf( pszz, 50, L"DRIVER=my driver" );
     pszz += 1 + swprintf( pszz, 50, L"DSN=my dsn" );
     pszz += 1 + swprintf( pszz, 50, L"DATABASE=my database" );
-    *pszz = 0; // MYODBCC::getKeywordValues() needs two NULLs
+    *pszz = 0; // MYODBCCMap::getKeywordValues() needs two NULLs
 
     nActualLength = pszz - szzAttributes - 1;
 
-    nLength = MYODBCC::getKeywordValuesLength( szzAttributes );
+    nLength = MYODBCCMap::getKeywordValuesLength( szzAttributes );
     QCOMPARE( nLength, nActualLength );
 
     if ( !MYODBCIns::getKeywordValues( &hashKeywordValues,

Modified: trunk/SDK/MYSQLPlus/Library/MConnection.cpp
===================================================================
--- trunk/SDK/MYSQLPlus/Library/MConnection.cpp	2007-04-03 09:55:44 UTC (rev 832)
+++ trunk/SDK/MYSQLPlus/Library/MConnection.cpp	2007-04-03 10:18:06 UTC (rev 833)
@@ -870,7 +870,7 @@
     BOOL                    bPrompt     = false;
 
 #if MYODBC_DBG > 1
-    MYODBCDbgInfo( QString("nDriverCompletion=%1=%2").arg( nDriverCompletion ).arg(
MYODBCC::getDriverCompletionString( nDriverCompletion ) ) );
+    MYODBCDbgInfo( QString("nDriverCompletion=%1=%2").arg( nDriverCompletion ).arg(
MYODBCCMap::getDriverCompletionString( nDriverCompletion ) ) );
 #endif
 
     /*!

Modified: trunk/SDK/MYSQLPlus/Library/MConnection_props.cpp
===================================================================
--- trunk/SDK/MYSQLPlus/Library/MConnection_props.cpp	2007-04-03 09:55:44 UTC (rev 832)
+++ trunk/SDK/MYSQLPlus/Library/MConnection_props.cpp	2007-04-03 10:18:06 UTC (rev 833)
@@ -9,7 +9,7 @@
     MYODBCDbgEnter();
 
 #if MYODBC_DBG > 1
-    MYODBCDbgInfo( QString( "nAttribute=%1=%2" ).arg( nAttribute ).arg(
MYODBCC::getConnectAttrString( nAttribute ) ) );
+    MYODBCDbgInfo( QString( "nAttribute=%1=%2" ).arg( nAttribute ).arg(
MYODBCCMap::getConnectAttrString( nAttribute ) ) );
 #endif
 
     /*!
@@ -240,7 +240,7 @@
     MYODBCDbgEnter();
 
 #if MYODBC_DBG > 1
-    MYODBCDbgInfo( QString( "nAttribute=%1=%2" ).arg( nAttribute ).arg(
MYODBCC::getConnectAttrString( nAttribute ) ) );
+    MYODBCDbgInfo( QString( "nAttribute=%1=%2" ).arg( nAttribute ).arg(
MYODBCCMap::getConnectAttrString( nAttribute ) ) );
 #endif
 
     BOOL bCopyOk;
@@ -457,7 +457,7 @@
     MYODBCDbgEnter();
 
 #if MYODBC_DBG > 1
-    MYODBCDbgInfo( QString( "nInfoType=%1=%2" ).arg( nInfoType).arg(
MYODBCC::getInfoTypeString( nInfoType ) ) );
+    MYODBCDbgInfo( QString( "nInfoType=%1=%2" ).arg( nInfoType).arg(
MYODBCCMap::getInfoTypeString( nInfoType ) ) );
 #endif
 
     /* this is above, as it CAN be NULL */

Modified: trunk/SDK/MYSQLPlus/Library/MDescriptorARD.cpp
===================================================================
--- trunk/SDK/MYSQLPlus/Library/MDescriptorARD.cpp	2007-04-03 09:55:44 UTC (rev 832)
+++ trunk/SDK/MYSQLPlus/Library/MDescriptorARD.cpp	2007-04-03 10:18:06 UTC (rev 833)
@@ -11,7 +11,7 @@
     MYODBCDbgEnter();
 
 #if MYODBC_DBG > 1
-    MYODBCDbgInfo( QString( "nFieldIdentifier=%1=%2" ).arg( nFieldIdentifier ).arg(
MYODBCC::getDescFieldString( nFieldIdentifier ) ) );
+    MYODBCDbgInfo( QString( "nFieldIdentifier=%1=%2" ).arg( nFieldIdentifier ).arg(
MYODBCCMap::getDescFieldString( nFieldIdentifier ) ) );
 #endif
 
     /*!

Modified: trunk/SDK/MYSQLPlus/Library/MDescriptorRecord.cpp
===================================================================
--- trunk/SDK/MYSQLPlus/Library/MDescriptorRecord.cpp	2007-04-03 09:55:44 UTC (rev 832)
+++ trunk/SDK/MYSQLPlus/Library/MDescriptorRecord.cpp	2007-04-03 10:18:06 UTC (rev 833)
@@ -2036,7 +2036,7 @@
     MYODBCDbgEnter();
 
 #if MYODBC_DBG > 1
-    MYODBCDbgInfo( QString( "nConciseType=%1=%2" ).arg( nConciseType ).arg(
MYODBCC::getConciseTypeStringC( nConciseType ) ) );
+    MYODBCDbgInfo( QString( "nConciseType=%1=%2" ).arg( nConciseType ).arg(
MYODBCCMap::getConciseTypeStringC( nConciseType ) ) );
 #endif
 
     /*
@@ -2236,7 +2236,7 @@
     MYODBCDbgEnter();
 
 #if MYODBC_DBG > 1
-    MYODBCDbgInfo( QString( "nConciseType=%1=%2" ).arg( nConciseType ).arg(
MYODBCC::getConciseTypeStringSQL( nConciseType ) ) );
+    MYODBCDbgInfo( QString( "nConciseType=%1=%2" ).arg( nConciseType ).arg(
MYODBCCMap::getConciseTypeStringSQL( nConciseType ) ) );
 #endif
     /*
         \internal ODBC Rule

Modified: trunk/SDK/MYSQLPlus/Library/MEnvironment.cpp
===================================================================
--- trunk/SDK/MYSQLPlus/Library/MEnvironment.cpp	2007-04-03 09:55:44 UTC (rev 832)
+++ trunk/SDK/MYSQLPlus/Library/MEnvironment.cpp	2007-04-03 10:18:06 UTC (rev 833)
@@ -96,7 +96,7 @@
     MYODBCDbgEnter();
 
 #if MYODBC_DBG > 1
-    MYODBCDbgInfo( QString( "nAttribute=%1=%2" ).arg( nAttribute ).arg(
MYODBCC::getEnvAttrString( nAttribute ) ) );
+    MYODBCDbgInfo( QString( "nAttribute=%1=%2" ).arg( nAttribute ).arg(
MYODBCCMap::getEnvAttrString( nAttribute ) ) );
 #endif
 
     /*!

Modified: trunk/SDK/MYSQLPlus/Library/MResultStmt.cpp
===================================================================
--- trunk/SDK/MYSQLPlus/Library/MResultStmt.cpp	2007-04-03 09:55:44 UTC (rev 832)
+++ trunk/SDK/MYSQLPlus/Library/MResultStmt.cpp	2007-04-03 10:18:06 UTC (rev 833)
@@ -799,9 +799,9 @@
 
                     for ( int nColumn = 0; nColumn < nColumns; nColumn++ )
                     {
-                        MYODBCC::doFree( pbindColumns[nColumn].buffer );
+                        free(pbindColumns[nColumn].buffer);
                     }
-                    MYODBCC::doFree( pbindColumns );
+                    free(pbindColumns);
                     pbindColumns    = NULL;
                 }
 //                getImpParamDesc()->doClear();

Modified: trunk/SDK/MYSQLPlus/Library/MResult_data_toC.cpp
===================================================================
--- trunk/SDK/MYSQLPlus/Library/MResult_data_toC.cpp	2007-04-03 09:55:44 UTC (rev 832)
+++ trunk/SDK/MYSQLPlus/Library/MResult_data_toC.cpp	2007-04-03 10:18:06 UTC (rev 833)
@@ -110,7 +110,7 @@
     {
         MYODBCDbgReturn( getDiagnostic()->doAppend( MDiagnostic::STATE_HY003, 0,
                     QString( "Invalid C-type=%1=%2" ).arg( nTargetType )
-                        .arg( MYODBCC::getConciseTypeStringC(
+                        .arg( MYODBCCMap::getConciseTypeStringC(
                                 nTargetType, getEnvironment()->getODBCVersion() ) ) )
);
     }
 
@@ -204,7 +204,7 @@
     /* alter target type to concrete if asked for default */
     if ( nTargetType == SQL_C_DEFAULT )
     {
-        nTargetType = MYODBCC::getCDefault(
+        nTargetType = MYODBCCMap::getCDefault(
                 getEnvironment()->getODBCVersion(),
                 pImpRowDescRec->getConciseType(),
                 pImpRowDescRec->getUnsigned() );

Modified: trunk/SDK/MYSQLPlus/Library/MResult_props.cpp
===================================================================
--- trunk/SDK/MYSQLPlus/Library/MResult_props.cpp	2007-04-03 09:55:44 UTC (rev 832)
+++ trunk/SDK/MYSQLPlus/Library/MResult_props.cpp	2007-04-03 10:18:06 UTC (rev 833)
@@ -34,7 +34,7 @@
     MYODBCDbgEnter();
 
 #if MYODBC_DBG > 1
-    MYODBCDbgInfo( QString( "nConcurrency=%1=%2" ).arg( nConcurrency ).arg(
MYODBCC::getConcurrencyString( nConcurrency ) ) );
+    MYODBCDbgInfo( QString( "nConcurrency=%1=%2" ).arg( nConcurrency ).arg(
MYODBCCMap::getConcurrencyString( nConcurrency ) ) );
 #endif
     if ( getState() >= STATE_PREPARED )
         MYODBCDbgReturn( getDiagnostic()->doAppend( MDiagnostic::STATE_HY010 ) );
@@ -71,7 +71,7 @@
 {
     MYODBCDbgEnter();
 #if MYODBC_DBG > 1
-    MYODBCDbgInfo( QString( "nCursorScrollable=%1=%2" ).arg( nCursorScrollable ).arg(
MYODBCC::getCursorScrollableString( nCursorScrollable ) ) );
+    MYODBCDbgInfo( QString( "nCursorScrollable=%1=%2" ).arg( nCursorScrollable ).arg(
MYODBCCMap::getCursorScrollableString( nCursorScrollable ) ) );
 #endif
     if ( getState() >= STATE_PREPARED )
         MYODBCDbgReturn( getDiagnostic()->doAppend( MDiagnostic::STATE_HY010 ) );
@@ -109,7 +109,7 @@
 {
     MYODBCDbgEnter();
 #if MYODBC_DBG > 1
-    MYODBCDbgInfo( QString( "nCursorSensitivity=%1=%2" ).arg( nCursorSensitivity ).arg(
MYODBCC::getCursorSensitivityString( nCursorSensitivity ) ) );
+    MYODBCDbgInfo( QString( "nCursorSensitivity=%1=%2" ).arg( nCursorSensitivity ).arg(
MYODBCCMap::getCursorSensitivityString( nCursorSensitivity ) ) );
 #endif
     if ( getState() >= STATE_PREPARED )
         MYODBCDbgReturn( getDiagnostic()->doAppend( MDiagnostic::STATE_HY010 ) );
@@ -148,7 +148,7 @@
 {
     MYODBCDbgEnter();
 #if MYODBC_DBG > 1
-    MYODBCDbgInfo( QString( "nCursorType=%1=%2" ).arg( nCursorType ).arg(
MYODBCC::getCursorTypeString( nCursorType ) ) );
+    MYODBCDbgInfo( QString( "nCursorType=%1=%2" ).arg( nCursorType ).arg(
MYODBCCMap::getCursorTypeString( nCursorType ) ) );
 #endif
     if ( getState() >= STATE_PREPARED )
         MYODBCDbgReturn( getDiagnostic()->doAppend( MDiagnostic::STATE_HY010 ) );
@@ -320,7 +320,7 @@
     MYODBCDbgEnter();
 
 #if MYODBC_DBG > 1
-    MYODBCDbgInfo( QString( "nSimulateCursor=%1=%2" ).arg( nSimulateCursor ).arg(
MYODBCC::getSimulateCursorString( nSimulateCursor ) ) );
+    MYODBCDbgInfo( QString( "nSimulateCursor=%1=%2" ).arg( nSimulateCursor ).arg(
MYODBCCMap::getSimulateCursorString( nSimulateCursor ) ) );
 #endif
     if ( getState() >= STATE_PREPARED )
         MYODBCDbgReturn( getDiagnostic()->doAppend( MDiagnostic::STATE_HY010 ) );
@@ -354,7 +354,7 @@
 {
     MYODBCDbgEnter();
 #if MYODBC_DBG > 1
-    MYODBCDbgInfo( QString( "nConcurrency=%1=%2" ).arg( nConcurrency ).arg(
MYODBCC::getConcurrencyString( nConcurrency ) ) );
+    MYODBCDbgInfo( QString( "nConcurrency=%1=%2" ).arg( nConcurrency ).arg(
MYODBCCMap::getConcurrencyString( nConcurrency ) ) );
 #endif
     MYODBCDbgReturn3( "%d", nConcurrency );
 }
@@ -363,7 +363,7 @@
 {
     MYODBCDbgEnter();
 #if MYODBC_DBG > 1
-    MYODBCDbgInfo( QString( "nCursorScrollable=%1=%2" ).arg( nCursorScrollable ).arg(
MYODBCC::getCursorScrollableString( nCursorScrollable ) ) );
+    MYODBCDbgInfo( QString( "nCursorScrollable=%1=%2" ).arg( nCursorScrollable ).arg(
MYODBCCMap::getCursorScrollableString( nCursorScrollable ) ) );
 #endif
     MYODBCDbgReturn3( "%d", nCursorScrollable );
 }
@@ -372,7 +372,7 @@
 {
     MYODBCDbgEnter();
 #if MYODBC_DBG > 1
-    MYODBCDbgInfo( QString( "nCursorSensitivity=%1=%2" ).arg( nCursorSensitivity ).arg(
MYODBCC::getCursorSensitivityString( nCursorSensitivity ) ) );
+    MYODBCDbgInfo( QString( "nCursorSensitivity=%1=%2" ).arg( nCursorSensitivity ).arg(
MYODBCCMap::getCursorSensitivityString( nCursorSensitivity ) ) );
 #endif
     MYODBCDbgReturn3( "%d", nCursorSensitivity );
 }
@@ -381,7 +381,7 @@
 {
     MYODBCDbgEnter();
 #if MYODBC_DBG > 1
-    MYODBCDbgInfo( QString( "nCursorType=%1=%2" ).arg( nCursorType ).arg(
MYODBCC::getCursorTypeString( nCursorType ) ) );
+    MYODBCDbgInfo( QString( "nCursorType=%1=%2" ).arg( nCursorType ).arg(
MYODBCCMap::getCursorTypeString( nCursorType ) ) );
 #endif
     MYODBCDbgReturn3( "%d", nCursorType );
 }
@@ -444,7 +444,7 @@
 {
     MYODBCDbgEnter();
 #if MYODBC_DBG > 1
-    MYODBCDbgInfo( QString( "nSimulateCursor=%1=%2" ).arg( nSimulateCursor ).arg(
MYODBCC::getSimulateCursorString( nSimulateCursor ) ) );
+    MYODBCDbgInfo( QString( "nSimulateCursor=%1=%2" ).arg( nSimulateCursor ).arg(
MYODBCCMap::getSimulateCursorString( nSimulateCursor ) ) );
 #endif
     MYODBCDbgReturn3( "%d", nSimulateCursor );
 }

Modified: trunk/SDK/MYSQLPlus/Library/MStatement.cpp
===================================================================
--- trunk/SDK/MYSQLPlus/Library/MStatement.cpp	2007-04-03 09:55:44 UTC (rev 832)
+++ trunk/SDK/MYSQLPlus/Library/MStatement.cpp	2007-04-03 10:18:06 UTC (rev 833)
@@ -293,7 +293,7 @@
 #if MYODBC_DBG > 1
     MYODBCDbgInfo( QString( "nColumnNumber=%1" ).arg( nColumnNumber ) );
     MYODBCDbgInfo( QString( "nTargetType=%1=%2" ).arg( nTargetType ).
-                    arg( MYODBCC::getConciseTypeStringC( nTargetType,
getEnvironment()->getODBCVersion() ) ) );
+                    arg( MYODBCCMap::getConciseTypeStringC( nTargetType,
getEnvironment()->getODBCVersion() ) ) );
     MYODBCDbgInfo( QString( "pTargetValue=%1" ).arg( (qulonglong)pTargetValue ) );
     MYODBCDbgInfo( QString( "nBufferLength=%1" ).arg( nBufferLength ) );
     MYODBCDbgInfo( QString( "pnStrLenOrInd=%1" ).arg( (qulonglong)pnStrLenOrInd ) );
@@ -814,9 +814,9 @@
 
 #if MYODBC_DBG > 1
     MYODBCDbgInfo( QString( "nParameterNumber   =%1" ).arg( nParameterNumber ) );
-    MYODBCDbgInfo( QString( "nInputOutputType   =%1=%2" ).arg( nInputOutputType ).arg(
MYODBCC::getInputOutputTypeString( nInputOutputType ) ) );
-    MYODBCDbgInfo( QString( "nValueType         =%1=%2" ).arg( nValueType ).arg(
MYODBCC::getConciseTypeStringC( nValueType ) ) );
-    MYODBCDbgInfo( QString( "nParameterType     =%1=%2" ).arg( nParameterType ).arg(
MYODBCC::getConciseTypeStringSQL( nParameterType ) ) );
+    MYODBCDbgInfo( QString( "nInputOutputType   =%1=%2" ).arg( nInputOutputType ).arg(
MYODBCCMap::getInputOutputTypeString( nInputOutputType ) ) );
+    MYODBCDbgInfo( QString( "nValueType         =%1=%2" ).arg( nValueType ).arg(
MYODBCCMap::getConciseTypeStringC( nValueType ) ) );
+    MYODBCDbgInfo( QString( "nParameterType     =%1=%2" ).arg( nParameterType ).arg(
MYODBCCMap::getConciseTypeStringSQL( nParameterType ) ) );
     MYODBCDbgInfo( QString( "nColumnSize        =%1" ).arg( nColumnSize ) );
     MYODBCDbgInfo( QString( "nDecimalDigits     =%1" ).arg( nDecimalDigits ) );
     MYODBCDbgInfo( QString( "pParameterValue    =%1" ).arg( (unsigned
long)pParameterValue ) );
@@ -888,9 +888,9 @@
     */
     if ( nValueType == SQL_C_DEFAULT )
     {
-        nValueType = MYODBCC::getCDefault( getEnvironment()->getODBCVersion(),
nParameterType );
+        nValueType = MYODBCCMap::getCDefault( getEnvironment()->getODBCVersion(),
nParameterType );
 #if MYODBC_DBG > 1
-        MYODBCDbgInfo( QString( "nValueType=%1=%2" ).arg( nValueType ).arg(
MYODBCC::getConciseTypeStringC( nValueType, getEnvironment()->getODBCVersion() ) ) );
+        MYODBCDbgInfo( QString( "nValueType=%1=%2" ).arg( nValueType ).arg(
MYODBCCMap::getConciseTypeStringC( nValueType, getEnvironment()->getODBCVersion() ) )
);
 #endif
     }
 

Modified: trunk/SDK/MYSQLPlus/Library/MStatement_props.cpp
===================================================================
--- trunk/SDK/MYSQLPlus/Library/MStatement_props.cpp	2007-04-03 09:55:44 UTC (rev 832)
+++ trunk/SDK/MYSQLPlus/Library/MStatement_props.cpp	2007-04-03 10:18:06 UTC (rev 833)
@@ -113,7 +113,7 @@
     MYODBCDbgEnter();
 
 #if MYODBC_DBG > 1
-    MYODBCDbgInfo( QString( "nAttribute=%1=%2" ).arg( nAttribute ).arg(
MYODBCC::getStmtAttrString( nAttribute ) ) );
+    MYODBCDbgInfo( QString( "nAttribute=%1=%2" ).arg( nAttribute ).arg(
MYODBCCMap::getStmtAttrString( nAttribute ) ) );
 #endif
 
     /*!
@@ -145,7 +145,7 @@
     /* handle odbc v2 mappings of SQLSetStmtOption */
     if ( getEnvironment()->getODBCVersion() == SQL_OV_ODBC2 )
     {
-        nAttribute = MYODBCC::getStmtAttrFromOption(
+        nAttribute = MYODBCCMap::getStmtAttrFromOption(
                 (SQLUSMALLINT)nAttribute );
     }
 
@@ -350,7 +350,7 @@
 
 #if MYODBC_DBG > 1
     MYODBCDbgInfo( QString( "nRecNumber=%1" ).arg( nRecNumber ) );
-    MYODBCDbgInfo( QString( "nDiagIdentifier=%1=%2" ).arg( nDiagIdentifier ).arg(
MYODBCC::getDiagFieldString( nDiagIdentifier ) ) );
+    MYODBCDbgInfo( QString( "nDiagIdentifier=%1=%2" ).arg( nDiagIdentifier ).arg(
MYODBCCMap::getDiagFieldString( nDiagIdentifier ) ) );
 #endif
 
     /* specific state is required */
@@ -383,7 +383,7 @@
     MYODBCDbgEnter();
 
 #if MYODBC_DBG > 1
-    MYODBCDbgInfo( QString( "nAttribute=%1=%2" ).arg( nAttribute ).arg(
MYODBCC::getStmtAttrString( nAttribute ) ) );
+    MYODBCDbgInfo( QString( "nAttribute=%1=%2" ).arg( nAttribute ).arg(
MYODBCCMap::getStmtAttrString( nAttribute ) ) );
 #endif
 
     /*!
@@ -417,7 +417,7 @@
     /* handle odbc v2 mappings of SQLSetStmtOption */
     if ( getEnvironment()->getODBCVersion() == SQL_OV_ODBC2 )
     {
-        nAttribute = MYODBCC::getStmtAttrFromOption((SQLUSMALLINT)nAttribute );
+        nAttribute = MYODBCCMap::getStmtAttrFromOption((SQLUSMALLINT)nAttribute );
     }
 
     /* known statement nAttributes */
@@ -792,7 +792,7 @@
     MYODBCDbgEnter();
 
 #if MYODBC_DBG > 1
-    MYODBCDbgInfo( QString( "nAsyncEnable=%1=%2" ).arg( nAsyncEnable ).arg(
MYODBCC::getAsyncEnableString( nAsyncEnable ) ) );
+    MYODBCDbgInfo( QString( "nAsyncEnable=%1=%2" ).arg( nAsyncEnable ).arg(
MYODBCCMap::getAsyncEnableString( nAsyncEnable ) ) );
 #endif
     switch ( nAsyncEnable )
     {
@@ -816,7 +816,7 @@
     MYODBCDbgEnter();
 
 #if MYODBC_DBG > 1
-    MYODBCDbgInfo( QString( "nConcurrency=%1=%2" ).arg( nConcurrency ).arg(
MYODBCC::getConcurrencyString( nConcurrency ) ) );
+    MYODBCDbgInfo( QString( "nConcurrency=%1=%2" ).arg( nConcurrency ).arg(
MYODBCCMap::getConcurrencyString( nConcurrency ) ) );
 #endif
     /*!
         \internal ODBC RULE
@@ -885,7 +885,7 @@
     MYODBCDbgEnter();
 
 #if MYODBC_DBG > 1
-    MYODBCDbgInfo( QString( "nCursorScrollable=%1=%2" ).arg( nCursorScrollable ).arg(
MYODBCC::getCursorScrollableString( nCursorScrollable ) ) );
+    MYODBCDbgInfo( QString( "nCursorScrollable=%1=%2" ).arg( nCursorScrollable ).arg(
MYODBCCMap::getCursorScrollableString( nCursorScrollable ) ) );
 #endif
     switch ( nCursorScrollable )
     {
@@ -931,7 +931,7 @@
     MYODBCDbgEnter();
 
 #if MYODBC_DBG > 1
-    MYODBCDbgInfo( QString( "nCursorSensitivity=%1=%2" ).arg( nCursorSensitivity ).arg(
MYODBCC::getCursorSensitivityString( nCursorSensitivity ) ) );
+    MYODBCDbgInfo( QString( "nCursorSensitivity=%1=%2" ).arg( nCursorSensitivity ).arg(
MYODBCCMap::getCursorSensitivityString( nCursorSensitivity ) ) );
 #endif
     switch ( nCursorSensitivity )
     {
@@ -989,7 +989,7 @@
     MYODBCDbgEnter();
 
 #if MYODBC_DBG > 1
-    MYODBCDbgInfo( QString( "nCursorType=%1=%2" ).arg( nCursorType ).arg(
MYODBCC::getCursorTypeString( nCursorType ) ) );
+    MYODBCDbgInfo( QString( "nCursorType=%1=%2" ).arg( nCursorType ).arg(
MYODBCCMap::getCursorTypeString( nCursorType ) ) );
 #endif
     /*!
         \internal ODBC RULE
@@ -1144,7 +1144,7 @@
     MYODBCDbgEnter();
 
 #if MYODBC_DBG > 1
-    MYODBCDbgInfo( QString( "nNoscan=%1=%2" ).arg( nNoscan ).arg(
MYODBCC::getNoscanString( nNoscan ) ) );
+    MYODBCDbgInfo( QString( "nNoscan=%1=%2" ).arg( nNoscan ).arg(
MYODBCCMap::getNoscanString( nNoscan ) ) );
 #endif
     switch ( nNoscan )
     {
@@ -1220,7 +1220,7 @@
     MYODBCDbgEnter();
 
 #if MYODBC_DBG > 1
-    MYODBCDbgInfo( QString( "nRetrieveData=%1=%2" ).arg( nRetrieveData ).arg(
MYODBCC::getRetrieveDataString( nRetrieveData ) ) );
+    MYODBCDbgInfo( QString( "nRetrieveData=%1=%2" ).arg( nRetrieveData ).arg(
MYODBCCMap::getRetrieveDataString( nRetrieveData ) ) );
 #endif
     switch ( nRetrieveData )
     {
@@ -1291,7 +1291,7 @@
     MYODBCDbgEnter();
 
 #if MYODBC_DBG > 1
-    MYODBCDbgInfo( QString( "nSimulateCursor=%1=%2" ).arg( nSimulateCursor ).arg(
MYODBCC::getSimulateCursorString( nSimulateCursor ) ) );
+    MYODBCDbgInfo( QString( "nSimulateCursor=%1=%2" ).arg( nSimulateCursor ).arg(
MYODBCCMap::getSimulateCursorString( nSimulateCursor ) ) );
 #endif
     /*!
         \internal ODBC RULE
@@ -1331,7 +1331,7 @@
     MYODBCDbgEnter();
 
 #if MYODBC_DBG > 1
-    MYODBCDbgInfo( QString( "nUseBookmarks=%1=%2" ).arg( nUseBookmarks ).arg(
MYODBCC::getUseBookmarksString( nUseBookmarks ) ) );
+    MYODBCDbgInfo( QString( "nUseBookmarks=%1=%2" ).arg( nUseBookmarks ).arg(
MYODBCCMap::getUseBookmarksString( nUseBookmarks ) ) );
 #endif
     /*!
         \internal ODBC RULE
@@ -1522,7 +1522,7 @@
 {
     MYODBCDbgEnter();
 #if MYODBC_DBG > 1
-    MYODBCDbgInfo( QString( "nConcurrency=%1=%2" ).arg( nConcurrency ).arg(
MYODBCC::getConcurrencyString( nConcurrency ) ) );
+    MYODBCDbgInfo( QString( "nConcurrency=%1=%2" ).arg( nConcurrency ).arg(
MYODBCCMap::getConcurrencyString( nConcurrency ) ) );
 #endif
     MYODBCDbgReturn3( "%d", nConcurrency );
 }
@@ -1531,7 +1531,7 @@
 {
     MYODBCDbgEnter();
 #if MYODBC_DBG > 1
-    MYODBCDbgInfo( QString( "nCursorScrollable=%1=%2" ).arg( nCursorScrollable ).arg(
MYODBCC::getCursorScrollableString( nCursorScrollable ) ) );
+    MYODBCDbgInfo( QString( "nCursorScrollable=%1=%2" ).arg( nCursorScrollable ).arg(
MYODBCCMap::getCursorScrollableString( nCursorScrollable ) ) );
 #endif
     MYODBCDbgReturn3( "%d", nCursorScrollable );
 }
@@ -1540,7 +1540,7 @@
 {
     MYODBCDbgEnter();
 #if MYODBC_DBG > 1
-    MYODBCDbgInfo( QString( "nCursorSensitivity=%1=%2" ).arg( nCursorSensitivity ).arg(
MYODBCC::getCursorSensitivityString( nCursorSensitivity ) ) );
+    MYODBCDbgInfo( QString( "nCursorSensitivity=%1=%2" ).arg( nCursorSensitivity ).arg(
MYODBCCMap::getCursorSensitivityString( nCursorSensitivity ) ) );
 #endif
     MYODBCDbgReturn3( "%d", nCursorSensitivity );
 }
@@ -1549,7 +1549,7 @@
 {
     MYODBCDbgEnter();
 #if MYODBC_DBG > 1
-    MYODBCDbgInfo( QString( "nCursorType=%1=%2" ).arg( nCursorType ).arg(
MYODBCC::getCursorTypeString( nCursorType ) ) );
+    MYODBCDbgInfo( QString( "nCursorType=%1=%2" ).arg( nCursorType ).arg(
MYODBCCMap::getCursorTypeString( nCursorType ) ) );
 #endif
     MYODBCDbgReturn3( "%d", nCursorType );
 }
@@ -1758,7 +1758,7 @@
 {
     MYODBCDbgEnter();
 #if MYODBC_DBG > 1
-    MYODBCDbgInfo( QString( "nSimulateCursor=%1=%2" ).arg( nSimulateCursor ).arg(
MYODBCC::getSimulateCursorString( nSimulateCursor ) ) );
+    MYODBCDbgInfo( QString( "nSimulateCursor=%1=%2" ).arg( nSimulateCursor ).arg(
MYODBCCMap::getSimulateCursorString( nSimulateCursor ) ) );
 #endif
     MYODBCDbgReturn3( "%d", nSimulateCursor );
 }
Thread
• Connector/ODBC 5 commit: r833 - in trunk: Driver/Driver/Library Driver/Setup/Library SDK/C/Library SDK/C/include SDK/Dbg/Library SDK/Installer/Library...	ahristov	3 Apr