Connector/ODBC 5 commit: r121 - / MYODBCC MYSQLCC MYSQLCC/MYSQLCCLib MYSQLCC/include

[pharvey]

Modified:
   MYODBCC/MYODBCC.vpj
   MYSQLCC/MYSQLCC.vpj
   MYSQLCC/MYSQLCCLib/MYSQLCCLib.vpj
   MYSQLCC/include/M.h
   MYSQLCC/include/MEnvironment.h
   connector-odbc.vpw
Log:


Modified: MYODBCC/MYODBCC.vpj
===================================================================
--- MYODBCC/MYODBCC.vpj	2006-04-25 21:33:43 UTC (rev 120)
+++ MYODBCC/MYODBCC.vpj	2006-04-25 21:43:10 UTC (rev 121)
@@ -56,7 +56,7 @@
 		<Folder
 			Name="Header Files"
 			Filters="*.h;*.H;*.hh;*.hpp;*.hxx;*.inc;*.sh;*.cpy;*.if">
-			<F N="include/MYODBCC.h"/>
+			<F N="include/M.h"/>
 		</Folder>
 		<Folder
 			Name="Resource Files"
@@ -68,7 +68,7 @@
 			Name="Other Files"
 			Filters="">
 			<F N="CMakeLists.txt"/>
-			<F N="MYODBCC.pro"/>
+			<F N="MYSQLCC.pro"/>
 		</Folder>
 	</Files>
 	<CompatibleVersions>

Modified: MYSQLCC/MYSQLCC.vpj
===================================================================
--- MYSQLCC/MYSQLCC.vpj	2006-04-25 21:33:43 UTC (rev 120)
+++ MYSQLCC/MYSQLCC.vpj	2006-04-25 21:43:10 UTC (rev 121)
@@ -55,6 +55,11 @@
 		<Folder
 			Name="Header Files"
 			Filters="*.h;*.H;*.hh;*.hpp;*.hxx;*.inc;*.sh;*.cpy;*.if">
+			<F N="include/M.h"/>
+			<F N="include/MConnection.h"/>
+			<F N="include/MDescriptor.h"/>
+			<F N="include/MEnvironment.h"/>
+			<F N="include/MStatement.h"/>
 		</Folder>
 		<Folder
 			Name="Resource Files"

Modified: MYSQLCC/MYSQLCCLib/MYSQLCCLib.vpj
===================================================================
--- MYSQLCC/MYSQLCCLib/MYSQLCCLib.vpj	2006-04-25 21:33:43 UTC (rev 120)
+++ MYSQLCC/MYSQLCCLib/MYSQLCCLib.vpj	2006-04-25 21:43:10 UTC (rev 121)
@@ -52,11 +52,33 @@
 		<Folder
 			Name="Source Files"
 			Filters="*.c;*.C;*.cc;*.cpp;*.cp;*.cxx;*.prg;*.pas;*.dpr;*.asm;*.s;*.bas;*.java;*.cs;*.sc;*.e;*.cob;*.html;*.rc;*.tcl;*.py;*.pl">
+			<F N="MConnection.cpp"/>
+			<F N="MDesAPD.cpp"/>
+			<F N="MDesARD.cpp"/>
+			<F N="MDescriptor.cpp"/>
+			<F N="MDesIPD.cpp"/>
+			<F N="MDesIRD.cpp"/>
+			<F N="MDesRec.cpp"/>
+			<F N="MDesRecAPD.cpp"/>
+			<F N="MDesRecARD.cpp"/>
+			<F N="MDesRecIPD.cpp"/>
+			<F N="MDesRecIRD.cpp"/>
+			<F N="MEnvironment.cpp"/>
+			<F N="MStatement.cpp"/>
 		</Folder>
 		<Folder
 			Name="Header Files"
 			Filters="*.h;*.H;*.hh;*.hpp;*.hxx;*.inc;*.sh;*.cpy;*.if">
-			<F N="MYODBCInternal.h"/>
+			<F N="MDesAPD.h"/>
+			<F N="MDesARD.h"/>
+			<F N="MDesIPD.h"/>
+			<F N="MDesIRD.h"/>
+			<F N="MDesRec.h"/>
+			<F N="MDesRecAPD.h"/>
+			<F N="MDesRecARD.h"/>
+			<F N="MDesRecIPD.h"/>
+			<F N="MDesRecIRD.h"/>
+			<F N="MInternal.h"/>
 		</Folder>
 		<Folder
 			Name="Resource Files"
@@ -67,7 +89,7 @@
 		<Folder
 			Name="Other Files"
 			Filters="">
