diff options
Diffstat (limited to 'src/platformsupport/themes/genericunix')
4 files changed, 7 insertions, 39 deletions
diff --git a/src/platformsupport/themes/genericunix/dbusmenu/qdbusplatformmenu.cpp b/src/platformsupport/themes/genericunix/dbusmenu/qdbusplatformmenu.cpp index 4b099e5c0e..51c690d43a 100644 --- a/src/platformsupport/themes/genericunix/dbusmenu/qdbusplatformmenu.cpp +++ b/src/platformsupport/themes/genericunix/dbusmenu/qdbusplatformmenu.cpp @@ -50,9 +50,8 @@ Q_LOGGING_CATEGORY(qLcMenu, "qt.qpa.menu") static int nextDBusID = 1; QHash<int, QDBusPlatformMenuItem *> menuItemsByID; -QDBusPlatformMenuItem::QDBusPlatformMenuItem(quintptr tag) - : m_tag(tag ? tag : reinterpret_cast<quintptr>(this)) // QMenu will overwrite this later - , m_subMenu(Q_NULLPTR) +QDBusPlatformMenuItem::QDBusPlatformMenuItem() + : m_subMenu(nullptr) , m_role(NoRole) , m_isEnabled(true) , m_isVisible(true) @@ -72,11 +71,6 @@ QDBusPlatformMenuItem::~QDBusPlatformMenuItem() static_cast<QDBusPlatformMenu *>(m_subMenu)->setContainingMenuItem(Q_NULLPTR); } -void QDBusPlatformMenuItem::setTag(quintptr tag) -{ - m_tag = tag; -} - void QDBusPlatformMenuItem::setText(const QString &text) { qCDebug(qLcMenu) << m_dbusID << text; @@ -167,9 +161,8 @@ QList<const QDBusPlatformMenuItem *> QDBusPlatformMenuItem::byIds(const QList<in } -QDBusPlatformMenu::QDBusPlatformMenu(quintptr tag) - : m_tag(tag ? tag : reinterpret_cast<quintptr>(this)) - , m_isEnabled(true) +QDBusPlatformMenu::QDBusPlatformMenu() + : m_isEnabled(true) , m_isVisible(true) , m_revision(1) , m_containingMenuItem(Q_NULLPTR) @@ -252,11 +245,6 @@ void QDBusPlatformMenu::emitUpdated() emit updated(++m_revision, 0); } -void QDBusPlatformMenu::setTag(quintptr tag) -{ - m_tag = tag; -} - void QDBusPlatformMenu::setText(const QString &text) { m_text = text; diff --git a/src/platformsupport/themes/genericunix/dbusmenu/qdbusplatformmenu_p.h b/src/platformsupport/themes/genericunix/dbusmenu/qdbusplatformmenu_p.h index 49b7316d11..5458e2fdd5 100644 --- a/src/platformsupport/themes/genericunix/dbusmenu/qdbusplatformmenu_p.h +++ b/src/platformsupport/themes/genericunix/dbusmenu/qdbusplatformmenu_p.h @@ -73,12 +73,9 @@ class QDBusPlatformMenuItem : public QPlatformMenuItem Q_OBJECT public: - QDBusPlatformMenuItem(quintptr tag = 0LL); + QDBusPlatformMenuItem(); ~QDBusPlatformMenuItem(); - quintptr tag()const Q_DECL_OVERRIDE { return m_tag; } - void setTag(quintptr tag) Q_DECL_OVERRIDE; - const QString text() const { return m_text; } void setText(const QString &text) Q_DECL_OVERRIDE; QIcon icon() const { return m_icon; } @@ -110,13 +107,10 @@ public: void trigger(); - bool operator==(const QDBusPlatformMenuItem& other) { return m_tag == other.m_tag; } - static QDBusPlatformMenuItem *byId(int id); static QList<const QDBusPlatformMenuItem *> byIds(const QList<int> &ids); private: - quintptr m_tag; QString m_text; QIcon m_icon; QPlatformMenu *m_subMenu; @@ -137,7 +131,7 @@ class QDBusPlatformMenu : public QPlatformMenu Q_OBJECT public: - QDBusPlatformMenu(quintptr tag = 0LL); + QDBusPlatformMenu(); ~QDBusPlatformMenu(); void insertMenuItem(QPlatformMenuItem *menuItem, QPlatformMenuItem *before) Q_DECL_OVERRIDE; void removeMenuItem(QPlatformMenuItem *menuItem) Q_DECL_OVERRIDE; @@ -145,9 +139,6 @@ public: void syncMenuItem(QPlatformMenuItem *menuItem) Q_DECL_OVERRIDE; void syncSeparatorsCollapsible(bool enable) Q_DECL_OVERRIDE { Q_UNUSED(enable); } - quintptr tag()const Q_DECL_OVERRIDE { return m_tag; } - void setTag(quintptr tag) Q_DECL_OVERRIDE; - const QString text() const { return m_text; } void setText(const QString &text) Q_DECL_OVERRIDE; QIcon icon() const { return m_icon; } @@ -172,8 +163,6 @@ public: QPlatformMenuItem *createMenuItem() const Q_DECL_OVERRIDE; QPlatformMenu *createSubMenu() const Q_DECL_OVERRIDE; - bool operator==(const QDBusPlatformMenu& other) { return m_tag == other.m_tag; } - uint revision() const { return m_revision; } void emitUpdated(); @@ -184,7 +173,6 @@ signals: void popupRequested(int id, uint timestamp); private: - quintptr m_tag; QString m_text; QIcon m_icon; bool m_isEnabled; diff --git a/src/platformsupport/themes/genericunix/dbustray/qdbustraytypes.cpp b/src/platformsupport/themes/genericunix/dbustray/qdbustraytypes.cpp index fc0fa00655..fc49fcbea9 100644 --- a/src/platformsupport/themes/genericunix/dbustray/qdbustraytypes.cpp +++ b/src/platformsupport/themes/genericunix/dbustray/qdbustraytypes.cpp @@ -104,7 +104,7 @@ QXdgDBusImageVector iconToQXdgDBusImageVector(const QIcon &icon) } // copy and endian-convert QXdgDBusImageStruct kim(im.width(), im.height()); - const uchar *end = im.constBits() + im.byteCount(); + const uchar *end = im.constBits() + im.sizeInBytes(); uchar *dest = reinterpret_cast<uchar *>(kim.data.data()); for (const uchar *src = im.constBits(); src < end; src += 4, dest += 4) qToUnaligned(qToBigEndian<quint32>(qFromUnaligned<quint32>(src)), dest); diff --git a/src/platformsupport/themes/genericunix/qgenericunixthemes.cpp b/src/platformsupport/themes/genericunix/qgenericunixthemes.cpp index 323e8fd13b..be0fac4b55 100644 --- a/src/platformsupport/themes/genericunix/qgenericunixthemes.cpp +++ b/src/platformsupport/themes/genericunix/qgenericunixthemes.cpp @@ -87,14 +87,6 @@ void ResourceHelper::clear() std::fill(fonts, fonts + QPlatformTheme::NFonts, static_cast<QFont *>(0)); } -/*! - \class QGenericX11ThemeQKdeTheme - \brief QGenericX11Theme is a generic theme implementation for X11. - \since 5.0 - \internal - \ingroup qpa -*/ - const char *QGenericUnixTheme::name = "generic"; // Default system font, corresponding to the value returned by 4.8 for |