diff options
| author | Tomas Junnonen <tomas.junnonen@nokia.com> | 2010-04-09 16:30:11 +0300 |
|---|---|---|
| committer | Tomas Junnonen <tomas.junnonen@nokia.com> | 2010-04-09 16:30:11 +0300 |
| commit | 0508ff4448f5d0d2799098fa7c5daa9b963a6900 (patch) | |
| tree | a95ce4dc5838758f2f414fd32ad1ce9ee0ee8278 | |
| parent | 5da635b3e9ed2a759ea706fb291781eaef2c4b10 (diff) | |
Changes: Fix ft_duiservicefwgen
RevBy: TrustMe
Details: Updated expected template
| -rw-r--r-- | tests/ft_duiservicefwgen/ftduiservicefwgen1adaptor.cpp.correct | 2 | ||||
| -rw-r--r-- | tests/ft_duiservicefwgen/ftduiservicefwgen2adaptor.cpp.correct | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/tests/ft_duiservicefwgen/ftduiservicefwgen1adaptor.cpp.correct b/tests/ft_duiservicefwgen/ftduiservicefwgen1adaptor.cpp.correct index 16ead473..4dcf0653 100644 --- a/tests/ft_duiservicefwgen/ftduiservicefwgen1adaptor.cpp.correct +++ b/tests/ft_duiservicefwgen/ftduiservicefwgen1adaptor.cpp.correct @@ -71,9 +71,9 @@ void FtDuiServiceFwGen1Adaptor::showImage(const QString &backServiceName, const // handle method call com.nokia.fakegalleryserviceinterface.showImage QMetaObject::invokeMethod(parent(), "showImage", Q_ARG(QString, uri), Q_ARG(QStringList, uriList)); - DuiApplication::instance()->activeWindow()->setWindowTitle( windowTitle ); DuiApplicationWindow *appWindow = DuiApplication::activeApplicationWindow(); if (appWindow != 0) { + appWindow->setWindowTitle( windowTitle ); appWindow->currentPage()->setEscapeMode( DuiApplicationPageModel::EscapeManualBack ); // connect to the back button - assumes the above 'showImage' opens a // new window and so the window referred to below is already the top one diff --git a/tests/ft_duiservicefwgen/ftduiservicefwgen2adaptor.cpp.correct b/tests/ft_duiservicefwgen/ftduiservicefwgen2adaptor.cpp.correct index fab90364..bce3aa61 100644 --- a/tests/ft_duiservicefwgen/ftduiservicefwgen2adaptor.cpp.correct +++ b/tests/ft_duiservicefwgen/ftduiservicefwgen2adaptor.cpp.correct @@ -63,9 +63,9 @@ void FtDuiServiceFwGen2Adaptor::showImage(const QString &backServiceName, const // handle method call com.nokia.fakegalleryserviceinterface.showImage QMetaObject::invokeMethod(parent(), "showImage", Q_ARG(QString, uri), Q_ARG(QStringList, uriList)); - DuiApplication::instance()->activeWindow()->setWindowTitle( windowTitle ); DuiApplicationWindow *appWindow = DuiApplication::activeApplicationWindow(); if (appWindow != 0) { + appWindow->setWindowTitle( windowTitle ); appWindow->currentPage()->setEscapeMode( DuiApplicationPageModel::EscapeManualBack ); // connect to the back button - assumes the above 'showImage' opens a // new window and so the window referred to below is already the top one |