summaryrefslogtreecommitdiffstats
path: root/libreofficekit
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2019-08-24 14:41:43 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2019-08-24 20:29:39 +0200
commit715e7370a160bd3a51bf5aefdd92319da239bc4e (patch)
treee7a8271d1d27e1172466acf2a2705cf09ba55cc7 /libreofficekit
parentloplugin:returnconstval in desktop..forms (diff)
downloadcore-715e7370a160bd3a51bf5aefdd92319da239bc4e.tar.gz
core-715e7370a160bd3a51bf5aefdd92319da239bc4e.zip
loplugin:returnconstval in fpicker..reportdesign
Change-Id: I59c55a858b2706d1327c837abc158dceca02360e Reviewed-on: https://gerrit.libreoffice.org/78058 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'libreofficekit')
-rw-r--r--libreofficekit/qa/gtktiledviewer/gtv-application-window.cxx2
-rw-r--r--libreofficekit/qa/gtktiledviewer/gtv-helpers.cxx2
-rw-r--r--libreofficekit/qa/gtktiledviewer/gtv-helpers.hxx4
-rw-r--r--libreofficekit/qa/gtktiledviewer/gtv-main-toolbar.cxx2
-rw-r--r--libreofficekit/qa/gtktiledviewer/gtv-main-toolbar.hxx2
-rw-r--r--libreofficekit/source/gtk/lokdocview.cxx2
6 files changed, 7 insertions, 7 deletions
diff --git a/libreofficekit/qa/gtktiledviewer/gtv-application-window.cxx b/libreofficekit/qa/gtktiledviewer/gtv-application-window.cxx
index 564c1de137c6..17f2ef77a1d3 100644
--- a/libreofficekit/qa/gtktiledviewer/gtv-application-window.cxx
+++ b/libreofficekit/qa/gtktiledviewer/gtv-application-window.cxx
@@ -278,7 +278,7 @@ GtkToolItem* gtv_application_window_find_tool_by_unocommand(GtvApplicationWindow
return result;
}
-static const std::string
+static std::string
createRenderingArgsJSON(const GtvRenderingArgs* pRenderingArgs)
{
boost::property_tree::ptree aTree;
diff --git a/libreofficekit/qa/gtktiledviewer/gtv-helpers.cxx b/libreofficekit/qa/gtktiledviewer/gtv-helpers.cxx
index 2a4784da5209..63f232b6021f 100644
--- a/libreofficekit/qa/gtktiledviewer/gtv-helpers.cxx
+++ b/libreofficekit/qa/gtktiledviewer/gtv-helpers.cxx
@@ -139,7 +139,7 @@ GtkWidget* GtvHelpers::createCommentBox(const boost::property_tree::ptree& aComm
return pCommentVBox;
}
-const std::string GtvHelpers::getDirPath(const std::string& filePath)
+std::string GtvHelpers::getDirPath(const std::string& filePath)
{
int position = filePath.find_last_of('/');
const std::string dirPath = filePath.substr(0, position + 1);
diff --git a/libreofficekit/qa/gtktiledviewer/gtv-helpers.hxx b/libreofficekit/qa/gtktiledviewer/gtv-helpers.hxx
index 9474f4c0271a..cc686bfdfdd4 100644
--- a/libreofficekit/qa/gtktiledviewer/gtv-helpers.hxx
+++ b/libreofficekit/qa/gtktiledviewer/gtv-helpers.hxx
@@ -37,10 +37,10 @@ namespace GtvHelpers
GtkWidget* createCommentBox(const boost::property_tree::ptree& aComment);
- const std::string getDirPath(const std::string& filePath);
+ std::string getDirPath(const std::string& filePath);
template<typename T>
- const std::vector<T> split(const std::string& aPayload, const std::string& aDelim, const int nItems)
+ std::vector<T> split(const std::string& aPayload, const std::string& aDelim, const int nItems)
{
std::vector<T> aRet;
diff --git a/libreofficekit/qa/gtktiledviewer/gtv-main-toolbar.cxx b/libreofficekit/qa/gtktiledviewer/gtv-main-toolbar.cxx
index a415a8448e6c..4541a0c3706f 100644
--- a/libreofficekit/qa/gtktiledviewer/gtv-main-toolbar.cxx
+++ b/libreofficekit/qa/gtktiledviewer/gtv-main-toolbar.cxx
@@ -250,7 +250,7 @@ gtv_main_toolbar_add_recent_uno(GtvMainToolbar* toolbar, const std::string& rUno
// TODO: Remove other text entries with same key
}
-const std::string
+std::string
gtv_main_toolbar_get_recent_uno_args(GtvMainToolbar* toolbar, const std::string& rUnoCmd)
{
GtvMainToolbarPrivate& priv = getPrivate(toolbar);
diff --git a/libreofficekit/qa/gtktiledviewer/gtv-main-toolbar.hxx b/libreofficekit/qa/gtktiledviewer/gtv-main-toolbar.hxx
index 2e43ed4c7dc7..0930228fda59 100644
--- a/libreofficekit/qa/gtktiledviewer/gtv-main-toolbar.hxx
+++ b/libreofficekit/qa/gtktiledviewer/gtv-main-toolbar.hxx
@@ -53,7 +53,7 @@ void gtv_main_toolbar_doc_loaded(GtvMainToolbar* toolbar, LibreOfficeKitDocument
void gtv_main_toolbar_add_recent_uno(GtvMainToolbar* toolbar, const std::string& rUnoCmdStr);
-const std::string gtv_main_toolbar_get_recent_uno_args(GtvMainToolbar* toolbar, const std::string& rUnoCmd);
+std::string gtv_main_toolbar_get_recent_uno_args(GtvMainToolbar* toolbar, const std::string& rUnoCmd);
#endif /* GTV_MAIN_TOOLBAR_H */
diff --git a/libreofficekit/source/gtk/lokdocview.cxx b/libreofficekit/source/gtk/lokdocview.cxx
index 60ec5afbc8c5..51e1e8e1e801 100644
--- a/libreofficekit/source/gtk/lokdocview.cxx
+++ b/libreofficekit/source/gtk/lokdocview.cxx
@@ -1010,7 +1010,7 @@ payloadToRectangle (LOKDocView* pDocView, const char* pPayload)
return aRet;
}
-static const std::vector<GdkRectangle>
+static std::vector<GdkRectangle>
payloadToRectangles(LOKDocView* pDocView, const char* pPayload)
{
std::vector<GdkRectangle> aRet;