Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Merge commit '6addc529ff2b04d12d82dcf2701aae71748e3461'
  • Loading branch information
Valerio Valerio committed Jun 12, 2013
2 parents 0fb1164 + 6addc52 commit a64b653
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 9 deletions.
1 change: 0 additions & 1 deletion qmf/examples/qtmail/app/statusmonitor.cpp
Expand Up @@ -48,7 +48,6 @@
#include <QResizeEvent>
#include <qtmailnamespace.h>

#define DEFINE_STATUS_MONITOR_INSTANCE
#include "statusmonitor.h"

class ServiceActionStatusWidget : public QWidget
Expand Down
9 changes: 1 addition & 8 deletions qmf/examples/qtmail/app/statusmonitor.h
Expand Up @@ -82,15 +82,12 @@ private slots:
QString m_description;
};

#ifdef DEFINE_STATUS_MONITOR_INSTANCE
static StatusMonitor* StatusMonitorInstance();
#endif

class StatusMonitor : public QObject
{
Q_OBJECT

public:
StatusMonitor();
static StatusMonitor* instance();
void add(StatusItem* newItem);
int itemCount() const;
Expand All @@ -107,11 +104,7 @@ private slots:
void statusItemDestroyed(QObject*);

private:
StatusMonitor();
void updateProgress();
#ifdef DEFINE_STATUS_MONITOR_INSTANCE
friend StatusMonitor* StatusMonitorInstance();
#endif

private:
QList<StatusItem*> m_statusItems;
Expand Down

0 comments on commit a64b653

Please sign in to comment.