--- a/controlpanelplugins/themeplugin/src/cpthemeutil.h	Wed Jul 14 07:09:46 2010 +0800
+++ b/controlpanelplugins/themeplugin/src/cpthemeutil.h	Fri Jul 23 11:04:51 2010 +0800
@@ -19,6 +19,7 @@
 #define CPTHEMEUTIL_H_
 
 #include <QList>
+#include <QPair>
 
 class QStringList;
 class CpThemeInfo;
@@ -26,11 +27,13 @@
 class CpThemeUtil {
 
 public:
-    static QStringList themePathList();
     static QList<CpThemeInfo> buildThemeList();
-    static CpThemeInfo* buildThemeInfo(const QString& themePath, const QString& themeName);
-    static QString themePath(const QString& themeName);
+    static CpThemeInfo* buildThemeInfo(const QString& themePath, const QString& themeName = QString());
     static CpThemeInfo* defaultTheme();
+    static const QList< QPair< QString, QString > > availableThemes(); 
+    static const QStringList themeDirectories(const QList<CpThemeInfo> &themeInfoList);
+
+        
 };
 
 #endif /* CPTHEMEUTIL_H_ */