git.iko.soy/unity8
on xenial help sign in
review comments
f897b88Nick Dedekind
plugins/Unity/Indicators/modelactionrootstate.cpp+7−7
compare with xenial
unifiedsplit
@@ -1,5 +1,5 @@
1/*
1/*
2− * Copyright 2013 Canonical Ltd.
2+ * Copyright 2013-2016 Canonical Ltd.
3 *
3 *
4 * This program is free software; you can redistribute it and/or modify
4 * This program is free software; you can redistribute it and/or modify
5 * it under the terms of the GNU Lesser General Public License as published by
5 * it under the terms of the GNU Lesser General Public License as published by
@@ -162,25 +162,25 @@ void ModelActionRootState::updateOtherActions()
162
162
163 if (m_menu && m_menu->rowCount() > 0) {
163 if (m_menu && m_menu->rowCount() > 0) {
164 QVariantMap map;
164 QVariantMap map;
165− map[QStringLiteral("submenu-action")] = QLatin1String("string");
165+ map[QStringLiteral("submenu-action")] = QStringLiteral("string");
166− map[QStringLiteral("x-canonical-scroll-action")] = QLatin1String("string");
166+ map[QStringLiteral("x-canonical-scroll-action")] = QStringLiteral("string");
167− map[QStringLiteral("x-canonical-secondary-action")] = QLatin1String("string");
167+ map[QStringLiteral("x-canonical-secondary-action")] = QStringLiteral("string");
168 m_menu->loadExtendedAttributes(0, map);
168 m_menu->loadExtendedAttributes(0, map);
169 QVariantMap extMap = m_menu->get(0, "ext").toMap();
169 QVariantMap extMap = m_menu->get(0, "ext").toMap();
170
170
171− QString secondaryAction = extMap[QStringLiteral("xCanonicalSecondaryAction")].toString();
171+ QString secondaryAction = extMap.value(QStringLiteral("xCanonicalSecondaryAction")).toString();
172 if (m_secondaryAction != secondaryAction) {
172 if (m_secondaryAction != secondaryAction) {
173 m_secondaryAction = secondaryAction;
173 m_secondaryAction = secondaryAction;
174 Q_EMIT secondaryActionChanged();
174 Q_EMIT secondaryActionChanged();
175 }
175 }
176
176
177− QString scrollAction = extMap[QStringLiteral("xCanonicalScrollAction")].toString();
177+ QString scrollAction = extMap.value(QStringLiteral("xCanonicalScrollAction")).toString();
178 if (m_scrollAction != scrollAction) {
178 if (m_scrollAction != scrollAction) {
179 m_scrollAction = scrollAction;
179 m_scrollAction = scrollAction;
180 Q_EMIT scrollActionChanged();
180 Q_EMIT scrollActionChanged();
181 }
181 }
182
182
183− QString submenuAction = extMap[QStringLiteral("submenuAction")].toString();
183+ QString submenuAction = extMap.value(QStringLiteral("submenuAction")).toString();
184 if (m_submenuAction != submenuAction) {
184 if (m_submenuAction != submenuAction) {
185 m_submenuAction = submenuAction;
185 m_submenuAction = submenuAction;
186 Q_EMIT submenuActionChanged();
186 Q_EMIT submenuActionChanged();
plugins/Unity/Indicators/modelactionrootstate.h+1−1
@@ -1,5 +1,5 @@
1/*
1/*
2− * Copyright 2013 Canonical Ltd.
2+ * Copyright 2013-2016 Canonical Ltd.
3 *
3 *
4 * This program is free software; you can redistribute it and/or modify
4 * This program is free software; you can redistribute it and/or modify
5 * it under the terms of the GNU Lesser General Public License as published by
5 * it under the terms of the GNU Lesser General Public License as published by
qml/Components/VolumeControl.qml+1−1
@@ -1,5 +1,5 @@
1/*
1/*
2− * Copyright (C) 2013-2015 Canonical, Ltd.
2+ * Copyright (C) 2013-2016 Canonical, Ltd.
3 *
3 *
4 * This program is free software; you can redistribute it and/or modify
4 * This program is free software; you can redistribute it and/or modify
5 * it under the terms of the GNU General Public License as published by
5 * it under the terms of the GNU General Public License as published by
qml/Panel/IndicatorItem.qml+1−1
@@ -1,5 +1,5 @@
1/*
1/*
2− * Copyright 2013-2014 Canonical Ltd.
2+ * Copyright 2013-2016 Canonical Ltd.
3 *
3 *
4 * This program is free software; you can redistribute it and/or modify
4 * This program is free software; you can redistribute it and/or modify
5 * it under the terms of the GNU Lesser General Public License as published by
5 * it under the terms of the GNU Lesser General Public License as published by
tests/mocks/Unity/Indicators/ModelActionRootState.qml+1−1
@@ -1,5 +1,5 @@
1/*
1/*
2− * Copyright 2013 Canonical Ltd.
2+ * Copyright 2013-2016 Canonical Ltd.
3 *
3 *
4 * This program is free software; you can redistribute it and/or modify
4 * This program is free software; you can redistribute it and/or modify
5 * it under the terms of the GNU Lesser General Public License as published by
5 * it under the terms of the GNU Lesser General Public License as published by