summaryrefslogtreecommitdiff
path: root/shell/inc
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2019-03-27 09:02:15 +0100
committerStephan Bergmann <sbergman@redhat.com>2019-03-27 11:30:37 +0100
commitb07a990e51f9bef637cfdcb31b904c223d7ce738 (patch)
tree8d326b1ad8ae85349e3b55fed5daa00a14abaaf1 /shell/inc
parent89a95f5fa5a2e10d2c67d33270fa31404df33fd5 (diff)
loplugin:typedefparam (clang-cl)
Change-Id: I07604028845c49cc084927e21db7f21c5d053bab Reviewed-on: https://gerrit.libreoffice.org/69796 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'shell/inc')
-rw-r--r--shell/inc/basereader.hxx14
-rw-r--r--shell/inc/contentreader.hxx10
-rw-r--r--shell/inc/infotips.hxx2
-rw-r--r--shell/inc/metainforeader.hxx10
-rw-r--r--shell/inc/propsheets.hxx6
5 files changed, 21 insertions, 21 deletions
diff --git a/shell/inc/basereader.hxx b/shell/inc/basereader.hxx
index 8ccb1a5f1490..1f09f9bc2039 100644
--- a/shell/inc/basereader.hxx
+++ b/shell/inc/basereader.hxx
@@ -45,21 +45,21 @@ protected: // protected because its only an implementation relevant class
virtual void end_document();
virtual void start_element(
- const std::wstring& raw_name,
- const std::wstring& local_name,
- const XmlTagAttributes_t& attributes) override = 0;
+ const string_t& raw_name,
+ const string_t& local_name,
+ const xml_tag_attribute_container_t& attributes) override = 0;
virtual void end_element(
- const std::wstring& raw_name, const std::wstring& local_name) override = 0;
+ const string_t& raw_name, const string_t& local_name) override = 0;
- virtual void characters(const std::wstring& character) override = 0;
+ virtual void characters(const string_t& character) override = 0;
- virtual void ignore_whitespace(const std::wstring& /*whitespaces*/) override {};
+ virtual void ignore_whitespace(const string_t& /*whitespaces*/) override {};
virtual void processing_instruction(
const std::wstring& /*target*/, const std::wstring& /*data*/){};
- virtual void comment(const std::wstring& /*comment*/) override {};
+ virtual void comment(const string_t& /*comment*/) override {};
void Initialize( const std::string& /*ContentName*/);
diff --git a/shell/inc/contentreader.hxx b/shell/inc/contentreader.hxx
index 55a943b6dd1a..a8af703dd982 100644
--- a/shell/inc/contentreader.hxx
+++ b/shell/inc/contentreader.hxx
@@ -56,9 +56,9 @@ protected: // protected because its only an implementation relevant class
attribute structure.
*/
virtual void start_element(
- const std::wstring& raw_name,
- const std::wstring& local_name,
- const XmlTagAttributes_t& attributes) override;
+ const string_t& raw_name,
+ const string_t& local_name,
+ const xml_tag_attribute_container_t& attributes) override;
/** end_element occurs when a tag is closed
@@ -68,14 +68,14 @@ protected: // protected because its only an implementation relevant class
local name of the tag.
*/
virtual void end_element(
- const std::wstring& raw_name, const std::wstring& local_name) override;
+ const string_t& raw_name, const string_t& local_name) override;
/** characters occurs when receiving characters
@param character
content of the information received.
*/
- virtual void characters(const std::wstring& character) override;
+ virtual void characters(const string_t& character) override;
protected:
/** choose an appropriate tag reader to handle the tag.
diff --git a/shell/inc/infotips.hxx b/shell/inc/infotips.hxx
index a50276b04351..0155559752ce 100644
--- a/shell/inc/infotips.hxx
+++ b/shell/inc/infotips.hxx
@@ -47,7 +47,7 @@ public:
// IQueryInfo methods
- virtual HRESULT STDMETHODCALLTYPE GetInfoTip(DWORD dwFlags, wchar_t** ppwszTip) override;
+ virtual HRESULT STDMETHODCALLTYPE GetInfoTip(DWORD dwFlags, PWSTR* ppwszTip) override;
virtual HRESULT STDMETHODCALLTYPE GetInfoFlags(DWORD *pdwFlags) override;
diff --git a/shell/inc/metainforeader.hxx b/shell/inc/metainforeader.hxx
index 33e82a532806..7ff0a734fc3f 100644
--- a/shell/inc/metainforeader.hxx
+++ b/shell/inc/metainforeader.hxx
@@ -88,9 +88,9 @@ protected: // protected because its only an implementation relevant class
attribute structure.
*/
virtual void start_element(
- const std::wstring& raw_name,
- const std::wstring& local_name,
- const XmlTagAttributes_t& attributes) override;
+ const string_t& raw_name,
+ const string_t& local_name,
+ const xml_tag_attribute_container_t& attributes) override;
/** end_element occurs when a tag is closed
@@ -100,14 +100,14 @@ protected: // protected because its only an implementation relevant class
local name of the tag.
*/
virtual void end_element(
- const std::wstring& raw_name, const std::wstring& local_name) override;
+ const string_t& raw_name, const string_t& local_name) override;
/** characters occurs when receiving characters
@param character
content of the information received.
*/
- virtual void characters(const std::wstring& character) override;
+ virtual void characters(const string_t& character) override;
protected:
/** choose an appropriate tag reader to handle the tag.
diff --git a/shell/inc/propsheets.hxx b/shell/inc/propsheets.hxx
index 20aa1e9e37a4..9a95ed169adb 100644
--- a/shell/inc/propsheets.hxx
+++ b/shell/inc/propsheets.hxx
@@ -51,16 +51,16 @@ public:
virtual HRESULT STDMETHODCALLTYPE Initialize(
- LPCITEMIDLIST pidlFolder, LPDATAOBJECT lpdobj, HKEY hkeyProgID) override;
+ LPCITEMIDLIST pidlFolder, IDataObject * lpdobj, HKEY hkeyProgID) override;
// IShellPropSheetExt
- virtual HRESULT STDMETHODCALLTYPE AddPages(LPFNADDPROPSHEETPAGE lpfnAddPage, LPARAM lParam) override;
+ virtual HRESULT STDMETHODCALLTYPE AddPages(LPFNSVADDPROPSHEETPAGE lpfnAddPage, LPARAM lParam) override;
virtual HRESULT STDMETHODCALLTYPE ReplacePage(
- UINT uPageID, LPFNADDPROPSHEETPAGE lpfnReplaceWith, LPARAM lParam) override;
+ EXPPS uPageID, LPFNSVADDPROPSHEETPAGE lpfnReplaceWith, LPARAM lParam) override;
private:
// Windows callback functions