summaryrefslogtreecommitdiff
path: root/configmgr
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2015-10-12 15:25:41 +0200
committerStephan Bergmann <sbergman@redhat.com>2015-10-12 17:52:26 +0200
commitbff4c13475957863bfa7da5bc3bcf82a64a7503a (patch)
tree23530ecc27cb8d46b26d5d4aea6b058e5fbaf9db /configmgr
parent27491c28cb67ada0a4c5eaa90eaf589425990582 (diff)
Replace "SAL_DELETED_FUNCTION" with "= delete" in LIBO_INTERNAL_ONLY code
Change-Id: I328ac7a95ccc87732efae48b567a0556865928f3
Diffstat (limited to 'configmgr')
-rw-r--r--configmgr/source/access.hxx4
-rw-r--r--configmgr/source/broadcaster.hxx4
-rw-r--r--configmgr/source/components.hxx4
-rw-r--r--configmgr/source/configurationprovider.cxx8
-rw-r--r--configmgr/source/configurationregistry.cxx8
-rw-r--r--configmgr/source/data.hxx4
-rw-r--r--configmgr/source/modifications.hxx4
-rw-r--r--configmgr/source/partial.hxx4
-rw-r--r--configmgr/source/readonlyaccess.cxx4
-rw-r--r--configmgr/source/readwriteaccess.cxx4
-rw-r--r--configmgr/source/update.cxx4
-rw-r--r--configmgr/source/valueparser.hxx4
-rw-r--r--configmgr/source/writemodfile.cxx2
-rw-r--r--configmgr/source/writemodfile.hxx4
14 files changed, 31 insertions, 31 deletions
diff --git a/configmgr/source/access.hxx b/configmgr/source/access.hxx
index e3cb69199faf..f9006657a17d 100644
--- a/configmgr/source/access.hxx
+++ b/configmgr/source/access.hxx
@@ -474,8 +474,8 @@ protected:
bool isDisposed() const { return disposed_;}
private:
- Access(const Access&) SAL_DELETED_FUNCTION;
- Access& operator=(const Access&) SAL_DELETED_FUNCTION;
+ Access(const Access&) = delete;
+ Access& operator=(const Access&) = delete;
struct ModifiedChild {
rtl::Reference< ChildAccess > child;
diff --git a/configmgr/source/broadcaster.hxx b/configmgr/source/broadcaster.hxx
index e808dd84f9e1..e0a5fc4ce962 100644
--- a/configmgr/source/broadcaster.hxx
+++ b/configmgr/source/broadcaster.hxx
@@ -78,8 +78,8 @@ public:
void send();
private:
- Broadcaster(const Broadcaster&) SAL_DELETED_FUNCTION;
- Broadcaster& operator=(const Broadcaster&) SAL_DELETED_FUNCTION;
+ Broadcaster(const Broadcaster&) = delete;
+ Broadcaster& operator=(const Broadcaster&) = delete;
struct DisposeNotification {
css::uno::Reference< css::lang::XEventListener > listener;
diff --git a/configmgr/source/components.hxx b/configmgr/source/components.hxx
index 43e682e7757e..b28da71f4111 100644
--- a/configmgr/source/components.hxx
+++ b/configmgr/source/components.hxx
@@ -102,8 +102,8 @@ public:
getExternalValue(OUString const & descriptor);
private:
- Components(const Components&) SAL_DELETED_FUNCTION;
- Components& operator=(const Components&) SAL_DELETED_FUNCTION;
+ Components(const Components&) = delete;
+ Components& operator=(const Components&) = delete;
typedef void FileParser(
OUString const &, int, Data &, Partial const *, Modifications *,
diff --git a/configmgr/source/configurationprovider.cxx b/configmgr/source/configurationprovider.cxx
index 31b87b69edd7..58c3da6e73b8 100644
--- a/configmgr/source/configurationprovider.cxx
+++ b/configmgr/source/configurationprovider.cxx
@@ -110,8 +110,8 @@ public:
}
private:
- Service(const Service&) SAL_DELETED_FUNCTION;
- Service& operator=(const Service&) SAL_DELETED_FUNCTION;
+ Service(const Service&) = delete;
+ Service& operator=(const Service&) = delete;
virtual ~Service() {}
@@ -376,8 +376,8 @@ public:
Factory() {}
private:
- Factory(const Factory&) SAL_DELETED_FUNCTION;
- Factory& operator=(const Factory&) SAL_DELETED_FUNCTION;
+ Factory(const Factory&) = delete;
+ Factory& operator=(const Factory&) = delete;
virtual ~Factory() {}
diff --git a/configmgr/source/configurationregistry.cxx b/configmgr/source/configurationregistry.cxx
index d1f640e3c112..6fa5450ca5c3 100644
--- a/configmgr/source/configurationregistry.cxx
+++ b/configmgr/source/configurationregistry.cxx
@@ -75,8 +75,8 @@ public:
explicit Service(css::uno::Reference< css::uno::XComponentContext > const & context);
private:
- Service(const Service&) SAL_DELETED_FUNCTION;
- Service& operator=(const Service&) SAL_DELETED_FUNCTION;
+ Service(const Service&) = delete;
+ Service& operator=(const Service&) = delete;
virtual ~Service() {}
@@ -158,8 +158,8 @@ public:
service_(service), value_(value) {}
private:
- RegistryKey(const RegistryKey&) SAL_DELETED_FUNCTION;
- RegistryKey& operator=(const RegistryKey&) SAL_DELETED_FUNCTION;
+ RegistryKey(const RegistryKey&) = delete;
+ RegistryKey& operator=(const RegistryKey&) = delete;
virtual ~RegistryKey() {}
diff --git a/configmgr/source/data.hxx b/configmgr/source/data.hxx
index 681bf55aa261..e0293b518390 100644
--- a/configmgr/source/data.hxx
+++ b/configmgr/source/data.hxx
@@ -85,8 +85,8 @@ struct Data {
OUString const & url);
private:
- Data(const Data&) SAL_DELETED_FUNCTION;
- Data& operator=(const Data&) SAL_DELETED_FUNCTION;
+ Data(const Data&) = delete;
+ Data& operator=(const Data&) = delete;
typedef config_map< rtl::Reference< ExtensionXcu > >
ExtensionXcuAdditions;
diff --git a/configmgr/source/modifications.hxx b/configmgr/source/modifications.hxx
index 098992d08fd5..dc97fd3bee07 100644
--- a/configmgr/source/modifications.hxx
+++ b/configmgr/source/modifications.hxx
@@ -52,8 +52,8 @@ public:
Node const & getRoot() const { return root_;}
private:
- Modifications(const Modifications&) SAL_DELETED_FUNCTION;
- Modifications& operator=(const Modifications&) SAL_DELETED_FUNCTION;
+ Modifications(const Modifications&) = delete;
+ Modifications& operator=(const Modifications&) = delete;
Node root_;
};
diff --git a/configmgr/source/partial.hxx b/configmgr/source/partial.hxx
index d9864a6f4841..e7641e2c974b 100644
--- a/configmgr/source/partial.hxx
+++ b/configmgr/source/partial.hxx
@@ -43,8 +43,8 @@ public:
Containment contains(Path const & path) const;
private:
- Partial(const Partial&) SAL_DELETED_FUNCTION;
- Partial& operator=(const Partial&) SAL_DELETED_FUNCTION;
+ Partial(const Partial&) = delete;
+ Partial& operator=(const Partial&) = delete;
struct Node {
typedef boost::unordered_map< OUString, Node, OUStringHash > Children;
diff --git a/configmgr/source/readonlyaccess.cxx b/configmgr/source/readonlyaccess.cxx
index afaef972f3ff..8948ce93043e 100644
--- a/configmgr/source/readonlyaccess.cxx
+++ b/configmgr/source/readonlyaccess.cxx
@@ -51,8 +51,8 @@ public:
context_(context) {}
private:
- Service(const Service&) SAL_DELETED_FUNCTION;
- Service& operator=(const Service&) SAL_DELETED_FUNCTION;
+ Service(const Service&) = delete;
+ Service& operator=(const Service&) = delete;
virtual ~Service() {}
diff --git a/configmgr/source/readwriteaccess.cxx b/configmgr/source/readwriteaccess.cxx
index e6c4fa07dc5d..d1cc4134562e 100644
--- a/configmgr/source/readwriteaccess.cxx
+++ b/configmgr/source/readwriteaccess.cxx
@@ -53,8 +53,8 @@ public:
context_(context) {}
private:
- Service(const Service&) SAL_DELETED_FUNCTION;
- Service& operator=(const Service&) SAL_DELETED_FUNCTION;
+ Service(const Service&) = delete;
+ Service& operator=(const Service&) = delete;
virtual ~Service() {}
diff --git a/configmgr/source/update.cxx b/configmgr/source/update.cxx
index 5d4028559fed..44b9840b612e 100644
--- a/configmgr/source/update.cxx
+++ b/configmgr/source/update.cxx
@@ -68,8 +68,8 @@ public:
}
private:
- Service(const Service&) SAL_DELETED_FUNCTION;
- Service& operator=(const Service&) SAL_DELETED_FUNCTION;
+ Service(const Service&) = delete;
+ Service& operator=(const Service&) = delete;
virtual ~Service() {}
diff --git a/configmgr/source/valueparser.hxx b/configmgr/source/valueparser.hxx
index f2c3b3c2e5bb..092d910dcd05 100644
--- a/configmgr/source/valueparser.hxx
+++ b/configmgr/source/valueparser.hxx
@@ -68,8 +68,8 @@ public:
OString separator_;
private:
- ValueParser(const ValueParser&) SAL_DELETED_FUNCTION;
- ValueParser& operator=(const ValueParser&) SAL_DELETED_FUNCTION;
+ ValueParser(const ValueParser&) = delete;
+ ValueParser& operator=(const ValueParser&) = delete;
template< typename T > css::uno::Any convertItems();
diff --git a/configmgr/source/writemodfile.cxx b/configmgr/source/writemodfile.cxx
index 056041dea512..d56b284004e1 100644
--- a/configmgr/source/writemodfile.cxx
+++ b/configmgr/source/writemodfile.cxx
@@ -152,7 +152,7 @@ void writeData_(TempFile &handle, char const * begin, sal_Int32 length) {
handle.writeString(begin, length);
}
-void writeValueContent_(TempFile &, bool) SAL_DELETED_FUNCTION;
+void writeValueContent_(TempFile &, bool) = delete;
// silence loplugin:salbool
void writeValueContent_(TempFile &handle, sal_Bool value) {
if (value) {
diff --git a/configmgr/source/writemodfile.hxx b/configmgr/source/writemodfile.hxx
index 5a80959ac359..ffd1fda316cd 100644
--- a/configmgr/source/writemodfile.hxx
+++ b/configmgr/source/writemodfile.hxx
@@ -44,8 +44,8 @@ struct TempFile {
void writeString(char const *begin, sal_Int32 length);
private:
- TempFile(const TempFile&) SAL_DELETED_FUNCTION;
- TempFile& operator=(const TempFile&) SAL_DELETED_FUNCTION;
+ TempFile(const TempFile&) = delete;
+ TempFile& operator=(const TempFile&) = delete;
};
void writeData(TempFile &handle, OString const & text);