1
=== modified file 'plugins/Cursor/CursorImageInfo.cpp'
2
--- plugins/Cursor/CursorImageInfo.cpp	2016-05-19 19:44:37 +0000
3
+++ plugins/Cursor/CursorImageInfo.cpp	2016-06-09 10:54:48 +0000
4
@@ -19,17 +19,14 @@
5
19
CursorImageInfo::CursorImageInfo(QObject *parent)
19
CursorImageInfo::CursorImageInfo(QObject *parent)
6
20
    : QObject(parent)
20
    : QObject(parent)
7
21
{
21
{
8
22
    m_updateTimer.setInterval(0);
9
23
    m_updateTimer.setSingleShot(true);
10
24
    connect(&m_updateTimer, &QTimer::timeout, this, &CursorImageInfo::update);
11
25
}
22
}
12
26
23
13
27
void CursorImageInfo::setCursorName(const QString &cursorName)
24
void CursorImageInfo::setCursorName(const QString &cursorName)
14
28
{
25
{
15
29
    if (cursorName != m_cursorName) {
26
    if (cursorName != m_cursorName) {
16
30
        m_cursorName = cursorName;
27
        m_cursorName = cursorName;
17
28
        update();
18
31
        Q_EMIT cursorNameChanged();
29
        Q_EMIT cursorNameChanged();
19
32
        scheduleUpdate();
20
33
    }
30
    }
21
34
}
31
}
22
35
32
23
@@ -37,15 +34,8 @@
24
37
{
34
{
25
38
    if (m_themeName != themeName) {
35
    if (m_themeName != themeName) {
26
39
        m_themeName = themeName;
36
        m_themeName = themeName;
27
37
        update();
28
40
        Q_EMIT themeNameChanged();
38
        Q_EMIT themeNameChanged();
29
41
        scheduleUpdate();
30
42
    }
31
43
}
32
44
33
45
void CursorImageInfo::scheduleUpdate()
34
46
{
35
47
    if (!m_updateTimer.isActive()) {
36
48
        m_updateTimer.start();
37
49
    }
39
    }
38
50
}
40
}
39
51
41
40
52
42
41
=== modified file 'plugins/Cursor/CursorImageInfo.h'
42
--- plugins/Cursor/CursorImageInfo.h	2016-05-19 19:44:37 +0000
43
+++ plugins/Cursor/CursorImageInfo.h	2016-06-09 10:54:48 +0000
44
@@ -21,7 +21,6 @@
45
21
21
46
22
#include <QObject>
22
#include <QObject>
47
23
#include <QString>
23
#include <QString>
48
24
#include <QTimer>
49
25
24
50
26
class CursorImageInfo : public QObject
25
class CursorImageInfo : public QObject
51
27
{
26
{
52
@@ -64,9 +63,6 @@
53
64
    void update();
63
    void update();
54
65
64
55
66
private:
65
private:
56
67
    void scheduleUpdate();
57
68
    QTimer m_updateTimer;
58
69
59
70
    QString m_themeName;
66
    QString m_themeName;
60
71
    QString m_cursorName;
67
    QString m_cursorName;
61
72
68
Reviewer	Review Type	Date Requested	Status
Unity8 CI Bot	continuous-integration		Needs Fixing on 2016-06-09
Albert Astals Cid (community)		2016-06-08	Approve on 2016-06-08
Review via email: mp+296859@code.launchpad.net