summaryrefslogtreecommitdiff
path: root/sd/source/ui/remotecontrol
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2014-04-01 19:18:35 +0200
committerStephan Bergmann <sbergman@redhat.com>2014-04-01 19:22:54 +0200
commit362d4f0cd4e50111edfae9d30c90602c37ed65a2 (patch)
tree0b432c049d580dcac6130bca9fb028bab8af8fa8 /sd/source/ui/remotecontrol
parentb66d87086804460c1986df1b832fd6b2ea075a90 (diff)
Explicitly mark overriding destructors as "virtual"
It appears that the C++ standard allows overriding destructors to be marked "override," but at least some MSVC versions complain about it, so at least make sure such destructors are explicitly marked "virtual." Change-Id: I0e1cafa7584fd16ebdce61f569eae2373a71b0a1
Diffstat (limited to 'sd/source/ui/remotecontrol')
-rw-r--r--sd/source/ui/remotecontrol/BluetoothServer.hxx2
-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.hxx2
-rw-r--r--sd/source/ui/remotecontrol/Receiver.hxx2
-rw-r--r--sd/source/ui/remotecontrol/Transmitter.hxx2
7 files changed, 7 insertions, 7 deletions
diff --git a/sd/source/ui/remotecontrol/BluetoothServer.hxx b/sd/source/ui/remotecontrol/BluetoothServer.hxx
index 0f649d9a2178..2427ed7c1f08 100644
--- a/sd/source/ui/remotecontrol/BluetoothServer.hxx
+++ b/sd/source/ui/remotecontrol/BluetoothServer.hxx
@@ -40,7 +40,7 @@ namespace sd
void addCommunicator( Communicator* pCommunicator );
private:
BluetoothServer( std::vector<Communicator*>* pCommunicators );
- ~BluetoothServer();
+ virtual ~BluetoothServer();
enum { UNKNOWN, DISCOVERABLE, NOT_DISCOVERABLE } meWasDiscoverable;
static BluetoothServer *spServer;
diff --git a/sd/source/ui/remotecontrol/Communicator.hxx b/sd/source/ui/remotecontrol/Communicator.hxx
index c7f00c6e1e77..c912fa5aa057 100644
--- a/sd/source/ui/remotecontrol/Communicator.hxx
+++ b/sd/source/ui/remotecontrol/Communicator.hxx
@@ -39,7 +39,7 @@ namespace sd
{
public:
Communicator( IBluetoothSocket *pSocket );
- ~Communicator();
+ virtual ~Communicator();
void presentationStarted( const css::uno::Reference<
css::presentation::XSlideShowController > &rController );
diff --git a/sd/source/ui/remotecontrol/DiscoveryService.hxx b/sd/source/ui/remotecontrol/DiscoveryService.hxx
index a362d0fe911d..a2ffeff20184 100644
--- a/sd/source/ui/remotecontrol/DiscoveryService.hxx
+++ b/sd/source/ui/remotecontrol/DiscoveryService.hxx
@@ -28,7 +28,7 @@ namespace sd
private:
DiscoveryService();
- ~DiscoveryService();
+ virtual ~DiscoveryService();
/**
* Networking related setup -- must be run within our own thread
diff --git a/sd/source/ui/remotecontrol/ImagePreparer.hxx b/sd/source/ui/remotecontrol/ImagePreparer.hxx
index 0b1d861e9dd0..6790a70bb328 100644
--- a/sd/source/ui/remotecontrol/ImagePreparer.hxx
+++ b/sd/source/ui/remotecontrol/ImagePreparer.hxx
@@ -25,7 +25,7 @@ public:
ImagePreparer( const
css::uno::Reference<css::presentation::XSlideShowController>&
rxController, sd::Transmitter *aTransmitter );
- ~ImagePreparer();
+ virtual ~ImagePreparer();
private:
css::uno::Reference<css::presentation::XSlideShowController> xController;
diff --git a/sd/source/ui/remotecontrol/Listener.hxx b/sd/source/ui/remotecontrol/Listener.hxx
index 89521395d1fa..5bcc02d11422 100644
--- a/sd/source/ui/remotecontrol/Listener.hxx
+++ b/sd/source/ui/remotecontrol/Listener.hxx
@@ -32,7 +32,7 @@ class Listener
{
public:
Listener( const ::rtl::Reference<Communicator>& rServer, sd::Transmitter *aTransmitter );
- ~Listener();
+ virtual ~Listener();
void init( const css::uno::Reference< css::presentation::XSlideShowController >& aController );
// XAnimationListener
diff --git a/sd/source/ui/remotecontrol/Receiver.hxx b/sd/source/ui/remotecontrol/Receiver.hxx
index 41a3bb872ff4..a5020303f42b 100644
--- a/sd/source/ui/remotecontrol/Receiver.hxx
+++ b/sd/source/ui/remotecontrol/Receiver.hxx
@@ -32,7 +32,7 @@ class Receiver : Timer
std::deque< std::vector< OString > > maExecQueue;
public:
Receiver( Transmitter *aTransmitter );
- ~Receiver();
+ virtual ~Receiver();
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 14e1b9ea79f2..74cbc45bf102 100644
--- a/sd/source/ui/remotecontrol/Transmitter.hxx
+++ b/sd/source/ui/remotecontrol/Transmitter.hxx
@@ -27,7 +27,7 @@ class Transmitter
public:
enum Priority { PRIORITY_LOW = 1, PRIORITY_HIGH };
Transmitter( ::sd::IBluetoothSocket* aSocket );
- ~Transmitter();
+ virtual ~Transmitter();
void addMessage( const OString& aMessage, const Priority aPriority );
void notifyFinished();