summaryrefslogtreecommitdiff
path: root/configmgr
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2016-09-13 13:09:01 +0200
committerStephan Bergmann <sbergman@redhat.com>2016-09-13 13:19:22 +0200
commit91dd2db17bd6cb9b357d1d69b187174e31eabef0 (patch)
treed634de3a1a6820904b5699c2136b79b1a5a807c7 /configmgr
parent6f8ea7e89ea190b9462c945d55a3ad8777b2f3ef (diff)
loplugin:override: No more need for the "MSVC dtor override" workaround
The issue of 362d4f0cd4e50111edfae9d30c90602c37ed65a2 "Explicitly mark overriding destructors as 'virtual'" appears to no longer be a problem with MSVC 2013. (The little change in the rewriting code of compilerplugins/clang/override.cxx was necessary to prevent an endless loop when adding "override" to OOO_DLLPUBLIC_CHARTTOOLS virtual ~CloseableLifeTimeManager(); in chart2/source/inc/LifeTime.hxx, getting stuck in the leading OOO_DLLPUBLIC_CHARTTOOLS macro. Can't remember what that isAtEndOfImmediateMacroExpansion thing was originally necessary for, anyway.) Change-Id: I534c634504d7216b9bb632c2775c04eaf27e927e
Diffstat (limited to 'configmgr')
-rw-r--r--configmgr/qa/unit/test.cxx2
-rw-r--r--configmgr/source/access.hxx2
-rw-r--r--configmgr/source/childaccess.hxx2
-rw-r--r--configmgr/source/components.cxx2
-rw-r--r--configmgr/source/configurationprovider.cxx4
-rw-r--r--configmgr/source/configurationregistry.cxx4
-rw-r--r--configmgr/source/groupnode.hxx2
-rw-r--r--configmgr/source/localizedpropertynode.hxx2
-rw-r--r--configmgr/source/localizedvaluenode.hxx2
-rw-r--r--configmgr/source/node.hxx2
-rw-r--r--configmgr/source/parsemanager.hxx2
-rw-r--r--configmgr/source/parser.hxx2
-rw-r--r--configmgr/source/propertynode.hxx2
-rw-r--r--configmgr/source/readonlyaccess.cxx2
-rw-r--r--configmgr/source/readwriteaccess.cxx2
-rw-r--r--configmgr/source/rootaccess.hxx2
-rw-r--r--configmgr/source/rootnode.hxx2
-rw-r--r--configmgr/source/setnode.hxx2
-rw-r--r--configmgr/source/update.cxx2
-rw-r--r--configmgr/source/xcdparser.hxx2
-rw-r--r--configmgr/source/xcsparser.hxx2
-rw-r--r--configmgr/source/xcuparser.hxx2
22 files changed, 24 insertions, 24 deletions
diff --git a/configmgr/qa/unit/test.cxx b/configmgr/qa/unit/test.cxx
index 00903eb80417..d0fc33260225 100644
--- a/configmgr/qa/unit/test.cxx
+++ b/configmgr/qa/unit/test.cxx
@@ -123,7 +123,7 @@ public:
void test();
protected:
- virtual ~RecursiveTest();
+ virtual ~RecursiveTest() override;
virtual void step() const = 0;
diff --git a/configmgr/source/access.hxx b/configmgr/source/access.hxx
index 63cba6907a5f..5bd3a74f89c3 100644
--- a/configmgr/source/access.hxx
+++ b/configmgr/source/access.hxx
@@ -427,7 +427,7 @@ public:
protected:
explicit Access(Components & components);
- virtual ~Access();
+ virtual ~Access() override;
virtual OUString getNameInternal() = 0;
virtual rtl::Reference< RootAccess > getRootAccess() = 0;
diff --git a/configmgr/source/childaccess.hxx b/configmgr/source/childaccess.hxx
index 9a43d86e8c21..dd81b251bb8b 100644
--- a/configmgr/source/childaccess.hxx
+++ b/configmgr/source/childaccess.hxx
@@ -118,7 +118,7 @@ public:
void commitChanges(bool valid, Modifications * globalModifications);
private:
- virtual ~ChildAccess();
+ virtual ~ChildAccess() override;
virtual void addTypes(
std::vector< css::uno::Type > * types) const override;
diff --git a/configmgr/source/components.cxx b/configmgr/source/components.cxx
index b401197f7026..2450d0b4af40 100644
--- a/configmgr/source/components.cxx
+++ b/configmgr/source/components.cxx
@@ -154,7 +154,7 @@ public:
void flush() { delay_.set(); }
private:
- virtual ~WriteThread() {}
+ virtual ~WriteThread() override {}
virtual void execute() override;
diff --git a/configmgr/source/configurationprovider.cxx b/configmgr/source/configurationprovider.cxx
index ed4fe6a098d4..e4454a4c02a3 100644
--- a/configmgr/source/configurationprovider.cxx
+++ b/configmgr/source/configurationprovider.cxx
@@ -113,7 +113,7 @@ private:
Service(const Service&) = delete;
Service& operator=(const Service&) = delete;
- virtual ~Service() {}
+ virtual ~Service() override {}
virtual void SAL_CALL disposing() override { flushModifications(); }
@@ -379,7 +379,7 @@ private:
Factory(const Factory&) = delete;
Factory& operator=(const Factory&) = delete;
- virtual ~Factory() {}
+ virtual ~Factory() override {}
virtual css::uno::Reference< css::uno::XInterface > SAL_CALL
createInstanceWithContext(
diff --git a/configmgr/source/configurationregistry.cxx b/configmgr/source/configurationregistry.cxx
index 437cc798d335..5370f036cde5 100644
--- a/configmgr/source/configurationregistry.cxx
+++ b/configmgr/source/configurationregistry.cxx
@@ -78,7 +78,7 @@ private:
Service(const Service&) = delete;
Service& operator=(const Service&) = delete;
- virtual ~Service() {}
+ virtual ~Service() override {}
virtual OUString SAL_CALL getImplementationName()
throw (css::uno::RuntimeException, std::exception) override
@@ -161,7 +161,7 @@ private:
RegistryKey(const RegistryKey&) = delete;
RegistryKey& operator=(const RegistryKey&) = delete;
- virtual ~RegistryKey() {}
+ virtual ~RegistryKey() override {}
virtual OUString SAL_CALL getKeyName()
throw (css::uno::RuntimeException, std::exception) override;
diff --git a/configmgr/source/groupnode.hxx b/configmgr/source/groupnode.hxx
index 59f2d7e3feeb..c889f807df59 100644
--- a/configmgr/source/groupnode.hxx
+++ b/configmgr/source/groupnode.hxx
@@ -49,7 +49,7 @@ public:
private:
GroupNode(GroupNode const & other, bool keepTemplateName);
- virtual ~GroupNode();
+ virtual ~GroupNode() override;
virtual Kind kind() const override;
diff --git a/configmgr/source/localizedpropertynode.hxx b/configmgr/source/localizedpropertynode.hxx
index 702613f8abe8..35b67d2345bf 100644
--- a/configmgr/source/localizedpropertynode.hxx
+++ b/configmgr/source/localizedpropertynode.hxx
@@ -46,7 +46,7 @@ public:
private:
LocalizedPropertyNode(LocalizedPropertyNode const & other);
- virtual ~LocalizedPropertyNode();
+ virtual ~LocalizedPropertyNode() override;
virtual Kind kind() const override;
diff --git a/configmgr/source/localizedvaluenode.hxx b/configmgr/source/localizedvaluenode.hxx
index e3055aecf9f3..441d32bbb6ca 100644
--- a/configmgr/source/localizedvaluenode.hxx
+++ b/configmgr/source/localizedvaluenode.hxx
@@ -51,7 +51,7 @@ public:
private:
LocalizedValueNode(LocalizedValueNode const & other);
- virtual ~LocalizedValueNode();
+ virtual ~LocalizedValueNode() override;
virtual Kind kind() const override;
diff --git a/configmgr/source/node.hxx b/configmgr/source/node.hxx
index a42b769f1b26..b745f668a92c 100644
--- a/configmgr/source/node.hxx
+++ b/configmgr/source/node.hxx
@@ -57,7 +57,7 @@ protected:
explicit Node(int layer);
explicit Node(const Node & other);
- virtual ~Node();
+ virtual ~Node() override;
int layer_;
int finalized_;
diff --git a/configmgr/source/parsemanager.hxx b/configmgr/source/parsemanager.hxx
index 85ed3c5ca4f3..478211ff4221 100644
--- a/configmgr/source/parsemanager.hxx
+++ b/configmgr/source/parsemanager.hxx
@@ -47,7 +47,7 @@ public:
enum { NAMESPACE_OOR = 1, NAMESPACE_XS = 2, NAMESPACE_XSI = 3 };
private:
- virtual ~ParseManager();
+ virtual ~ParseManager() override;
xmlreader::XmlReader reader_;
rtl::Reference< Parser > parser_;
diff --git a/configmgr/source/parser.hxx b/configmgr/source/parser.hxx
index c3c10540752d..de57d4783381 100644
--- a/configmgr/source/parser.hxx
+++ b/configmgr/source/parser.hxx
@@ -46,7 +46,7 @@ public:
protected:
Parser() {}
- virtual ~Parser() {}
+ virtual ~Parser() override {}
};
}
diff --git a/configmgr/source/propertynode.hxx b/configmgr/source/propertynode.hxx
index e1ddb4495d08..0a442a1d21f8 100644
--- a/configmgr/source/propertynode.hxx
+++ b/configmgr/source/propertynode.hxx
@@ -57,7 +57,7 @@ public:
private:
PropertyNode(PropertyNode const & other);
- virtual ~PropertyNode();
+ virtual ~PropertyNode() override;
virtual Kind kind() const override;
diff --git a/configmgr/source/readonlyaccess.cxx b/configmgr/source/readonlyaccess.cxx
index 864eb131ab3c..9ff6c10acfa7 100644
--- a/configmgr/source/readonlyaccess.cxx
+++ b/configmgr/source/readonlyaccess.cxx
@@ -54,7 +54,7 @@ private:
Service(const Service&) = delete;
Service& operator=(const Service&) = delete;
- virtual ~Service() {}
+ virtual ~Service() override {}
virtual OUString SAL_CALL getImplementationName()
throw (css::uno::RuntimeException, std::exception) override
diff --git a/configmgr/source/readwriteaccess.cxx b/configmgr/source/readwriteaccess.cxx
index ca59f551eea1..9ebf2f9dee65 100644
--- a/configmgr/source/readwriteaccess.cxx
+++ b/configmgr/source/readwriteaccess.cxx
@@ -56,7 +56,7 @@ private:
Service(const Service&) = delete;
Service& operator=(const Service&) = delete;
- virtual ~Service() {}
+ virtual ~Service() override {}
virtual OUString SAL_CALL getImplementationName()
throw (css::uno::RuntimeException, std::exception) override
diff --git a/configmgr/source/rootaccess.hxx b/configmgr/source/rootaccess.hxx
index 8ea6b2025e6d..b0efeeeab842 100644
--- a/configmgr/source/rootaccess.hxx
+++ b/configmgr/source/rootaccess.hxx
@@ -101,7 +101,7 @@ public:
throw (css::uno::RuntimeException, std::exception) override;
private:
- virtual ~RootAccess();
+ virtual ~RootAccess() override;
virtual std::vector<OUString> getRelativePath() override;
diff --git a/configmgr/source/rootnode.hxx b/configmgr/source/rootnode.hxx
index 28e1041f1ff7..285c3e65bb28 100644
--- a/configmgr/source/rootnode.hxx
+++ b/configmgr/source/rootnode.hxx
@@ -24,7 +24,7 @@ public:
RootNode();
private:
- virtual ~RootNode();
+ virtual ~RootNode() override;
virtual Kind kind() const override;
diff --git a/configmgr/source/setnode.hxx b/configmgr/source/setnode.hxx
index 1638eb622254..528a2ea8c82c 100644
--- a/configmgr/source/setnode.hxx
+++ b/configmgr/source/setnode.hxx
@@ -57,7 +57,7 @@ public:
private:
SetNode(SetNode const & other, bool keepTemplateName);
- virtual ~SetNode();
+ virtual ~SetNode() override;
virtual Kind kind() const override;
diff --git a/configmgr/source/update.cxx b/configmgr/source/update.cxx
index 054bca7be646..43cc4dd40430 100644
--- a/configmgr/source/update.cxx
+++ b/configmgr/source/update.cxx
@@ -71,7 +71,7 @@ private:
Service(const Service&) = delete;
Service& operator=(const Service&) = delete;
- virtual ~Service() {}
+ virtual ~Service() override {}
virtual void SAL_CALL insertExtensionXcsFile(
sal_Bool shared, OUString const & fileUri)
diff --git a/configmgr/source/xcdparser.hxx b/configmgr/source/xcdparser.hxx
index c537f5b86398..c51bd6368136 100644
--- a/configmgr/source/xcdparser.hxx
+++ b/configmgr/source/xcdparser.hxx
@@ -43,7 +43,7 @@ public:
Data & data);
private:
- virtual ~XcdParser();
+ virtual ~XcdParser() override;
virtual xmlreader::XmlReader::Text getTextMode() override;
diff --git a/configmgr/source/xcsparser.hxx b/configmgr/source/xcsparser.hxx
index 7a01c5d5d426..36d4a239f704 100644
--- a/configmgr/source/xcsparser.hxx
+++ b/configmgr/source/xcsparser.hxx
@@ -45,7 +45,7 @@ public:
XcsParser(int layer, Data & data);
private:
- virtual ~XcsParser();
+ virtual ~XcsParser() override;
virtual xmlreader::XmlReader::Text getTextMode() override;
diff --git a/configmgr/source/xcuparser.hxx b/configmgr/source/xcuparser.hxx
index f7bc15839462..27e193bde8b7 100644
--- a/configmgr/source/xcuparser.hxx
+++ b/configmgr/source/xcuparser.hxx
@@ -56,7 +56,7 @@ public:
Modifications * broadcastModifications, Additions * additions);
private:
- virtual ~XcuParser();
+ virtual ~XcuParser() override;
virtual xmlreader::XmlReader::Text getTextMode() override;