diff --git a/abstract_client.h b/abstract_client.h --- a/abstract_client.h +++ b/abstract_client.h @@ -94,7 +94,7 @@ /** * The x11 ids for all desktops this client is in. On X11 this list will always have a length of 1 **/ - Q_PROPERTY(QList x11DesktopIds READ x11DesktopIds NOTIFY x11DesktopIdsChanged) + Q_PROPERTY(QVector x11DesktopIds READ x11DesktopIds NOTIFY x11DesktopIdsChanged) /** * Indicates that the window should not be included on a taskbar. **/ @@ -432,13 +432,13 @@ int desktop() const override { return m_desktops.isEmpty() ? (int)NET::OnAllDesktops : m_desktops.last()->x11DesktopNumber(); } - virtual QList desktops() const { + virtual QVector desktops() const { return m_desktops; } void removeDesktop(VirtualDesktop *desktop) { m_desktops.removeAll(desktop); } - QList x11DesktopIds() const; + QVector x11DesktopIds() const; void setMinimized(bool set); /** @@ -1122,7 +1122,7 @@ bool m_demandsAttention = false; bool m_minimized = false; QTimer *m_autoRaiseTimer = nullptr; - QList m_desktops; + QVector m_desktops; QString m_colorScheme; std::shared_ptr m_palette; diff --git a/abstract_client.cpp b/abstract_client.cpp --- a/abstract_client.cpp +++ b/abstract_client.cpp @@ -602,10 +602,10 @@ setDesktop(VirtualDesktopManager::self()->current()); } -QList AbstractClient::x11DesktopIds() const +QVector AbstractClient::x11DesktopIds() const { const auto desks = desktops(); - QList x11Ids; + QVector x11Ids; x11Ids.reserve(desks.count()); std::transform(desks.constBegin(), desks.constEnd(), std::back_inserter(x11Ids), diff --git a/deleted.h b/deleted.h --- a/deleted.h +++ b/deleted.h @@ -52,7 +52,7 @@ void discard(); virtual int desktop() const; virtual QStringList activities() const; - virtual QList desktops() const; + virtual QVector desktops() const; virtual QPoint clientPos() const; virtual QSize clientSize() const; QPoint clientContentPos() const override { @@ -196,7 +196,7 @@ QPoint m_contentPos; QRect transparent_rect; xcb_window_t m_frame; - QList m_desktops; + QVector m_desktops; bool no_border; QRect decoration_left; diff --git a/deleted.cpp b/deleted.cpp --- a/deleted.cpp +++ b/deleted.cpp @@ -165,7 +165,7 @@ return activityList; } -QList Deleted::desktops() const +QVector Deleted::desktops() const { return m_desktops; } diff --git a/toplevel.h b/toplevel.h --- a/toplevel.h +++ b/toplevel.h @@ -290,7 +290,7 @@ * isOnDesktop() instead. */ virtual int desktop() const = 0; - virtual QList desktops() const = 0; + virtual QVector desktops() const = 0; virtual QStringList activities() const = 0; bool isOnDesktop(int d) const; bool isOnActivity(const QString &activity) const; diff --git a/unmanaged.h b/unmanaged.h --- a/unmanaged.h +++ b/unmanaged.h @@ -39,7 +39,7 @@ static void deleteUnmanaged(Unmanaged* c); virtual int desktop() const; virtual QStringList activities() const; - virtual QList desktops() const override; + virtual QVector desktops() const override; virtual QPoint clientPos() const; virtual QSize clientSize() const; virtual QRect transparentRect() const; diff --git a/unmanaged.cpp b/unmanaged.cpp --- a/unmanaged.cpp +++ b/unmanaged.cpp @@ -123,9 +123,9 @@ return QStringList(); } -QList Unmanaged::desktops() const +QVector Unmanaged::desktops() const { - return QList(); + return QVector(); } QPoint Unmanaged::clientPos() const