diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2015-12-10 08:06:06 +0100 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2015-12-10 08:06:06 +0100 |
commit | fb8a3fac5d448451794804a7470be45fa14da453 (patch) | |
tree | 110395d7cf3b7ad304e34a007ea597263adcfad8 /libreofficekit | |
parent | b8ecfd83bac98ea58a435c59856da8fd94f5c6d9 (diff) |
loplugin:nullptr: More NULL -> nullptr automatic rewrite
Change-Id: Ie83819e2bcdc5fa160b39296b005ca9a5ff74b1d
Diffstat (limited to 'libreofficekit')
-rw-r--r-- | libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx | 74 | ||||
-rw-r--r-- | libreofficekit/source/gtk/lokdocview.cxx | 20 |
2 files changed, 47 insertions, 47 deletions
diff --git a/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx b/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx index 875fefc46400..e49b5a403622 100644 --- a/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx +++ b/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx @@ -971,7 +971,7 @@ static GtkWidget* createWindow(TiledWindow& rWindow) gtk_tool_item_set_tooltip_text(pSave, "Save"); gtk_toolbar_insert(GTK_TOOLBAR(pUpperToolbar), pSave, -1); gtk_toolbar_insert(GTK_TOOLBAR(pUpperToolbar), gtk_separator_tool_item_new(), -1); - g_signal_connect(G_OBJECT(pSave), "clicked", G_CALLBACK(toggleToolItem), NULL); + g_signal_connect(G_OBJECT(pSave), "clicked", G_CALLBACK(toggleToolItem), nullptr); lcl_registerToolItem(rWindow, pSave, ".uno:Save"); // Copy and paste. @@ -979,12 +979,12 @@ static GtkWidget* createWindow(TiledWindow& rWindow) gtk_tool_button_set_icon_name(GTK_TOOL_BUTTON(pCopyButton), "edit-copy-symbolic"); gtk_tool_item_set_tooltip_text(pCopyButton, "Copy"); gtk_toolbar_insert(GTK_TOOLBAR(pUpperToolbar), pCopyButton, -1); - g_signal_connect(G_OBJECT(pCopyButton), "clicked", G_CALLBACK(doCopy), NULL); + g_signal_connect(G_OBJECT(pCopyButton), "clicked", G_CALLBACK(doCopy), nullptr); GtkToolItem* pPasteButton = gtk_tool_button_new( nullptr, nullptr); gtk_tool_button_set_icon_name(GTK_TOOL_BUTTON(pPasteButton), "edit-paste-symbolic"); gtk_tool_item_set_tooltip_text(pPasteButton, "Paste"); gtk_toolbar_insert(GTK_TOOLBAR(pUpperToolbar), pPasteButton, -1); - g_signal_connect(G_OBJECT(pPasteButton), "clicked", G_CALLBACK(doPaste), NULL); + g_signal_connect(G_OBJECT(pPasteButton), "clicked", G_CALLBACK(doPaste), nullptr); gtk_toolbar_insert( GTK_TOOLBAR(pUpperToolbar), gtk_separator_tool_item_new(), -1); // Undo and redo. @@ -992,13 +992,13 @@ static GtkWidget* createWindow(TiledWindow& rWindow) gtk_tool_button_set_icon_name(GTK_TOOL_BUTTON(pUndo), "edit-undo-symbolic"); gtk_tool_item_set_tooltip_text(pUndo, "Undo"); gtk_toolbar_insert(GTK_TOOLBAR(pUpperToolbar), pUndo, -1); - g_signal_connect(G_OBJECT(pUndo), "clicked", G_CALLBACK(toggleToolItem), NULL); + g_signal_connect(G_OBJECT(pUndo), "clicked", G_CALLBACK(toggleToolItem), nullptr); lcl_registerToolItem(rWindow, pUndo, ".uno:Undo"); GtkToolItem* pRedo = gtk_tool_button_new(nullptr, nullptr); gtk_tool_button_set_icon_name(GTK_TOOL_BUTTON(pRedo), "edit-redo-symbolic"); gtk_tool_item_set_tooltip_text(pRedo, "Redo"); gtk_toolbar_insert(GTK_TOOLBAR(pUpperToolbar), pRedo, -1); - g_signal_connect(G_OBJECT(pRedo), "clicked", G_CALLBACK(toggleToolItem), NULL); + g_signal_connect(G_OBJECT(pRedo), "clicked", G_CALLBACK(toggleToolItem), nullptr); lcl_registerToolItem(rWindow, pRedo, ".uno:Redo"); gtk_toolbar_insert(GTK_TOOLBAR(pUpperToolbar), gtk_separator_tool_item_new(), -1); @@ -1007,7 +1007,7 @@ static GtkWidget* createWindow(TiledWindow& rWindow) gtk_tool_button_set_icon_name(GTK_TOOL_BUTTON (pFindButton), "edit-find-symbolic"); gtk_tool_item_set_tooltip_text(pFindButton, "Find"); gtk_toolbar_insert(GTK_TOOLBAR(pUpperToolbar), pFindButton, -1); - g_signal_connect(G_OBJECT(pFindButton), "clicked", G_CALLBACK(toggleFindbar), NULL); + g_signal_connect(G_OBJECT(pFindButton), "clicked", G_CALLBACK(toggleFindbar), nullptr); gtk_toolbar_insert(GTK_TOOLBAR(pUpperToolbar), gtk_separator_tool_item_new(), -1); // Misc upper toolbar. @@ -1015,19 +1015,19 @@ static GtkWidget* createWindow(TiledWindow& rWindow) gtk_tool_button_set_icon_name(GTK_TOOL_BUTTON (pZoomIn), "zoom-in-symbolic"); gtk_tool_item_set_tooltip_text(pZoomIn, "Zoom In"); gtk_toolbar_insert(GTK_TOOLBAR(pUpperToolbar), pZoomIn, -1); - g_signal_connect(G_OBJECT(pZoomIn), "clicked", G_CALLBACK(changeZoom), NULL); + g_signal_connect(G_OBJECT(pZoomIn), "clicked", G_CALLBACK(changeZoom), nullptr); GtkToolItem* pZoom1 = gtk_tool_button_new(nullptr, nullptr); gtk_tool_button_set_icon_name(GTK_TOOL_BUTTON(pZoom1), "zoom-original-symbolic"); gtk_tool_item_set_tooltip_text(pZoom1, "Normal Size"); gtk_toolbar_insert(GTK_TOOLBAR(pUpperToolbar), pZoom1, -1); - g_signal_connect(G_OBJECT(pZoom1), "clicked", G_CALLBACK(changeZoom), NULL); + g_signal_connect(G_OBJECT(pZoom1), "clicked", G_CALLBACK(changeZoom), nullptr); GtkToolItem* pZoomOut = gtk_tool_button_new(nullptr, nullptr); gtk_tool_button_set_icon_name(GTK_TOOL_BUTTON (pZoomOut), "zoom-out-symbolic"); gtk_tool_item_set_tooltip_text(pZoomOut, "Zoom Out"); gtk_toolbar_insert(GTK_TOOLBAR(pUpperToolbar), pZoomOut, -1); - g_signal_connect(G_OBJECT(pZoomOut), "clicked", G_CALLBACK(changeZoom), NULL); + g_signal_connect(G_OBJECT(pZoomOut), "clicked", G_CALLBACK(changeZoom), nullptr); GtkToolItem* pPartSelectorToolItem = gtk_tool_item_new(); GtkWidget* pComboBox = gtk_combo_box_text_new(); @@ -1046,13 +1046,13 @@ static GtkWidget* createWindow(TiledWindow& rWindow) gtk_tool_button_set_icon_name(GTK_TOOL_BUTTON (pEnableEditing), "insert-text-symbolic"); gtk_tool_item_set_tooltip_text(pEnableEditing, "Edit"); gtk_toolbar_insert(GTK_TOOLBAR(pUpperToolbar), pEnableEditing, -1); - g_signal_connect(G_OBJECT(pEnableEditing), "toggled", G_CALLBACK(toggleEditing), NULL); + g_signal_connect(G_OBJECT(pEnableEditing), "toggled", G_CALLBACK(toggleEditing), nullptr); GtkToolItem* pNewViewButton = gtk_tool_button_new( nullptr, nullptr); gtk_tool_button_set_icon_name(GTK_TOOL_BUTTON (pNewViewButton), "view-continuous-symbolic"); gtk_tool_item_set_tooltip_text(pNewViewButton, "New View"); gtk_toolbar_insert(GTK_TOOLBAR(pUpperToolbar), pNewViewButton, -1); - g_signal_connect(G_OBJECT(pNewViewButton), "clicked", G_CALLBACK(createView), NULL); + g_signal_connect(G_OBJECT(pNewViewButton), "clicked", G_CALLBACK(createView), nullptr); gtk_box_pack_start(GTK_BOX(rWindow.m_pVBox), pUpperToolbar, FALSE, FALSE, 0 ); // Adds to top. // Lower toolbar. @@ -1064,25 +1064,25 @@ static GtkWidget* createWindow(TiledWindow& rWindow) gtk_tool_button_set_icon_name(GTK_TOOL_BUTTON(rWindow.m_pBold), "format-text-bold-symbolic"); gtk_tool_item_set_tooltip_text(rWindow.m_pBold, "Bold"); gtk_toolbar_insert(GTK_TOOLBAR(pLowerToolbar), rWindow.m_pBold, -1); - g_signal_connect(G_OBJECT(rWindow.m_pBold), "toggled", G_CALLBACK(toggleToolItem), NULL); + g_signal_connect(G_OBJECT(rWindow.m_pBold), "toggled", G_CALLBACK(toggleToolItem), nullptr); lcl_registerToolItem(rWindow, rWindow.m_pBold, ".uno:Bold"); rWindow.m_pItalic = gtk_toggle_tool_button_new(); gtk_tool_button_set_icon_name(GTK_TOOL_BUTTON (rWindow.m_pItalic), "format-text-italic-symbolic"); gtk_tool_item_set_tooltip_text(rWindow.m_pItalic, "Italic"); gtk_toolbar_insert(GTK_TOOLBAR(pLowerToolbar), rWindow.m_pItalic, -1); - g_signal_connect(G_OBJECT(rWindow.m_pItalic), "toggled", G_CALLBACK(toggleToolItem), NULL); + g_signal_connect(G_OBJECT(rWindow.m_pItalic), "toggled", G_CALLBACK(toggleToolItem), nullptr); lcl_registerToolItem(rWindow, rWindow.m_pItalic, ".uno:Italic"); rWindow.m_pUnderline = gtk_toggle_tool_button_new(); gtk_tool_button_set_icon_name(GTK_TOOL_BUTTON (rWindow.m_pUnderline), "format-text-underline-symbolic"); gtk_tool_item_set_tooltip_text(rWindow.m_pUnderline, "Underline"); gtk_toolbar_insert(GTK_TOOLBAR(pLowerToolbar), rWindow.m_pUnderline, -1); - g_signal_connect(G_OBJECT(rWindow.m_pUnderline), "toggled", G_CALLBACK(toggleToolItem), NULL); + g_signal_connect(G_OBJECT(rWindow.m_pUnderline), "toggled", G_CALLBACK(toggleToolItem), nullptr); lcl_registerToolItem(rWindow, rWindow.m_pUnderline, ".uno:Underline"); rWindow.m_pStrikethrough = gtk_toggle_tool_button_new (); gtk_tool_button_set_icon_name(GTK_TOOL_BUTTON(rWindow.m_pStrikethrough), "format-text-strikethrough-symbolic"); gtk_tool_item_set_tooltip_text(rWindow.m_pStrikethrough, "Strikethrough"); gtk_toolbar_insert(GTK_TOOLBAR(pLowerToolbar), rWindow.m_pStrikethrough, -1); - g_signal_connect(G_OBJECT(rWindow.m_pStrikethrough), "toggled", G_CALLBACK(toggleToolItem), NULL); + g_signal_connect(G_OBJECT(rWindow.m_pStrikethrough), "toggled", G_CALLBACK(toggleToolItem), nullptr); lcl_registerToolItem(rWindow, rWindow.m_pStrikethrough, ".uno:Strikeout"); gtk_toolbar_insert(GTK_TOOLBAR(pLowerToolbar), gtk_separator_tool_item_new(), -1); @@ -1091,13 +1091,13 @@ static GtkWidget* createWindow(TiledWindow& rWindow) gtk_tool_button_set_icon_name(GTK_TOOL_BUTTON(rWindow.m_pSuperscript), "go-up-symbolic"); gtk_tool_item_set_tooltip_text(rWindow.m_pSuperscript, "Superscript"); gtk_toolbar_insert(GTK_TOOLBAR(pLowerToolbar), rWindow.m_pSuperscript, -1); - g_signal_connect(G_OBJECT(rWindow.m_pSuperscript), "toggled", G_CALLBACK(toggleToolItem), NULL); + g_signal_connect(G_OBJECT(rWindow.m_pSuperscript), "toggled", G_CALLBACK(toggleToolItem), nullptr); lcl_registerToolItem(rWindow, rWindow.m_pSuperscript, ".uno:SuperScript"); rWindow.m_pSubscript = gtk_toggle_tool_button_new(); gtk_tool_button_set_icon_name(GTK_TOOL_BUTTON(rWindow.m_pSubscript), "go-down-symbolic"); gtk_tool_item_set_tooltip_text(rWindow.m_pSubscript, "Subscript"); gtk_toolbar_insert(GTK_TOOLBAR(pLowerToolbar), rWindow.m_pSubscript, -1); - g_signal_connect(G_OBJECT(rWindow.m_pSubscript), "toggled", G_CALLBACK(toggleToolItem), NULL); + g_signal_connect(G_OBJECT(rWindow.m_pSubscript), "toggled", G_CALLBACK(toggleToolItem), nullptr); lcl_registerToolItem(rWindow, rWindow.m_pSubscript, ".uno:SubScript"); gtk_toolbar_insert(GTK_TOOLBAR(pLowerToolbar), gtk_separator_tool_item_new(), -1); @@ -1106,25 +1106,25 @@ static GtkWidget* createWindow(TiledWindow& rWindow) gtk_tool_button_set_icon_name(GTK_TOOL_BUTTON(rWindow.m_pLeftpara), "format-justify-left-symbolic"); gtk_tool_item_set_tooltip_text(rWindow.m_pLeftpara, "Align Left"); gtk_toolbar_insert(GTK_TOOLBAR(pLowerToolbar), rWindow.m_pLeftpara, -1); - g_signal_connect(G_OBJECT(rWindow.m_pLeftpara), "toggled", G_CALLBACK(toggleToolItem), NULL); + g_signal_connect(G_OBJECT(rWindow.m_pLeftpara), "toggled", G_CALLBACK(toggleToolItem), nullptr); lcl_registerToolItem(rWindow, rWindow.m_pLeftpara, ".uno:LeftPara"); rWindow.m_pCenterpara = gtk_toggle_tool_button_new(); gtk_tool_button_set_icon_name(GTK_TOOL_BUTTON(rWindow.m_pCenterpara), "format-justify-center-symbolic"); gtk_tool_item_set_tooltip_text(rWindow.m_pCenterpara, "Center Horizontally"); gtk_toolbar_insert(GTK_TOOLBAR(pLowerToolbar), rWindow.m_pCenterpara, -1); - g_signal_connect(G_OBJECT(rWindow.m_pCenterpara), "toggled", G_CALLBACK(toggleToolItem), NULL); + g_signal_connect(G_OBJECT(rWindow.m_pCenterpara), "toggled", G_CALLBACK(toggleToolItem), nullptr); lcl_registerToolItem(rWindow, rWindow.m_pCenterpara, ".uno:CenterPara"); rWindow.m_pRightpara = gtk_toggle_tool_button_new(); gtk_tool_button_set_icon_name(GTK_TOOL_BUTTON(rWindow.m_pRightpara), "format-justify-right-symbolic"); gtk_tool_item_set_tooltip_text(rWindow.m_pRightpara, "Align Right"); gtk_toolbar_insert(GTK_TOOLBAR(pLowerToolbar), rWindow.m_pRightpara, -1); - g_signal_connect(G_OBJECT(rWindow.m_pRightpara), "toggled", G_CALLBACK(toggleToolItem), NULL); + g_signal_connect(G_OBJECT(rWindow.m_pRightpara), "toggled", G_CALLBACK(toggleToolItem), nullptr); lcl_registerToolItem(rWindow, rWindow.m_pRightpara, ".uno:RightPara"); rWindow.m_pJustifypara = gtk_toggle_tool_button_new(); gtk_tool_button_set_icon_name(GTK_TOOL_BUTTON(rWindow.m_pJustifypara), "format-justify-fill-symbolic"); gtk_tool_item_set_tooltip_text(rWindow.m_pJustifypara, "Justified"); gtk_toolbar_insert(GTK_TOOLBAR(pLowerToolbar), rWindow.m_pJustifypara, -1); - g_signal_connect(G_OBJECT(rWindow.m_pJustifypara), "toggled", G_CALLBACK(toggleToolItem), NULL); + g_signal_connect(G_OBJECT(rWindow.m_pJustifypara), "toggled", G_CALLBACK(toggleToolItem), nullptr); lcl_registerToolItem(rWindow, rWindow.m_pJustifypara, ".uno:JustifyPara"); gtk_toolbar_insert(GTK_TOOLBAR(pLowerToolbar), gtk_separator_tool_item_new(), -1); @@ -1133,14 +1133,14 @@ static GtkWidget* createWindow(TiledWindow& rWindow) gtk_tool_button_set_icon_name(GTK_TOOL_BUTTON(pInsertAnnotation), "changes-allow-symbolic"); gtk_tool_item_set_tooltip_text(pInsertAnnotation, "Insert Comment"); gtk_toolbar_insert(GTK_TOOLBAR(pLowerToolbar), pInsertAnnotation, -1); - g_signal_connect(G_OBJECT(pInsertAnnotation), "clicked", G_CALLBACK(toggleToolItem), NULL); + g_signal_connect(G_OBJECT(pInsertAnnotation), "clicked", G_CALLBACK(toggleToolItem), nullptr); lcl_registerToolItem(rWindow, pInsertAnnotation, ".uno:InsertAnnotation"); GtkToolItem* pDeleteComment = gtk_tool_button_new(nullptr, nullptr); gtk_tool_button_set_icon_name(GTK_TOOL_BUTTON(pDeleteComment), "changes-prevent-symbolic"); gtk_tool_item_set_tooltip_text(pDeleteComment, "Delete Comment"); gtk_toolbar_insert(GTK_TOOLBAR(pLowerToolbar), pDeleteComment, -1); - g_signal_connect(G_OBJECT(pDeleteComment), "clicked", G_CALLBACK(toggleToolItem), NULL); + g_signal_connect(G_OBJECT(pDeleteComment), "clicked", G_CALLBACK(toggleToolItem), nullptr); lcl_registerToolItem(rWindow, pDeleteComment, ".uno:DeleteComment"); // Formula bar @@ -1158,7 +1158,7 @@ static GtkWidget* createWindow(TiledWindow& rWindow) GtkToolItem* pFindbarClose = gtk_tool_button_new( nullptr, nullptr); gtk_tool_button_set_icon_name(GTK_TOOL_BUTTON (pFindbarClose), "window-close-symbolic"); gtk_toolbar_insert(GTK_TOOLBAR(rWindow.m_pFindbar), pFindbarClose, -1); - g_signal_connect(G_OBJECT(pFindbarClose), "clicked", G_CALLBACK(toggleFindbar), NULL); + g_signal_connect(G_OBJECT(pFindbarClose), "clicked", G_CALLBACK(toggleFindbar), nullptr); GtkToolItem* pEntryContainer = gtk_tool_item_new(); rWindow.m_pFindbarEntry = gtk_entry_new(); @@ -1169,17 +1169,17 @@ static GtkWidget* createWindow(TiledWindow& rWindow) GtkToolItem* pFindbarNext = gtk_tool_button_new( nullptr, nullptr); gtk_tool_button_set_icon_name(GTK_TOOL_BUTTON (pFindbarNext), "go-down-symbolic"); gtk_toolbar_insert(GTK_TOOLBAR(rWindow.m_pFindbar), pFindbarNext, -1); - g_signal_connect(G_OBJECT(pFindbarNext), "clicked", G_CALLBACK(signalSearchNext), NULL); + g_signal_connect(G_OBJECT(pFindbarNext), "clicked", G_CALLBACK(signalSearchNext), nullptr); GtkToolItem* pFindbarPrev = gtk_tool_button_new( nullptr, nullptr); gtk_tool_button_set_icon_name(GTK_TOOL_BUTTON (pFindbarPrev), "go-up-symbolic"); gtk_toolbar_insert(GTK_TOOLBAR(rWindow.m_pFindbar), pFindbarPrev, -1); - g_signal_connect(G_OBJECT(pFindbarPrev), "clicked", G_CALLBACK(signalSearchPrev), NULL); + g_signal_connect(G_OBJECT(pFindbarPrev), "clicked", G_CALLBACK(signalSearchPrev), nullptr); GtkToolItem* pFindAll = gtk_toggle_tool_button_new(); gtk_tool_button_set_label(GTK_TOOL_BUTTON(pFindAll), "Highlight All"); gtk_toolbar_insert(GTK_TOOLBAR(rWindow.m_pFindbar), pFindAll, -1); - g_signal_connect(G_OBJECT(pFindAll), "toggled", G_CALLBACK(toggleFindAll), NULL); + g_signal_connect(G_OBJECT(pFindAll), "toggled", G_CALLBACK(toggleFindAll), nullptr); GtkToolItem* pFindbarLabelContainer = gtk_tool_item_new(); rWindow.m_pFindbarLabel = gtk_label_new(""); @@ -1254,16 +1254,16 @@ static void setupDocView(GtkWidget* pDocView) #if GLIB_CHECK_VERSION(2,40,0) g_assert_nonnull(pDocView); #endif - g_signal_connect(pDocView, "edit-changed", G_CALLBACK(signalEdit), NULL); - g_signal_connect(pDocView, "command-changed", G_CALLBACK(signalCommand), NULL); - g_signal_connect(pDocView, "command-result", G_CALLBACK(signalCommandResult), NULL); - g_signal_connect(pDocView, "search-not-found", G_CALLBACK(signalSearch), NULL); - g_signal_connect(pDocView, "search-result-count", G_CALLBACK(signalSearchResultCount), NULL); - g_signal_connect(pDocView, "part-changed", G_CALLBACK(signalPart), NULL); - g_signal_connect(pDocView, "size-changed", G_CALLBACK(signalSize), NULL); - g_signal_connect(pDocView, "hyperlink-clicked", G_CALLBACK(signalHyperlink), NULL); - g_signal_connect(pDocView, "cursor-changed", G_CALLBACK(cursorChanged), NULL); - g_signal_connect(pDocView, "formula-changed", G_CALLBACK(formulaChanged), NULL); + g_signal_connect(pDocView, "edit-changed", G_CALLBACK(signalEdit), nullptr); + g_signal_connect(pDocView, "command-changed", G_CALLBACK(signalCommand), nullptr); + g_signal_connect(pDocView, "command-result", G_CALLBACK(signalCommandResult), nullptr); + g_signal_connect(pDocView, "search-not-found", G_CALLBACK(signalSearch), nullptr); + g_signal_connect(pDocView, "search-result-count", G_CALLBACK(signalSearchResultCount), nullptr); + g_signal_connect(pDocView, "part-changed", G_CALLBACK(signalPart), nullptr); + g_signal_connect(pDocView, "size-changed", G_CALLBACK(signalSize), nullptr); + g_signal_connect(pDocView, "hyperlink-clicked", G_CALLBACK(signalHyperlink), nullptr); + g_signal_connect(pDocView, "cursor-changed", G_CALLBACK(cursorChanged), nullptr); + g_signal_connect(pDocView, "formula-changed", G_CALLBACK(formulaChanged), nullptr); } int main( int argc, char* argv[] ) diff --git a/libreofficekit/source/gtk/lokdocview.cxx b/libreofficekit/source/gtk/lokdocview.cxx index 741760214be4..e0654b1447ae 100644 --- a/libreofficekit/source/gtk/lokdocview.cxx +++ b/libreofficekit/source/gtk/lokdocview.cxx @@ -1007,7 +1007,7 @@ callback (gpointer pData) twipToPixel(priv->m_nDocumentWidthTwips, priv->m_fZoom), twipToPixel(priv->m_nDocumentHeightTwips, priv->m_fZoom)); - g_signal_emit(pDocView, doc_view_signals[SIZE_CHANGED], 0, NULL); + g_signal_emit(pDocView, doc_view_signals[SIZE_CHANGED], 0, nullptr); } break; case LOK_CALLBACK_SET_PART: @@ -1161,9 +1161,9 @@ paintTileFinish(LOKDocView* pDocView, GAsyncResult* res, GError **error) { GTask* task = G_TASK(res); - g_return_val_if_fail(LOK_IS_DOC_VIEW(pDocView), NULL); - g_return_val_if_fail(g_task_is_valid(res, pDocView), NULL); - g_return_val_if_fail(error == nullptr || *error == nullptr, NULL); + g_return_val_if_fail(LOK_IS_DOC_VIEW(pDocView), nullptr); + g_return_val_if_fail(g_task_is_valid(res, pDocView), nullptr); + g_return_val_if_fail(error == nullptr || *error == nullptr, nullptr); return g_task_propagate_pointer(task, error); } @@ -1294,7 +1294,7 @@ renderOverlay(LOKDocView* pDocView, cairo_t* pCairo) if (priv->m_bEdit && priv->m_bCursorVisible && !isEmptyRectangle(priv->m_aVisibleCursor) && priv->m_aTextSelectionRectangles.empty()) { // Have a cursor, but no selection: we need the middle handle. - gchar* handleMiddlePath = g_strconcat (priv->m_aLOPath, "/../..", CURSOR_HANDLE_DIR, "handle_image_middle.png", NULL); + gchar* handleMiddlePath = g_strconcat (priv->m_aLOPath, "/../..", CURSOR_HANDLE_DIR, "handle_image_middle.png", nullptr); if (!priv->m_pHandleMiddle) { priv->m_pHandleMiddle = cairo_image_surface_create_from_png(handleMiddlePath); @@ -1322,7 +1322,7 @@ renderOverlay(LOKDocView* pDocView, cairo_t* pCairo) if (!isEmptyRectangle(priv->m_aTextSelectionStart)) { // Have a start position: we need a start handle. - gchar* handleStartPath = g_strconcat (priv->m_aLOPath, "/../..", CURSOR_HANDLE_DIR, "handle_image_start.png", NULL); + gchar* handleStartPath = g_strconcat (priv->m_aLOPath, "/../..", CURSOR_HANDLE_DIR, "handle_image_start.png", nullptr); if (!priv->m_pHandleStart) { priv->m_pHandleStart = cairo_image_surface_create_from_png(handleStartPath); @@ -1334,7 +1334,7 @@ renderOverlay(LOKDocView* pDocView, cairo_t* pCairo) if (!isEmptyRectangle(priv->m_aTextSelectionEnd)) { // Have a start position: we need an end handle. - gchar* handleEndPath = g_strconcat (priv->m_aLOPath, "/../..", CURSOR_HANDLE_DIR, "handle_image_end.png", NULL); + gchar* handleEndPath = g_strconcat (priv->m_aLOPath, "/../..", CURSOR_HANDLE_DIR, "handle_image_end.png", nullptr); if (!priv->m_pHandleEnd) { priv->m_pHandleEnd = cairo_image_surface_create_from_png(handleEndPath); @@ -1347,7 +1347,7 @@ renderOverlay(LOKDocView* pDocView, cairo_t* pCairo) if (!isEmptyRectangle(priv->m_aGraphicSelection)) { - gchar* handleGraphicPath = g_strconcat (priv->m_aLOPath, "/../..", CURSOR_HANDLE_DIR, "handle_graphic.png", NULL); + gchar* handleGraphicPath = g_strconcat (priv->m_aLOPath, "/../..", CURSOR_HANDLE_DIR, "handle_graphic.png", nullptr); if (!priv->m_pGraphicHandle) { priv->m_pGraphicHandle = cairo_image_surface_create_from_png(handleGraphicPath); @@ -2386,14 +2386,14 @@ static void lok_doc_view_class_init (LOKDocViewClass* pClass) SAL_DLLPUBLIC_EXPORT GtkWidget* lok_doc_view_new (const gchar* pPath, GCancellable *cancellable, GError **error) { - return GTK_WIDGET (g_initable_new (LOK_TYPE_DOC_VIEW, cancellable, error, "lopath", pPath == nullptr ? LOK_PATH : pPath, NULL)); + return GTK_WIDGET (g_initable_new (LOK_TYPE_DOC_VIEW, cancellable, error, "lopath", pPath == nullptr ? LOK_PATH : pPath, nullptr)); } SAL_DLLPUBLIC_EXPORT GtkWidget* lok_doc_view_new_from_widget(LOKDocView* pOldLOKDocView) { LOKDocViewPrivate& pOldPriv = getPrivate(pOldLOKDocView); GtkWidget* pNewDocView = GTK_WIDGET(g_initable_new(LOK_TYPE_DOC_VIEW, /*cancellable=*/nullptr, /*error=*/nullptr, - "lopath", pOldPriv->m_aLOPath, "lopointer", pOldPriv->m_pOffice, "docpointer", pOldPriv->m_pDocument, NULL)); + "lopath", pOldPriv->m_aLOPath, "lopointer", pOldPriv->m_pOffice, "docpointer", pOldPriv->m_pDocument, nullptr)); // No documentLoad(), just a createView(). LibreOfficeKitDocument* pDocument = lok_doc_view_get_document(LOK_DOC_VIEW(pNewDocView)); |