diff options
Diffstat (limited to 'vcl')
-rw-r--r-- | vcl/source/gdi/scrptrun.cxx | 2 | ||||
-rw-r--r-- | vcl/unx/gtk3/a11y/gtk3atklistener.cxx | 2 | ||||
-rw-r--r-- | vcl/unx/gtk3/fpicker/SalGtkFilePicker.cxx | 4 | ||||
-rw-r--r-- | vcl/unx/gtk3/gtk3gloactiongroup.cxx | 4 | ||||
-rw-r--r-- | vcl/unx/gtk3/gtk3glomenu.cxx | 2 | ||||
-rw-r--r-- | vcl/unx/gtk3/gtk3gtkdata.cxx | 2 | ||||
-rw-r--r-- | vcl/unx/gtk3/gtk3gtkframe.cxx | 8 | ||||
-rw-r--r-- | vcl/unx/gtk3/gtk3gtkinst.cxx | 16 |
8 files changed, 20 insertions, 20 deletions
diff --git a/vcl/source/gdi/scrptrun.cxx b/vcl/source/gdi/scrptrun.cxx index cee6fb27eb15..b18816cac26c 100644 --- a/vcl/source/gdi/scrptrun.cxx +++ b/vcl/source/gdi/scrptrun.cxx @@ -137,7 +137,7 @@ namespace vcl { const char ScriptRun::fgClassID=0; -static UBool sameScript(int32_t scriptOne, int32_t scriptTwo) +static bool sameScript(int32_t scriptOne, int32_t scriptTwo) { return scriptOne <= USCRIPT_INHERITED || scriptTwo <= USCRIPT_INHERITED || scriptOne == scriptTwo; } diff --git a/vcl/unx/gtk3/a11y/gtk3atklistener.cxx b/vcl/unx/gtk3/a11y/gtk3atklistener.cxx index 4a7d41638479..f690edfe62e3 100644 --- a/vcl/unx/gtk3/a11y/gtk3atklistener.cxx +++ b/vcl/unx/gtk3/a11y/gtk3atklistener.cxx @@ -468,7 +468,7 @@ void AtkListener::notifyEvent( const accessibility::AccessibleEventObject& aEven AtkStateType eOldState = mapState( aEvent.OldValue ); AtkStateType eNewState = mapState( aEvent.NewValue ); - gboolean bState = eNewState != ATK_STATE_INVALID; + bool bState = eNewState != ATK_STATE_INVALID; AtkStateType eRealState = bState ? eNewState : eOldState; atk_object_notify_state_change( atk_obj, eRealState, bState ); diff --git a/vcl/unx/gtk3/fpicker/SalGtkFilePicker.cxx b/vcl/unx/gtk3/fpicker/SalGtkFilePicker.cxx index 1892155527bc..75f832cc815a 100644 --- a/vcl/unx/gtk3/fpicker/SalGtkFilePicker.cxx +++ b/vcl/unx/gtk3/fpicker/SalGtkFilePicker.cxx @@ -1480,7 +1480,7 @@ void SalGtkFilePicker::selection_changed_cb( GtkFileChooser *, SalGtkFilePicker void SalGtkFilePicker::update_preview_cb( GtkFileChooser *file_chooser, SalGtkFilePicker* pobjFP ) { - gboolean have_preview = false; + bool have_preview = false; GtkWidget* preview = pobjFP->m_pPreview; char* filename = gtk_file_chooser_get_preview_filename( file_chooser ); @@ -1794,7 +1794,7 @@ extern "C" static gboolean case_insensitive_filter (const GtkFileFilterInfo *filter_info, gpointer data) { - gboolean bRetval = false; + bool bRetval = false; const char *pFilter = static_cast<const char *>(data); g_return_val_if_fail( data != nullptr, false ); diff --git a/vcl/unx/gtk3/gtk3gloactiongroup.cxx b/vcl/unx/gtk3/gtk3gloactiongroup.cxx index 88189f34e23e..ca315b07e01b 100644 --- a/vcl/unx/gtk3/gtk3gloactiongroup.cxx +++ b/vcl/unx/gtk3/gtk3gloactiongroup.cxx @@ -187,7 +187,7 @@ g_lo_action_group_perform_submenu_action (GLOActionGroup *group, const gchar *action_name, GVariant *state) { - gboolean bState = g_variant_get_boolean (state); + bool bState = g_variant_get_boolean (state); SAL_INFO("vcl.unity", "g_lo_action_group_perform_submenu_action on " << group << " to " << bState); if (bState) @@ -217,7 +217,7 @@ g_lo_action_group_change_state (GActionGroup *group, g_lo_action_group_perform_submenu_action (lo_group, action_name, value); else { - gboolean is_new = FALSE; + bool is_new = FALSE; /* If action already exists but has no state, it should be removed and added again. */ if (action->state_type == nullptr) diff --git a/vcl/unx/gtk3/gtk3glomenu.cxx b/vcl/unx/gtk3/gtk3glomenu.cxx index d6ac0d0a89ae..a82c6946422c 100644 --- a/vcl/unx/gtk3/gtk3glomenu.cxx +++ b/vcl/unx/gtk3/gtk3glomenu.cxx @@ -52,7 +52,7 @@ g_lo_menu_struct_item_init (struct item *menu_item) * - no consecutive '-' * - not longer than 1024 chars */ -static gboolean +static bool valid_attribute_name (const gchar *name) { gint i; diff --git a/vcl/unx/gtk3/gtk3gtkdata.cxx b/vcl/unx/gtk3/gtk3gtkdata.cxx index e1c19825de3c..66a5dfcce890 100644 --- a/vcl/unx/gtk3/gtk3gtkdata.cxx +++ b/vcl/unx/gtk3/gtk3gtkdata.cxx @@ -375,7 +375,7 @@ bool GtkSalData::Yield( bool bWait, bool bHandleAllCurrentEvents ) if( bDispatchThread ) { int nMaxEvents = bHandleAllCurrentEvents ? 100 : 1; - gboolean wasOneEvent = TRUE; + bool wasOneEvent = TRUE; while( nMaxEvents-- && wasOneEvent ) { wasOneEvent = g_main_context_iteration( nullptr, bWait && !bWasEvent ); diff --git a/vcl/unx/gtk3/gtk3gtkframe.cxx b/vcl/unx/gtk3/gtk3gtkframe.cxx index deeaac3140cd..4c4005dc9a7c 100644 --- a/vcl/unx/gtk3/gtk3gtkframe.cxx +++ b/vcl/unx/gtk3/gtk3gtkframe.cxx @@ -490,7 +490,7 @@ static void hud_activated( gboolean hud_active, gpointer user_data ) } } -static gboolean ensure_dbus_setup( gpointer data ) +static bool ensure_dbus_setup( gpointer data ) { GtkSalFrame* pSalFrame = static_cast< GtkSalFrame* >( data ); GdkWindow* gdkWindow = widget_get_window( pSalFrame->getWindow() ); @@ -3429,7 +3429,7 @@ gboolean GtkDropTarget::signalDragDrop(GtkWidget* pWidget, GdkDragContext* conte { // remove the deferred dragExit, as we'll do a drop #ifndef NDEBUG - gboolean res = + bool res = #endif g_idle_remove_by_data(this); assert(res); @@ -3808,7 +3808,7 @@ bool GtkSalFrame::IMHandler::handleKeyEvent( GdkEventKey* pEvent ) if( aDel.isDeleted() ) return true; - gboolean bResult = gtk_im_context_filter_keypress( m_pIMContext, pEvent ); + bool bResult = gtk_im_context_filter_keypress( m_pIMContext, pEvent ); g_object_unref( pRef ); if( aDel.isDeleted() ) @@ -3839,7 +3839,7 @@ bool GtkSalFrame::IMHandler::handleKeyEvent( GdkEventKey* pEvent ) if (pEvent->type == GDK_KEY_RELEASE) { GObject* pRef = G_OBJECT( g_object_ref( G_OBJECT( m_pIMContext ) ) ); - gboolean bResult = gtk_im_context_filter_keypress( m_pIMContext, pEvent ); + bool bResult = gtk_im_context_filter_keypress( m_pIMContext, pEvent ); g_object_unref( pRef ); if( aDel.isDeleted() ) diff --git a/vcl/unx/gtk3/gtk3gtkinst.cxx b/vcl/unx/gtk3/gtk3gtkinst.cxx index 83c6bbaf9f63..f3ec6ddfb71e 100644 --- a/vcl/unx/gtk3/gtk3gtkinst.cxx +++ b/vcl/unx/gtk3/gtk3gtkinst.cxx @@ -2521,7 +2521,7 @@ public: { //for toplevel windows this is sadly futile under wayland, so we can't tell where a dialog is in order to allow //the document underneath to auto-scroll to place content in a visible location - gboolean ret = gtk_widget_translate_coordinates(m_pWidget, + bool ret = gtk_widget_translate_coordinates(m_pWidget, dynamic_cast<GtkInstanceWidget&>(rRelative).getWidget(), 0, 0, &x, &y); width = gtk_widget_get_allocated_width(m_pWidget); @@ -7385,7 +7385,7 @@ private: pThis->signal_activated(); } - gboolean signal_key_press(GdkEventKey* pEvent) + bool signal_key_press(GdkEventKey* pEvent) { if (pEvent->keyval == GDK_KEY_Return) { @@ -8101,7 +8101,7 @@ private: bool get_bool(int pos, int col) const { - gboolean bRet(false); + bool bRet(false); GtkTreeModel *pModel = GTK_TREE_MODEL(m_pTreeStore); GtkTreeIter iter; if (gtk_tree_model_iter_nth_child(pModel, &iter, nullptr, pos)) @@ -8358,7 +8358,7 @@ private: g_DragSource = nullptr; } - gboolean signal_key_press(GdkEventKey* pEvent) + bool signal_key_press(GdkEventKey* pEvent) { if (pEvent->keyval != GDK_KEY_Left && pEvent->keyval != GDK_KEY_Right) return false; @@ -9322,7 +9322,7 @@ public: GtkInstanceTreeIter& rGtkIter = static_cast<GtkInstanceTreeIter&>(rIter); GtkTreeModel *pModel = GTK_TREE_MODEL(m_pTreeStore); GtkTreeIter tmp; - gboolean ret = gtk_tree_model_iter_children(pModel, &tmp, &rGtkIter.iter); + bool ret = gtk_tree_model_iter_children(pModel, &tmp, &rGtkIter.iter); rGtkIter.iter = tmp; if (ret) { @@ -11094,7 +11094,7 @@ private: std::unique_ptr<comphelper::string::NaturalStringSorter> m_xSorter; vcl::QuickSelectionEngine m_aQuickSelectionEngine; std::vector<int> m_aSeparatorRows; - gboolean m_bPopupActive; + bool m_bPopupActive; bool m_bAutoComplete; bool m_bAutoCompleteCaseSensitive; gulong m_nToggleFocusInSignalId; @@ -11217,7 +11217,7 @@ private: m_aQuickSelectionEngine.Reset(); gboolean bIsShown(false); g_object_get(m_pComboBox, "popup-shown", &bIsShown, nullptr); - if (m_bPopupActive != bIsShown) + if (m_bPopupActive != bool(bIsShown)) { m_bPopupActive = bIsShown; ComboBox::signal_popup_toggled(); @@ -11965,7 +11965,7 @@ private: guint m_nAutoCompleteIdleId; bool m_bAutoCompleteCaseSensitive; - gboolean signal_key_press(GdkEventKey* pEvent) + bool signal_key_press(GdkEventKey* pEvent) { if (pEvent->keyval == GDK_KEY_KP_Up || pEvent->keyval == GDK_KEY_Up || pEvent->keyval == GDK_KEY_KP_Page_Up || pEvent->keyval == GDK_KEY_Page_Up || pEvent->keyval == GDK_KEY_KP_Down || pEvent->keyval == GDK_KEY_Down || pEvent->keyval == GDK_KEY_KP_Page_Down || pEvent->keyval == GDK_KEY_Page_Down) |