65 mFileSaveThread(NULL) |
65 mFileSaveThread(NULL) |
66 { |
66 { |
67 CX_DEBUG_ENTER_FUNCTION(); |
67 CX_DEBUG_ENTER_FUNCTION(); |
68 |
68 |
69 // Do secondary construction during reserve call. |
69 // Do secondary construction during reserve call. |
70 connect(this, SIGNAL(reserveStarted()), this, SLOT(construct())); |
70 //! @todo temporarily commented as part of a hack to change the startup sequence |
|
71 // to avoid GOOM issues |
|
72 // connect(this, SIGNAL(reserveStarted()), this, SLOT(construct())); |
71 |
73 |
72 CxeCameraDeviceControlSymbian *deviceControl = new CxeCameraDeviceControlSymbian(); |
74 CxeCameraDeviceControlSymbian *deviceControl = new CxeCameraDeviceControlSymbian(); |
73 mCameraDeviceControl = deviceControl; |
75 mCameraDeviceControl = deviceControl; |
74 mCameraDevice = deviceControl->cameraDevice(); |
76 mCameraDevice = deviceControl->cameraDevice(); |
75 CX_ASSERT_ALWAYS(mCameraDeviceControl); |
77 CX_ASSERT_ALWAYS(mCameraDeviceControl); |
76 CX_ASSERT_ALWAYS(mCameraDevice); |
78 CX_ASSERT_ALWAYS(mCameraDevice); |
77 |
79 |
78 mCameraDeviceControl->init(); |
80 mCameraDeviceControl->init(); |
79 |
81 //! @todo calling construct here is a hack to change the startup sequence |
|
82 // to avoid GOOM issues |
|
83 construct(); |
|
84 |
80 CX_DEBUG_EXIT_FUNCTION(); |
85 CX_DEBUG_EXIT_FUNCTION(); |
81 } |
86 } |
82 |
87 |
83 |
88 |
84 /*! |
89 /*! |
117 mSettingsModel = new CxeSettingsModelImp(settingsStore); |
122 mSettingsModel = new CxeSettingsModelImp(settingsStore); |
118 // assert if settings model fails to intialize |
123 // assert if settings model fails to intialize |
119 CX_DEBUG_ASSERT(mSettingsModel); |
124 CX_DEBUG_ASSERT(mSettingsModel); |
120 |
125 |
121 mSettings = new CxeSettingsImp(*mSettingsModel); |
126 mSettings = new CxeSettingsImp(*mSettingsModel); |
|
127 |
|
128 //! @todo a temporary hack to change the startup sequence to avoid GOOM problems |
|
129 static_cast<CxeSettingsImp*>(mSettings)->loadSettings(mode()); |
|
130 |
|
131 |
122 // Connect P&S key updates to settings signal. |
132 // Connect P&S key updates to settings signal. |
123 connect(settingsStore, SIGNAL(settingValueChanged(long int, unsigned long int, QVariant)), |
133 connect(settingsStore, SIGNAL(settingValueChanged(long int, unsigned long int, QVariant)), |
124 mSettings, SIGNAL(settingValueChanged(long int, unsigned long int, QVariant))); |
134 mSettings, SIGNAL(settingValueChanged(long int, unsigned long int, QVariant))); |
125 |
135 |
126 mFeatureManager = new CxeFeatureManagerImp(*mSettingsModel); |
136 mFeatureManager = new CxeFeatureManagerImp(*mSettingsModel); |