summaryrefslogtreecommitdiff
path: root/include/svx/sidebar
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2015-04-14 12:44:47 +0200
committerNoel Grandin <noel@peralex.com>2015-04-15 11:47:12 +0200
commit71b809959bb8f775d83dc52628448bb8b8322b28 (patch)
treef9aa4308050eb7d55611068602c0cf0e3c1b3690 /include/svx/sidebar
parent135907f2061550624ee1859745d94eee01849070 (diff)
remove unnecessary use of void in function declarations
ie. void f(void); becomes void f(); I used the following command to make the changes: git grep -lP '\(\s*void\s*\)' -- *.cxx \ | xargs perl -pi -w -e 's/(\w+)\s*\(\s*void\s*\)/$1\(\)/g;' and ran it for both .cxx and .hxx files. Change-Id: I314a1b56e9c14d10726e32841736b0ad5eef8ddd
Diffstat (limited to 'include/svx/sidebar')
-rw-r--r--include/svx/sidebar/Popup.hxx12
-rw-r--r--include/svx/sidebar/PopupContainer.hxx2
-rw-r--r--include/svx/sidebar/PopupControl.hxx2
-rw-r--r--include/svx/sidebar/SelectionChangeHandler.hxx12
-rw-r--r--include/svx/sidebar/SidebarDialControl.hxx2
-rw-r--r--include/svx/sidebar/ValueSetWithTextControl.hxx2
6 files changed, 16 insertions, 16 deletions
diff --git a/include/svx/sidebar/Popup.hxx b/include/svx/sidebar/Popup.hxx
index e11e8c1ee6b0..7f0d804f78c2 100644
--- a/include/svx/sidebar/Popup.hxx
+++ b/include/svx/sidebar/Popup.hxx
@@ -53,7 +53,7 @@ public :
vcl::Window* pParent,
const ::boost::function<PopupControl*(PopupContainer*)>& rControlCreator,
const ::rtl::OUString& rsAccessibleName);
- virtual ~Popup (void);
+ virtual ~Popup();
/** Show the popup.
@rToolBox
@@ -68,12 +68,12 @@ public :
application can call Hide() when the popup should be closed
for other, non-standard reasons.
*/
- void Hide (void);
+ void Hide();
/** If you want to be informed when the popup closes then add a
callback that is called after that.
*/
- void SetPopupModeEndHandler (const ::boost::function<void(void)>& rCallback);
+ void SetPopupModeEndHandler (const ::boost::function<void()>& rCallback);
protected:
std::unique_ptr<PopupControl> mxControl;
@@ -81,17 +81,17 @@ protected:
/** Make sure that both PopupContainer and PopupControl objects
exist. Calls the maControlCreator functor if necessary.
*/
- void ProvideContainerAndControl (void);
+ void ProvideContainerAndControl();
/** A derived specialisation class can override this method to do
additional work.
*/
- void CreateContainerAndControl (void);
+ void CreateContainerAndControl();
private:
vcl::Window* mpParent;
::boost::function<PopupControl*(PopupContainer*)> maControlCreator;
- ::boost::function<void(void)> maPopupModeEndCallback;
+ ::boost::function<void()> maPopupModeEndCallback;
const ::rtl::OUString msAccessibleName;
std::unique_ptr<PopupContainer> mxContainer;
diff --git a/include/svx/sidebar/PopupContainer.hxx b/include/svx/sidebar/PopupContainer.hxx
index f8f6f524573f..f15c283ff313 100644
--- a/include/svx/sidebar/PopupContainer.hxx
+++ b/include/svx/sidebar/PopupContainer.hxx
@@ -34,7 +34,7 @@ class SVX_DLLPUBLIC PopupContainer
{
public:
PopupContainer (vcl::Window* pParent);
- virtual ~PopupContainer (void);
+ virtual ~PopupContainer();
virtual bool Notify (NotifyEvent& rNEvt) SAL_OVERRIDE;
};
diff --git a/include/svx/sidebar/PopupControl.hxx b/include/svx/sidebar/PopupControl.hxx
index 84bed5af5870..32658b3ae4d7 100644
--- a/include/svx/sidebar/PopupControl.hxx
+++ b/include/svx/sidebar/PopupControl.hxx
@@ -38,7 +38,7 @@ public :
PopupControl (
vcl::Window* pParent,
const ResId& rResId);
- virtual ~PopupControl (void);
+ virtual ~PopupControl();
virtual void Paint (const Rectangle& rect) SAL_OVERRIDE;
};
diff --git a/include/svx/sidebar/SelectionChangeHandler.hxx b/include/svx/sidebar/SelectionChangeHandler.hxx
index ed5e9a80ad1e..715265840c57 100644
--- a/include/svx/sidebar/SelectionChangeHandler.hxx
+++ b/include/svx/sidebar/SelectionChangeHandler.hxx
@@ -48,10 +48,10 @@ class SVX_DLLPUBLIC SelectionChangeHandler
{
public:
SelectionChangeHandler (
- const boost::function<rtl::OUString(void)>& rSelectionChangeCallback,
+ const boost::function<rtl::OUString()>& rSelectionChangeCallback,
const css::uno::Reference<css::frame::XController>& rxController,
const sfx2::sidebar::EnumContext::Context eDefaultContext);
- virtual ~SelectionChangeHandler (void);
+ virtual ~SelectionChangeHandler();
virtual void SAL_CALL selectionChanged (const css::lang::EventObject& rEvent)
throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
@@ -59,17 +59,17 @@ public:
virtual void SAL_CALL disposing (const css::lang::EventObject& rEvent)
throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- virtual void SAL_CALL disposing (void)
+ virtual void SAL_CALL disposing()
throw (css::uno::RuntimeException) SAL_OVERRIDE;
- void Connect (void);
- void Disconnect (void);
+ void Connect();
+ void Disconnect();
private:
SelectionChangeHandler(const SelectionChangeHandler&) SAL_DELETED_FUNCTION;
SelectionChangeHandler& operator=(const SelectionChangeHandler&) SAL_DELETED_FUNCTION;
- const boost::function<rtl::OUString(void)> maSelectionChangeCallback;
+ const boost::function<rtl::OUString()> maSelectionChangeCallback;
css::uno::Reference<css::frame::XController> mxController;
const sfx2::sidebar::EnumContext::Context meDefaultContext;
bool mbIsConnected;
diff --git a/include/svx/sidebar/SidebarDialControl.hxx b/include/svx/sidebar/SidebarDialControl.hxx
index a77d0f412419..1d829d27fe76 100644
--- a/include/svx/sidebar/SidebarDialControl.hxx
+++ b/include/svx/sidebar/SidebarDialControl.hxx
@@ -29,7 +29,7 @@ class SVX_DLLPUBLIC SidebarDialControl : public svx::DialControl
{
public:
SidebarDialControl (vcl::Window* pParent, WinBits nBits = 0);
- virtual ~SidebarDialControl (void);
+ virtual ~SidebarDialControl();
virtual Size GetOptimalSize() const SAL_OVERRIDE;
virtual void MouseButtonDown (const MouseEvent& rMEvt) SAL_OVERRIDE;
diff --git a/include/svx/sidebar/ValueSetWithTextControl.hxx b/include/svx/sidebar/ValueSetWithTextControl.hxx
index 33054ead6feb..e6724b278c9c 100644
--- a/include/svx/sidebar/ValueSetWithTextControl.hxx
+++ b/include/svx/sidebar/ValueSetWithTextControl.hxx
@@ -52,7 +52,7 @@ public:
vcl::Window* pParent,
const ResId& rResId);
- virtual ~ValueSetWithTextControl(void);
+ virtual ~ValueSetWithTextControl();
// add item for control type IMAGE_TEXT
// if control type does not match IMAGE_TEXT no item is added.