-			<F N="MYODBCClsLib.pro"/>
+			<F N="MYSQLCCLib.pro"/>
 		</Folder>
 	</Files>
 </Project>

Modified: MYSQLCC/include/M.h
===================================================================
--- MYSQLCC/include/M.h	2006-04-25 21:33:43 UTC (rev 120)
+++ MYSQLCC/include/M.h	2006-04-25 21:43:10 UTC (rev 121)
@@ -1,14 +1,14 @@
-#ifndef MYODBC_H
-#define MYODBC_H
+#ifndef M_H
+#define M_H
 
 #include <QObject>
 
 #include <MYODBCDia.h>
 
-#include "MYODBCEnvironment.h"
-#include "MYODBCConnection.h"
-#include "MYODBCStatement.h"
-#include "MYODBCDescriptor.h"
+#include "MEnvironment.h"
+#include "MConnection.h"
+#include "MStatement.h"
+#include "MDescriptor.h"
 
 #endif
 

Modified: MYSQLCC/include/MEnvironment.h
===================================================================
--- MYSQLCC/include/MEnvironment.h	2006-04-25 21:33:43 UTC (rev 120)
+++ MYSQLCC/include/MEnvironment.h	2006-04-25 21:43:10 UTC (rev 121)
@@ -1,5 +1,5 @@
-#ifndef MYODBC_ENVIRONMENT
-#define MYODBC_ENVIRONMENT
+#ifndef M_ENVIRONMENT_H
+#define M_ENVIRONMENT_H
 
 #include "MYODBC.h"
 
@@ -11,12 +11,17 @@
     MYODBCEnvironment();
     ~MYODBCEnvironment();
 
-    SQLRETURN sqlEndTran( SQLSMALLINT nCompletionType );
-    SQLRETURN sqlGetDiagField( SQLSMALLINT nRecNumber, SQLSMALLINT nDiagIdentifier,
SQLPOINTER pDiagInfoPtr, SQLSMALLINT nBufferLength, SQLSMALLINT *pnStringLengthPtr );
-    SQLRETURN sqlGetDiagRec( SQLSMALLINT nRecNumber, SQLWCHAR *psSQLState, SQLINTEGER
*pnNativeErrorPtr, SQLWCHAR *psMessageText, SQLSMALLINT nBufferLength, SQLSMALLINT
*pnTextLengthPtr );
-    SQLRETURN sqlGetEnvAttr( SQLINTEGER nAttribute, SQLPOINTER pValuePtr, SQLINTEGER
nBufferLength, SQLINTEGER *pnStringLengthPtr );
-    SQLRETURN sqlSetEnvAttr( SQLINTEGER nAttribute, SQLPOINTER pValue, SQLINTEGER
nStringLength );
+    /* setters */
 
+    /* getters */
+    SQLRETURN getDiagField( SQLSMALLINT nRecNumber, SQLSMALLINT nDiagIdentifier,
SQLPOINTER pDiagInfoPtr, SQLSMALLINT nBufferLength, SQLSMALLINT *pnStringLengthPtr );
+    SQLRETURN getDiagRec( SQLSMALLINT nRecNumber, SQLWCHAR *psSQLState, SQLINTEGER
*pnNativeErrorPtr, SQLWCHAR *psMessageText, SQLSMALLINT nBufferLength, SQLSMALLINT
*pnTextLengthPtr );
+    SQLRETURN getEnvAttr( SQLINTEGER nAttribute, SQLPOINTER pValuePtr, SQLINTEGER
nBufferLength, SQLINTEGER *pnStringLengthPtr );
+    SQLRETURN setEnvAttr( SQLINTEGER nAttribute, SQLPOINTER pValue, SQLINTEGER
nStringLength );
+
+    /* doers */
+    SQLRETURN doEndTran( SQLSMALLINT nCompletionType );
+
     MYODBCDia *             getDia();
     MYODBCAttEnvironment *  getAtt();
 

Modified: connector-odbc.vpw
===================================================================
--- connector-odbc.vpw	2006-04-25 21:33:43 UTC (rev 120)
+++ connector-odbc.vpw	2006-04-25 21:43:10 UTC (rev 121)
@@ -35,6 +35,8 @@
 		<Project File="MYODBCTst/MYODBCTst.vpj" />
 		<Project File="MYODBCTst/MYODBCTstLib/MYODBCTstLib.vpj" />
 		<Project File="../mysql-include.vpj" />
+		<Project File="MYSQLCC/MYSQLCC.vpj" />
+		<Project File="MYSQLCC/MYSQLCCLib/MYSQLCCLib.vpj" />
 		<Project File="root.vpj" />
 	</Projects>
 </Workspace>