--- a/homescreenapp/hsdomainmodel/src/hsscene.cpp Mon May 03 12:24:59 2010 +0300
+++ b/homescreenapp/hsdomainmodel/src/hsscene.cpp Fri May 14 15:43:04 2010 +0300
@@ -343,9 +343,10 @@
HsScene *HsScene::instance()
{
if (!mInstance) {
- mInstance.reset(new HsScene);
+ mInstance = new HsScene;
+ mInstance->setParent(HsScene::mainWindow());
}
- return mInstance.data();
+ return mInstance;
}
/*!
@@ -393,10 +394,10 @@
mActiveWidget(0),
mIsOnline(true),
mMaximumPageCount(1),
- mMaximumWidgetSizeInPixels(341, 268),
- mMinimumWidgetSizeInPixels(20, 20),
- mMaximumWidgetSizeInUnits(51, 40),
- mMinimumWidgetSizeInUnits(3, 3)
+ mMaximumWidgetSizeInPixels(321.6, 261.3),
+ mMinimumWidgetSizeInPixels(58.625, 58.625),
+ mMaximumWidgetSizeInUnits(48, 39),
+ mMinimumWidgetSizeInUnits(8.75, 8.75)
{
mWallpaper = new HsWallpaper;
}
@@ -404,4 +405,4 @@
/*!
Points to the scene instance.
*/
-QScopedPointer<HsScene> HsScene::mInstance(0);
+HsScene *HsScene::mInstance = 0;