From a1a852750985eafe66e53ac038d5b69fe8b1813b Mon Sep 17 00:00:00 2001 From: Pranav Kant Date: Thu, 13 Jul 2017 13:34:35 +0530 Subject: put helpers in namespace Change-Id: Id3f8b04ea427e62e50dc9ec7055f18b734567423 --- libreofficekit/qa/gtktiledviewer/gtv-application-window.cxx | 2 +- libreofficekit/qa/gtktiledviewer/gtv-comments-sidebar.cxx | 2 +- libreofficekit/qa/gtktiledviewer/gtv-helpers.cxx | 10 ++++------ libreofficekit/qa/gtktiledviewer/gtv-helpers.hxx | 13 ++++++++----- .../qa/gtktiledviewer/gtv-lokdocview-signal-handlers.cxx | 2 +- libreofficekit/qa/gtktiledviewer/gtv-signal-handlers.cxx | 8 ++++---- 6 files changed, 19 insertions(+), 18 deletions(-) diff --git a/libreofficekit/qa/gtktiledviewer/gtv-application-window.cxx b/libreofficekit/qa/gtktiledviewer/gtv-application-window.cxx index 82d87702f6e0..7914ab700c05 100644 --- a/libreofficekit/qa/gtktiledviewer/gtv-application-window.cxx +++ b/libreofficekit/qa/gtktiledviewer/gtv-application-window.cxx @@ -303,7 +303,7 @@ createRenderingArgsJSON(const GtvRenderingArgs* pRenderingArgs) aTree.put(boost::property_tree::ptree::path_type(".uno:HideWhitespace/value", '/'), true); } aTree.put(boost::property_tree::ptree::path_type(".uno:Author/type", '/'), "string"); - aTree.put(boost::property_tree::ptree::path_type(".uno:Author/value", '/'), getNextAuthor()); + aTree.put(boost::property_tree::ptree::path_type(".uno:Author/value", '/'), GtvHelpers::getNextAuthor()); std::stringstream aStream; boost::property_tree::write_json(aStream, aTree); return aStream.str(); diff --git a/libreofficekit/qa/gtktiledviewer/gtv-comments-sidebar.cxx b/libreofficekit/qa/gtktiledviewer/gtv-comments-sidebar.cxx index 8d5017728e1e..3bae3e4a1469 100644 --- a/libreofficekit/qa/gtktiledviewer/gtv-comments-sidebar.cxx +++ b/libreofficekit/qa/gtktiledviewer/gtv-comments-sidebar.cxx @@ -46,7 +46,7 @@ gtv_comments_sidebar_view_annotations(GtvCommentsSidebar* sidebar) { for (boost::property_tree::ptree::value_type& rValue : aTree.get_child("comments")) { - GtkWidget* pCommentBox = createCommentBox(rValue.second); + GtkWidget* pCommentBox = GtvHelpers::createCommentBox(rValue.second); gtk_container_add(GTK_CONTAINER(sidebar->commentsgrid), pCommentBox); } gtk_widget_show_all(sidebar->scrolledwindow); diff --git a/libreofficekit/qa/gtktiledviewer/gtv-helpers.cxx b/libreofficekit/qa/gtktiledviewer/gtv-helpers.cxx index 40be20a8200c..3f448b3f9261 100644 --- a/libreofficekit/qa/gtktiledviewer/gtv-helpers.cxx +++ b/libreofficekit/qa/gtktiledviewer/gtv-helpers.cxx @@ -15,8 +15,7 @@ #include -void -userPromptDialog(GtkWindow* pWindow, const std::string& aTitle, std::map& aEntries) +void GtvHelpers::userPromptDialog(GtkWindow* pWindow, const std::string& aTitle, std::map& aEntries) { GtkWidget* pDialog = gtk_dialog_new_with_buttons (aTitle.c_str(), pWindow, @@ -70,8 +69,7 @@ static void htmlClearFunc(GtkClipboard* /*pClipboard*/, gpointer pData) g_free(pData); } -void -clipboardSetHtml(GtkClipboard* pClipboard, const char* pSelection) +void GtvHelpers::clipboardSetHtml(GtkClipboard* pClipboard, const char* pSelection) { GtkTargetList* pList = gtk_target_list_new(nullptr, 0); GdkAtom aAtom(gdk_atom_intern("text/html", false)); @@ -85,14 +83,14 @@ clipboardSetHtml(GtkClipboard* pClipboard, const char* pSelection) gtk_target_list_unref(pList); } -std::string getNextAuthor() +std::string GtvHelpers::getNextAuthor() { static int nCounter = 0; struct passwd* pPasswd = getpwuid(getuid()); return std::string(pPasswd->pw_gecos) + " #" + std::to_string(++nCounter); } -GtkWidget* createCommentBox(const boost::property_tree::ptree& aComment) +GtkWidget* GtvHelpers::createCommentBox(const boost::property_tree::ptree& aComment) { GtkWidget* pCommentVBox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 1); gchar *id = g_strndup(aComment.get("id").c_str(), 20); diff --git a/libreofficekit/qa/gtktiledviewer/gtv-helpers.hxx b/libreofficekit/qa/gtktiledviewer/gtv-helpers.hxx index 594f121acb53..9a38d34ad263 100644 --- a/libreofficekit/qa/gtktiledviewer/gtv-helpers.hxx +++ b/libreofficekit/qa/gtktiledviewer/gtv-helpers.hxx @@ -19,14 +19,17 @@ #include -void userPromptDialog(GtkWindow* pWindow, const std::string& aTitle, std::map& aEntries); +namespace GtvHelpers +{ + void userPromptDialog(GtkWindow* pWindow, const std::string& aTitle, std::map& aEntries); -void clipboardSetHtml(GtkClipboard* pClipboard, const char* pSelection); + void clipboardSetHtml(GtkClipboard* pClipboard, const char* pSelection); -/// Generate an author string for multiple views. -std::string getNextAuthor(); + /// Generate an author string for multiple views. + std::string getNextAuthor(); -GtkWidget* createCommentBox(const boost::property_tree::ptree& aComment); + GtkWidget* createCommentBox(const boost::property_tree::ptree& aComment); +} #endif diff --git a/libreofficekit/qa/gtktiledviewer/gtv-lokdocview-signal-handlers.cxx b/libreofficekit/qa/gtktiledviewer/gtv-lokdocview-signal-handlers.cxx index 9217cce37f66..465d2348c349 100644 --- a/libreofficekit/qa/gtktiledviewer/gtv-lokdocview-signal-handlers.cxx +++ b/libreofficekit/qa/gtktiledviewer/gtv-lokdocview-signal-handlers.cxx @@ -253,7 +253,7 @@ void lokdocview_commentCallback(LOKDocView* pDocView, gchar* pComment, gpointer) } else if (aComment.get("action") == "Add" || aComment.get("action") == "Modify") { - GtkWidget* pCommentBox = createCommentBox(aComment); + GtkWidget* pCommentBox = GtvHelpers::createCommentBox(aComment); if (pSelf != nullptr || pParent != nullptr) { gtk_grid_insert_next_to(GTK_GRID(pCommentsGrid), pSelf != nullptr ? pSelf : pParent, GTK_POS_BOTTOM); diff --git a/libreofficekit/qa/gtktiledviewer/gtv-signal-handlers.cxx b/libreofficekit/qa/gtktiledviewer/gtv-signal-handlers.cxx index 5ef17c862308..965c3b07f738 100644 --- a/libreofficekit/qa/gtktiledviewer/gtv-signal-handlers.cxx +++ b/libreofficekit/qa/gtktiledviewer/gtv-signal-handlers.cxx @@ -33,7 +33,7 @@ void btn_clicked(GtkWidget* pButton, gpointer) { std::map aEntries; aEntries["Text"] = ""; - userPromptDialog(GTK_WINDOW(window), "Insert Comment", aEntries); + GtvHelpers::userPromptDialog(GTK_WINDOW(window), "Insert Comment", aEntries); boost::property_tree::ptree aTree; aTree.put(boost::property_tree::ptree::path_type(g_strconcat("Text", "/", "type", nullptr), '/'), "string"); @@ -64,7 +64,7 @@ void doCopy(GtkWidget* pButton, gpointer /*pItem*/) if (aUsedFormat == "text/plain;charset=utf-8") gtk_clipboard_set_text(pClipboard, pSelection, -1); else - clipboardSetHtml(pClipboard, pSelection); + GtvHelpers::clipboardSetHtml(pClipboard, pSelection); free(pSelection); free(pUsedFormat); @@ -537,7 +537,7 @@ void editButtonClicked(GtkWidget* pWidget, gpointer userdata) std::map aEntries; aEntries["Text"] = ""; - userPromptDialog(GTK_WINDOW(window), "Edit comment", aEntries); + GtvHelpers::userPromptDialog(GTK_WINDOW(window), "Edit comment", aEntries); gchar *commentId = static_cast(g_object_get_data(G_OBJECT(userdata), "id")); @@ -561,7 +561,7 @@ void replyButtonClicked(GtkWidget* pWidget, gpointer userdata) std::map aEntries; aEntries["Text"] = ""; - userPromptDialog(GTK_WINDOW(window), "Reply comment", aEntries); + GtvHelpers::userPromptDialog(GTK_WINDOW(window), "Reply comment", aEntries); gchar *commentId = static_cast(g_object_get_data(G_OBJECT(userdata), "id")); -- cgit