Connector/ODBC 5 commit: r175 - MYSQLPlus/MYSQLPlusLib doc/Design

[pharvey]

Modified:
   MYSQLPlus/MYSQLPlusLib/MDiagnosticRecord.cpp
   MYSQLPlus/MYSQLPlusLib/MDiagnosticRecord.h
   MYSQLPlus/MYSQLPlusLib/MInternal.h
   MYSQLPlus/MYSQLPlusLib/MResult.cpp
   doc/Design/UML.vsd
Log:


Modified: MYSQLPlus/MYSQLPlusLib/MDiagnosticRecord.cpp
===================================================================
--- MYSQLPlus/MYSQLPlusLib/MDiagnosticRecord.cpp	2006-05-02 03:54:31 UTC (rev 174)
+++ MYSQLPlus/MYSQLPlusLib/MDiagnosticRecord.cpp	2006-05-02 16:53:40 UTC (rev 175)
@@ -23,7 +23,7 @@
 
     \sa     MDiagnosticRecordFree
 */    
-MDiagnosticRecord::MDiagnosticRecord( MDiagnostic *pDiagnostic, MDiagnostic::DIA nState )
+MDiagnosticRecord::MDiagnosticRecord( MDiagnostic *pDiagnostic, int nState /*
MDiagnostic::DIA nState */ )
     : QObject( pDiagnostic )
 {
     MYODBCDbgEnter();

Modified: MYSQLPlus/MYSQLPlusLib/MDiagnosticRecord.h
===================================================================
--- MYSQLPlus/MYSQLPlusLib/MDiagnosticRecord.h	2006-05-02 03:54:31 UTC (rev 174)
+++ MYSQLPlus/MYSQLPlusLib/MDiagnosticRecord.h	2006-05-02 16:53:40 UTC (rev 175)
@@ -23,7 +23,7 @@
     friend class MDiagnostic;
     friend QTextStream &operator<<( QTextStream &stream, const
MDiagnosticRecord &rval );
 public:
-    MDiagnosticRecord( MDiagnostic *pDiagnostic, MDiagnostic::DIA nState );
+    MDiagnosticRecord( MDiagnostic *pDiagnostic, int nState /* MDiagnostic::DIA nState */
);
     ~MDiagnosticRecord();
 
     /* getters */
@@ -51,7 +51,7 @@
     QString     getSubClassOrigin();    /*!< */
 
 private:
-    MDiagnostic::DIA    nState;
+    int                 nState;             /* MDiagnostic::DIA    nState; */
     QString             stringMessage;      /*! Unformatted/short message.               
                              */
 
     /* the var names reflect the field names used in the ODBC specification */

Modified: MYSQLPlus/MYSQLPlusLib/MInternal.h
===================================================================
--- MYSQLPlus/MYSQLPlusLib/MInternal.h	2006-05-02 03:54:31 UTC (rev 174)
+++ MYSQLPlus/MYSQLPlusLib/MInternal.h	2006-05-02 16:53:40 UTC (rev 175)
@@ -5,9 +5,9 @@
 
 #include <MYODBCDbg.h>
 
-// class MResult;
+class MResult;
 class MResultPlus;
-// class MDiagnostic;
+class MDiagnostic;
 class MDiagnosticRecord;
 class MDescriptorAPD;
 class MDescriptorARD;
@@ -19,8 +19,6 @@
 class MDescriptorRecordIPD;
 class MDescriptorRecordIRD;
 
-#include "MResult.h"
-#include "MResultPlus.h"
 #include "MDiagnostic.h"
 #include "MDiagnosticRecord.h"
 #include "MDescriptorAPD.h"
@@ -32,6 +30,8 @@
 #include "MDescriptorRecordARD.h"
 #include "MDescriptorRecordIPD.h"
 #include "MDescriptorRecordIRD.h"
+#include "MResult.h"
+#include "MResultPlus.h"
 
 #endif
 

Modified: MYSQLPlus/MYSQLPlusLib/MResult.cpp
===================================================================
--- MYSQLPlus/MYSQLPlusLib/MResult.cpp	2006-05-02 03:54:31 UTC (rev 174)
+++ MYSQLPlus/MYSQLPlusLib/MResult.cpp	2006-05-02 16:53:40 UTC (rev 175)
@@ -18,7 +18,7 @@
             or server) is dictated by; DSN options, env/dbc/stm attributes.
 */    
 
-#include "MResult.h"
+#include "MInternal.h"
 
 /*! 
     \internal

Modified: doc/Design/UML.vsd
===================================================================
(Binary files differ)