diff options
| author | Tomas Junnonen <tomas.junnonen@nokia.com> | 2010-03-08 10:34:08 +0200 |
|---|---|---|
| committer | Tomas Junnonen <tomas.junnonen@nokia.com> | 2010-03-08 10:34:08 +0200 |
| commit | 979e1edccab47d0450f2d6abeb4980bf22fd3abf (patch) | |
| tree | 61769d0a7f2afe02fcf0bfaa68c6c70e2d620974 | |
| parent | eb94b5131b0bd4d0d72cae82b1faae3a70bd157a (diff) | |
Revert "Changes: Fixed ft_theme compile errors"0.19.4-2
This reverts commit de3030bd26d5198fbf6c8fc8cedcea307d51e6cb.
| -rw-r--r-- | tests/ft_theme/ft_theme.cpp | 4 | ||||
| -rw-r--r-- | tests/ft_theme/testthemedaemon.cpp | 7 | ||||
| -rw-r--r-- | tests/ft_theme/testthemedaemon.h | 1 |
3 files changed, 3 insertions, 9 deletions
diff --git a/tests/ft_theme/ft_theme.cpp b/tests/ft_theme/ft_theme.cpp index 3aa18072..5b5ac7c8 100644 --- a/tests/ft_theme/ft_theme.cpp +++ b/tests/ft_theme/ft_theme.cpp @@ -118,8 +118,8 @@ void Ft_Theme::initTestCase() testDaemon = new TestThemeDaemon; DuiTheme::instance()->d_ptr->themeDaemon = testDaemon; // a bit hackish, but connect the signals - connect(testDaemon, SIGNAL(themeChanged(QStringList, QStringList)), - DuiTheme::instance(), SLOT(themeChangedSlot(QStringList, QStringList))); + connect(testDaemon, SIGNAL(themeChanged(QStringList)), + DuiTheme::instance(), SLOT(themeChangedSlot(QStringList))); connect(testDaemon, SIGNAL(pixmapChanged(QString, QSize, Qt::HANDLE)), DuiTheme::instance(), SLOT(pixmapChangedSlot(QString, QSize, Qt::HANDLE))); diff --git a/tests/ft_theme/testthemedaemon.cpp b/tests/ft_theme/testthemedaemon.cpp index a790e87a..774fd2ce 100644 --- a/tests/ft_theme/testthemedaemon.cpp +++ b/tests/ft_theme/testthemedaemon.cpp @@ -95,7 +95,7 @@ void TestThemeDaemon::changeTheme(const QString &theme_id) void TestThemeDaemon::emitThemeChange() { - emit themeChanged(themeInheritanceChain(), QStringList()); + emit themeChanged(themeInheritanceChain()); } QStringList TestThemeDaemon::themeInheritanceChain() @@ -110,11 +110,6 @@ QStringList TestThemeDaemon::themeInheritanceChain() return themeInheritance; } -QStringList TestThemeDaemon::themeLibraryNames() -{ - return QStringList(); -} - bool TestThemeDaemon::hasPendingRequests() const { return false; diff --git a/tests/ft_theme/testthemedaemon.h b/tests/ft_theme/testthemedaemon.h index 055e8089..c44ce6ac 100644 --- a/tests/ft_theme/testthemedaemon.h +++ b/tests/ft_theme/testthemedaemon.h @@ -42,7 +42,6 @@ public: virtual void changeTheme(const QString &theme_id); void emitThemeChange(); virtual QStringList themeInheritanceChain(); - virtual QStringList themeLibraryNames(); virtual bool hasPendingRequests() const; |