From b36963c0a6a09f70ca6d8d607dd3249a3496497d Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Mon, 12 Oct 2015 16:04:04 +0200 Subject: Replace "SAL_OVERRIDE" with "override" in LIBO_INTERNAL_ONLY code Change-Id: I2ea407acd763ef2d7dae2d3b8f32525523ac8274 --- unoidl/source/legacyprovider.cxx | 6 +++--- unoidl/source/legacyprovider.hxx | 4 ++-- unoidl/source/sourcefileprovider.cxx | 6 +++--- unoidl/source/sourcefileprovider.hxx | 4 ++-- unoidl/source/sourcetreeprovider.cxx | 6 +++--- unoidl/source/sourcetreeprovider.hxx | 4 ++-- unoidl/source/unoidl.cxx | 6 +++--- unoidl/source/unoidlprovider.cxx | 6 +++--- unoidl/source/unoidlprovider.hxx | 4 ++-- 9 files changed, 23 insertions(+), 23 deletions(-) (limited to 'unoidl') diff --git a/unoidl/source/legacyprovider.cxx b/unoidl/source/legacyprovider.cxx index b9ee5e5897c5..eb3dde4cfef5 100644 --- a/unoidl/source/legacyprovider.cxx +++ b/unoidl/source/legacyprovider.cxx @@ -82,7 +82,7 @@ public: private: virtual ~Cursor() throw () {} - virtual rtl::Reference< Entity > getNext(OUString * name) SAL_OVERRIDE; + virtual rtl::Reference< Entity > getNext(OUString * name) override; rtl::Reference< Manager > manager_; RegistryKey ucr_; @@ -137,9 +137,9 @@ public: private: virtual ~Module() throw () {} - virtual std::vector< OUString > getMemberNames() const SAL_OVERRIDE; + virtual std::vector< OUString > getMemberNames() const override; - virtual rtl::Reference< MapCursor > createCursor() const SAL_OVERRIDE + virtual rtl::Reference< MapCursor > createCursor() const override { return new Cursor(manager_, ucr_, key_); } rtl::Reference< Manager > manager_; diff --git a/unoidl/source/legacyprovider.hxx b/unoidl/source/legacyprovider.hxx index c3ba6ef7a252..aac97824e986 100644 --- a/unoidl/source/legacyprovider.hxx +++ b/unoidl/source/legacyprovider.hxx @@ -24,11 +24,11 @@ public: LegacyProvider(Manager & manager, OUString const & uri); // throws FileFormatException: - virtual rtl::Reference< MapCursor > createRootCursor() const SAL_OVERRIDE; + virtual rtl::Reference< MapCursor > createRootCursor() const override; // throws FileFormatException: virtual rtl::Reference< Entity > findEntity(OUString const & name) - const SAL_OVERRIDE; + const override; private: virtual ~LegacyProvider() throw (); diff --git a/unoidl/source/sourcefileprovider.cxx b/unoidl/source/sourcefileprovider.cxx index c73142dc83e3..7e687b7231a8 100644 --- a/unoidl/source/sourcefileprovider.cxx +++ b/unoidl/source/sourcefileprovider.cxx @@ -29,7 +29,7 @@ public: private: virtual ~Cursor() throw () {} - virtual rtl::Reference< Entity > getNext(OUString * name) SAL_OVERRIDE; + virtual rtl::Reference< Entity > getNext(OUString * name) override; std::map< OUString, rtl::Reference > const & map_; //TODO: extent std::map< OUString, rtl::Reference >::const_iterator iterator_; @@ -55,9 +55,9 @@ public: private: virtual ~Module() throw () {} - virtual std::vector getMemberNames() const SAL_OVERRIDE; + virtual std::vector getMemberNames() const override; - virtual rtl::Reference createCursor() const SAL_OVERRIDE + virtual rtl::Reference createCursor() const override { return new Cursor(map); } }; diff --git a/unoidl/source/sourcefileprovider.hxx b/unoidl/source/sourcefileprovider.hxx index aa215b5b2e2c..5e775c2d8a9c 100644 --- a/unoidl/source/sourcefileprovider.hxx +++ b/unoidl/source/sourcefileprovider.hxx @@ -26,10 +26,10 @@ public: rtl::Reference const & manager, OUString const & uri); // throws FileFormatException: - virtual rtl::Reference createRootCursor() const SAL_OVERRIDE; + virtual rtl::Reference createRootCursor() const override; // throws FileFormatException: - virtual rtl::Reference findEntity(OUString const & name) const SAL_OVERRIDE; + virtual rtl::Reference findEntity(OUString const & name) const override; private: virtual ~SourceFileProvider() throw (); diff --git a/unoidl/source/sourcetreeprovider.cxx b/unoidl/source/sourcetreeprovider.cxx index e9d00940bb69..526d3321afb7 100644 --- a/unoidl/source/sourcetreeprovider.cxx +++ b/unoidl/source/sourcetreeprovider.cxx @@ -101,7 +101,7 @@ public: private: virtual ~Cursor() throw () {} - virtual rtl::Reference getNext(OUString *) SAL_OVERRIDE + virtual rtl::Reference getNext(OUString *) override { return rtl::Reference(); } //TODO }; @@ -112,10 +112,10 @@ public: private: virtual ~SourceModuleEntity() throw () {} - virtual std::vector getMemberNames() const SAL_OVERRIDE + virtual std::vector getMemberNames() const override { return std::vector(); } //TODO - virtual rtl::Reference< MapCursor > createCursor() const SAL_OVERRIDE + virtual rtl::Reference< MapCursor > createCursor() const override { return new Cursor; } }; diff --git a/unoidl/source/sourcetreeprovider.hxx b/unoidl/source/sourcetreeprovider.hxx index 0c1d993f5453..9262f0d2defb 100644 --- a/unoidl/source/sourcetreeprovider.hxx +++ b/unoidl/source/sourcetreeprovider.hxx @@ -25,10 +25,10 @@ public: SourceTreeProvider(Manager & manager, OUString const & uri); // throws FileFormatException: - virtual rtl::Reference createRootCursor() const SAL_OVERRIDE; + virtual rtl::Reference createRootCursor() const override; // throws FileFormatException: - virtual rtl::Reference findEntity(OUString const & name) const SAL_OVERRIDE; + virtual rtl::Reference findEntity(OUString const & name) const override; private: virtual ~SourceTreeProvider() throw (); diff --git a/unoidl/source/unoidl.cxx b/unoidl/source/unoidl.cxx index e5573f0b124b..d6569e689a71 100644 --- a/unoidl/source/unoidl.cxx +++ b/unoidl/source/unoidl.cxx @@ -39,9 +39,9 @@ public: private: virtual ~AggregatingModule() throw () {} - virtual std::vector< OUString > getMemberNames() const SAL_OVERRIDE; + virtual std::vector< OUString > getMemberNames() const override; - virtual rtl::Reference< MapCursor > createCursor() const SAL_OVERRIDE; + virtual rtl::Reference< MapCursor > createCursor() const override; std::vector< rtl::Reference< Provider > > providers_; OUString name_; @@ -74,7 +74,7 @@ public: private: virtual ~AggregatingCursor() throw () {} - virtual rtl::Reference< Entity > getNext(OUString * name) SAL_OVERRIDE; + virtual rtl::Reference< Entity > getNext(OUString * name) override; void findCursor(); diff --git a/unoidl/source/unoidlprovider.cxx b/unoidl/source/unoidlprovider.cxx index 90f3b81ab949..94204e809dc7 100644 --- a/unoidl/source/unoidlprovider.cxx +++ b/unoidl/source/unoidlprovider.cxx @@ -659,7 +659,7 @@ public: private: virtual ~UnoidlCursor() throw () {} - virtual rtl::Reference< Entity > getNext(OUString * name) SAL_OVERRIDE; + virtual rtl::Reference< Entity > getNext(OUString * name) override; rtl::Reference< MappedFile > file_; rtl::Reference reference1_; // HACK to keep alive whatever @@ -701,9 +701,9 @@ public: private: virtual ~UnoidlModuleEntity() throw () {} - virtual std::vector< OUString > getMemberNames() const SAL_OVERRIDE; + virtual std::vector< OUString > getMemberNames() const override; - virtual rtl::Reference< MapCursor > createCursor() const SAL_OVERRIDE { + virtual rtl::Reference< MapCursor > createCursor() const override { return new UnoidlCursor( file_, rtl::Reference(), const_cast(this), map_); diff --git a/unoidl/source/unoidlprovider.hxx b/unoidl/source/unoidlprovider.hxx index 9eacfb5f17dd..77c77c59c605 100644 --- a/unoidl/source/unoidlprovider.hxx +++ b/unoidl/source/unoidlprovider.hxx @@ -39,11 +39,11 @@ public: explicit UnoidlProvider(OUString const & uri); // throws FileFormatException: - virtual rtl::Reference< MapCursor > createRootCursor() const SAL_OVERRIDE; + virtual rtl::Reference< MapCursor > createRootCursor() const override; // throws FileFormatException: virtual rtl::Reference< Entity > findEntity(OUString const & name) - const SAL_OVERRIDE; + const override; private: virtual ~UnoidlProvider() throw (); -- cgit