ns for lokdocviewsighandlers

Change-Id: I6ba4d6957f96aa6a8af8de9188769521e06834aa

4 files changed, 45 insertions, 41 deletions

diff --git a/libreofficekit/qa/gtktiledviewer/gtv-application-window.cxx b/libreofficekit/qa/gtktiledviewer/gtv-application-window.cxx
index 7914ab700c05..b5c9c8d29566 100644
--- a/libreofficekit/qa/gtktiledviewer/gtv-application-window.cxx
+++ b/libreofficekit/qa/gtktiledviewer/gtv-application-window.cxx
@@ -314,20 +314,20 @@ static void setupDocView(LOKDocView* pDocView)
 #if GLIB_CHECK_VERSION(2,40,0)
     g_assert_nonnull(pDocView);
 #endif
-    g_signal_connect(pDocView, "edit-changed", G_CALLBACK(lokdocview_signalEdit), nullptr);
-    g_signal_connect(pDocView, "command-changed", G_CALLBACK(lokdocview_signalCommand), nullptr);
-    g_signal_connect(pDocView, "command-result", G_CALLBACK(lokdocview_signalCommandResult), nullptr);
-    g_signal_connect(pDocView, "search-not-found", G_CALLBACK(lokdocview_signalSearch), nullptr);
-    g_signal_connect(pDocView, "search-result-count", G_CALLBACK(lokdocview_signalSearchResultCount), nullptr);
-    g_signal_connect(pDocView, "part-changed", G_CALLBACK(lokdocview_signalPart), nullptr);
-    g_signal_connect(pDocView, "hyperlink-clicked", G_CALLBACK(lokdocview_signalHyperlink), nullptr);
-    g_signal_connect(pDocView, "cursor-changed", G_CALLBACK(lokdocview_cursorChanged), nullptr);
-    g_signal_connect(pDocView, "address-changed", G_CALLBACK(lokdocview_addressChanged), nullptr);
-    g_signal_connect(pDocView, "formula-changed", G_CALLBACK(lokdocview_formulaChanged), nullptr);
-    g_signal_connect(pDocView, "password-required", G_CALLBACK(lokdocview_passwordRequired), nullptr);
-    g_signal_connect(pDocView, "comment", G_CALLBACK(lokdocview_commentCallback), nullptr);
-
-    g_signal_connect(pDocView, "configure-event", G_CALLBACK(lokdocview_configureEvent), nullptr);
+    g_signal_connect(pDocView, "edit-changed", G_CALLBACK(LOKDocViewSigHandlers::editChanged), nullptr);
+    g_signal_connect(pDocView, "command-changed", G_CALLBACK(LOKDocViewSigHandlers::commandChanged), nullptr);
+    g_signal_connect(pDocView, "command-result", G_CALLBACK(LOKDocViewSigHandlers::commandResult), nullptr);
+    g_signal_connect(pDocView, "search-not-found", G_CALLBACK(LOKDocViewSigHandlers::searchNotFound), nullptr);
+    g_signal_connect(pDocView, "search-result-count", G_CALLBACK(LOKDocViewSigHandlers::searchResultCount), nullptr);
+    g_signal_connect(pDocView, "part-changed", G_CALLBACK(LOKDocViewSigHandlers::partChanged), nullptr);
+    g_signal_connect(pDocView, "hyperlink-clicked", G_CALLBACK(LOKDocViewSigHandlers::hyperlinkClicked), nullptr);
+    g_signal_connect(pDocView, "cursor-changed", G_CALLBACK(LOKDocViewSigHandlers::cursorChanged), nullptr);
+    g_signal_connect(pDocView, "address-changed", G_CALLBACK(LOKDocViewSigHandlers::addressChanged), nullptr);
+    g_signal_connect(pDocView, "formula-changed", G_CALLBACK(LOKDocViewSigHandlers::formulaChanged), nullptr);
+    g_signal_connect(pDocView, "password-required", G_CALLBACK(LOKDocViewSigHandlers::passwordRequired), nullptr);
+    g_signal_connect(pDocView, "comment", G_CALLBACK(LOKDocViewSigHandlers::comment), nullptr);
+
+    g_signal_connect(pDocView, "configure-event", G_CALLBACK(LOKDocViewSigHandlers::configureEvent), nullptr);
 }
 
 void
