--- a/phoneplugins/infowidgetplugin/tsrc/mocks/mock_infowidgetlayoutmanager.cpp Tue Jul 06 14:15:47 2010 +0300
+++ b/phoneplugins/infowidgetplugin/tsrc/mocks/mock_infowidgetlayoutmanager.cpp Wed Aug 18 09:48:26 2010 +0300
@@ -16,6 +16,8 @@
*/
#include <QDebug>
#include <QObject>
+#include <QGraphicsWidget>
+#include <QList>
#include <smcmockclassincludes.h>
#include "infowidgetlayoutmanager.h"
@@ -68,9 +70,9 @@
// InfoWidgetLayoutManager::layoutInfoDisplay
// -----------------------------------------------------------------------------
//
-QGraphicsLayout * InfoWidgetLayoutManager::layoutInfoDisplay( )
+QGraphicsWidget * InfoWidgetLayoutManager::layoutInfoDisplay( )
{
- SMC_MOCK_METHOD0( QGraphicsLayout * )
+ SMC_MOCK_METHOD0( QGraphicsWidget * )
}
@@ -78,9 +80,9 @@
// InfoWidgetLayoutManager::layoutSettingsDialog
// -----------------------------------------------------------------------------
//
-QGraphicsLayout * InfoWidgetLayoutManager::layoutSettingsDialog( )
+QGraphicsWidget * InfoWidgetLayoutManager::layoutSettingsDialog( )
{
- SMC_MOCK_METHOD0( QGraphicsLayout * )
+ SMC_MOCK_METHOD0( QGraphicsWidget * )
}
@@ -101,22 +103,7 @@
// InfoWidgetLayoutManager::loadWidgets
// -----------------------------------------------------------------------------
//
-bool InfoWidgetLayoutManager::loadWidgets(
- const DisplayRole displayRole,
- const QList<LayoutItemRole> &displayWidgets,
- QMap<LayoutItemRole, QGraphicsWidget *> &widgetMap)
- {
- typedef QMap <LayoutItemRole, QGraphicsWidget *> & TYPE3;
- SMC_MOCK_METHOD3( bool, const DisplayRole, displayRole,
- const QList<LayoutItemRole> &, displayWidgets,
- TYPE3, widgetMap )
- }
-
-// -----------------------------------------------------------------------------
-// InfoWidgetLayoutManager::reloadWidgets
-// -----------------------------------------------------------------------------
-//
-bool InfoWidgetLayoutManager::reloadWidgets(
+bool InfoWidgetLayoutManager::loadWidgets(
const DisplayRole displayRole )
{
SMC_MOCK_METHOD1( bool, const DisplayRole, displayRole )
@@ -219,27 +206,6 @@
// -----------------------------------------------------------------------------
-// InfoWidgetLayoutManager::layoutRows
-// -----------------------------------------------------------------------------
-//
-int InfoWidgetLayoutManager::layoutRows( ) const
- {
- SMC_MOCK_METHOD0( int )
- }
-
-
-// -----------------------------------------------------------------------------
-// InfoWidgetLayoutManager::setLayoutRows
-// -----------------------------------------------------------------------------
-//
-void InfoWidgetLayoutManager::setLayoutRows(
- int rows )
- {
- SMC_MOCK_METHOD1( void, int, rows )
- }
-
-
-// -----------------------------------------------------------------------------
// InfoWidgetLayoutManager::layoutRowHeight
// -----------------------------------------------------------------------------
//
@@ -265,6 +231,21 @@
// -----------------------------------------------------------------------------
+// InfoWidgetLayoutManager::loadWidgets
+// -----------------------------------------------------------------------------
+//
+bool InfoWidgetLayoutManager::loadWidgets(
+ const DisplayRole displayRole,
+ const QList<LayoutItemRole> & displayWidgets,
+ QMap <LayoutItemRole,QGraphicsWidget *> & widgetMap )
+ {
+ //SMC_MOCK_METHOD3( bool, const DisplayRole, displayRole,
+ // const QList<LayoutItemRole> &, displayWidgets,
+ // QMap<LayoutItemRole,QGraphicsWidget *> &, widgetMap )
+ }
+
+
+// -----------------------------------------------------------------------------
// InfoWidgetDocumentLoader::createObject
// -----------------------------------------------------------------------------
//