summaryrefslogtreecommitdiff
path: root/unoidl
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2014-03-26 16:37:00 +0100
committerStephan Bergmann <sbergman@redhat.com>2014-03-26 16:39:26 +0100
commit70cc2b191b95fbc210bc1f0f6a7159f341894f0f (patch)
treea70f4957c454b443520cbf91250c41d9eea80017 /unoidl
parent8757bea2e88c6e349e1fe98d8e9695d7b9c6179e (diff)
First batch of adding SAL_OVERRRIDE to overriding function declarations
...mostly done with a rewriting Clang plugin, with just some manual tweaking necessary to fix poor macro usage. Change-Id: I71fa20213e86be10de332ece0aa273239df7b61a
Diffstat (limited to 'unoidl')
-rw-r--r--unoidl/source/legacyprovider.cxx6
-rw-r--r--unoidl/source/legacyprovider.hxx4
-rw-r--r--unoidl/source/sourcefileprovider.cxx6
-rw-r--r--unoidl/source/sourcefileprovider.hxx4
-rw-r--r--[-rwxr-xr-x]unoidl/source/sourcetreeprovider.cxx6
-rw-r--r--unoidl/source/sourcetreeprovider.hxx4
-rw-r--r--unoidl/source/unoidl.cxx6
-rw-r--r--unoidl/source/unoidlprovider.cxx6
-rw-r--r--unoidl/source/unoidlprovider.hxx4
9 files changed, 23 insertions, 23 deletions
diff --git a/unoidl/source/legacyprovider.cxx b/unoidl/source/legacyprovider.cxx
index 3b3821566ff0..ac8ec6909966 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);
+ virtual rtl::Reference< Entity > getNext(OUString * name) SAL_OVERRIDE;
rtl::Reference< Manager > manager_;
RegistryKey ucr_;
@@ -137,9 +137,9 @@ public:
private:
virtual ~Module() throw () {}
- virtual std::vector< OUString > getMemberNames() const;
+ virtual std::vector< OUString > getMemberNames() const SAL_OVERRIDE;
- virtual rtl::Reference< MapCursor > createCursor() const
+ virtual rtl::Reference< MapCursor > createCursor() const SAL_OVERRIDE
{ return new Cursor(manager_, ucr_, key_); }
rtl::Reference< Manager > manager_;
diff --git a/unoidl/source/legacyprovider.hxx b/unoidl/source/legacyprovider.hxx
index e4d079ad8aaf..bcb300d4b2e8 100644
--- a/unoidl/source/legacyprovider.hxx
+++ b/unoidl/source/legacyprovider.hxx
@@ -25,11 +25,11 @@ public:
rtl::Reference< Manager > const & manager, OUString const & uri);
// throws FileFormatException:
- virtual rtl::Reference< MapCursor > createRootCursor() const;
+ virtual rtl::Reference< MapCursor > createRootCursor() const SAL_OVERRIDE;
// throws FileFormatException:
virtual rtl::Reference< Entity > findEntity(OUString const & name)
- const;
+ const SAL_OVERRIDE;
private:
virtual ~LegacyProvider() throw ();
diff --git a/unoidl/source/sourcefileprovider.cxx b/unoidl/source/sourcefileprovider.cxx
index 4c522e8fc423..3348d1c5e8e0 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);
+ virtual rtl::Reference< Entity > getNext(OUString * name) SAL_OVERRIDE;
std::map< OUString, rtl::Reference<Entity> > const & map_; //TODO: extent
std::map< OUString, rtl::Reference<Entity> >::const_iterator iterator_;
@@ -55,9 +55,9 @@ public:
private:
virtual ~Module() throw () {}
- virtual std::vector<rtl::OUString> getMemberNames() const;
+ virtual std::vector<rtl::OUString> getMemberNames() const SAL_OVERRIDE;
- virtual rtl::Reference<MapCursor> createCursor() const
+ virtual rtl::Reference<MapCursor> createCursor() const SAL_OVERRIDE
{ return new Cursor(map); }
};
diff --git a/unoidl/source/sourcefileprovider.hxx b/unoidl/source/sourcefileprovider.hxx
index 608de8c352bc..aa215b5b2e2c 100644
--- a/unoidl/source/sourcefileprovider.hxx
+++ b/unoidl/source/sourcefileprovider.hxx
@@ -26,10 +26,10 @@ public:
rtl::Reference<Manager> const & manager, OUString const & uri);
// throws FileFormatException:
- virtual rtl::Reference<MapCursor> createRootCursor() const;
+ virtual rtl::Reference<MapCursor> createRootCursor() const SAL_OVERRIDE;
// throws FileFormatException:
- virtual rtl::Reference<Entity> findEntity(OUString const & name) const;
+ virtual rtl::Reference<Entity> findEntity(OUString const & name) const SAL_OVERRIDE;
private:
virtual ~SourceFileProvider() throw ();
diff --git a/unoidl/source/sourcetreeprovider.cxx b/unoidl/source/sourcetreeprovider.cxx
index 2cfe93885b3c..5c203e450075 100755..100644
--- a/unoidl/source/sourcetreeprovider.cxx
+++ b/unoidl/source/sourcetreeprovider.cxx
@@ -100,7 +100,7 @@ public:
private:
virtual ~Cursor() throw () {}
- virtual rtl::Reference<Entity> getNext(OUString *)
+ virtual rtl::Reference<Entity> getNext(OUString *) SAL_OVERRIDE
{ return rtl::Reference<Entity>(); } //TODO
};
@@ -111,10 +111,10 @@ public:
private:
virtual ~SourceModuleEntity() throw () {}
- virtual std::vector<OUString> getMemberNames() const
+ virtual std::vector<OUString> getMemberNames() const SAL_OVERRIDE
{ return std::vector<OUString>(); } //TODO
- virtual rtl::Reference< MapCursor > createCursor() const
+ virtual rtl::Reference< MapCursor > createCursor() const SAL_OVERRIDE
{ return new Cursor; }
};
diff --git a/unoidl/source/sourcetreeprovider.hxx b/unoidl/source/sourcetreeprovider.hxx
index c29fa0312975..57ae3d5823f3 100644
--- a/unoidl/source/sourcetreeprovider.hxx
+++ b/unoidl/source/sourcetreeprovider.hxx
@@ -26,10 +26,10 @@ public:
rtl::Reference<Manager> const & manager, OUString const & uri);
// throws FileFormatException:
- virtual rtl::Reference<MapCursor> createRootCursor() const;
+ virtual rtl::Reference<MapCursor> createRootCursor() const SAL_OVERRIDE;
// throws FileFormatException:
- virtual rtl::Reference<Entity> findEntity(OUString const & name) const;
+ virtual rtl::Reference<Entity> findEntity(OUString const & name) const SAL_OVERRIDE;
private:
virtual ~SourceTreeProvider() throw ();
diff --git a/unoidl/source/unoidl.cxx b/unoidl/source/unoidl.cxx
index 6d716d46c4c3..3eb36a8990ae 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;
+ virtual std::vector< OUString > getMemberNames() const SAL_OVERRIDE;
- virtual rtl::Reference< MapCursor > createCursor() const;
+ virtual rtl::Reference< MapCursor > createCursor() const SAL_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);
+ virtual rtl::Reference< Entity > getNext(OUString * name) SAL_OVERRIDE;
void findCursor();
diff --git a/unoidl/source/unoidlprovider.cxx b/unoidl/source/unoidlprovider.cxx
index b195f4473c0c..2e7ac091434b 100644
--- a/unoidl/source/unoidlprovider.cxx
+++ b/unoidl/source/unoidlprovider.cxx
@@ -556,7 +556,7 @@ public:
private:
virtual ~UnoidlCursor() throw () {}
- virtual rtl::Reference< Entity > getNext(OUString * name);
+ virtual rtl::Reference< Entity > getNext(OUString * name) SAL_OVERRIDE;
rtl::Reference< MappedFile > file_;
MapEntry const * mapIndex_;
@@ -589,9 +589,9 @@ public:
private:
virtual ~UnoidlModuleEntity() throw () {}
- virtual std::vector< OUString > getMemberNames() const;
+ virtual std::vector< OUString > getMemberNames() const SAL_OVERRIDE;
- virtual rtl::Reference< MapCursor > createCursor() const
+ virtual rtl::Reference< MapCursor > createCursor() const SAL_OVERRIDE
{ return new UnoidlCursor(file_, mapBegin_, mapSize_); }
rtl::Reference< MappedFile > file_;
diff --git a/unoidl/source/unoidlprovider.hxx b/unoidl/source/unoidlprovider.hxx
index 6ea8aedddaf0..2f0728af8cd6 100644
--- a/unoidl/source/unoidlprovider.hxx
+++ b/unoidl/source/unoidlprovider.hxx
@@ -27,11 +27,11 @@ public:
explicit UnoidlProvider(OUString const & uri);
// throws FileFormatException:
- virtual rtl::Reference< MapCursor > createRootCursor() const;
+ virtual rtl::Reference< MapCursor > createRootCursor() const SAL_OVERRIDE;
// throws FileFormatException:
virtual rtl::Reference< Entity > findEntity(OUString const & name)
- const;
+ const SAL_OVERRIDE;
private:
virtual ~UnoidlProvider() throw ();