vclwidget: only call dispose() once

by using a new utility method in vcl::Window
This means that we don't have to make all our dispose
methods safe to call more than once.

Change-Id: I2110c7de4a86c70fdc97dd8fd318c86b56865374

1 files changed, 7 insertions, 2 deletions

diff --git a/compilerplugins/clang/vclwidgets.cxx b/compilerplugins/clang/vclwidgets.cxx
index ba7da08dbc43..4189024851c6 100644
--- a/compilerplugins/clang/vclwidgets.cxx
+++ b/compilerplugins/clang/vclwidgets.cxx
@@ -162,13 +162,18 @@ bool VCLWidgets::VisitCXXDestructorDecl(const CXXDestructorDecl* pCXXDestructorD
     if (pCompoundStatement && pCompoundStatement->size() == 1) {
         const CXXMemberCallExpr *pCallExpr = dyn_cast<CXXMemberCallExpr>(*pCompoundStatement->body_begin());
         if (pCallExpr) {
-            ok = true;
+            if( const FunctionDecl* func = pCallExpr->getDirectCallee()) {
+                if( func->getNumParams() == 0 && func->getIdentifier() != NULL
+                    && ( func->getName() == "disposeOnce" )) {
+                    ok = true;
+                }
+            }
         }
     }
     if (!ok) {
         report(
             DiagnosticsEngine::Warning,
-            "vcl::Window subclass should have nothing in it's destructor but a call to dispose().",
+            "vcl::Window subclass should have nothing in it's destructor but a call to disposeOnce().",
             pCXXDestructorDecl->getLocStart())
           << pCXXDestructorDecl->getSourceRange();
         return true;