diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2019-10-06 09:17:48 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2019-10-06 12:05:28 +0200 |
| commit | ac87cfdf263d2abd97b32857534d0f749b7c4479 (patch) | |
| tree | 05fa0c8d1632d9ed1b2cf3669ddcfee0b395bf23 /vcl/unx | |
| parent | 6a789e617ed07bfddc516c8fc0cf94cd6dfe7250 (diff) | |
Replace SystemEnvData pToolkit/pPlatformName strings with enums
(and streamline those data members' names)
Change-Id: Ifdd596c7a54dd507045d412c30b463468c2f798b
Reviewed-on: https://gerrit.libreoffice.org/80313
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'vcl/unx')
| -rw-r--r-- | vcl/unx/gtk3/gtk3gtkframe.cxx | 6 | ||||
| -rw-r--r-- | vcl/unx/gtk3/gtk3gtkobject.cxx | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/vcl/unx/gtk3/gtk3gtkframe.cxx b/vcl/unx/gtk3/gtk3gtkframe.cxx index 164699768496..5eb9cfa951e3 100644 --- a/vcl/unx/gtk3/gtk3gtkframe.cxx +++ b/vcl/unx/gtk3/gtk3gtkframe.cxx @@ -968,14 +968,14 @@ void GtkSalFrame::InitCommon() m_aSystemData.pSalFrame = this; m_aSystemData.pWidget = m_pWindow; m_aSystemData.nScreen = m_nXScreen.getXScreen(); - m_aSystemData.pToolkit = "gtk3"; + m_aSystemData.toolkit = SystemEnvData::Toolkit::Gtk3; #if defined(GDK_WINDOWING_X11) GdkDisplay *pDisplay = getGdkDisplay(); if (DLSYM_GDK_IS_X11_DISPLAY(pDisplay)) { m_aSystemData.pDisplay = gdk_x11_display_get_xdisplay(pDisplay); - m_aSystemData.pPlatformName = "xcb"; + m_aSystemData.platform = SystemEnvData::Platform::Xcb; if (GTK_IS_WINDOW(m_pWindow)) { GdkScreen* pScreen = gtk_window_get_screen(GTK_WINDOW(m_pWindow)); @@ -988,7 +988,7 @@ void GtkSalFrame::InitCommon() if (DLSYM_GDK_IS_WAYLAND_DISPLAY(pDisplay)) { m_aSystemData.pDisplay = gdk_wayland_display_get_wl_display(pDisplay); - m_aSystemData.pPlatformName = "wayland"; + m_aSystemData.platform = SystemEnvData::Platform::Wayland; } #endif diff --git a/vcl/unx/gtk3/gtk3gtkobject.cxx b/vcl/unx/gtk3/gtk3gtkobject.cxx index a4c7fb5864dc..400f82ad47a3 100644 --- a/vcl/unx/gtk3/gtk3gtkobject.cxx +++ b/vcl/unx/gtk3/gtk3gtkobject.cxx @@ -53,7 +53,7 @@ GtkSalObject::GtkSalObject( GtkSalFrame* pParent, bool bShow ) m_aSystemData.pSalFrame = nullptr; m_aSystemData.pWidget = m_pSocket; m_aSystemData.nScreen = pParent->getXScreenNumber().getXScreen(); - m_aSystemData.pToolkit = "gtk3"; + m_aSystemData.toolkit = SystemEnvData::Toolkit::Gtk3; GdkScreen* pScreen = gtk_window_get_screen(GTK_WINDOW(pParent->getWindow())); GdkVisual* pVisual = gdk_screen_get_system_visual(pScreen); @@ -63,14 +63,14 @@ GtkSalObject::GtkSalObject( GtkSalFrame* pParent, bool bShow ) { m_aSystemData.pDisplay = gdk_x11_display_get_xdisplay(pDisplay); m_aSystemData.pVisual = gdk_x11_visual_get_xvisual(pVisual); - m_aSystemData.pPlatformName = "xcb"; + m_aSystemData.platform = SystemEnvData::Platform::Xcb; } #endif #if defined(GDK_WINDOWING_WAYLAND) if (DLSYM_GDK_IS_WAYLAND_DISPLAY(pDisplay)) { m_aSystemData.pDisplay = gdk_wayland_display_get_wl_display(pDisplay); - m_aSystemData.pPlatformName = "wayland"; + m_aSystemData.platform = SystemEnvData::Platform::Wayland; } #endif |