summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@theqtcompany.com>2015-04-20 17:28:40 +0200
committerFriedemann Kleint <Friedemann.Kleint@theqtcompany.com>2015-04-20 16:22:08 +0000
commit65019ea1e1af0acc45517ef74f58bbd0efbba36e (patch)
treecc9856727079a2465ab97a139e86b9c2a53e32ea
parent593581b05a511406ff27fb56996bfddc2ac9720d (diff)
downloadqtactiveqt-65019ea1e1af0acc45517ef74f58bbd0efbba36e.tar.gz
Add virtual destructors to some classes.
Silence warnings by MinGW for QAxServerAggregate, QAxSignalVec, QAxConnection, QClassFactory: warning: deleting object of polymorphic class type '...' which has non-virtual destructor might cause undefined behavior [-Wdelete-non-virtual-dtor] Task-number: QTBUG-45666 Change-Id: Id610094014699b95cba46119658da1b5005ff554 Reviewed-by: Andy Shaw <andy.shaw@digia.com>
-rw-r--r--src/activeqt/control/qaxserverbase.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/activeqt/control/qaxserverbase.cpp b/src/activeqt/control/qaxserverbase.cpp
index 5929270..b788e07 100644
--- a/src/activeqt/control/qaxserverbase.cpp
+++ b/src/activeqt/control/qaxserverbase.cpp
@@ -423,7 +423,7 @@ public:
InitializeCriticalSection(&refCountSection);
InitializeCriticalSection(&createWindowSection);
}
- ~QAxServerAggregate()
+ virtual ~QAxServerAggregate()
{
DeleteCriticalSection(&refCountSection);
DeleteCriticalSection(&createWindowSection);
@@ -504,7 +504,7 @@ public:
for (int i = 0; i < count; ++i)
cpoints.at(i)->AddRef();
}
- ~QAxSignalVec()
+ virtual ~QAxSignalVec()
{
const int count = cpoints.count();
for (int i = 0; i < count; ++i)
@@ -623,7 +623,7 @@ public:
foreach (const CONNECTDATA &connection, connections)
connection.pUnk->AddRef();
}
- ~QAxConnection()
+ virtual ~QAxConnection()
{
DeleteCriticalSection(&refCountSection);
}
@@ -843,7 +843,7 @@ public:
}
}
- ~QClassFactory()
+ virtual ~QClassFactory()
{
DeleteCriticalSection(&refCountSection);
}