diff --git a/autotests/drm/drmTest.cpp b/autotests/drm/drmTest.cpp index 5ec9f7e00d..ddfa860794 100644 --- a/autotests/drm/drmTest.cpp +++ b/autotests/drm/drmTest.cpp @@ -88,7 +88,7 @@ void DrmTest::initTestCase() { // TODO: Remove this when CI is updated to ubuntu 22.04 or something with a newer kernel. const Version kernelVersion = getKernelVersion(); - if (kernelVersion.major() == 5 && kernelVersion.minor() <= 4) { + if (kernelVersion.majorVersion() == 5 && kernelVersion.minorVersion() <= 4) { QSKIP("drmPrimeFDToHandle() randomly fails"); return; } diff --git a/autotests/integration/screencasting_test.cpp b/autotests/integration/screencasting_test.cpp index 1a26c66afc..e130cd7d0b 100644 --- a/autotests/integration/screencasting_test.cpp +++ b/autotests/integration/screencasting_test.cpp @@ -94,7 +94,7 @@ void ScreencastingTest::init() { // TODO: Remove this when CI is updated to ubuntu 22.04 or something with a newer kernel. const Version kernelVersion = linuxKernelVersion(); - if (kernelVersion.major() == 5 && kernelVersion.minor() <= 4) { + if (kernelVersion.majorVersion() == 5 && kernelVersion.minorVersion() <= 4) { QSKIP("drmPrimeFDToHandle() randomly fails"); return; } diff --git a/src/libkwineffects/version.cpp b/src/libkwineffects/version.cpp index 82fc8046f5..b500100c76 100644 --- a/src/libkwineffects/version.cpp +++ b/src/libkwineffects/version.cpp @@ -26,17 +26,17 @@ bool Version::isValid() const return m_major > 0 || m_minor > 0 || m_patch > 0; } -uint32_t Version::major() const +uint32_t Version::majorVersion() const { return m_major; } -uint32_t Version::minor() const +uint32_t Version::minorVersion() const { return m_minor; } -uint32_t Version::patch() const +uint32_t Version::patchVersion() const { return m_patch; } diff --git a/src/libkwineffects/version.h b/src/libkwineffects/version.h index b25544415b..b8d65c607d 100644 --- a/src/libkwineffects/version.h +++ b/src/libkwineffects/version.h @@ -23,9 +23,9 @@ public: auto operator<=>(const Version &other) const = default; bool isValid() const; - uint32_t major() const; - uint32_t minor() const; - uint32_t patch() const; + uint32_t majorVersion() const; + uint32_t minorVersion() const; + uint32_t patchVersion() const; QString toString() const; QByteArray toByteArray() const;