summaryrefslogtreecommitdiff
path: root/sd/source/ui/remotecontrol
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2014-03-27 18:12:18 +0100
committerStephan Bergmann <sbergman@redhat.com>2014-03-27 18:12:18 +0100
commit567ef6d5782cdb729b49005caf6005610ce03e22 (patch)
tree7e3be1da41382e555d9091914ef7e064852a4fd4 /sd/source/ui/remotecontrol
parentc36daa01f444ebad799c1cc7a106f1b4bb3c3d12 (diff)
Second batch of adding SAL_OVERRIDE to overriding function declarations
...mostly done with a rewriting Clang plugin, with just some manual tweaking necessary to fix poor macro usage. Change-Id: Ie656f9d653fc716f72ac175925272696d509038f
Diffstat (limited to 'sd/source/ui/remotecontrol')
-rw-r--r--sd/source/ui/remotecontrol/AvahiNetworkService.hxx4
-rw-r--r--sd/source/ui/remotecontrol/BluetoothServer.hxx2
-rw-r--r--sd/source/ui/remotecontrol/BufferedStreamSocket.hxx6
-rw-r--r--sd/source/ui/remotecontrol/Communicator.hxx2
-rw-r--r--sd/source/ui/remotecontrol/DiscoveryService.hxx2
-rw-r--r--sd/source/ui/remotecontrol/ImagePreparer.hxx2
-rw-r--r--sd/source/ui/remotecontrol/Listener.hxx24
-rw-r--r--sd/source/ui/remotecontrol/Receiver.hxx2
-rw-r--r--sd/source/ui/remotecontrol/Transmitter.hxx2
9 files changed, 23 insertions, 23 deletions
diff --git a/sd/source/ui/remotecontrol/AvahiNetworkService.hxx b/sd/source/ui/remotecontrol/AvahiNetworkService.hxx
index 239059215929..11afc7bff4b3 100644
--- a/sd/source/ui/remotecontrol/AvahiNetworkService.hxx
+++ b/sd/source/ui/remotecontrol/AvahiNetworkService.hxx
@@ -21,8 +21,8 @@ namespace sd {
: ZeroconfService(aname, aport){}
virtual ~AvahiNetworkService(){}
- void clear();
- void setup();
+ void clear() SAL_OVERRIDE;
+ void setup() SAL_OVERRIDE;
};
}
#endif
diff --git a/sd/source/ui/remotecontrol/BluetoothServer.hxx b/sd/source/ui/remotecontrol/BluetoothServer.hxx
index 45fe3b21b141..0f649d9a2178 100644
--- a/sd/source/ui/remotecontrol/BluetoothServer.hxx
+++ b/sd/source/ui/remotecontrol/BluetoothServer.hxx
@@ -49,7 +49,7 @@ namespace sd
struct Impl;
boost::scoped_ptr<Impl> mpImpl;
#endif
- virtual void SAL_CALL run();
+ virtual void SAL_CALL run() SAL_OVERRIDE;
void cleanupCommunicators();
std::vector<Communicator*>* mpCommunicators;
diff --git a/sd/source/ui/remotecontrol/BufferedStreamSocket.hxx b/sd/source/ui/remotecontrol/BufferedStreamSocket.hxx
index 6705e000e72f..7b6e7deaedd1 100644
--- a/sd/source/ui/remotecontrol/BufferedStreamSocket.hxx
+++ b/sd/source/ui/remotecontrol/BufferedStreamSocket.hxx
@@ -47,11 +47,11 @@ namespace sd
* Returns whatever the last call of recv returned, i.e. 0 or less
* if there was a problem in communications.
*/
- virtual sal_Int32 readLine( OString& aLine );
+ virtual sal_Int32 readLine( OString& aLine ) SAL_OVERRIDE;
- virtual sal_Int32 write( const void* pBuffer, sal_uInt32 n );
+ virtual sal_Int32 write( const void* pBuffer, sal_uInt32 n ) SAL_OVERRIDE;
- virtual void close();
+ virtual void close() SAL_OVERRIDE;
void getPeerAddr(osl::SocketAddr&);
private:
diff --git a/sd/source/ui/remotecontrol/Communicator.hxx b/sd/source/ui/remotecontrol/Communicator.hxx
index 89f2c2e6d131..c7f00c6e1e77 100644
--- a/sd/source/ui/remotecontrol/Communicator.hxx
+++ b/sd/source/ui/remotecontrol/Communicator.hxx
@@ -48,7 +48,7 @@ namespace sd
void forceClose();
private:
- void execute();
+ void execute() SAL_OVERRIDE;
IBluetoothSocket *mpSocket;
Transmitter *pTransmitter;
diff --git a/sd/source/ui/remotecontrol/DiscoveryService.hxx b/sd/source/ui/remotecontrol/DiscoveryService.hxx
index 03bbf87e4e96..a362d0fe911d 100644
--- a/sd/source/ui/remotecontrol/DiscoveryService.hxx
+++ b/sd/source/ui/remotecontrol/DiscoveryService.hxx
@@ -37,7 +37,7 @@ namespace sd
void setupSockets();
static DiscoveryService *spService;
- virtual void SAL_CALL run();
+ virtual void SAL_CALL run() SAL_OVERRIDE;
int mSocket;
ZeroconfService * zService;
diff --git a/sd/source/ui/remotecontrol/ImagePreparer.hxx b/sd/source/ui/remotecontrol/ImagePreparer.hxx
index 358b1b2ccf9b..0b1d861e9dd0 100644
--- a/sd/source/ui/remotecontrol/ImagePreparer.hxx
+++ b/sd/source/ui/remotecontrol/ImagePreparer.hxx
@@ -31,7 +31,7 @@ private:
css::uno::Reference<css::presentation::XSlideShowController> xController;
Transmitter *pTransmitter;
- virtual void Timeout();
+ virtual void Timeout() SAL_OVERRIDE;
void sendPreview( sal_uInt32 aSlideNumber );
css::uno::Sequence<sal_Int8> preparePreview( sal_uInt32 aSlideNumber,
diff --git a/sd/source/ui/remotecontrol/Listener.hxx b/sd/source/ui/remotecontrol/Listener.hxx
index 41dc351f414c..89521395d1fa 100644
--- a/sd/source/ui/remotecontrol/Listener.hxx
+++ b/sd/source/ui/remotecontrol/Listener.hxx
@@ -37,28 +37,28 @@ public:
// XAnimationListener
virtual void SAL_CALL beginEvent(const css::uno::Reference<
- css::animations::XAnimationNode >& rNode ) throw (css::uno::RuntimeException, std::exception);
+ css::animations::XAnimationNode >& rNode ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual void SAL_CALL endEvent( const css::uno::Reference<
- css::animations::XAnimationNode >& rNode ) throw (css::uno::RuntimeException, std::exception);
+ css::animations::XAnimationNode >& rNode ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual void SAL_CALL repeat( const css::uno::Reference<
css::animations::XAnimationNode >& rNode, ::sal_Int32 Repeat )
- throw (css::uno::RuntimeException, std::exception);
+ throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// XSlideShowListener
- virtual void SAL_CALL paused( ) throw (css::uno::RuntimeException, std::exception);
- virtual void SAL_CALL resumed( ) throw (css::uno::RuntimeException, std::exception);
- virtual void SAL_CALL slideTransitionStarted( ) throw (css::uno::RuntimeException, std::exception);
- virtual void SAL_CALL slideTransitionEnded( ) throw (css::uno::RuntimeException, std::exception);
- virtual void SAL_CALL slideAnimationsEnded( ) throw (css::uno::RuntimeException, std::exception);
- virtual void SAL_CALL slideEnded(sal_Bool bReverse) throw (css::uno::RuntimeException, std::exception);
+ virtual void SAL_CALL paused( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual void SAL_CALL resumed( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual void SAL_CALL slideTransitionStarted( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual void SAL_CALL slideTransitionEnded( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual void SAL_CALL slideAnimationsEnded( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual void SAL_CALL slideEnded(sal_Bool bReverse) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual void SAL_CALL hyperLinkClicked( const OUString& hyperLink )
- throw (css::uno::RuntimeException, std::exception);
+ throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// XEventListener
- virtual void SAL_CALL disposing (void);
+ virtual void SAL_CALL disposing (void) SAL_OVERRIDE;
virtual void SAL_CALL disposing (
const com::sun::star::lang::EventObject& rEvent)
- throw (com::sun::star::uno::RuntimeException, std::exception);
+ throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
private:
rtl::Reference<Communicator> mCommunicator;
diff --git a/sd/source/ui/remotecontrol/Receiver.hxx b/sd/source/ui/remotecontrol/Receiver.hxx
index 2bf338c8eb77..41a3bb872ff4 100644
--- a/sd/source/ui/remotecontrol/Receiver.hxx
+++ b/sd/source/ui/remotecontrol/Receiver.hxx
@@ -33,7 +33,7 @@ class Receiver : Timer
public:
Receiver( Transmitter *aTransmitter );
~Receiver();
- virtual void Timeout();
+ virtual void Timeout() SAL_OVERRIDE;
void pushCommand( const std::vector<OString> &rCommand );
void executeCommand( const std::vector<OString> &aCommand );
diff --git a/sd/source/ui/remotecontrol/Transmitter.hxx b/sd/source/ui/remotecontrol/Transmitter.hxx
index b832d614f7e8..14e1b9ea79f2 100644
--- a/sd/source/ui/remotecontrol/Transmitter.hxx
+++ b/sd/source/ui/remotecontrol/Transmitter.hxx
@@ -32,7 +32,7 @@ public:
void notifyFinished();
private:
- virtual void SAL_CALL run();
+ virtual void SAL_CALL run() SAL_OVERRIDE;
::sd::IBluetoothSocket* pStreamSocket;