diff --git a/libreofficekit/qa/gtktiledviewer/gtv-lokdocview-signal-handlers.cxx b/libreofficekit/qa/gtktiledviewer/gtv-lokdocview-signal-handlers.cxx
index 465d2348c349..203990e8dc41 100644
--- a/libreofficekit/qa/gtktiledviewer/gtv-lokdocview-signal-handlers.cxx
+++ b/libreofficekit/qa/gtktiledviewer/gtv-lokdocview-signal-handlers.cxx
@@ -14,11 +14,12 @@
 #include <gtv-signal-handlers.hxx>
 #include <gtv-calc-header-bar.hxx>
 #include <gtv-comments-sidebar.hxx>
+#include <gtv-lokdocview-signal-handlers.hxx>
 
 #include <boost/property_tree/json_parser.hpp>
 #include <boost/optional.hpp>
 
-void lokdocview_signalEdit(LOKDocView* pDocView, gboolean bWasEdit, gpointer)
+void LOKDocViewSigHandlers::editChanged(LOKDocView* pDocView, gboolean bWasEdit, gpointer)
 {
     GtvApplicationWindow* window = GTV_APPLICATION_WINDOW(gtk_widget_get_toplevel(GTK_WIDGET(pDocView)));
     gboolean bEdit = lok_doc_view_get_edit(LOK_DOC_VIEW(window->lokdocview));
@@ -29,7 +30,7 @@ void lokdocview_signalEdit(LOKDocView* pDocView, gboolean bWasEdit, gpointer)
     gtv_main_toolbar_set_edit(pMainToolbar, bEdit);
 }
 
-void lokdocview_signalCommand(LOKDocView* pDocView, char* pPayload, gpointer)
+void LOKDocViewSigHandlers::commandChanged(LOKDocView* pDocView, char* pPayload, gpointer)
 {
     GtvApplicationWindow* window = GTV_APPLICATION_WINDOW(gtk_widget_get_toplevel(GTK_WIDGET(pDocView)));
     std::string aPayload(pPayload);
@@ -75,18 +76,18 @@ void lokdocview_signalCommand(LOKDocView* pDocView, char* pPayload, gpointer)
     }
 }
 
-void lokdocview_signalCommandResult(LOKDocView*, char* pPayload, gpointer)
+void LOKDocViewSigHandlers::commandResult(LOKDocView*, char* pPayload, gpointer)
 {
     fprintf(stderr, "Command finished: %s\n", pPayload);
 }
 
-void lokdocview_signalSearch(LOKDocView* pDocView, char* , gpointer)
+void LOKDocViewSigHandlers::searchNotFound(LOKDocView* pDocView, char* , gpointer)
 {
     GtvApplicationWindow* window = GTV_APPLICATION_WINDOW(gtk_widget_get_toplevel(GTK_WIDGET(pDocView)));
     gtk_label_set_text(GTK_LABEL(window->findbarlabel), "Search key not found");
 }
 
-void lokdocview_signalSearchResultCount(LOKDocView* pDocView, char* pPayload, gpointer)
+void LOKDocViewSigHandlers::searchResultCount(LOKDocView* pDocView, char* pPayload, gpointer)
 {
     GtvApplicationWindow* window = GTV_APPLICATION_WINDOW(gtk_widget_get_toplevel(GTK_WIDGET(pDocView)));
     std::stringstream ss;
@@ -94,7 +95,7 @@ void lokdocview_signalSearchResultCount(LOKDocView* pDocView, char* pPayload, gp
     gtk_label_set_text(GTK_LABEL(window->findbarlabel), ss.str().c_str());
 }
 
-void lokdocview_signalPart(LOKDocView* /*pDocView*/, int, gpointer)
+void LOKDocViewSigHandlers::partChanged(LOKDocView* /*pDocView*/, int, gpointer)
 {
 //    GtvApplicationWindow* window = GTV_APPLICATION_WINDOW(gtk_widget_get_toplevel(GTK_WIDGET(pDocView)));
     //rWindow.m_bPartSelectorBroadcast = false;
@@ -102,7 +103,7 @@ void lokdocview_signalPart(LOKDocView* /*pDocView*/, int, gpointer)
     //  rWindow.m_bPartSelectorBroadcast = true;
 }
 
-void lokdocview_signalHyperlink(LOKDocView* pDocView, char* pPayload, gpointer)
+void LOKDocViewSigHandlers::hyperlinkClicked(LOKDocView* pDocView, char* pPayload, gpointer)
 {
     GError* pError = nullptr;
 #if GTK_CHECK_VERSION(3,22,0)
@@ -120,7 +121,7 @@ void lokdocview_signalHyperlink(LOKDocView* pDocView, char* pPayload, gpointer)
     }
 }
 
