@@ -15,7 +15,7 @@
1515 *
1616 */
1717
18−#include "sessionscreenshoter.h"
18+#include "sessiongrabber.h"
1919
2020#include <QDebug>
2121#include <QQuickItem>
@@ -27,18 +27,18 @@ static QString cachePath()
2727 return QDir::homePath() + "/.cache/app_shots/";
2828}
2929
30−SessionScreenshoter::SessionScreenshoter(QObject *parent)
30+SessionGrabber::SessionGrabber(QObject *parent)
3131 : QObject(parent),
3232 m_target(nullptr)
3333{
3434}
3535
36−QString SessionScreenshoter::appId() const
36+QString SessionGrabber::appId() const
3737{
3838 return m_appId;
3939}
4040
41−void SessionScreenshoter::setAppdId(const QString &appId)
41+void SessionGrabber::setAppdId(const QString &appId)
4242{
4343 if (appId != m_appId) {
4444 m_appId = appId;
@@ -49,12 +49,12 @@ void SessionScreenshoter::setAppdId(const QString &appId)
4949 }
5050}
5151
52−QQuickItem *SessionScreenshoter::target() const
52+QQuickItem *SessionGrabber::target() const
5353{
5454 return m_target;
5555}
5656
57−void SessionScreenshoter::setTarget(QQuickItem *target)
57+void SessionGrabber::setTarget(QQuickItem *target)
5858{
5959 if (target != m_target) {
6060 m_target = target;
@@ -62,12 +62,12 @@ void SessionScreenshoter::setTarget(QQuickItem *target)
6262 }
6363}
6464
65−QString SessionScreenshoter::path() const
65+QString SessionGrabber::path() const
6666{
6767 return m_path;
6868}
6969
70−void SessionScreenshoter::setPath(const QString &path)
70+void SessionGrabber::setPath(const QString &path)
7171{
7272 if (path != m_path) {
7373 m_path = path;
@@ -90,7 +90,7 @@ static QString saveScreenshot(const QString &appId, const QSharedPointer<QQuickI
9090 }
9191}
9292
93−void SessionScreenshoter::take()
93+void SessionGrabber::take()
9494{
9595 if (!m_grabResult.isNull()) {
9696 qWarning() << "Asked to take a screenshot when there's one already being taken, ignoring";
@@ -100,27 +100,27 @@ void SessionScreenshoter::take()
100100 if (m_target && !m_appId.isEmpty()) {
101101 // grabToImage runs in a separate thread
102102 m_grabResult = m_target->grabToImage();
103− connect(m_grabResult.data(), &QQuickItemGrabResult::ready, this, &SessionScreenshoter::grabReady);
103+ connect(m_grabResult.data(), &QQuickItemGrabResult::ready, this, &SessionGrabber::grabReady);
104104 } else {
105105 qWarning() << "Can't take screnshot: appId:" << m_appId << " target:" << m_target;
106106 }
107107}
108108
109−void SessionScreenshoter::removeScreenshot()
109+void SessionGrabber::removeScreenshot()
110110{
111111 const QString path = cachePath() + m_appId + ".png";
112112 QFile::remove(path);
113113}
114114
115−void SessionScreenshoter::grabReady()
115+void SessionGrabber::grabReady()
116116{
117117 QFuture<QString> f = QtConcurrent::run(saveScreenshot, m_appId, m_grabResult);
118118 m_watcher.reset(new QFutureWatcher<QString>(this));
119119 m_watcher->setFuture(f);
120− connect(m_watcher.data(), &QFutureWatcher<QString>::finished, this, &SessionScreenshoter::saveFinished);
120+ connect(m_watcher.data(), &QFutureWatcher<QString>::finished, this, &SessionGrabber::saveFinished);
121121}
122122
123−void SessionScreenshoter::saveFinished()
123+void SessionGrabber::saveFinished()
124124{
125125 setPath(m_watcher->future().result());
126126 m_watcher.clear();