diff options
author | Pranav Kant <pranavk@collabora.co.uk> | 2017-07-13 12:38:37 +0530 |
---|---|---|
committer | Pranav Kant <pranavk@collabora.co.uk> | 2017-07-13 12:38:37 +0530 |
commit | a8180bbe76eeb6bfbc156b82b49cd476d0178032 (patch) | |
tree | 753302278e04467bd6cc8a30d0b1d1c9ef6d8eff | |
parent | fd5add1df37ae2760dc78db120fc544f779f5272 (diff) |
Silence all warnings
Change-Id: I5f178056ab38ee639a2fee50b66346037e706a3c
5 files changed, 21 insertions, 19 deletions
diff --git a/libreofficekit/qa/gtktiledviewer/gtv-application.cxx b/libreofficekit/qa/gtktiledviewer/gtv-application.cxx index d72df0fda4fe..33fec40deaef 100644 --- a/libreofficekit/qa/gtktiledviewer/gtv-application.cxx +++ b/libreofficekit/qa/gtktiledviewer/gtv-application.cxx @@ -33,7 +33,7 @@ getPrivate(GtvApplication* app) } static void -gtv_application_open(GApplication* app, GFile** file, gint nFiles, const gchar* hint) +gtv_application_open(GApplication* app, GFile** file, gint /*nFiles*/, const gchar* /*hint*/) { // TODO: add some option to create a new view for existing document // For now, this just opens a new document @@ -55,8 +55,7 @@ gtv_application_init(GtvApplication* app) { "enable-tiled-annotations", 0, G_OPTION_FLAG_NONE, G_OPTION_ARG_NONE, nullptr, "Whether tiled annotations should be enabled", nullptr }, { "background-color", 0, G_OPTION_FLAG_NONE, G_OPTION_ARG_STRING, nullptr, "Background color", nullptr }, { "hide-page-shadow", 0, G_OPTION_FLAG_NONE, G_OPTION_ARG_NONE, nullptr, "Hide page shadow", nullptr }, - { "hide-whitespace", 0, G_OPTION_FLAG_NONE, G_OPTION_ARG_NONE, nullptr, "Hide whitespace", nullptr }, - { nullptr } + { "hide-whitespace", 0, G_OPTION_FLAG_NONE, G_OPTION_ARG_NONE, nullptr, "Hide whitespace", nullptr } }; g_application_add_main_option_entries(G_APPLICATION(app), commandLineOptions); diff --git a/libreofficekit/qa/gtktiledviewer/gtv-comments-sidebar.cxx b/libreofficekit/qa/gtktiledviewer/gtv-comments-sidebar.cxx index 25f620c1227f..50e8e67efa81 100644 --- a/libreofficekit/qa/gtktiledviewer/gtv-comments-sidebar.cxx +++ b/libreofficekit/qa/gtktiledviewer/gtv-comments-sidebar.cxx @@ -134,9 +134,8 @@ gtv_comments_sidebar_init(GtvCommentsSidebar* sidebar) } static void -gtv_comments_sidebar_class_init(GtvCommentsSidebarClass* klass) +gtv_comments_sidebar_class_init(GtvCommentsSidebarClass* /*klass*/) { - } GtkWidget* diff --git a/libreofficekit/qa/gtktiledviewer/gtv-helpers.cxx b/libreofficekit/qa/gtktiledviewer/gtv-helpers.cxx index ce6989c382f5..e5996893c1e4 100644 --- a/libreofficekit/qa/gtktiledviewer/gtv-helpers.cxx +++ b/libreofficekit/qa/gtktiledviewer/gtv-helpers.cxx @@ -9,6 +9,8 @@ #include <gtk/gtk.h> +#include <pwd.h> + #include <cstring> #include <gtv-helpers.hxx> @@ -83,4 +85,11 @@ clipboardSetHtml(GtkClipboard* pClipboard, const char* pSelection) gtk_target_list_unref(pList); } +std::string getNextAuthor() +{ + static int nCounter = 0; + struct passwd* pPasswd = getpwuid(getuid()); + return std::string(pPasswd->pw_gecos) + " #" + std::to_string(++nCounter); +} + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/libreofficekit/qa/gtktiledviewer/gtv-helpers.hxx b/libreofficekit/qa/gtktiledviewer/gtv-helpers.hxx index 3866efee981b..cb26c811f236 100644 --- a/libreofficekit/qa/gtktiledviewer/gtv-helpers.hxx +++ b/libreofficekit/qa/gtktiledviewer/gtv-helpers.hxx @@ -12,22 +12,15 @@ #include <gtk/gtk.h> -#include <pwd.h> - -#include <string> #include <map> +#include <string> void userPromptDialog(GtkWindow* pWindow, const std::string& aTitle, std::map<std::string, std::string>& aEntries); void clipboardSetHtml(GtkClipboard* pClipboard, const char* pSelection); /// Generate an author string for multiple views. -static std::string getNextAuthor() -{ - static int nCounter = 0; - struct passwd* pPasswd = getpwuid(getuid()); - return std::string(pPasswd->pw_gecos) + " #" + std::to_string(++nCounter); -} +std::string getNextAuthor(); #endif diff --git a/libreofficekit/qa/gtktiledviewer/gtv-lokdocview-signal-handlers.cxx b/libreofficekit/qa/gtktiledviewer/gtv-lokdocview-signal-handlers.cxx index ba5c7aee9de3..6ec9629b956e 100644 --- a/libreofficekit/qa/gtktiledviewer/gtv-lokdocview-signal-handlers.cxx +++ b/libreofficekit/qa/gtktiledviewer/gtv-lokdocview-signal-handlers.cxx @@ -93,9 +93,9 @@ 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 lokdocview_signalPart(LOKDocView* /*pDocView*/, int, gpointer) { - GtvApplicationWindow* window = GTV_APPLICATION_WINDOW(gtk_widget_get_toplevel(GTK_WIDGET(pDocView))); +// GtvApplicationWindow* window = GTV_APPLICATION_WINDOW(gtk_widget_get_toplevel(GTK_WIDGET(pDocView))); //rWindow.m_bPartSelectorBroadcast = false; // gtk_combo_box_set_active(GTK_COMBO_BOX(rWindow.m_pPartSelector), nPart); // rWindow.m_bPartSelectorBroadcast = true; @@ -119,7 +119,8 @@ void lokdocview_signalHyperlink(LOKDocView* pDocView, char* pPayload, gpointer) } } -void lokdocview_cursorChanged(LOKDocView* pDocView, gint nX, gint nY, gint nWidth, gint nHeight, gpointer) +void lokdocview_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))); GtkAdjustment* vadj = gtk_scrolled_window_get_vadjustment(GTK_SCROLLED_WINDOW(window->scrolledwindow)); @@ -219,10 +220,9 @@ void lokdocview_passwordRequired(LOKDocView* pDocView, char* pUrl, gboolean bMod void lokdocview_commentCallback(LOKDocView* pDocView, gchar* pComment, gpointer); -gboolean lokdocview_configureEvent(GtkWidget* pWidget, GdkEventConfigure* pEvent, gpointer pData) +gboolean lokdocview_configureEvent(GtkWidget* pWidget, GdkEventConfigure* /*pEvent*/, gpointer /*pData*/) { GtvApplicationWindow* window = GTV_APPLICATION_WINDOW(gtk_widget_get_toplevel(GTK_WIDGET(pWidget))); - printf("configuring"); LibreOfficeKitDocument* pDocument = lok_doc_view_get_document(LOK_DOC_VIEW(window->lokdocview)); if (pDocument && pDocument->pClass->getDocumentType(pDocument) == LOK_DOCTYPE_SPREADSHEET) { @@ -254,6 +254,8 @@ gboolean lokdocview_configureEvent(GtkWidget* pWidget, GdkEventConfigure* pEvent gtv_calc_header_bar_configure(GTV_CALC_HEADER_BAR(window->columnbar), &aTree.get_child("columns")); gtv_calc_header_bar_configure(GTV_CALC_HEADER_BAR(window->cornerarea), nullptr); } + + return TRUE; } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |