Changeset View
Changeset View
Standalone View
Standalone View
effects.cpp
Show First 20 Lines • Show All 1072 Lines • ▼ Show 20 Line(s) | |||||
1073 | #else | 1073 | #else | ||
1074 | Q_UNUSED(desktop) | 1074 | Q_UNUSED(desktop) | ||
1075 | #endif | 1075 | #endif | ||
1076 | } | 1076 | } | ||
1077 | 1077 | | |||
1078 | EffectWindowList EffectsHandlerImpl::currentTabBoxWindowList() const | 1078 | EffectWindowList EffectsHandlerImpl::currentTabBoxWindowList() const | ||
1079 | { | 1079 | { | ||
1080 | #ifdef KWIN_BUILD_TABBOX | 1080 | #ifdef KWIN_BUILD_TABBOX | ||
1081 | EffectWindowList ret; | | |||
1082 | const auto clients = TabBox::TabBox::self()->currentClientList(); | 1081 | const auto clients = TabBox::TabBox::self()->currentClientList(); | ||
1083 | for (auto c : clients) | 1082 | EffectWindowList ret; | ||
1084 | ret.append(c->effectWindow()); | 1083 | ret.reserve(clients.size()); | ||
1084 | std::transform(std::cbegin(clients), std::cend(clients), | ||||
1085 | std::back_inserter(ret), | ||||
1086 | [](auto client) { return client->effectWindow(); }); | ||||
graesslin: I would just use (auto client) - we can use c++14 in KWin. | |||||
1085 | return ret; | 1087 | return ret; | ||
1086 | #else | 1088 | #else | ||
1087 | return EffectWindowList(); | 1089 | return EffectWindowList(); | ||
1088 | #endif | 1090 | #endif | ||
1089 | } | 1091 | } | ||
1090 | 1092 | | |||
1091 | void EffectsHandlerImpl::refTabBox() | 1093 | void EffectsHandlerImpl::refTabBox() | ||
1092 | { | 1094 | { | ||
▲ Show 20 Lines • Show All 602 Lines • ▼ Show 20 Line(s) | 1693 | { | |||
1695 | } | 1697 | } | ||
1696 | return NULL; | 1698 | return NULL; | ||
1697 | } | 1699 | } | ||
1698 | 1700 | | |||
1699 | template <typename T> | 1701 | template <typename T> | ||
1700 | EffectWindowList getMainWindows(Toplevel *toplevel) | 1702 | EffectWindowList getMainWindows(Toplevel *toplevel) | ||
1701 | { | 1703 | { | ||
1702 | T *c = static_cast<T*>(toplevel); | 1704 | T *c = static_cast<T*>(toplevel); | ||
1703 | EffectWindowList ret; | | |||
1704 | const auto mainclients = c->mainClients(); | 1705 | const auto mainclients = c->mainClients(); | ||
1705 | for (auto tmp : mainclients) | 1706 | EffectWindowList ret; | ||
1706 | ret.append(tmp->effectWindow()); | 1707 | ret.reserve(mainclients.size()); | ||
1708 | std::transform(std::cbegin(mainclients), std::cend(mainclients), | ||||
1709 | std::back_inserter(ret), | ||||
1710 | [](auto client) { return client->effectWindow(); }); | ||||
1707 | return ret; | 1711 | return ret; | ||
1708 | } | 1712 | } | ||
1709 | 1713 | | |||
1710 | EffectWindowList EffectWindowImpl::mainWindows() const | 1714 | EffectWindowList EffectWindowImpl::mainWindows() const | ||
1711 | { | 1715 | { | ||
1712 | if (dynamic_cast<AbstractClient*>(toplevel)) { | 1716 | if (dynamic_cast<AbstractClient*>(toplevel)) { | ||
1713 | return getMainWindows<AbstractClient>(toplevel); | 1717 | return getMainWindows<AbstractClient>(toplevel); | ||
1714 | } else if (toplevel->isDeleted()) { | 1718 | } else if (toplevel->isDeleted()) { | ||
▲ Show 20 Lines • Show All 98 Lines • ▼ Show 20 Line(s) | |||||
1813 | 1817 | | |||
1814 | //**************************************** | 1818 | //**************************************** | ||
1815 | // EffectWindowGroupImpl | 1819 | // EffectWindowGroupImpl | ||
1816 | //**************************************** | 1820 | //**************************************** | ||
1817 | 1821 | | |||
1818 | 1822 | | |||
1819 | EffectWindowList EffectWindowGroupImpl::members() const | 1823 | EffectWindowList EffectWindowGroupImpl::members() const | ||
1820 | { | 1824 | { | ||
1825 | const auto memberList = group->members(); | ||||
1821 | EffectWindowList ret; | 1826 | EffectWindowList ret; | ||
1822 | for (Toplevel * c : group->members()) | 1827 | ret.reserve(memberList.size()); | ||
1823 | ret.append(c->effectWindow()); | 1828 | std::transform(std::cbegin(memberList), std::cend(memberList), | ||
1829 | std::back_inserter(ret), | ||||
1830 | [](auto toplevel) { return toplevel->effectWindow(); }); | ||||
1824 | return ret; | 1831 | return ret; | ||
1825 | } | 1832 | } | ||
1826 | 1833 | | |||
1827 | //**************************************** | 1834 | //**************************************** | ||
1828 | // EffectFrameImpl | 1835 | // EffectFrameImpl | ||
1829 | //**************************************** | 1836 | //**************************************** | ||
1830 | 1837 | | |||
1831 | EffectFrameImpl::EffectFrameImpl(EffectFrameStyle style, bool staticSize, QPoint position, Qt::Alignment alignment) | 1838 | EffectFrameImpl::EffectFrameImpl(EffectFrameStyle style, bool staticSize, QPoint position, Qt::Alignment alignment) | ||
▲ Show 20 Lines • Show All 235 Lines • Show Last 20 Lines |
I would just use (auto client) - we can use c++14 in KWin.