git.iko.soy/unity8
on xenial help sign in
rename hinting signal
6e14238Michael Zanetti
plugins/Unity/Launcher/launchermodel.cpp+2−2
compare with xenial
unifiedsplit
@@ -347,7 +347,7 @@ void LauncherModel::countVisibleChanged(const QString &appId, int countVisible)
347 beginInsertRows(QModelIndex(), m_list.count(), m_list.count());
347 beginInsertRows(QModelIndex(), m_list.count(), m_list.count());
348 m_list.append(item);
348 m_list.append(item);
349 endInsertRows();
349 endInsertRows();
350− Q_EMIT hintChanged();
350+ Q_EMIT hint();
351 }
351 }
352 }
352 }
353}
353}
@@ -428,7 +428,7 @@ void LauncherModel::refresh()
428 }
428 }
429
429
430 if (changed) {
430 if (changed) {
431− Q_EMIT hintChanged();
431+ Q_EMIT hint();
432 }
432 }
433}
433}
434
434
qml/Launcher/Launcher.qml+1−1
@@ -115,7 +115,7 @@ Item {
115
115
116 Connections {
116 Connections {
117 target: LauncherModel
117 target: LauncherModel
118− onHintChanged: hint();
118+ onHint: hint();
119 }
119 }
120
120
121 SequentialAnimation {
121 SequentialAnimation {
tests/mocks/Unity/Launcher/MockLauncherModel.cpp+2−2
@@ -209,9 +209,9 @@ void MockLauncherModel::setApplicationManager(unity::shell::application::Applica
209 Q_UNUSED(applicationManager)
209 Q_UNUSED(applicationManager)
210}
210}
211
211
212−void MockLauncherModel::emitHintChanged()
212+void MockLauncherModel::emitHint()
213{
213{
214− Q_EMIT hintChanged();
214+ Q_EMIT hint();
215}
215}
216
216
217unity::shell::application::ApplicationManagerInterface *MockLauncherModel::applicationManager() const
217unity::shell::application::ApplicationManagerInterface *MockLauncherModel::applicationManager() const
tests/mocks/Unity/Launcher/MockLauncherModel.h+1−1
@@ -50,7 +50,7 @@ public:
50 void setApplicationManager(unity::shell::application::ApplicationManagerInterface *applicationManager);
50 void setApplicationManager(unity::shell::application::ApplicationManagerInterface *applicationManager);
51
51
52 // For testing
52 // For testing
53− Q_INVOKABLE void emitHintChanged();
53+ Q_INVOKABLE void emitHint();
54
54
55Q_SIGNALS:
55Q_SIGNALS:
56 void quickListTriggered(const QString &appId, int index);
56 void quickListTriggered(const QString &appId, int index);
tests/plugins/Unity/Launcher/launchermodeltest.cpp+1−1
@@ -430,7 +430,7 @@ private Q_SLOTS:
430
430
431 void testSettings() {
431 void testSettings() {
432 GSettings *settings = launcherModel->m_settings;
432 GSettings *settings = launcherModel->m_settings;
433− QSignalSpy spy(launcherModel, SIGNAL(hintChanged()));
433+ QSignalSpy spy(launcherModel, SIGNAL(hint()));
434
434
435 // Nothing pinned at startup
435 // Nothing pinned at startup
436 QCOMPARE(settings->storedApplications().count(), 0);
436 QCOMPARE(settings->storedApplications().count(), 0);
tests/qmltests/Launcher/tst_Launcher.qml+3−3
@@ -75,9 +75,9 @@ Item {
75 }
75 }
76
76
77 Button {
77 Button {
78− anchors { top: parent.top; right: parent.right; margins: units.gu(1) }
78+ anchors { bottom: parent.bottom; right: parent.right; margins: units.gu(1) }
79 text: "emit hinting signal"
79 text: "emit hinting signal"
80− onClicked: LauncherModel.emitHintChanged()
80+ onClicked: LauncherModel.emitHint()
81 }
81 }
82
82
83 SignalSpy {
83 SignalSpy {
@@ -243,7 +243,7 @@ Item {
243 launcher.maxPanelX = -launcher.panelWidth
243 launcher.maxPanelX = -launcher.panelWidth
244 // change it
244 // change it
245 LauncherModel.move(0, 1)
245 LauncherModel.move(0, 1)
246− LauncherModel.emitHintChanged();
246+ LauncherModel.emitHint();
247
247
248 // make sure it opened fully and hides again without delay
248 // make sure it opened fully and hides again without delay
249 tryCompare(launcher, "maxPanelX", 0)
249 tryCompare(launcher, "maxPanelX", 0)