Hello community, here is the log from the commit of package kwayland for openSUSE:Leap:15.2 checked in at 2020-02-16 18:27:29 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Leap:15.2/kwayland (Old) and /work/SRC/openSUSE:Leap:15.2/.kwayland.new.26092 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kwayland" Sun Feb 16 18:27:29 2020 rev:66 rq:773951 version:5.67.0 Changes: -------- --- /work/SRC/openSUSE:Leap:15.2/kwayland/kwayland.changes 2020-01-19 15:49:34.825777119 +0100 +++ /work/SRC/openSUSE:Leap:15.2/.kwayland.new.26092/kwayland.changes 2020-02-16 18:28:22.446719686 +0100 @@ -1,0 +2,14 @@ +Sun Feb 2 18:07:13 UTC 2020 - Christophe Giboudeaux <[email protected]> + +- Replace %make_jobs with %cmake_build. + +------------------------------------------------------------------- +Sun Feb 2 14:33:01 UTC 2020 - Christophe Giboudeaux <[email protected]> + +- Update to 5.67.0 + * New feature release + * For more details please see: + * https://www.kde.org/announcements/kde-frameworks-5.67.0.php +- No code change since 5.66.0. + +------------------------------------------------------------------- Old: ---- kwayland-5.66.0.tar.xz kwayland-5.66.0.tar.xz.sig New: ---- kwayland-5.67.0.tar.xz kwayland-5.67.0.tar.xz.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kwayland.spec ++++++ --- /var/tmp/diff_new_pack.qR9Xch/_old 2020-02-16 18:28:22.826719885 +0100 +++ /var/tmp/diff_new_pack.qR9Xch/_new 2020-02-16 18:28:22.830719887 +0100 @@ -16,7 +16,7 @@ # -%define _tar_path 5.66 +%define _tar_path 5.67 # Full KF5 version (e.g. 5.33.0) %{!?_kf5_version: %global _kf5_version %{version}} # Last major and minor KF5 version (e.g. 5.33) @@ -24,7 +24,7 @@ # Only needed for the package signature condition %bcond_without lang Name: kwayland -Version: 5.66.0 +Version: 5.67.0 Release: 0 Summary: KDE Wayland library License: LGPL-2.1-or-later @@ -40,11 +40,11 @@ BuildRequires: extra-cmake-modules >= %{_kf5_bugfix_version} BuildRequires: fdupes BuildRequires: kf5-filesystem -BuildRequires: libQt5Gui-private-headers-devel >= 5.11.0 +BuildRequires: libQt5Gui-private-headers-devel >= 5.12.0 BuildRequires: pkgconfig -BuildRequires: cmake(Qt5Concurrent) >= 5.11.0 -BuildRequires: cmake(Qt5Gui) >= 5.11.0 -BuildRequires: cmake(Qt5Test) >= 5.11.0 +BuildRequires: cmake(Qt5Concurrent) >= 5.12.0 +BuildRequires: cmake(Qt5Gui) >= 5.12.0 +BuildRequires: cmake(Qt5Test) >= 5.12.0 BuildRequires: pkgconfig(egl) BuildRequires: pkgconfig(wayland-client) >= 1.15.0 BuildRequires: pkgconfig(wayland-protocols) @@ -63,7 +63,7 @@ Group: Development/Libraries/KDE Requires: %{name} = %{version} Requires: extra-cmake-modules >= %{_kf5_bugfix_version} -Requires: cmake(Qt5Gui) >= 5.11.0 +Requires: cmake(Qt5Gui) >= 5.12.0 %description devel KWayland provides a Qt-style Client and Server library wrapper for the Wayland libraries. @@ -73,7 +73,7 @@ %build %cmake_kf5 -d build - %make_jobs + %cmake_build %install %kf5_makeinstall -C build ++++++ kwayland-5.66.0.tar.xz -> kwayland-5.67.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwayland-5.66.0/CMakeLists.txt new/kwayland-5.67.0/CMakeLists.txt --- old/kwayland-5.66.0/CMakeLists.txt 2020-01-04 00:14:34.000000000 +0100 +++ new/kwayland-5.67.0/CMakeLists.txt 2020-02-01 10:07:30.000000000 +0100 @@ -1,11 +1,11 @@ cmake_minimum_required(VERSION 3.5) -set(KF5_VERSION "5.66.0") # handled by release scripts +set(KF5_VERSION "5.67.0") # handled by release scripts project(KWayland VERSION ${KF5_VERSION}) # ECM setup include(FeatureSummary) -find_package(ECM 5.66.0 NO_MODULE) +find_package(ECM 5.67.0 NO_MODULE) set_package_properties(ECM PROPERTIES TYPE REQUIRED DESCRIPTION "Extra CMake Modules." URL "https://commits.kde.org/extra-cmake-modules";) feature_summary(WHAT REQUIRED_PACKAGES_NOT_FOUND FATAL_ON_MISSING_REQUIRED_PACKAGES) set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${CMAKE_SOURCE_DIR}/cmake/Modules) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwayland-5.66.0/cmake/Modules/FindWaylandProtocols.cmake new/kwayland-5.67.0/cmake/Modules/FindWaylandProtocols.cmake --- old/kwayland-5.66.0/cmake/Modules/FindWaylandProtocols.cmake 2020-01-04 00:14:34.000000000 +0100 +++ new/kwayland-5.67.0/cmake/Modules/FindWaylandProtocols.cmake 2020-02-01 10:07:30.000000000 +0100 @@ -14,7 +14,7 @@ # The wayland protocols data directory #============================================================================= -# Copyright 2019 Vlad Zagorodniy <[email protected]> +# Copyright 2019 Vlad Zahorodnii <[email protected]> # # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwayland-5.66.0/src/client/buffer.cpp new/kwayland-5.67.0/src/client/buffer.cpp --- old/kwayland-5.66.0/src/client/buffer.cpp 2020-01-04 00:14:34.000000000 +0100 +++ new/kwayland-5.67.0/src/client/buffer.cpp 2020-02-01 10:07:30.000000000 +0100 @@ -30,7 +30,7 @@ namespace Client { -#ifndef DOXYGEN_SHOULD_SKIP_THIS +#ifndef K_DOXYGEN const struct wl_buffer_listener Buffer::Private::s_listener = { Buffer::Private::releasedCallback }; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwayland-5.66.0/src/client/dataoffer.cpp new/kwayland-5.67.0/src/client/dataoffer.cpp --- old/kwayland-5.66.0/src/client/dataoffer.cpp 2020-01-04 00:14:34.000000000 +0100 +++ new/kwayland-5.67.0/src/client/dataoffer.cpp 2020-02-01 10:07:30.000000000 +0100 @@ -52,7 +52,7 @@ static const struct wl_data_offer_listener s_listener; }; -#ifndef DOXYGEN_SHOULD_SKIP_THIS +#ifndef K_DOXYGEN const struct wl_data_offer_listener DataOffer::Private::s_listener = { offerCallback, sourceActionsCallback, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwayland-5.66.0/src/client/dpms.cpp new/kwayland-5.67.0/src/client/dpms.cpp --- old/kwayland-5.66.0/src/client/dpms.cpp 2020-01-04 00:14:34.000000000 +0100 +++ new/kwayland-5.67.0/src/client/dpms.cpp 2020-02-01 10:07:30.000000000 +0100 @@ -131,7 +131,7 @@ }; -#ifndef DOXYGEN_SHOULD_SKIP_THIS +#ifndef K_DOXYGEN const org_kde_kwin_dpms_listener Dpms::Private::s_listener = { supportedCallback, modeCallback, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwayland-5.66.0/src/client/registry.cpp new/kwayland-5.67.0/src/client/registry.cpp --- old/kwayland-5.66.0/src/client/registry.cpp 2020-01-04 00:14:34.000000000 +0100 +++ new/kwayland-5.67.0/src/client/registry.cpp 2020-02-01 10:07:30.000000000 +0100 @@ -514,7 +514,7 @@ return d->queue; } -#ifndef DOXYGEN_SHOULD_SKIP_THIS +#ifndef K_DOXYGEN const struct wl_registry_listener Registry::Private::s_registryListener = { globalAnnounce, globalRemove diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwayland-5.66.0/src/client/remote_access.cpp new/kwayland-5.67.0/src/client/remote_access.cpp --- old/kwayland-5.66.0/src/client/remote_access.cpp 2020-01-04 00:14:34.000000000 +0100 +++ new/kwayland-5.67.0/src/client/remote_access.cpp 2020-02-01 10:07:30.000000000 +0100 @@ -162,7 +162,7 @@ emit p->q->parametersObtained(); } -#ifndef DOXYGEN_SHOULD_SKIP_THIS +#ifndef K_DOXYGEN org_kde_kwin_remote_buffer_listener RemoteBuffer::Private::s_listener = { paramsCallback }; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwayland-5.66.0/src/client/server_decoration.cpp new/kwayland-5.67.0/src/client/server_decoration.cpp --- old/kwayland-5.66.0/src/client/server_decoration.cpp 2020-01-04 00:14:34.000000000 +0100 +++ new/kwayland-5.67.0/src/client/server_decoration.cpp 2020-02-01 10:07:30.000000000 +0100 @@ -67,7 +67,7 @@ ServerSideDecoration *q; }; -#ifndef DOXYGEN_SHOULD_SKIP_THIS +#ifndef K_DOXYGEN const org_kde_kwin_server_decoration_manager_listener ServerSideDecorationManager::Private::s_listener = { defaultModeCallback }; @@ -178,7 +178,7 @@ return deco; } -#ifndef DOXYGEN_SHOULD_SKIP_THIS +#ifndef K_DOXYGEN const org_kde_kwin_server_decoration_listener ServerSideDecoration::Private::s_listener = { modeCallback }; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwayland-5.66.0/src/client/shadow.cpp new/kwayland-5.67.0/src/client/shadow.cpp --- old/kwayland-5.66.0/src/client/shadow.cpp 2020-01-04 00:14:34.000000000 +0100 +++ new/kwayland-5.67.0/src/client/shadow.cpp 2020-02-01 10:07:30.000000000 +0100 @@ -166,7 +166,7 @@ org_kde_kwin_shadow_commit(d->shadow); } -#ifndef DOXYGEN_SHOULD_SKIP_THIS +#ifndef K_DOXYGEN #define attach( __PART__, __WAYLAND_PART__ ) \ void Shadow::attach##__PART__(wl_buffer *buffer) \ { \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwayland-5.66.0/src/client/shell.cpp new/kwayland-5.67.0/src/client/shell.cpp --- old/kwayland-5.66.0/src/client/shell.cpp 2020-01-04 00:14:34.000000000 +0100 +++ new/kwayland-5.67.0/src/client/shell.cpp 2020-02-01 10:07:30.000000000 +0100 @@ -234,7 +234,7 @@ d->surface.destroy(); } -#ifndef DOXYGEN_SHOULD_SKIP_THIS +#ifndef K_DOXYGEN const struct wl_shell_surface_listener ShellSurface::Private::s_listener = { pingCallback, configureCallback, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwayland-5.66.0/src/client/surface.cpp new/kwayland-5.67.0/src/client/surface.cpp --- old/kwayland-5.66.0/src/client/surface.cpp 2020-01-04 00:14:34.000000000 +0100 +++ new/kwayland-5.67.0/src/client/surface.cpp 2020-02-01 10:07:30.000000000 +0100 @@ -161,7 +161,7 @@ emit q->frameRendered(); } -#ifndef DOXYGEN_SHOULD_SKIP_THIS +#ifndef K_DOXYGEN const struct wl_callback_listener Surface::Private::s_listener = { frameCallback }; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwayland-5.66.0/src/server/appmenu_interface.cpp new/kwayland-5.67.0/src/server/appmenu_interface.cpp --- old/kwayland-5.66.0/src/server/appmenu_interface.cpp 2020-01-04 00:14:34.000000000 +0100 +++ new/kwayland-5.67.0/src/server/appmenu_interface.cpp 2020-02-01 10:07:30.000000000 +0100 @@ -55,7 +55,7 @@ const quint32 AppMenuManagerInterface::Private::s_version = 1; -#ifndef DOXYGEN_SHOULD_SKIP_THIS +#ifndef K_DOXYGEN const struct org_kde_kwin_appmenu_manager_interface AppMenuManagerInterface::Private::s_interface = { createCallback }; @@ -127,7 +127,7 @@ static const struct org_kde_kwin_appmenu_interface s_interface; }; -#ifndef DOXYGEN_SHOULD_SKIP_THIS +#ifndef K_DOXYGEN const struct org_kde_kwin_appmenu_interface AppMenuInterface::Private::s_interface = { setAddressCallback, resourceDestroyedCallback diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwayland-5.66.0/src/server/blur_interface.cpp new/kwayland-5.67.0/src/server/blur_interface.cpp --- old/kwayland-5.66.0/src/server/blur_interface.cpp 2020-01-04 00:14:34.000000000 +0100 +++ new/kwayland-5.67.0/src/server/blur_interface.cpp 2020-02-01 10:07:30.000000000 +0100 @@ -59,7 +59,7 @@ const quint32 BlurManagerInterface::Private::s_version = 1; -#ifndef DOXYGEN_SHOULD_SKIP_THIS +#ifndef K_DOXYGEN const struct org_kde_kwin_blur_manager_interface BlurManagerInterface::Private::s_interface = { createCallback, unsetCallback @@ -155,7 +155,7 @@ static const struct org_kde_kwin_blur_interface s_interface; }; -#ifndef DOXYGEN_SHOULD_SKIP_THIS +#ifndef K_DOXYGEN const struct org_kde_kwin_blur_interface BlurInterface::Private::s_interface = { commitCallback, setRegionCallback, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwayland-5.66.0/src/server/compositor_interface.cpp new/kwayland-5.67.0/src/server/compositor_interface.cpp --- old/kwayland-5.66.0/src/server/compositor_interface.cpp 2020-01-04 00:14:34.000000000 +0100 +++ new/kwayland-5.67.0/src/server/compositor_interface.cpp 2020-02-01 10:07:30.000000000 +0100 @@ -59,7 +59,7 @@ { } -#ifndef DOXYGEN_SHOULD_SKIP_THIS +#ifndef K_DOXYGEN const struct wl_compositor_interface CompositorInterface::Private::s_interface = { createSurfaceCallback, createRegionCallback diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwayland-5.66.0/src/server/contrast_interface.cpp new/kwayland-5.67.0/src/server/contrast_interface.cpp --- old/kwayland-5.66.0/src/server/contrast_interface.cpp 2020-01-04 00:14:34.000000000 +0100 +++ new/kwayland-5.67.0/src/server/contrast_interface.cpp 2020-02-01 10:07:30.000000000 +0100 @@ -60,7 +60,7 @@ const quint32 ContrastManagerInterface::Private::s_version = 1; -#ifndef DOXYGEN_SHOULD_SKIP_THIS +#ifndef K_DOXYGEN const struct org_kde_kwin_contrast_manager_interface ContrastManagerInterface::Private::s_interface = { createCallback, unsetCallback @@ -165,7 +165,7 @@ static const struct org_kde_kwin_contrast_interface s_interface; }; -#ifndef DOXYGEN_SHOULD_SKIP_THIS +#ifndef K_DOXYGEN const struct org_kde_kwin_contrast_interface ContrastInterface::Private::s_interface = { commitCallback, setRegionCallback, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwayland-5.66.0/src/server/datadevice_interface.cpp new/kwayland-5.67.0/src/server/datadevice_interface.cpp --- old/kwayland-5.66.0/src/server/datadevice_interface.cpp 2020-01-04 00:14:34.000000000 +0100 +++ new/kwayland-5.67.0/src/server/datadevice_interface.cpp 2020-02-01 10:07:30.000000000 +0100 @@ -75,7 +75,7 @@ static const struct wl_data_device_interface s_interface; }; -#ifndef DOXYGEN_SHOULD_SKIP_THIS +#ifndef K_DOXYGEN const struct wl_data_device_interface DataDeviceInterface::Private::s_interface = { startDragCallback, setSelectionCallback, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwayland-5.66.0/src/server/datadevicemanager_interface.cpp new/kwayland-5.67.0/src/server/datadevicemanager_interface.cpp --- old/kwayland-5.66.0/src/server/datadevicemanager_interface.cpp 2020-01-04 00:14:34.000000000 +0100 +++ new/kwayland-5.67.0/src/server/datadevicemanager_interface.cpp 2020-02-01 10:07:30.000000000 +0100 @@ -58,7 +58,7 @@ const qint32 DataDeviceManagerInterface::Private::s_dataDeviceVersion = 3; const qint32 DataDeviceManagerInterface::Private::s_dataSourceVersion = 3; -#ifndef DOXYGEN_SHOULD_SKIP_THIS +#ifndef K_DOXYGEN const struct wl_data_device_manager_interface DataDeviceManagerInterface::Private::s_interface = { createDataSourceCallback, getDataDeviceCallback diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwayland-5.66.0/src/server/dataoffer_interface.cpp new/kwayland-5.67.0/src/server/dataoffer_interface.cpp --- old/kwayland-5.66.0/src/server/dataoffer_interface.cpp 2020-01-04 00:14:34.000000000 +0100 +++ new/kwayland-5.67.0/src/server/dataoffer_interface.cpp 2020-02-01 10:07:30.000000000 +0100 @@ -32,7 +32,7 @@ namespace Server { -#ifndef DOXYGEN_SHOULD_SKIP_THIS +#ifndef K_DOXYGEN const struct wl_data_offer_interface DataOfferInterface::Private::s_interface = { acceptCallback, receiveCallback, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwayland-5.66.0/src/server/datasource_interface.cpp new/kwayland-5.67.0/src/server/datasource_interface.cpp --- old/kwayland-5.66.0/src/server/datasource_interface.cpp 2020-01-04 00:14:34.000000000 +0100 +++ new/kwayland-5.67.0/src/server/datasource_interface.cpp 2020-02-01 10:07:30.000000000 +0100 @@ -54,7 +54,7 @@ const static struct wl_data_source_interface s_interface; }; -#ifndef DOXYGEN_SHOULD_SKIP_THIS +#ifndef K_DOXYGEN const struct wl_data_source_interface DataSourceInterface::Private::s_interface = { offerCallback, resourceDestroyedCallback, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwayland-5.66.0/src/server/dpms_interface.cpp new/kwayland-5.67.0/src/server/dpms_interface.cpp --- old/kwayland-5.66.0/src/server/dpms_interface.cpp 2020-01-04 00:14:34.000000000 +0100 +++ new/kwayland-5.67.0/src/server/dpms_interface.cpp 2020-02-01 10:07:30.000000000 +0100 @@ -28,7 +28,7 @@ const quint32 DpmsManagerInterface::Private::s_version = 1; -#ifndef DOXYGEN_SHOULD_SKIP_THIS +#ifndef K_DOXYGEN const struct org_kde_kwin_dpms_manager_interface DpmsManagerInterface::Private::s_interface = { getDpmsCallback }; @@ -75,7 +75,7 @@ DpmsManagerInterface::~DpmsManagerInterface() = default; -#ifndef DOXYGEN_SHOULD_SKIP_THIS +#ifndef K_DOXYGEN const struct org_kde_kwin_dpms_interface DpmsInterface::Private::s_interface = { setCallback, resourceDestroyedCallback diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwayland-5.66.0/src/server/eglstream_controller_interface.cpp new/kwayland-5.67.0/src/server/eglstream_controller_interface.cpp --- old/kwayland-5.66.0/src/server/eglstream_controller_interface.cpp 2020-01-04 00:14:34.000000000 +0100 +++ new/kwayland-5.67.0/src/server/eglstream_controller_interface.cpp 2020-02-01 10:07:30.000000000 +0100 @@ -32,7 +32,7 @@ const quint32 EglStreamControllerInterface::Private::s_version = 1; -#ifndef DOXYGEN_SHOULD_SKIP_THIS +#ifndef K_DOXYGEN const struct wl_eglstream_controller_interface EglStreamControllerInterface::Private::s_interface = { attachStreamConsumer, attachStreamConsumerAttribs diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwayland-5.66.0/src/server/fakeinput_interface.cpp new/kwayland-5.67.0/src/server/fakeinput_interface.cpp --- old/kwayland-5.66.0/src/server/fakeinput_interface.cpp 2020-01-04 00:14:34.000000000 +0100 +++ new/kwayland-5.67.0/src/server/fakeinput_interface.cpp 2020-02-01 10:07:30.000000000 +0100 @@ -79,7 +79,7 @@ const quint32 FakeInputInterface::Private::s_version = 4; QList<quint32> FakeInputInterface::Private::touchIds = QList<quint32>(); -#ifndef DOXYGEN_SHOULD_SKIP_THIS +#ifndef K_DOXYGEN const struct org_kde_kwin_fake_input_interface FakeInputInterface::Private::s_interface = { authenticateCallback, pointerMotionCallback, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwayland-5.66.0/src/server/idle_interface.cpp new/kwayland-5.67.0/src/server/idle_interface.cpp --- old/kwayland-5.66.0/src/server/idle_interface.cpp 2020-01-04 00:14:34.000000000 +0100 +++ new/kwayland-5.67.0/src/server/idle_interface.cpp 2020-02-01 10:07:30.000000000 +0100 @@ -78,7 +78,7 @@ const quint32 IdleInterface::Private::s_version = 1; -#ifndef DOXYGEN_SHOULD_SKIP_THIS +#ifndef K_DOXYGEN const struct org_kde_kwin_idle_interface IdleInterface::Private::s_interface = { getIdleTimeoutCallback }; @@ -170,7 +170,7 @@ return reinterpret_cast<Private*>(d.data()); } -#ifndef DOXYGEN_SHOULD_SKIP_THIS +#ifndef K_DOXYGEN const struct org_kde_kwin_idle_timeout_interface IdleTimeoutInterface::Private::s_interface = { resourceDestroyedCallback, simulateUserActivityCallback diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwayland-5.66.0/src/server/idleinhibit_interface_v1.cpp new/kwayland-5.67.0/src/server/idleinhibit_interface_v1.cpp --- old/kwayland-5.66.0/src/server/idleinhibit_interface_v1.cpp 2020-01-04 00:14:34.000000000 +0100 +++ new/kwayland-5.67.0/src/server/idleinhibit_interface_v1.cpp 2020-02-01 10:07:30.000000000 +0100 @@ -48,7 +48,7 @@ const quint32 IdleInhibitManagerUnstableV1Interface::Private::s_version = 1; -#ifndef DOXYGEN_SHOULD_SKIP_THIS +#ifndef K_DOXYGEN const struct zwp_idle_inhibit_manager_v1_interface IdleInhibitManagerUnstableV1Interface::Private::s_interface = { destroyCallback, createInhibitorCallback @@ -104,7 +104,7 @@ IdleInhibitManagerUnstableV1Interface::~IdleInhibitManagerUnstableV1Interface() = default; -#ifndef DOXYGEN_SHOULD_SKIP_THIS +#ifndef K_DOXYGEN const struct zwp_idle_inhibitor_v1_interface IdleInhibitorInterface::Private::s_interface = { resourceDestroyedCallback }; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwayland-5.66.0/src/server/keyboard_interface.cpp new/kwayland-5.67.0/src/server/keyboard_interface.cpp --- old/kwayland-5.66.0/src/server/keyboard_interface.cpp 2020-01-04 00:14:34.000000000 +0100 +++ new/kwayland-5.67.0/src/server/keyboard_interface.cpp 2020-02-01 10:07:30.000000000 +0100 @@ -71,7 +71,7 @@ sendModifiers(); } -#ifndef DOXYGEN_SHOULD_SKIP_THIS +#ifndef K_DOXYGEN const struct wl_keyboard_interface KeyboardInterface::Private::s_interface { resourceDestroyedCallback }; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwayland-5.66.0/src/server/linuxdmabuf_v1_interface.cpp new/kwayland-5.67.0/src/server/linuxdmabuf_v1_interface.cpp --- old/kwayland-5.66.0/src/server/linuxdmabuf_v1_interface.cpp 2020-01-04 00:14:34.000000000 +0100 +++ new/kwayland-5.67.0/src/server/linuxdmabuf_v1_interface.cpp 2020-02-01 10:07:30.000000000 +0100 @@ -174,7 +174,7 @@ params->create(client, new_id, QSize(width, height), format, flags); } -#ifndef DOXYGEN_SHOULD_SKIP_THIS +#ifndef K_DOXYGEN const struct zwp_linux_dmabuf_v1_interface V1Iface::Private::s_implementation = { [](wl_client *, wl_resource *resource) { wl_resource_destroy(resource); }, // unbind createParamsCallback @@ -184,7 +184,7 @@ [](wl_client *, wl_resource *resource) { wl_resource_destroy(resource); } // destroy }; -#ifndef DOXYGEN_SHOULD_SKIP_THIS +#ifndef K_DOXYGEN const struct zwp_linux_buffer_params_v1_interface V1Iface::Private::Params::s_interface = { destroy, add, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwayland-5.66.0/src/server/output_interface.cpp new/kwayland-5.67.0/src/server/output_interface.cpp --- old/kwayland-5.66.0/src/server/output_interface.cpp 2020-01-04 00:14:34.000000000 +0100 +++ new/kwayland-5.67.0/src/server/output_interface.cpp 2020-02-01 10:07:30.000000000 +0100 @@ -91,7 +91,7 @@ s_privates.removeAll(this); } -#ifndef DOXYGEN_SHOULD_SKIP_THIS +#ifndef K_DOXYGEN const struct wl_output_interface OutputInterface::Private::s_interface = { releaseCallback }; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwayland-5.66.0/src/server/plasmashell_interface.cpp new/kwayland-5.67.0/src/server/plasmashell_interface.cpp --- old/kwayland-5.66.0/src/server/plasmashell_interface.cpp 2020-01-04 00:14:34.000000000 +0100 +++ new/kwayland-5.67.0/src/server/plasmashell_interface.cpp 2020-02-01 10:07:30.000000000 +0100 @@ -58,7 +58,7 @@ { } -#ifndef DOXYGEN_SHOULD_SKIP_THIS +#ifndef K_DOXYGEN const struct org_kde_plasma_shell_interface PlasmaShellInterface::Private::s_interface = { createSurfaceCallback }; @@ -157,7 +157,7 @@ { } -#ifndef DOXYGEN_SHOULD_SKIP_THIS +#ifndef K_DOXYGEN const struct org_kde_plasma_surface_interface PlasmaShellSurfaceInterface::Private::s_interface = { resourceDestroyedCallback, setOutputCallback, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwayland-5.66.0/src/server/plasmavirtualdesktop_interface.cpp new/kwayland-5.67.0/src/server/plasmavirtualdesktop_interface.cpp --- old/kwayland-5.66.0/src/server/plasmavirtualdesktop_interface.cpp 2020-01-04 00:14:34.000000000 +0100 +++ new/kwayland-5.67.0/src/server/plasmavirtualdesktop_interface.cpp 2020-02-01 10:07:30.000000000 +0100 @@ -93,7 +93,7 @@ const quint32 PlasmaVirtualDesktopManagementInterface::Private::s_version = 2; -#ifndef DOXYGEN_SHOULD_SKIP_THIS +#ifndef K_DOXYGEN const struct org_kde_plasma_virtual_desktop_management_interface PlasmaVirtualDesktopManagementInterface::Private::s_interface = { getVirtualDesktopCallback, requestCreateVirtualDesktopCallback, @@ -289,7 +289,7 @@ //// PlasmaVirtualDesktopInterface -#ifndef DOXYGEN_SHOULD_SKIP_THIS +#ifndef K_DOXYGEN const struct org_kde_plasma_virtual_desktop_interface PlasmaVirtualDesktopInterface::Private::s_interface = { requestActivateCallback }; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwayland-5.66.0/src/server/plasmawindowmanagement_interface.cpp new/kwayland-5.67.0/src/server/plasmawindowmanagement_interface.cpp --- old/kwayland-5.66.0/src/server/plasmawindowmanagement_interface.cpp 2020-01-04 00:14:34.000000000 +0100 +++ new/kwayland-5.67.0/src/server/plasmawindowmanagement_interface.cpp 2020-02-01 10:07:30.000000000 +0100 @@ -133,7 +133,7 @@ { } -#ifndef DOXYGEN_SHOULD_SKIP_THIS +#ifndef K_DOXYGEN const struct org_kde_plasma_window_management_interface PlasmaWindowManagementInterface::Private::s_interface = { showDesktopCallback, getWindowCallback @@ -293,7 +293,7 @@ return d->plasmaVirtualDesktopManagementInterface; } -#ifndef DOXYGEN_SHOULD_SKIP_THIS +#ifndef K_DOXYGEN const struct org_kde_plasma_window_interface PlasmaWindowInterface::Private::s_interface = { setStateCallback, setVirtualDesktopCallback, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwayland-5.66.0/src/server/pointer_interface.cpp new/kwayland-5.67.0/src/server/pointer_interface.cpp --- old/kwayland-5.66.0/src/server/pointer_interface.cpp 2020-01-04 00:14:34.000000000 +0100 +++ new/kwayland-5.67.0/src/server/pointer_interface.cpp 2020-02-01 10:07:30.000000000 +0100 @@ -220,7 +220,7 @@ wl_pointer_send_frame(resource); } -#ifndef DOXYGEN_SHOULD_SKIP_THIS +#ifndef K_DOXYGEN const struct wl_pointer_interface PointerInterface::Private::s_interface = { setCursorCallback, resourceDestroyedCallback diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwayland-5.66.0/src/server/pointerconstraints_interface_v1.cpp new/kwayland-5.67.0/src/server/pointerconstraints_interface_v1.cpp --- old/kwayland-5.66.0/src/server/pointerconstraints_interface_v1.cpp 2020-01-04 00:14:34.000000000 +0100 +++ new/kwayland-5.67.0/src/server/pointerconstraints_interface_v1.cpp 2020-02-01 10:07:30.000000000 +0100 @@ -76,7 +76,7 @@ const quint32 PointerConstraintsUnstableV1Interface::Private::s_version = 1; -#ifndef DOXYGEN_SHOULD_SKIP_THIS +#ifndef K_DOXYGEN const struct zwp_pointer_constraints_v1_interface PointerConstraintsUnstableV1Interface::Private::s_interface = { destroyCallback, lockPointerCallback, @@ -160,7 +160,7 @@ PointerConstraintsUnstableV1Interface::~PointerConstraintsUnstableV1Interface() = default; -#ifndef DOXYGEN_SHOULD_SKIP_THIS +#ifndef K_DOXYGEN const struct zwp_locked_pointer_v1_interface LockedPointerUnstableV1Interface::Private::s_interface = { resourceDestroyedCallback, setCursorPositionHintCallback, @@ -234,7 +234,7 @@ static const struct zwp_confined_pointer_v1_interface s_interface; }; -#ifndef DOXYGEN_SHOULD_SKIP_THIS +#ifndef K_DOXYGEN const struct zwp_confined_pointer_v1_interface ConfinedPointerUnstableV1Interface::Private::s_interface = { resourceDestroyedCallback, setRegionCallback diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwayland-5.66.0/src/server/pointergestures_interface_v1.cpp new/kwayland-5.67.0/src/server/pointergestures_interface_v1.cpp --- old/kwayland-5.66.0/src/server/pointergestures_interface_v1.cpp 2020-01-04 00:14:34.000000000 +0100 +++ new/kwayland-5.67.0/src/server/pointergestures_interface_v1.cpp 2020-02-01 10:07:30.000000000 +0100 @@ -54,7 +54,7 @@ const quint32 PointerGesturesUnstableV1Interface::Private::s_version = 1; -#ifndef DOXYGEN_SHOULD_SKIP_THIS +#ifndef K_DOXYGEN const struct zwp_pointer_gestures_v1_interface PointerGesturesUnstableV1Interface::Private::s_interface = { getSwipeGestureCallback, getPinchGestureCallback @@ -135,7 +135,7 @@ static const struct zwp_pointer_gesture_swipe_v1_interface s_interface; }; -#ifndef DOXYGEN_SHOULD_SKIP_THIS +#ifndef K_DOXYGEN const struct zwp_pointer_gesture_swipe_v1_interface PointerSwipeGestureUnstableV1Interface::Private::s_interface = { resourceDestroyedCallback }; @@ -222,7 +222,7 @@ static const struct zwp_pointer_gesture_pinch_v1_interface s_interface; }; -#ifndef DOXYGEN_SHOULD_SKIP_THIS +#ifndef K_DOXYGEN const struct zwp_pointer_gesture_pinch_v1_interface PointerPinchGestureUnstableV1Interface::Private::s_interface = { resourceDestroyedCallback }; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwayland-5.66.0/src/server/qtsurfaceextension_interface.cpp new/kwayland-5.67.0/src/server/qtsurfaceextension_interface.cpp --- old/kwayland-5.66.0/src/server/qtsurfaceextension_interface.cpp 2020-01-04 00:14:34.000000000 +0100 +++ new/kwayland-5.67.0/src/server/qtsurfaceextension_interface.cpp 2020-02-01 10:07:30.000000000 +0100 @@ -59,7 +59,7 @@ { } -#ifndef DOXYGEN_SHOULD_SKIP_THIS +#ifndef K_DOXYGEN const struct qt_surface_extension_interface QtSurfaceExtensionInterface::Private::s_interface = { createSurfaceCallback }; @@ -143,7 +143,7 @@ { } -#ifndef DOXYGEN_SHOULD_SKIP_THIS +#ifndef K_DOXYGEN const struct qt_extended_surface_interface QtExtendedSurfaceInterface::Private::s_interface = { updateGenericPropertyCallback, setContentOrientationMaskCallback, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwayland-5.66.0/src/server/region_interface.cpp new/kwayland-5.67.0/src/server/region_interface.cpp --- old/kwayland-5.66.0/src/server/region_interface.cpp 2020-01-04 00:14:34.000000000 +0100 +++ new/kwayland-5.67.0/src/server/region_interface.cpp 2020-02-01 10:07:30.000000000 +0100 @@ -48,7 +48,7 @@ static const struct wl_region_interface s_interface; }; -#ifndef DOXYGEN_SHOULD_SKIP_THIS +#ifndef K_DOXYGEN const struct wl_region_interface RegionInterface::Private::s_interface = { resourceDestroyedCallback, addCallback, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwayland-5.66.0/src/server/relativepointer_interface_v1.cpp new/kwayland-5.67.0/src/server/relativepointer_interface_v1.cpp --- old/kwayland-5.66.0/src/server/relativepointer_interface_v1.cpp 2020-01-04 00:14:34.000000000 +0100 +++ new/kwayland-5.67.0/src/server/relativepointer_interface_v1.cpp 2020-02-01 10:07:30.000000000 +0100 @@ -52,7 +52,7 @@ const quint32 RelativePointerManagerUnstableV1Interface::Private::s_version = 1; -#ifndef DOXYGEN_SHOULD_SKIP_THIS +#ifndef K_DOXYGEN const struct zwp_relative_pointer_manager_v1_interface RelativePointerManagerUnstableV1Interface::Private::s_interface = { destroyCallback, getRelativePointerCallback @@ -124,7 +124,7 @@ static const struct zwp_relative_pointer_v1_interface s_interface; }; -#ifndef DOXYGEN_SHOULD_SKIP_THIS +#ifndef K_DOXYGEN const struct zwp_relative_pointer_v1_interface RelativePointerUnstableV1Interface::Private::s_interface = { resourceDestroyedCallback }; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwayland-5.66.0/src/server/remote_access_interface.cpp new/kwayland-5.67.0/src/server/remote_access_interface.cpp --- old/kwayland-5.66.0/src/server/remote_access_interface.cpp 2020-01-04 00:14:34.000000000 +0100 +++ new/kwayland-5.67.0/src/server/remote_access_interface.cpp 2020-02-01 10:07:30.000000000 +0100 @@ -220,7 +220,7 @@ sentBuffers[buf->fd()] = holder; } -#ifndef DOXYGEN_SHOULD_SKIP_THIS +#ifndef K_DOXYGEN const struct org_kde_kwin_remote_access_manager_interface RemoteAccessManagerInterface::Private::s_interface = { getBufferCallback, releaseCallback @@ -344,7 +344,7 @@ const BufferHandle *wrapped; }; -#ifndef DOXYGEN_SHOULD_SKIP_THIS +#ifndef K_DOXYGEN const struct org_kde_kwin_remote_buffer_interface RemoteBufferInterface::Private::s_interface = { resourceDestroyedCallback }; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwayland-5.66.0/src/server/seat_interface.cpp new/kwayland-5.67.0/src/server/seat_interface.cpp --- old/kwayland-5.66.0/src/server/seat_interface.cpp 2020-01-04 00:14:34.000000000 +0100 +++ new/kwayland-5.67.0/src/server/seat_interface.cpp 2020-02-01 10:07:30.000000000 +0100 @@ -57,7 +57,7 @@ { } -#ifndef DOXYGEN_SHOULD_SKIP_THIS +#ifndef K_DOXYGEN const struct wl_seat_interface SeatInterface::Private::s_interface = { getPointerCallback, getKeyboardCallback, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwayland-5.66.0/src/server/server_decoration_interface.cpp new/kwayland-5.67.0/src/server/server_decoration_interface.cpp --- old/kwayland-5.66.0/src/server/server_decoration_interface.cpp 2020-01-04 00:14:34.000000000 +0100 +++ new/kwayland-5.67.0/src/server/server_decoration_interface.cpp 2020-02-01 10:07:30.000000000 +0100 @@ -60,7 +60,7 @@ const quint32 ServerSideDecorationManagerInterface::Private::s_version = 1; -#ifndef DOXYGEN_SHOULD_SKIP_THIS +#ifndef K_DOXYGEN const struct org_kde_kwin_server_decoration_manager_interface ServerSideDecorationManagerInterface::Private::s_interface = { createCallback }; @@ -185,7 +185,7 @@ static QVector<Private*> s_all; }; -#ifndef DOXYGEN_SHOULD_SKIP_THIS +#ifndef K_DOXYGEN const struct org_kde_kwin_server_decoration_interface ServerSideDecorationInterface::Private::s_interface = { resourceDestroyedCallback, requestModeCallback diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwayland-5.66.0/src/server/server_decoration_palette_interface.cpp new/kwayland-5.67.0/src/server/server_decoration_palette_interface.cpp --- old/kwayland-5.66.0/src/server/server_decoration_palette_interface.cpp 2020-01-04 00:14:34.000000000 +0100 +++ new/kwayland-5.67.0/src/server/server_decoration_palette_interface.cpp 2020-02-01 10:07:30.000000000 +0100 @@ -55,7 +55,7 @@ const quint32 ServerSideDecorationPaletteManagerInterface::Private::s_version = 1; -#ifndef DOXYGEN_SHOULD_SKIP_THIS +#ifndef K_DOXYGEN const struct org_kde_kwin_server_decoration_palette_manager_interface ServerSideDecorationPaletteManagerInterface::Private::s_interface = { createCallback }; @@ -127,7 +127,7 @@ static const struct org_kde_kwin_server_decoration_palette_interface s_interface; }; -#ifndef DOXYGEN_SHOULD_SKIP_THIS +#ifndef K_DOXYGEN const struct org_kde_kwin_server_decoration_palette_interface ServerSideDecorationPaletteInterface::Private::s_interface = { setPaletteCallback, resourceDestroyedCallback diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwayland-5.66.0/src/server/shadow_interface.cpp new/kwayland-5.67.0/src/server/shadow_interface.cpp --- old/kwayland-5.66.0/src/server/shadow_interface.cpp 2020-01-04 00:14:34.000000000 +0100 +++ new/kwayland-5.67.0/src/server/shadow_interface.cpp 2020-02-01 10:07:30.000000000 +0100 @@ -56,7 +56,7 @@ const quint32 ShadowManagerInterface::Private::s_version = 2; -#ifndef DOXYGEN_SHOULD_SKIP_THIS +#ifndef K_DOXYGEN const struct org_kde_kwin_shadow_manager_interface ShadowManagerInterface::Private::s_interface = { createCallback, unsetCallback, @@ -191,7 +191,7 @@ static const struct org_kde_kwin_shadow_interface s_interface; }; -#ifndef DOXYGEN_SHOULD_SKIP_THIS +#ifndef K_DOXYGEN const struct org_kde_kwin_shadow_interface ShadowInterface::Private::s_interface = { commitCallback, attachLeftCallback, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwayland-5.66.0/src/server/shell_interface.cpp new/kwayland-5.67.0/src/server/shell_interface.cpp --- old/kwayland-5.66.0/src/server/shell_interface.cpp 2020-01-04 00:14:34.000000000 +0100 +++ new/kwayland-5.67.0/src/server/shell_interface.cpp 2020-02-01 10:07:30.000000000 +0100 @@ -58,7 +58,7 @@ { } -#ifndef DOXYGEN_SHOULD_SKIP_THIS +#ifndef K_DOXYGEN const struct wl_shell_interface ShellInterface::Private::s_interface = { createSurfaceCallback }; @@ -167,7 +167,7 @@ pingTimer->setInterval(1000); } -#ifndef DOXYGEN_SHOULD_SKIP_THIS +#ifndef K_DOXYGEN const struct wl_shell_surface_interface ShellSurfaceInterface::Private::s_interface = { pongCallback, moveCallback, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwayland-5.66.0/src/server/slide_interface.cpp new/kwayland-5.67.0/src/server/slide_interface.cpp --- old/kwayland-5.66.0/src/server/slide_interface.cpp 2020-01-04 00:14:34.000000000 +0100 +++ new/kwayland-5.67.0/src/server/slide_interface.cpp 2020-02-01 10:07:30.000000000 +0100 @@ -57,7 +57,7 @@ const quint32 SlideManagerInterface::Private::s_version = 1; -#ifndef DOXYGEN_SHOULD_SKIP_THIS +#ifndef K_DOXYGEN const struct org_kde_kwin_slide_manager_interface SlideManagerInterface::Private::s_interface = { createCallback, unsetCallback @@ -148,7 +148,7 @@ static const struct org_kde_kwin_slide_interface s_interface; }; -#ifndef DOXYGEN_SHOULD_SKIP_THIS +#ifndef K_DOXYGEN const struct org_kde_kwin_slide_interface SlideInterface::Private::s_interface = { commitCallback, setLocationCallback, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwayland-5.66.0/src/server/subcompositor_interface.cpp new/kwayland-5.67.0/src/server/subcompositor_interface.cpp --- old/kwayland-5.66.0/src/server/subcompositor_interface.cpp 2020-01-04 00:14:34.000000000 +0100 +++ new/kwayland-5.67.0/src/server/subcompositor_interface.cpp 2020-02-01 10:07:30.000000000 +0100 @@ -54,7 +54,7 @@ const quint32 SubCompositorInterface::Private::s_version = 1; -#ifndef DOXYGEN_SHOULD_SKIP_THIS +#ifndef K_DOXYGEN const struct wl_subcompositor_interface SubCompositorInterface::Private::s_interface = { destroyCallback, subsurfaceCallback @@ -127,7 +127,7 @@ SubCompositorInterface::~SubCompositorInterface() = default; -#ifndef DOXYGEN_SHOULD_SKIP_THIS +#ifndef K_DOXYGEN const struct wl_subsurface_interface SubSurfaceInterface::Private::s_interface = { resourceDestroyedCallback, setPositionCallback, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwayland-5.66.0/src/server/surface_interface.cpp new/kwayland-5.67.0/src/server/surface_interface.cpp --- old/kwayland-5.66.0/src/server/surface_interface.cpp 2020-01-04 00:14:34.000000000 +0100 +++ new/kwayland-5.67.0/src/server/surface_interface.cpp 2020-02-01 10:07:30.000000000 +0100 @@ -265,7 +265,7 @@ } } -#ifndef DOXYGEN_SHOULD_SKIP_THIS +#ifndef K_DOXYGEN const struct wl_surface_interface SurfaceInterface::Private::s_interface = { resourceDestroyedCallback, attachCallback, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwayland-5.66.0/src/server/surfacerole.cpp new/kwayland-5.67.0/src/server/surfacerole.cpp --- old/kwayland-5.66.0/src/server/surfacerole.cpp 2020-01-04 00:14:34.000000000 +0100 +++ new/kwayland-5.67.0/src/server/surfacerole.cpp 2020-02-01 10:07:30.000000000 +0100 @@ -1,5 +1,5 @@ /**************************************************************************** -Copyright 2019 Vlad Zagorodniy <[email protected]> +Copyright 2019 Vlad Zahorodnii <[email protected]> This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwayland-5.66.0/src/server/surfacerole_p.h new/kwayland-5.67.0/src/server/surfacerole_p.h --- old/kwayland-5.66.0/src/server/surfacerole_p.h 2020-01-04 00:14:34.000000000 +0100 +++ new/kwayland-5.67.0/src/server/surfacerole_p.h 2020-02-01 10:07:30.000000000 +0100 @@ -1,5 +1,5 @@ /**************************************************************************** -Copyright 2019 Vlad Zagorodniy <[email protected]> +Copyright 2019 Vlad Zahorodnii <[email protected]> This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwayland-5.66.0/src/server/textinput_interface_v0.cpp new/kwayland-5.67.0/src/server/textinput_interface_v0.cpp --- old/kwayland-5.66.0/src/server/textinput_interface_v0.cpp 2020-01-04 00:14:34.000000000 +0100 +++ new/kwayland-5.67.0/src/server/textinput_interface_v0.cpp 2020-02-01 10:07:30.000000000 +0100 @@ -75,7 +75,7 @@ quint32 latestState = 0; }; -#ifndef DOXYGEN_SHOULD_SKIP_THIS +#ifndef K_DOXYGEN const struct wl_text_input_interface TextInputUnstableV0Interface::Private::s_interface = { activateCallback, deactivateCallback, @@ -373,7 +373,7 @@ }; const quint32 TextInputManagerUnstableV0Interface::Private::s_version = 1; -#ifndef DOXYGEN_SHOULD_SKIP_THIS +#ifndef K_DOXYGEN const struct wl_text_input_manager_interface TextInputManagerUnstableV0Interface::Private::s_interface = { createTextInputCallback }; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwayland-5.66.0/src/server/textinput_interface_v2.cpp new/kwayland-5.67.0/src/server/textinput_interface_v2.cpp --- old/kwayland-5.66.0/src/server/textinput_interface_v2.cpp 2020-01-04 00:14:34.000000000 +0100 +++ new/kwayland-5.67.0/src/server/textinput_interface_v2.cpp 2020-02-01 10:07:30.000000000 +0100 @@ -70,7 +70,7 @@ void disable(); }; -#ifndef DOXYGEN_SHOULD_SKIP_THIS +#ifndef K_DOXYGEN const struct zwp_text_input_v2_interface TextInputUnstableV2Interface::Private::s_interface = { resourceDestroyedCallback, enableCallback, @@ -349,7 +349,7 @@ }; const quint32 TextInputManagerUnstableV2Interface::Private::s_version = 1; -#ifndef DOXYGEN_SHOULD_SKIP_THIS +#ifndef K_DOXYGEN const struct zwp_text_input_manager_v2_interface TextInputManagerUnstableV2Interface::Private::s_interface = { destroyCallback, getTextInputCallback diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwayland-5.66.0/src/server/touch_interface.cpp new/kwayland-5.67.0/src/server/touch_interface.cpp --- old/kwayland-5.66.0/src/server/touch_interface.cpp 2020-01-04 00:14:34.000000000 +0100 +++ new/kwayland-5.67.0/src/server/touch_interface.cpp 2020-02-01 10:07:30.000000000 +0100 @@ -47,7 +47,7 @@ static const struct wl_touch_interface s_interface; }; -#ifndef DOXYGEN_SHOULD_SKIP_THIS +#ifndef K_DOXYGEN const struct wl_touch_interface TouchInterface::Private::s_interface = { resourceDestroyedCallback }; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwayland-5.66.0/src/server/xdgdecoration_interface.cpp new/kwayland-5.67.0/src/server/xdgdecoration_interface.cpp --- old/kwayland-5.66.0/src/server/xdgdecoration_interface.cpp 2020-01-04 00:14:34.000000000 +0100 +++ new/kwayland-5.67.0/src/server/xdgdecoration_interface.cpp 2020-02-01 10:07:30.000000000 +0100 @@ -68,7 +68,7 @@ XdgDecorationManagerInterface::~XdgDecorationManagerInterface() {} -#ifndef DOXYGEN_SHOULD_SKIP_THIS +#ifndef K_DOXYGEN const struct zxdg_decoration_manager_v1_interface XdgDecorationManagerInterface::Private::s_interface = { destroyCallback, getToplevelDecorationCallback @@ -153,7 +153,7 @@ static const struct zxdg_toplevel_decoration_v1_interface s_interface; }; -#ifndef DOXYGEN_SHOULD_SKIP_THIS +#ifndef K_DOXYGEN const struct zxdg_toplevel_decoration_v1_interface XdgDecorationInterface::Private::s_interface = { resourceDestroyedCallback, setModeCallback, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwayland-5.66.0/src/server/xdgforeign_v2_interface.cpp new/kwayland-5.67.0/src/server/xdgforeign_v2_interface.cpp --- old/kwayland-5.66.0/src/server/xdgforeign_v2_interface.cpp 2020-01-04 00:14:34.000000000 +0100 +++ new/kwayland-5.67.0/src/server/xdgforeign_v2_interface.cpp 2020-02-01 10:07:30.000000000 +0100 @@ -61,7 +61,7 @@ const quint32 XdgExporterUnstableV2Interface::Private::s_version = 1; -#ifndef DOXYGEN_SHOULD_SKIP_THIS +#ifndef K_DOXYGEN const struct zxdg_exporter_v2_interface XdgExporterUnstableV2Interface::Private::s_interface = { destroyCallback, exportCallback @@ -192,7 +192,7 @@ const quint32 XdgImporterUnstableV2Interface::Private::s_version = 1; -#ifndef DOXYGEN_SHOULD_SKIP_THIS +#ifndef K_DOXYGEN const struct zxdg_importer_v2_interface XdgImporterUnstableV2Interface::Private::s_interface = { destroyCallback, importCallback @@ -367,7 +367,7 @@ static const struct zxdg_exported_v2_interface s_interface; }; -#ifndef DOXYGEN_SHOULD_SKIP_THIS +#ifndef K_DOXYGEN const struct zxdg_exported_v2_interface XdgExportedUnstableV2Interface::Private::s_interface = { resourceDestroyedCallback }; @@ -412,7 +412,7 @@ static const struct zxdg_imported_v2_interface s_interface; }; -#ifndef DOXYGEN_SHOULD_SKIP_THIS +#ifndef K_DOXYGEN const struct zxdg_imported_v2_interface XdgImportedUnstableV2Interface::Private::s_interface = { resourceDestroyedCallback, setParentOfCallback diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwayland-5.66.0/src/server/xdgoutput_interface.cpp new/kwayland-5.67.0/src/server/xdgoutput_interface.cpp --- old/kwayland-5.66.0/src/server/xdgoutput_interface.cpp 2020-01-04 00:14:34.000000000 +0100 +++ new/kwayland-5.67.0/src/server/xdgoutput_interface.cpp 2020-02-01 10:07:30.000000000 +0100 @@ -56,7 +56,7 @@ const quint32 XdgOutputManagerInterface::Private::s_version = 1; -#ifndef DOXYGEN_SHOULD_SKIP_THIS +#ifndef K_DOXYGEN const struct zxdg_output_manager_v1_interface XdgOutputManagerInterface::Private::s_interface = { destroyCallback, getXdgOutputCallback @@ -292,7 +292,7 @@ zxdg_output_v1_send_done(d->resource); } -#ifndef DOXYGEN_SHOULD_SKIP_THIS +#ifndef K_DOXYGEN const struct zxdg_output_v1_interface XdgOutputV1Interface::Private::s_interface = { resourceDestroyedCallback }; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwayland-5.66.0/src/server/xdgshell_stable_interface.cpp new/kwayland-5.67.0/src/server/xdgshell_stable_interface.cpp --- old/kwayland-5.66.0/src/server/xdgshell_stable_interface.cpp 2020-01-04 00:14:34.000000000 +0100 +++ new/kwayland-5.67.0/src/server/xdgshell_stable_interface.cpp 2020-02-01 10:07:30.000000000 +0100 @@ -1,6 +1,6 @@ /**************************************************************************** Copyright 2017 David Edmundson <[email protected]> -Copyright 2019 Vlad Zagorodniy <[email protected]> +Copyright 2019 Vlad Zahorodnii <[email protected]> This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public @@ -245,7 +245,7 @@ const quint32 XdgShellStableInterface::Private::s_version = 1; -#ifndef DOXYGEN_SHOULD_SKIP_THIS +#ifndef K_DOXYGEN const struct xdg_wm_base_interface XdgShellStableInterface::Private::s_interface = { destroyCallback, createPositionerCallback, @@ -457,7 +457,7 @@ } } -#ifndef DOXYGEN_SHOULD_SKIP_THIS +#ifndef K_DOXYGEN const struct xdg_surface_interface XdgSurfaceStableInterface::Private::s_interface = { destroyCallback, getTopLevelCallback, @@ -611,7 +611,7 @@ { } -#ifndef DOXYGEN_SHOULD_SKIP_THIS +#ifndef K_DOXYGEN const struct xdg_positioner_interface XdgPositionerStableInterface::Private::s_interface = { resourceDestroyedCallback, setSizeCallback, @@ -929,7 +929,7 @@ XdgTopLevelStableInterface::Private::~Private() = default; -#ifndef DOXYGEN_SHOULD_SKIP_THIS +#ifndef K_DOXYGEN const struct xdg_popup_interface XdgPopupStableInterface::Private::s_interface = { resourceDestroyedCallback, grabCallback diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwayland-5.66.0/src/server/xdgshell_v5_interface.cpp new/kwayland-5.67.0/src/server/xdgshell_v5_interface.cpp --- old/kwayland-5.66.0/src/server/xdgshell_v5_interface.cpp 2020-01-04 00:14:34.000000000 +0100 +++ new/kwayland-5.67.0/src/server/xdgshell_v5_interface.cpp 2020-02-01 10:07:30.000000000 +0100 @@ -1,6 +1,6 @@ /**************************************************************************** Copyright 2016 Martin Gräßlin <[email protected]> -Copyright 2019 Vlad Zagorodniy <[email protected]> +Copyright 2019 Vlad Zahorodnii <[email protected]> This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public @@ -87,7 +87,7 @@ const quint32 XdgShellV5Interface::Private::s_version = 1; -#ifndef DOXYGEN_SHOULD_SKIP_THIS +#ifndef K_DOXYGEN const struct zxdg_shell_v5_interface XdgShellV5Interface::Private::s_interface = { destroyCallback, useUnstableVersionCallback, @@ -321,7 +321,7 @@ } } -#ifndef DOXYGEN_SHOULD_SKIP_THIS +#ifndef K_DOXYGEN const struct zxdg_surface_v5_interface XdgSurfaceV5Interface::Private::s_interface = { resourceDestroyedCallback, setParentCallback, @@ -501,7 +501,7 @@ return serial; } -#ifndef DOXYGEN_SHOULD_SKIP_THIS +#ifndef K_DOXYGEN const struct zxdg_popup_v5_interface XdgPopupV5Interface::Private::s_interface = { resourceDestroyedCallback }; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwayland-5.66.0/src/server/xdgshell_v6_interface.cpp new/kwayland-5.67.0/src/server/xdgshell_v6_interface.cpp --- old/kwayland-5.66.0/src/server/xdgshell_v6_interface.cpp 2020-01-04 00:14:34.000000000 +0100 +++ new/kwayland-5.67.0/src/server/xdgshell_v6_interface.cpp 2020-02-01 10:07:30.000000000 +0100 @@ -1,6 +1,6 @@ /**************************************************************************** Copyright 2017 David Edmundson <[email protected]> -Copyright 2019 Vlad Zagorodniy <[email protected]> +Copyright 2019 Vlad Zahorodnii <[email protected]> This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public @@ -247,7 +247,7 @@ const quint32 XdgShellV6Interface::Private::s_version = 1; -#ifndef DOXYGEN_SHOULD_SKIP_THIS +#ifndef K_DOXYGEN const struct zxdg_shell_v6_interface XdgShellV6Interface::Private::s_interface = { destroyCallback, createPositionerCallback, @@ -456,7 +456,7 @@ } } -#ifndef DOXYGEN_SHOULD_SKIP_THIS +#ifndef K_DOXYGEN const struct zxdg_surface_v6_interface XdgSurfaceV6Interface::Private::s_interface = { destroyCallback, getTopLevelCallback, @@ -613,7 +613,7 @@ { } -#ifndef DOXYGEN_SHOULD_SKIP_THIS +#ifndef K_DOXYGEN const struct zxdg_positioner_v6_interface XdgPositionerV6Interface::Private::s_interface = { resourceDestroyedCallback, setSizeCallback, @@ -914,7 +914,7 @@ XdgTopLevelV6Interface::Private::~Private() = default; -#ifndef DOXYGEN_SHOULD_SKIP_THIS +#ifndef K_DOXYGEN const struct zxdg_popup_v6_interface XdgPopupV6Interface::Private::s_interface = { resourceDestroyedCallback, grabCallback diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwayland-5.66.0/src/tools/generator.cpp new/kwayland-5.67.0/src/tools/generator.cpp --- old/kwayland-5.66.0/src/tools/generator.cpp 2020-01-04 00:14:34.000000000 +0100 +++ new/kwayland-5.67.0/src/tools/generator.cpp 2020-02-01 10:07:30.000000000 +0100 @@ -928,7 +928,7 @@ void Generator::generateServerPrivateInterfaceClass(const Interface &interface) { - *m_stream.localData() << QStringLiteral("#ifndef DOXYGEN_SHOULD_SKIP_THIS\n"); + *m_stream.localData() << QStringLiteral("#ifndef K_DOXYGEN\n"); *m_stream.localData() << QStringLiteral("const struct %2_interface %1::Private::s_interface = {\n").arg(interface.kwaylandServerName()).arg(interface.name()); bool first = true; for (auto r: interface.requests()) {
