--- a/src/hbservers/themechanger/themeselectionlist.h	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbservers/themechanger/themeselectionlist.h	Mon May 03 12:48:33 2010 +0300
@@ -29,14 +29,16 @@
 #include <QModelIndex>
 #include <QStandardItemModel>
 #include <QFileSystemWatcher>
+#include <QTime>
 #include <hbview.h>
-#include <hblistview.h>
+#include <hblistwidget.h>
 
 #ifdef Q_OS_SYMBIAN
 #include "themeclientsymbian.h"
 #else
 #include "themeclientqt.h"
 #endif
+#include "themechangerdefs.h"
 
 class HbIcon;
 
@@ -56,10 +58,14 @@
     void newThemeSelected(const QString &newthemepath);
 public slots:
     void displayThemes();
-    void setChosen(const QModelIndex &index);
+    void setChosen(HbListWidgetItem *item);
     void applySelection();
     void updateThemeList(const QString &path);
     void sendThemeName(const QString& name);
+#ifdef THEME_CHANGER_TIMER_LOG
+    void processWhenIdle();
+    void themeChanged();
+#endif
 
 protected:
     bool event(QEvent *e);
@@ -67,9 +73,8 @@
 private:
     static QStringList rootPaths();
     QDir dir; 
-    QModelIndex oldItemIndex;
-    HbListView *themelist;
-    QStandardItemModel* model;
+    int oldItemIndex;
+    HbListWidget *themelist;
     HbIcon* rightMark;
     HbIcon* noMark;
     HbAction *action;
@@ -81,5 +86,9 @@
 
     QFileSystemWatcher *watcher;
     QString iCurrentTheme;
+#ifdef THEME_CHANGER_TIMER_LOG
+    QTime timer;
+    QTimer *idleTimer;
+#endif
 };
 #endif //THEMESELECTIONLIST_H