git.iko.soy/unity8
on xenial help sign in
Make some members/arguments const and add serviceReadyChanged signal.
commit97ef592b1f7e24bc21eebb6960d82df04e7cb28b authorMichał Sawicz <michal.sawicz@canonical.com> dateMon 12 Aug 2013, 10:01 (13 years ago) parent127ad93
2 files changed+13−10
compare with xenial
unifiedsplit
plugins/Ubuntu/DownloadDaemonListener/DownloadTracker.cpp+8−6 plugins/Ubuntu/DownloadDaemonListener/DownloadTracker.h+5−4
plugins/Ubuntu/DownloadDaemonListener/DownloadTracker.cpp+8−6
@@ -26,7 +26,7 @@ DownloadTracker::DownloadTracker(QObject *parent) :
2626{
2727}
2828
29−bool DownloadTracker::isServiceReady()
29+bool DownloadTracker::isServiceReady() const
3030{
3131 bool ready = false;
3232 if(m_adaptor != nullptr) {
@@ -41,9 +41,9 @@ QString DownloadTracker::dbusPath() const
4141 return m_dbusPath;
4242}
4343
44−void DownloadTracker::setDbusPath(QString& path)
44+void DownloadTracker::setDbusPath(const QString& path)
4545{
46− if(path != "" && m_dbusPath != path){
46+ if(!path.isEmpty() && m_dbusPath != path){
4747 m_dbusPath = path;
4848 startService();
4949 Q_EMIT dbusPathChanged(m_dbusPath);
@@ -55,9 +55,9 @@ QString DownloadTracker::service() const
5555 return m_service;
5656}
5757
58−void DownloadTracker::setService(QString& service)
58+void DownloadTracker::setService(const QString& service)
5959{
60− if(service != "" && m_service != service){
60+ if(!service.isEmpty() && m_service != service){
6161 m_service = service;
6262 startService();
6363 Q_EMIT serviceChanged(m_service);
@@ -68,7 +68,7 @@ void DownloadTracker::startService()
6868{
6969 // FIXME update dbus path and service on changes
7070 if(!m_service.isEmpty() && !m_dbusPath.isEmpty()) {
71− m_adaptor = new DownloadTrackerAdaptor(m_service, m_dbusPath, QDBusConnection::sessionBus(), 0);
71+ m_adaptor = new DownloadTrackerAdaptor(m_service, m_dbusPath, QDBusConnection::sessionBus(), this);
7272
7373 connect(m_adaptor, SIGNAL(canceled(bool)), this, SIGNAL(canceled(bool)));
7474 connect(m_adaptor, SIGNAL(error(const QString &)), this, SIGNAL(error(const QString &)));
@@ -78,4 +78,6 @@ void DownloadTracker::startService()
7878 connect(m_adaptor, SIGNAL(resumed(bool)), this, SIGNAL(resumed(bool)));
7979 connect(m_adaptor, SIGNAL(started(bool)), this, SIGNAL(started(bool)));
8080 }
81+ // FIXME find a better way of determining if the service is ready
82+ Q_EMIT serviceReadyChanged(m_adaptor->isValid());
8183}
plugins/Ubuntu/DownloadDaemonListener/DownloadTracker.h+5−4
@@ -33,21 +33,22 @@ class DownloadTracker : public QObject
3333 Q_DISABLE_COPY(DownloadTracker)
3434 Q_PROPERTY(QString service READ service WRITE setService NOTIFY serviceChanged)
3535 Q_PROPERTY(QString dbusPath READ dbusPath WRITE setDbusPath NOTIFY dbusPathChanged)
36− Q_PROPERTY(bool serviceReady READ isServiceReady)
36+ Q_PROPERTY(bool serviceReady READ isServiceReady NOTIFY serviceReadyChanged)
3737
3838public:
3939 explicit DownloadTracker(QObject *parent = 0);
4040
4141 QString service() const;
4242 QString dbusPath() const;
43+ bool isServiceReady() const;
4344
44− void setDbusPath(QString& path);
45− void setService(QString& service);
46− bool isServiceReady();
45+ void setDbusPath(const QString& path);
46+ void setService(const QString& service);
4747
4848Q_SIGNALS:
4949 void serviceChanged(const QString &service);
5050 void dbusPathChanged(const QString &dbusPath);
51+ void serviceReadyChanged(const bool &serviceReady);
5152
5253 void canceled(bool success);
5354 void error(const QString &error);