diff options
author | Noel Grandin <noel@peralex.com> | 2015-04-14 12:44:47 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2015-04-15 11:47:12 +0200 |
commit | 71b809959bb8f775d83dc52628448bb8b8322b28 (patch) | |
tree | f9aa4308050eb7d55611068602c0cf0e3c1b3690 /include/sfx2 | |
parent | 135907f2061550624ee1859745d94eee01849070 (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/sfx2')
-rw-r--r-- | include/sfx2/sidebar/CommandInfoProvider.hxx | 14 | ||||
-rw-r--r-- | include/sfx2/sidebar/ControllerItem.hxx | 12 | ||||
-rw-r--r-- | include/sfx2/sidebar/EnumContext.hxx | 6 | ||||
-rw-r--r-- | include/sfx2/sidebar/SidebarPanelBase.hxx | 14 | ||||
-rw-r--r-- | include/sfx2/sidebar/SidebarToolBox.hxx | 4 | ||||
-rw-r--r-- | include/sfx2/sidebar/Theme.hxx | 20 | ||||
-rw-r--r-- | include/sfx2/templdlg.hxx | 2 | ||||
-rw-r--r-- | include/sfx2/titledockwin.hxx | 2 |
8 files changed, 37 insertions, 37 deletions
diff --git a/include/sfx2/sidebar/CommandInfoProvider.hxx b/include/sfx2/sidebar/CommandInfoProvider.hxx index 6eb1ba6c3638..55ce82b8a394 100644 --- a/include/sfx2/sidebar/CommandInfoProvider.hxx +++ b/include/sfx2/sidebar/CommandInfoProvider.hxx @@ -43,7 +43,7 @@ public: Lifetime control should work but could be more elegant. */ - static CommandInfoProvider& Instance (void); + static CommandInfoProvider& Instance(); /** Return a label for the given command. @param rsCommandName @@ -71,13 +71,13 @@ public: ::rtl::OUString msCachedModuleIdentifier; css::uno::Reference<css::lang::XComponent> mxFrameListener; - CommandInfoProvider (void); - ~CommandInfoProvider (void); + CommandInfoProvider(); + ~CommandInfoProvider(); - css::uno::Reference<css::ui::XAcceleratorConfiguration> GetDocumentAcceleratorConfiguration (void); - css::uno::Reference<css::ui::XAcceleratorConfiguration> GetModuleAcceleratorConfiguration (void); - css::uno::Reference<css::ui::XAcceleratorConfiguration> GetGlobalAcceleratorConfiguration(void); - ::rtl::OUString GetModuleIdentifier (void); + css::uno::Reference<css::ui::XAcceleratorConfiguration> GetDocumentAcceleratorConfiguration(); + css::uno::Reference<css::ui::XAcceleratorConfiguration> GetModuleAcceleratorConfiguration(); + css::uno::Reference<css::ui::XAcceleratorConfiguration> GetGlobalAcceleratorConfiguration(); + ::rtl::OUString GetModuleIdentifier(); ::rtl::OUString GetCommandShortcut (const ::rtl::OUString& rCommandName); css::uno::Sequence<css::beans::PropertyValue> GetCommandProperties ( const ::rtl::OUString& rsCommandName); diff --git a/include/sfx2/sidebar/ControllerItem.hxx b/include/sfx2/sidebar/ControllerItem.hxx index f06ae5e9e0a4..7210dea31c3d 100644 --- a/include/sfx2/sidebar/ControllerItem.hxx +++ b/include/sfx2/sidebar/ControllerItem.hxx @@ -91,21 +91,21 @@ public: /** Force the controller item to call its NotifyItemUpdate callback with up-to-date data. */ - void RequestUpdate (void); + void RequestUpdate(); /** Return the label for the command. It contains the keyboard accelerator when one exists. */ - ::rtl::OUString GetLabel (void) const; + ::rtl::OUString GetLabel() const; /** Return the extended help text for the command. Returns an empty string when the UNO command name is not available. */ - ::rtl::OUString GetHelpText (void) const; + ::rtl::OUString GetHelpText() const; /** Return the icon for the command. */ - Image GetIcon (void) const; + Image GetIcon() const; /** Convenience method for setting all relevant properties for the slot/command represented by the called object at the given tool @@ -116,11 +116,11 @@ public: /** Do not call. Used by local class only. Should be a member of a local and hidden interface. */ - void NotifyFrameContextChange (void); + void NotifyFrameContextChange(); /** Do not call. Used by local class only. Should be a member of a local and hidden interface. */ - void ResetFrame (void); + void ResetFrame(); protected: diff --git a/include/sfx2/sidebar/EnumContext.hxx b/include/sfx2/sidebar/EnumContext.hxx index 80e8228484ed..3fc5fda50f22 100644 --- a/include/sfx2/sidebar/EnumContext.hxx +++ b/include/sfx2/sidebar/EnumContext.hxx @@ -102,7 +102,7 @@ public: __LastContextEnum = Context_Unknown }; - EnumContext (void); + EnumContext(); EnumContext ( const Application eApplication, const Context eContext); @@ -142,8 +142,8 @@ private: Application meApplication; Context meContext; - static void ProvideApplicationContainers (void); - static void ProvideContextContainers (void); + static void ProvideApplicationContainers(); + static void ProvideContextContainers(); static void AddEntry (const ::rtl::OUString& rsName, const Application eApplication); static void AddEntry (const ::rtl::OUString& rsName, const Context eContext); }; diff --git a/include/sfx2/sidebar/SidebarPanelBase.hxx b/include/sfx2/sidebar/SidebarPanelBase.hxx index 6215f6d03e64..2f34065a8480 100644 --- a/include/sfx2/sidebar/SidebarPanelBase.hxx +++ b/include/sfx2/sidebar/SidebarPanelBase.hxx @@ -75,20 +75,20 @@ public: throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XUIElement - virtual css::uno::Reference<css::frame::XFrame> SAL_CALL getFrame (void) + virtual css::uno::Reference<css::frame::XFrame> SAL_CALL getFrame() throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::rtl::OUString SAL_CALL getResourceURL (void) + virtual ::rtl::OUString SAL_CALL getResourceURL() throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Int16 SAL_CALL getType (void) + virtual sal_Int16 SAL_CALL getType() throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::uno::Reference<css::uno::XInterface> SAL_CALL getRealInterface (void) + virtual css::uno::Reference<css::uno::XInterface> SAL_CALL getRealInterface() throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XToolPanel virtual css::uno::Reference<css::accessibility::XAccessible> SAL_CALL createAccessible ( const css::uno::Reference<css::accessibility::XAccessible>& rxParentAccessible) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::uno::Reference<css::awt::XWindow> SAL_CALL getWindow (void) + virtual css::uno::Reference<css::awt::XWindow> SAL_CALL getWindow() throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XSidebarPanel @@ -105,9 +105,9 @@ protected: const css::uno::Reference<css::frame::XFrame>& rxFrame, vcl::Window* pWindow, const css::ui::LayoutSize& rLayoutSize); - virtual ~SidebarPanelBase (void); + virtual ~SidebarPanelBase(); - virtual void SAL_CALL disposing (void) + virtual void SAL_CALL disposing() throw (css::uno::RuntimeException) SAL_OVERRIDE; private: diff --git a/include/sfx2/sidebar/SidebarToolBox.hxx b/include/sfx2/sidebar/SidebarToolBox.hxx index 381745da7648..a19e182f648a 100644 --- a/include/sfx2/sidebar/SidebarToolBox.hxx +++ b/include/sfx2/sidebar/SidebarToolBox.hxx @@ -40,7 +40,7 @@ class SFX2_DLLPUBLIC SidebarToolBox { public: SidebarToolBox(vcl::Window* pParentWindow); - virtual ~SidebarToolBox (void); + virtual ~SidebarToolBox(); using ToolBox::InsertItem; virtual void InsertItem(const OUString& rCommand, @@ -87,7 +87,7 @@ private: const sal_uInt16 nItemId, const css::uno::Reference<css::frame::XFrame>& rxFrame, const sal_Int32 nItemWidth = 0); - void RegisterHandlers (void); + void RegisterHandlers(); }; diff --git a/include/sfx2/sidebar/Theme.hxx b/include/sfx2/sidebar/Theme.hxx index ba3d49107118..faaa62360793 100644 --- a/include/sfx2/sidebar/Theme.hxx +++ b/include/sfx2/sidebar/Theme.hxx @@ -146,21 +146,21 @@ public: static sal_Int32 GetInteger (const ThemeItem eItem); static bool GetBoolean (const ThemeItem eItem); - static bool IsHighContrastMode (void); + static bool IsHighContrastMode(); - static void HandleDataChange (void); + static void HandleDataChange(); void InitializeTheme(); - Theme (void); - virtual ~Theme (void); + Theme(); + virtual ~Theme(); - virtual void SAL_CALL disposing (void) SAL_OVERRIDE; + virtual void SAL_CALL disposing() SAL_OVERRIDE; - static css::uno::Reference<css::beans::XPropertySet> GetPropertySet (void); + static css::uno::Reference<css::beans::XPropertySet> GetPropertySet(); // beans::XPropertySet - virtual css::uno::Reference<css::beans::XPropertySetInfo> SAL_CALL getPropertySetInfo (void) + virtual css::uno::Reference<css::beans::XPropertySetInfo> SAL_CALL getPropertySetInfo() throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL setPropertyValue ( const ::rtl::OUString& rsPropertyName, @@ -199,7 +199,7 @@ public: css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // beans::XPropertySetInfo - virtual css::uno::Sequence<css::beans::Property> SAL_CALL getProperties (void) + virtual css::uno::Sequence<css::beans::Property> SAL_CALL getProperties() throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual css::beans::Property SAL_CALL getPropertyByName (const ::rtl::OUString& rsName) throw(css::beans::UnknownPropertyException, @@ -244,8 +244,8 @@ private: PT_Invalid }; - void SetupPropertyMaps (void); - void UpdateTheme (void); + void SetupPropertyMaps(); + void UpdateTheme(); static PropertyType GetPropertyType (const ThemeItem eItem); static css::uno::Type GetCppuType (const PropertyType eType); static sal_Int32 GetIndex ( diff --git a/include/sfx2/templdlg.hxx b/include/sfx2/templdlg.hxx index a3237d345bd9..280610ff3e14 100644 --- a/include/sfx2/templdlg.hxx +++ b/include/sfx2/templdlg.hxx @@ -47,7 +47,7 @@ public: virtual void DataChanged( const DataChangedEvent& _rDCEvt ) SAL_OVERRIDE; virtual void Resize() SAL_OVERRIDE; virtual void StateChanged( StateChangedType nStateChange ) SAL_OVERRIDE; - void FreeResource (void); + void FreeResource(); private: const std::unique_ptr<SfxTemplateDialog_Impl> pImpl; diff --git a/include/sfx2/titledockwin.hxx b/include/sfx2/titledockwin.hxx index 97fdebc11fd2..61db702d236c 100644 --- a/include/sfx2/titledockwin.hxx +++ b/include/sfx2/titledockwin.hxx @@ -86,7 +86,7 @@ namespace sfx2 /** Return the border that is painted around the inner window as decoration. */ - SvBorder GetDecorationBorder (void) const { return m_aBorder; } + SvBorder GetDecorationBorder() const { return m_aBorder; } protected: // Window overridables |