diff -r 305818acdca4 -r 50e220be30d1 tsdevicedialog/tsdevicedialogplugin/inc/tsmodel.h --- a/tsdevicedialog/tsdevicedialogplugin/inc/tsmodel.h Mon Sep 13 13:26:33 2010 +0300 +++ b/tsdevicedialog/tsdevicedialogplugin/inc/tsmodel.h Mon Sep 20 10:22:22 2010 +0300 @@ -34,14 +34,12 @@ public: TsModel(TsTaskMonitor &applicationSrv, - QObject &activitySrv, QObject *parent = 0); ~TsModel(); int rowCount(const QModelIndex &parent = QModelIndex()) const; QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const; - int maxRowCount()const; // from QAbstractModel virtual bool insertRows(int row, int count, TsModelItem *item, const QModelIndex &parent = QModelIndex()); @@ -58,12 +56,10 @@ void openApplication(const QModelIndex &index); void closeApplication(const QModelIndex &index); void updateApplications(); - void updateActivities(); - void entryChanged(TsModelItem *); + private: TsModelItem *entry(const QModelIndex &index) const; void getApplications(); - void getActivities(bool fullUpdate = true); private: /* @@ -73,17 +69,6 @@ TsTaskMonitor &mApplicationService; - /* - * Activity Service - */ - QObject &mActivityService; - - /* - * Maximum number of items (only for running apps + activities) - */ - int mMaxItems; - int mActivitiesCount; - Q_DISABLE_COPY(TsModel) };