diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2019-12-24 10:47:38 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2019-12-24 11:03:58 +0100 |
commit | a2f1be46f29dad0923bee8a93ab1aecdbccb332b (patch) | |
tree | 0902027d570b4ae6dcc6105392188dc7b229cebc /include | |
parent | aba8e26120a6cabe65d43a3f089ee802cfbbe338 (diff) |
sal_Char->char in vcl
Change-Id: I4359b7042f98586e2c9f5529d83d769cdf3d033c
Reviewed-on: https://gerrit.libreoffice.org/85775
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'include')
-rw-r--r-- | include/vbahelper/vbaaccesshelper.hxx | 2 | ||||
-rw-r--r-- | include/vbahelper/vbaeventshelperbase.hxx | 2 | ||||
-rw-r--r-- | include/vcl/dockwin.hxx | 4 | ||||
-rw-r--r-- | include/vcl/idle.hxx | 6 | ||||
-rw-r--r-- | include/vcl/strhelper.hxx | 2 | ||||
-rw-r--r-- | include/vcl/syswin.hxx | 4 | ||||
-rw-r--r-- | include/vcl/task.hxx | 6 | ||||
-rw-r--r-- | include/vcl/timer.hxx | 6 | ||||
-rw-r--r-- | include/vcl/transfer.hxx | 2 |
9 files changed, 17 insertions, 17 deletions
diff --git a/include/vbahelper/vbaaccesshelper.hxx b/include/vbahelper/vbaaccesshelper.hxx index 3dd3be21f6fa..ce55e01e22ff 100644 --- a/include/vbahelper/vbaaccesshelper.hxx +++ b/include/vbahelper/vbaaccesshelper.hxx @@ -51,7 +51,7 @@ namespace ooo } /// @throws css::uno::Exception - inline css::uno::Reference< css::uno::XInterface > createVBAUnoAPIServiceWithArgs( SfxObjectShell const * pShell, const sal_Char* _pAsciiName, const css::uno::Sequence< css::uno::Any >& aArgs ) + inline css::uno::Reference< css::uno::XInterface > createVBAUnoAPIServiceWithArgs( SfxObjectShell const * pShell, const char* _pAsciiName, const css::uno::Sequence< css::uno::Any >& aArgs ) { OSL_PRECOND( pShell, "createVBAUnoAPIService: no shell!" ); OUString sVarName( OUString::createFromAscii( _pAsciiName ) ); diff --git a/include/vbahelper/vbaeventshelperbase.hxx b/include/vbahelper/vbaeventshelperbase.hxx index 0b4c9ba681df..f1bf3a805da9 100644 --- a/include/vbahelper/vbaeventshelperbase.hxx +++ b/include/vbahelper/vbaeventshelperbase.hxx @@ -112,7 +112,7 @@ protected: void registerEventHandler( sal_Int32 nEventId, sal_Int32 nModuleType, - const sal_Char* pcMacroName, + const char* pcMacroName, sal_Int32 nCancelIndex = -1, const css::uno::Any& rUserData = css::uno::Any() ); diff --git a/include/vcl/dockwin.hxx b/include/vcl/dockwin.hxx index a3743c2f2c39..d5c942e4d984 100644 --- a/include/vcl/dockwin.hxx +++ b/include/vcl/dockwin.hxx @@ -252,7 +252,7 @@ private: DockingWindow & operator= (const DockingWindow &) = delete; protected: - SAL_DLLPRIVATE void SetIdleDebugName( const sal_Char *pDebugName ); + SAL_DLLPRIVATE void SetIdleDebugName( const char *pDebugName ); using Window::ImplInit; SAL_DLLPRIVATE void ImplInit( vcl::Window* pParent, WinBits nStyle ); @@ -369,7 +369,7 @@ inline void DockingWindow::SetFloatingPos( const Point& rNewPos ) maFloatPos = rNewPos; } -inline void DockingWindow::SetIdleDebugName( const sal_Char *pDebugName ) +inline void DockingWindow::SetIdleDebugName( const char *pDebugName ) { maLayoutIdle.SetDebugName( pDebugName ); } diff --git a/include/vcl/idle.hxx b/include/vcl/idle.hxx index 7bbd52d41f3b..ebbeb160cf41 100644 --- a/include/vcl/idle.hxx +++ b/include/vcl/idle.hxx @@ -37,10 +37,10 @@ private: protected: virtual sal_uInt64 UpdateMinPeriod( sal_uInt64 nTimeNow ) const override; - Idle( bool bAuto, const sal_Char *pDebugName ); + Idle( bool bAuto, const char *pDebugName ); public: - Idle( const sal_Char *pDebugName = nullptr ); + Idle( const char *pDebugName = nullptr ); virtual void Start() override; }; @@ -57,7 +57,7 @@ public: class VCL_DLLPUBLIC AutoIdle : public Idle { public: - AutoIdle( const sal_Char *pDebugName ); + AutoIdle( const char *pDebugName ); }; diff --git a/include/vcl/strhelper.hxx b/include/vcl/strhelper.hxx index 61cd9aa29cea..5b04e788d08d 100644 --- a/include/vcl/strhelper.hxx +++ b/include/vcl/strhelper.hxx @@ -51,7 +51,7 @@ namespace psp inline double StringToDouble(const OString& rStr) { - return rtl::math::stringToDouble(rStr, '.', static_cast<sal_Char>(0)); + return rtl::math::stringToDouble(rStr, '.', static_cast<char>(0)); } // fills a character buffer with the string representation of a double diff --git a/include/vcl/syswin.hxx b/include/vcl/syswin.hxx index 9e0ea674ba5b..f1cb60015d4c 100644 --- a/include/vcl/syswin.hxx +++ b/include/vcl/syswin.hxx @@ -114,7 +114,7 @@ protected: SAL_DLLPRIVATE void DoInitialLayout(); - SAL_DLLPRIVATE void SetIdleDebugName( const sal_Char *pDebugName ); + SAL_DLLPRIVATE void SetIdleDebugName( const char *pDebugName ); public: virtual ~SystemWindow() override; @@ -220,7 +220,7 @@ public: void createScreenshot(VirtualDevice& rOutput); }; -inline void SystemWindow::SetIdleDebugName( const sal_Char *pDebugName ) +inline void SystemWindow::SetIdleDebugName( const char *pDebugName ) { maLayoutIdle.SetDebugName( pDebugName ); } diff --git a/include/vcl/task.hxx b/include/vcl/task.hxx index 0fc124de7a65..35efe4825bbc 100644 --- a/include/vcl/task.hxx +++ b/include/vcl/task.hxx @@ -44,7 +44,7 @@ class VCL_DLLPUBLIC Task friend struct ImplSchedulerData; ImplSchedulerData *mpSchedulerData; ///< Pointer to the element in scheduler list - const sal_Char *mpDebugName; ///< Useful for debugging + const char *mpDebugName; ///< Useful for debugging TaskPriority mePriority; ///< Task priority bool mbActive; ///< Currently in the scheduler bool mbStatic; ///< Is a static object @@ -70,7 +70,7 @@ protected: virtual sal_uInt64 UpdateMinPeriod( sal_uInt64 nTimeNow ) const = 0; public: - Task( const sal_Char *pDebugName ); + Task( const char *pDebugName ); Task( const Task& rTask ); virtual ~Task() COVERITY_NOEXCEPT_FALSE; Task& operator=( const Task& rTask ); @@ -78,7 +78,7 @@ public: void SetPriority(TaskPriority ePriority); TaskPriority GetPriority() const { return mePriority; } - void SetDebugName( const sal_Char *pDebugName ) { mpDebugName = pDebugName; } + void SetDebugName( const char *pDebugName ) { mpDebugName = pDebugName; } const char *GetDebugName() const { return mpDebugName; } // Call handler diff --git a/include/vcl/timer.hxx b/include/vcl/timer.hxx index 088a1e50e9c9..d9ad82ee5729 100644 --- a/include/vcl/timer.hxx +++ b/include/vcl/timer.hxx @@ -33,10 +33,10 @@ protected: virtual void SetDeletionFlags() override; virtual sal_uInt64 UpdateMinPeriod( sal_uInt64 nTimeNow ) const override; - Timer( bool bAuto, const sal_Char *pDebugName ); + Timer( bool bAuto, const char *pDebugName ); public: - Timer( const sal_Char *pDebugName = nullptr ); + Timer( const char *pDebugName = nullptr ); Timer( const Timer& rTimer ); virtual ~Timer() override; Timer& operator=( const Timer& rTimer ); @@ -72,7 +72,7 @@ public: class VCL_DLLPUBLIC AutoTimer : public Timer { public: - AutoTimer( const sal_Char *pDebugName = nullptr ); + AutoTimer( const char *pDebugName = nullptr ); }; /// Value suitable as a timeout user input into an EditBox to an expensive update diff --git a/include/vcl/transfer.hxx b/include/vcl/transfer.hxx index 1c1ba0e7db90..188e78132380 100644 --- a/include/vcl/transfer.hxx +++ b/include/vcl/transfer.hxx @@ -501,7 +501,7 @@ public: void CopyString( SotClipboardFormatId nFmt, const OUString& rStr ); void CopyByteString( SotClipboardFormatId nFormatId, const OString& rStr ); - void CopyAnyData( SotClipboardFormatId nFormatId, const sal_Char* pData, sal_uLong nLen ); + void CopyAnyData( SotClipboardFormatId nFormatId, const char* pData, sal_uLong nLen ); bool HasAnyData() const; |