diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-10-23 12:06:00 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-10-24 14:43:34 +0200 |
commit | 6f50961e69406a17d6ec998956a6b33208b1001b (patch) | |
tree | 413c83df969e73c5cba1e11ef3740afc748ee1f5 /include/vcl | |
parent | 4e729de73f2947155248f8df5897380611b87917 (diff) |
remove more rtl::OUString and OString prefixes
which seem to have snuck back in since the great rounds of removals.
Change-Id: I85f7f5f4801c0b48dae8b50f51f83595b286d6a1
Reviewed-on: https://gerrit.libreoffice.org/62229
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'include/vcl')
-rw-r--r-- | include/vcl/EnumContext.hxx | 16 | ||||
-rw-r--r-- | include/vcl/opengl/OpenGLContext.hxx | 4 | ||||
-rw-r--r-- | include/vcl/vclstatuslistener.hxx | 4 |
3 files changed, 12 insertions, 12 deletions
diff --git a/include/vcl/EnumContext.hxx b/include/vcl/EnumContext.hxx index df23520337cb..5a63d00c22e6 100644 --- a/include/vcl/EnumContext.hxx +++ b/include/vcl/EnumContext.hxx @@ -118,8 +118,8 @@ public: const Application eApplication, const Context eContext); EnumContext ( - const ::rtl::OUString& rsApplicationName, - const ::rtl::OUString& rsContextName); + const OUString& rsApplicationName, + const OUString& rsContextName); /** This variant of the GetCombinedContext() method treats some application names as identical to each other. Replacements @@ -143,11 +143,11 @@ public: const static sal_Int32 NoMatch; const static sal_Int32 OptimalMatch; - static Application GetApplicationEnum (const ::rtl::OUString& rsApplicationName); - static const ::rtl::OUString& GetApplicationName (const Application eApplication); + static Application GetApplicationEnum (const OUString& rsApplicationName); + static const OUString& GetApplicationName (const Application eApplication); - static Context GetContextEnum (const ::rtl::OUString& rsContextName); - static const ::rtl::OUString& GetContextName (const Context eContext); + static Context GetContextEnum (const OUString& rsContextName); + static const OUString& GetContextName (const Context eContext); private: Application meApplication; @@ -155,8 +155,8 @@ private: 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); + static void AddEntry (const OUString& rsName, const Application eApplication); + static void AddEntry (const OUString& rsName, const Context eContext); }; diff --git a/include/vcl/opengl/OpenGLContext.hxx b/include/vcl/opengl/OpenGLContext.hxx index 1253a4f02091..a7b227a687e8 100644 --- a/include/vcl/opengl/OpenGLContext.hxx +++ b/include/vcl/opengl/OpenGLContext.hxx @@ -180,13 +180,13 @@ protected: private: struct ProgramHash { - size_t operator()( const rtl::OString& aDigest ) const + size_t operator()( const OString& aDigest ) const { return static_cast<size_t>( rtl_crc32( 0, aDigest.getStr(), aDigest.getLength() ) ); } }; - typedef std::unordered_map< rtl::OString, std::shared_ptr<OpenGLProgram>, ProgramHash > ProgramCollection; + typedef std::unordered_map< OString, std::shared_ptr<OpenGLProgram>, ProgramHash > ProgramCollection; ProgramCollection maPrograms; OpenGLProgram* mpCurrentProgram; diff --git a/include/vcl/vclstatuslistener.hxx b/include/vcl/vclstatuslistener.hxx index 42894dd5e98b..f733eaad5067 100644 --- a/include/vcl/vclstatuslistener.hxx +++ b/include/vcl/vclstatuslistener.hxx @@ -24,7 +24,7 @@ template <class T> class VclStatusListener : public cppu::WeakImplHelper < css::frame::XStatusListener> { public: - VclStatusListener<T>(T* widget, const rtl::OUString& aCommand); + VclStatusListener<T>(T* widget, const OUString& aCommand); private: VclPtr<T> mWidget; /** The widget on which actions are performed */ @@ -47,7 +47,7 @@ public: }; template<class T> -VclStatusListener<T>::VclStatusListener(T* widget, const rtl::OUString& aCommand) { +VclStatusListener<T>::VclStatusListener(T* widget, const OUString& aCommand) { mWidget = widget; css::uno::Reference<css::uno::XComponentContext> xContext = ::comphelper::getProcessComponentContext(); |