From: Date: April 12 2007 8:17pm
Subject: Connector/ODBC 5 commit: r868 - in trunk/SDK/MYSQLPlus: Library include
List-Archive: http://lists.mysql.com/commits/24404
Message-Id: <200704121817.l3CIHqFg013067@bk-internal.mysql.com>
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Modified:
   trunk/SDK/MYSQLPlus/Library/MConnection.cpp
   trunk/SDK/MYSQLPlus/Library/MDescriptor.cpp
   trunk/SDK/MYSQLPlus/Library/MDiagnostic.cpp
   trunk/SDK/MYSQLPlus/Library/MDiagnostic.h
   trunk/SDK/MYSQLPlus/Library/MEnvironment.cpp
   trunk/SDK/MYSQLPlus/Library/MStatement.cpp
   trunk/SDK/MYSQLPlus/include/MConnection.h
Log:
removed dependence of MDiagnostic on QObject parent
removed QObject as base class of MConnection

Modified: trunk/SDK/MYSQLPlus/Library/MConnection.cpp
===================================================================
--- trunk/SDK/MYSQLPlus/Library/MConnection.cpp	2007-04-12 12:29:47 UTC (rev 867)
+++ trunk/SDK/MYSQLPlus/Library/MConnection.cpp	2007-04-12 18:17:51 UTC (rev 868)
@@ -47,7 +47,7 @@
 
     environment         = pEnvironment;
     nState              = STATE_C2_ALLOC;
-    pDiagnostic         = new MDiagnostic( this, pEnvironment->getDiagnostic()->getODBCVersion() );
+    pDiagnostic         = new MDiagnostic( pEnvironment->getDiagnostic()->getODBCVersion() );
     pDiagnosticCaller   = NULL;
     nStatementType      = STATEMENT_RES; // STATEMENT_DYNAMIC;
     nBufferedType       = BUFFERED_DYNAMIC;
@@ -124,6 +124,8 @@
     while ( descriptors.size() )
         delete descriptors.last();
 
+    delete pDiagnostic;
+
     DBUG_VOID_RETURN;
 }
 

Modified: trunk/SDK/MYSQLPlus/Library/MDescriptor.cpp
===================================================================
--- trunk/SDK/MYSQLPlus/Library/MDescriptor.cpp	2007-04-12 12:29:47 UTC (rev 867)
+++ trunk/SDK/MYSQLPlus/Library/MDescriptor.cpp	2007-04-12 18:17:51 UTC (rev 868)
@@ -46,7 +46,7 @@
     DBUG_ENTER("MDescriptor::MDescriptor");
 
     connection = NULL;
-    pDiagnostic = new MDiagnostic( NULL, odbcVersion );
+    pDiagnostic = new MDiagnostic( odbcVersion );
     nAllocType  = allocType;
     doInit();
 

Modified: trunk/SDK/MYSQLPlus/Library/MDiagnostic.cpp
===================================================================
--- trunk/SDK/MYSQLPlus/Library/MDiagnostic.cpp	2007-04-12 12:29:47 UTC (rev 867)
+++ trunk/SDK/MYSQLPlus/Library/MDiagnostic.cpp	2007-04-12 18:17:51 UTC (rev 868)
@@ -38,8 +38,7 @@
         
     \sa     MYODBCDiaFree
 */
-MDiagnostic::MDiagnostic( QObject *pObjectParent, SQLSMALLINT nODBCVersion )
-    : QObject( pObjectParent )
+MDiagnostic::MDiagnostic( SQLSMALLINT nODBCVersion )
 {
     DBUG_ENTER("MDiagnostic::MDiagnostic");
 

Modified: trunk/SDK/MYSQLPlus/Library/MDiagnostic.h
===================================================================
--- trunk/SDK/MYSQLPlus/Library/MDiagnostic.h	2007-04-12 12:29:47 UTC (rev 867)
+++ trunk/SDK/MYSQLPlus/Library/MDiagnostic.h	2007-04-12 18:17:51 UTC (rev 868)
@@ -217,7 +217,7 @@
         STATE_MAX
     };
 
-    MDiagnostic( QObject *pObjectParent = NULL, SQLSMALLINT nODBCVersion = SQL_OV_ODBC3 );
+    MDiagnostic( SQLSMALLINT nODBCVersion = SQL_OV_ODBC3 );
     ~MDiagnostic();
 
     /* setters */

Modified: trunk/SDK/MYSQLPlus/Library/MEnvironment.cpp
===================================================================
--- trunk/SDK/MYSQLPlus/Library/MEnvironment.cpp	2007-04-12 12:29:47 UTC (rev 867)
+++ trunk/SDK/MYSQLPlus/Library/MEnvironment.cpp	2007-04-12 18:17:51 UTC (rev 868)
@@ -42,7 +42,7 @@
     QTextCodec::setCodecForCStrings(QTextCodec::codecForName("UTF-8"));
     QTextCodec::setCodecForLocale(QTextCodec::codecForName("UTF-8"));
 
-    pDiagnostic = new MDiagnostic( this );
+    pDiagnostic = new MDiagnostic();
 
     nConnectionPooling  = SQL_CP_DEFAULT;
     nCPMatch            = SQL_CP_MATCH_DEFAULT;
@@ -64,6 +64,8 @@
     while ( connections.count() )
         delete connections.last();
 
+    delete pDiagnostic;
+
     DBUG_VOID_RETURN;
 }
 

Modified: trunk/SDK/MYSQLPlus/Library/MStatement.cpp
===================================================================
--- trunk/SDK/MYSQLPlus/Library/MStatement.cpp	2007-04-12 12:29:47 UTC (rev 867)
+++ trunk/SDK/MYSQLPlus/Library/MStatement.cpp	2007-04-12 18:17:51 UTC (rev 868)
@@ -73,7 +73,7 @@
 
     nState              = STATE_S1;
     pCommands           = new MCommands( this );
-    pDiagnostic         = new MDiagnostic( this, odbcVersion );
+    pDiagnostic         = new MDiagnostic( odbcVersion );
     pDiagnosticCaller   = NULL;
 
     /* descriptors */
@@ -150,6 +150,8 @@
     while ( descriptors.size() )
         delete descriptors.takeLast();
 
+    delete pDiagnostic;
+
     DBUG_VOID_RETURN;
 }
 

Modified: trunk/SDK/MYSQLPlus/include/MConnection.h
===================================================================
--- trunk/SDK/MYSQLPlus/include/MConnection.h	2007-04-12 12:29:47 UTC (rev 867)
+++ trunk/SDK/MYSQLPlus/include/MConnection.h	2007-04-12 18:17:51 UTC (rev 868)
@@ -31,7 +31,7 @@
 
 #include "M.h"
 
-class MConnection : public QObject
+class MConnection
 {
     friend class MEnvironment;
     friend class MStatement;