-void lokdocview_cursorChanged(LOKDocView* pDocView, gint nX, gint nY,
+void LOKDocViewSigHandlers::cursorChanged(LOKDocView* pDocView, gint nX, gint nY,
                               gint /*nWidth*/, gint /*nHeight*/, gpointer /*pData*/)
 {
     GtvApplicationWindow* window = GTV_APPLICATION_WINDOW(gtk_widget_get_toplevel(GTK_WIDGET(pDocView)));
@@ -168,19 +169,19 @@ void lokdocview_cursorChanged(LOKDocView* pDocView, gint nX, gint nY,
         gtk_adjustment_set_value(hadj, lok_doc_view_twip_to_pixel(pDocView, x));
 }
 
-void lokdocview_addressChanged(LOKDocView* pDocView, char* pPayload, gpointer)
+void LOKDocViewSigHandlers::addressChanged(LOKDocView* pDocView, char* pPayload, gpointer)
 {
     GtvApplicationWindow* window = GTV_APPLICATION_WINDOW(gtk_widget_get_toplevel(GTK_WIDGET(pDocView)));
     gtk_entry_set_text(GTK_ENTRY(window->addressbarentry), pPayload);
 }
 
-void lokdocview_formulaChanged(LOKDocView* pDocView, char* pPayload, gpointer)
+void LOKDocViewSigHandlers::formulaChanged(LOKDocView* pDocView, char* pPayload, gpointer)
 {
     GtvApplicationWindow* window = GTV_APPLICATION_WINDOW(gtk_widget_get_toplevel(GTK_WIDGET(pDocView)));
     gtk_entry_set_text(GTK_ENTRY(window->formulabarentry), pPayload);
 }
 
-void lokdocview_passwordRequired(LOKDocView* pDocView, char* pUrl, gboolean bModify, gpointer)
+void LOKDocViewSigHandlers::passwordRequired(LOKDocView* pDocView, char* pUrl, gboolean bModify, gpointer)
 {
     GtvApplicationWindow* window = GTV_APPLICATION_WINDOW(gtk_widget_get_toplevel(GTK_WIDGET(pDocView)));
     GtkWidget* pPasswordDialog = gtk_dialog_new_with_buttons ("Password required",
@@ -219,7 +220,7 @@ void lokdocview_passwordRequired(LOKDocView* pDocView, char* pUrl, gboolean bMod
     gtk_widget_destroy(pPasswordDialog);
 }
 
-void lokdocview_commentCallback(LOKDocView* pDocView, gchar* pComment, gpointer)
+void LOKDocViewSigHandlers::comment(LOKDocView* pDocView, gchar* pComment, gpointer)
 {
     GtvApplicationWindow* window = GTV_APPLICATION_WINDOW(gtk_widget_get_toplevel(GTK_WIDGET(pDocView)));
 
@@ -271,7 +272,7 @@ void lokdocview_commentCallback(LOKDocView* pDocView, gchar* pComment, gpointer)
     }
 }
 
-gboolean lokdocview_configureEvent(GtkWidget* pWidget, GdkEventConfigure* /*pEvent*/, gpointer /*pData*/)
+gboolean LOKDocViewSigHandlers::configureEvent(GtkWidget* pWidget, GdkEventConfigure* /*pEvent*/, gpointer /*pData*/)
 {
     GtvApplicationWindow* window = GTV_APPLICATION_WINDOW(gtk_widget_get_toplevel(GTK_WIDGET(pWidget)));
     LibreOfficeKitDocument* pDocument = lok_doc_view_get_document(LOK_DOC_VIEW(window->lokdocview));
diff --git a/libreofficekit/qa/gtktiledviewer/gtv-lokdocview-signal-handlers.hxx b/libreofficekit/qa/gtktiledviewer/gtv-lokdocview-signal-handlers.hxx
index 7466684a0d1e..724f2031d4f5 100644
--- a/libreofficekit/qa/gtktiledviewer/gtv-lokdocview-signal-handlers.hxx
+++ b/libreofficekit/qa/gtktiledviewer/gtv-lokdocview-signal-handlers.hxx
@@ -12,19 +12,22 @@
 
 #include <gtk/gtk.h>
 
-void lokdocview_signalEdit(LOKDocView* pDocView, gboolean bWasEdit, gpointer);
-void lokdocview_signalCommand(LOKDocView* pDocView, char* pPayload, gpointer);
-void lokdocview_signalCommandResult(LOKDocView*, char*, gpointer);
-void lokdocview_signalSearch(LOKDocView*, char*, gpointer);
-void lokdocview_signalSearchResultCount(LOKDocView*, char*, gpointer);
-void lokdocview_signalPart(LOKDocView*, int, gpointer);
-void lokdocview_signalHyperlink(LOKDocView*, char*, gpointer);
-void lokdocview_cursorChanged(LOKDocView* pDocView, gint nX, gint nY, gint nWidth, gint nHeight, gpointer);
-void lokdocview_addressChanged(LOKDocView* pDocView, char* pPayload, gpointer);
-void lokdocview_formulaChanged(LOKDocView* pDocView, char* pPayload, gpointer);
-void lokdocview_passwordRequired(LOKDocView* pDocView, char* pUrl, gboolean bModify, gpointer);
-void lokdocview_commentCallback(LOKDocView* pDocView, gchar* pComment, gpointer);
-gboolean lokdocview_configureEvent(GtkWidget* pWidget, GdkEventConfigure* pEvent, gpointer pData);
+namespace LOKDocViewSigHandlers {
+    void editChanged(LOKDocView* pDocView, gboolean bWasEdit, gpointer);
+    void commandChanged(LOKDocView* pDocView, char* pPayload, gpointer);
+    void commandResult(LOKDocView*, char*, gpointer);
+    void searchNotFound(LOKDocView*, char*, gpointer);
+    void searchResultCount(LOKDocView*, char*, gpointer);
+    void partChanged(LOKDocView*, int, gpointer);
+    void hyperlinkClicked(LOKDocView*, char*, gpointer);
+    void cursorChanged(LOKDocView* pDocView, gint nX, gint nY, gint nWidth, gint nHeight, gpointer);
+    void addressChanged(LOKDocView* pDocView, char* pPayload, gpointer);
+    void formulaChanged(LOKDocView* pDocView, char* pPayload, gpointer);
+    void passwordRequired(LOKDocView* pDocView, char* pUrl, gboolean bModify, gpointer);
+    void comment(LOKDocView* pDocView, gchar* pComment, gpointer);
+
+    gboolean configureEvent(GtkWidget* pWidget, GdkEventConfigure* pEvent, gpointer pData);
+}
 
 #endif
 
diff --git a/libreofficekit/qa/gtktiledviewer/gtv-signal-handlers.cxx b/libreofficekit/qa/gtktiledviewer/gtv-signal-handlers.cxx
index 965c3b07f738..976fc4604b90 100644
--- a/libreofficekit/qa/gtktiledviewer/gtv-signal-handlers.cxx
+++ b/libreofficekit/qa/gtktiledviewer/gtv-signal-handlers.cxx
@@ -528,7 +528,7 @@ void docAdjustmentChanged(GtkAdjustment*, gpointer pData)
     GtvApplicationWindow* window = GTV_APPLICATION_WINDOW(pData);
     printf("doc adjust ch : %p", window->lokdocview);
     if (window->lokdocview)
-        lokdocview_configureEvent(window->lokdocview, nullptr, nullptr);
+        LOKDocViewSigHandlers::configureEvent(window->lokdocview, nullptr, nullptr);
 }
 
 void editButtonClicked(GtkWidget* pWidget, gpointer userdata)