FCL/sf/mw/wirelessacc: comparison wlanutilities/wlanwizard/src/wlanwizard

equal deleted inserted replaced

-:fb81b597edf1
+:bdc64aa9b954
 * Description:
 * WLAN Wizard: Private implementation.
 */
 // System includes
-#include <QLocale>
 #include <QApplication>
 #include <QGraphicsWidget>
 #include <QTimer>
 #include <QDebug>
 #include <HbTranslator>
 #include <HbDocumentLoader>
 #include <HbMainWindow>
 #include <HbDialog>
 #include <HbStackedWidget>
 #include <HbLabel>
 #include <HbAction>
 #include <HbStyleLoader>
 // User includes
 #include "eapwizard.h"
 #include "wpswizard.h"
 #include "wlanqtutils.h"
 #include "wlanqtutilsap.h"
 #include "wlanwizardplugin.h"
 mWpsWizard(NULL),
 mFirstPageId(WlanWizardPageInternal::PageNone),
 mPageFinished(false),
 mClosed(false)
 {
-OstTraceFunctionEntry0( WLANWIZARDPRIVATE_WLANWIZARDPRIVATE_ENTRY );
+OstTraceFunctionEntry0(WLANWIZARDPRIVATE_WLANWIZARDPRIVATE_ENTRY);
-OstTrace1( TRACE_BORDER, WLANWIZARDPRIVATE_WLANWIZARDPRIVATE,
+OstTrace1(
+TRACE_BORDER,
+WLANWIZARDPRIVATE_WLANWIZARDPRIVATE,
 "WlanWizardPrivate::WlanWizardPrivate;this=%x",
-this );
+this);
 // Set initial values for configurations
 setConfiguration(ConfIapId, WlanQtUtils::IapIdNone);
 setConfiguration(ConfConnected, false);
-setConfiguration(ConfHiddenWlan, false);
+setConfiguration(ConfWlanScanSSID, false);
 setConfiguration(ConfProcessSettings, false);
 setConfiguration(ConfIctStatus, false);
 // Initialize timer for timer protected pages
 mPageTimer->setSingleShot(true);
 // First page is SSID query, unless client sets configurations via
 // setParameters(), which decides the first page..
 mFirstPageId = WlanWizardPageInternal::PageSsid;
-OstTraceExt2( TRACE_BORDER, WLANWIZARDPRIVATE_WLANWIZARDPRIVATE_DONE,
+OstTraceExt2(
+TRACE_BORDER,
+WLANWIZARDPRIVATE_WLANWIZARDPRIVATE_DONE,
 "WlanWizardPrivate::WlanWizardPrivate - done;"
 "this=%x;mFirstPageId=%{PageIds}",
-( unsigned )this, mFirstPageId );
+(unsigned)this,
-OstTraceFunctionExit0( WLANWIZARDPRIVATE_WLANWIZARDPRIVATE_EXIT );
+mFirstPageId);
+OstTraceFunctionExit0(WLANWIZARDPRIVATE_WLANWIZARDPRIVATE_EXIT);
 }
 /*!
 Destructor.
 */
 WlanWizardPrivate::~WlanWizardPrivate()
 {
-OstTraceFunctionEntry0( DUP1_WLANWIZARDPRIVATE_WLANWIZARDPRIVATE_ENTRY );
+OstTraceFunctionEntry0(DUP1_WLANWIZARDPRIVATE_WLANWIZARDPRIVATE_ENTRY);
-OstTrace1( TRACE_BORDER, WLANWIZARDPRIVATE_DWLANWIZARDPRIVATE,
+OstTrace1(
+TRACE_BORDER,
+WLANWIZARDPRIVATE_DWLANWIZARDPRIVATE,
 "WlanWizardPrivate::~WlanWizardPrivate;this=%x",
-this );
+this);
 // Remove wizard pages from stackedwidgets, since stackedwidget owns the
 // objects and all pages are deleted below.
 while (mStackedWidget->count()) {
 mStackedWidget->removeAt(0);
 mDialog->setAttribute( Qt::WA_DeleteOnClose, true );
 mDialog->close();
 // Remove the pointer from QScopedPointer to prevent double deallocation
 mDialog.take();
-OstTrace1( TRACE_BORDER, WLANWIZARDPRIVATE_DWLANWIZARDPRIVATE_DONE,
+OstTrace1(
+TRACE_BORDER,
+WLANWIZARDPRIVATE_DWLANWIZARDPRIVATE_DONE,
 "WlanWizardPrivate::~WlanWizardPrivate-Done;this=%x",
-this );
+this);
-OstTraceFunctionExit0( DUP1_WLANWIZARDPRIVATE_WLANWIZARDPRIVATE_EXIT );
+OstTraceFunctionExit0(DUP1_WLANWIZARDPRIVATE_WLANWIZARDPRIVATE_EXIT);
 }
 /*!
 See WlanWizard::setParameters().
 */
 void WlanWizardPrivate::setParameters(
 const QString &ssid,
 int networkMode,
 int securityMode,
 bool usePsk,
-bool hidden,
 bool wps)
 {
-OstTraceFunctionEntry0( WLANWIZARDPRIVATE_SETPARAMETERS_ENTRY );
+OstTraceFunctionEntry0(WLANWIZARDPRIVATE_SETPARAMETERS_ENTRY);
-OstTrace1( TRACE_BORDER, WLANWIZARDPRIVATE_SETPARAMETERS,
+OstTrace1(
+TRACE_BORDER,
+WLANWIZARDPRIVATE_SETPARAMETERS,
 "WlanWizardPrivate::setParameters;this=%x",
-this );
+this);
 mFirstPageId = getNextPageId(
-ssid, networkMode, securityMode, usePsk, hidden, wps);
+ssid,
+networkMode,
-OstTrace1( TRACE_BORDER, WLANWIZARDPRIVATE_SETPARAMETERS_DONE,
+securityMode,
+usePsk,
+false,
+wps);
+OstTrace1(
+TRACE_BORDER,
+WLANWIZARDPRIVATE_SETPARAMETERS_DONE,
 "WlanWizardPrivate::setParameters - Done;this=%x",
-this );
+this);
-OstTraceFunctionExit0( WLANWIZARDPRIVATE_SETPARAMETERS_EXIT );
+OstTraceFunctionExit0(WLANWIZARDPRIVATE_SETPARAMETERS_EXIT);
 }
 /*!
 See WlanWizard::show().
 */
 void WlanWizardPrivate::show()
 {
-OstTraceFunctionEntry0( WLANWIZARDPRIVATE_SHOW_ENTRY );
+OstTraceFunctionEntry0(WLANWIZARDPRIVATE_SHOW_ENTRY);
-OstTraceExt2( TRACE_BORDER, WLANWIZARDPRIVATE_SHOW,
+OstTraceExt2(
+TRACE_BORDER,
+WLANWIZARDPRIVATE_SHOW,
 "WlanWizardPrivate::show;this=%x;mFirstPageId=%{PageIds}",
-( unsigned )this, mFirstPageId );
+(unsigned)this,
+mFirstPageId);
 Q_ASSERT(mClosed == false);
 showPage(mFirstPageId, false);
 mDialog->show();
-OstTrace1( TRACE_BORDER, WLANWIZARDPRIVATE_SHOW_DONE,
+OstTrace1(
+TRACE_BORDER,
+WLANWIZARDPRIVATE_SHOW_DONE,
 "WlanWizardPrivate::show - Done;this=%x;",
-(unsigned)this );
+(unsigned)this);
-OstTraceFunctionExit0( WLANWIZARDPRIVATE_SHOW_EXIT );
+OstTraceFunctionExit0(WLANWIZARDPRIVATE_SHOW_EXIT);
 }
 /*!
 See WlanWizard::setParameters() for descriptions of parameters.
 int securityMode,
 bool usePsk,
 bool hidden,
 bool wps)
 {
-OstTraceFunctionEntry0( WLANWIZARDPRIVATE_GETNEXTPAGEID_ENTRY );
+OstTraceFunctionEntry0(WLANWIZARDPRIVATE_GETNEXTPAGEID_ENTRY);
 setConfiguration(ConfProcessSettings, true);
 setConfiguration(ConfSsid, ssid);
 setConfiguration(ConfNetworkMode, networkMode);
 setConfiguration(ConfSecurityMode, securityMode);
 setConfiguration(ConfUsePsk, usePsk);
-setConfiguration(ConfHiddenWlan, hidden);
+setConfiguration(ConfWlanScanSSID, hidden);
-OstTrace1( TRACE_NORMAL, WLANWIZARDPRIVATE_GETNEXTPAGEID,
+OstTrace1(
+TRACE_NORMAL,
+WLANWIZARDPRIVATE_GETNEXTPAGEID,
 "WlanWizardPrivate::getNextPageId;wps=%u",
-wps );
+wps);
-OstTraceFunctionExit0( WLANWIZARDPRIVATE_GETNEXTPAGEID_EXIT );
+OstTraceFunctionExit0(WLANWIZARDPRIVATE_GETNEXTPAGEID_EXIT);
 return nextPageId(wps);
 }
 /*!
 Utility method for WLAN Wizard pages to query the wlanqtutils class.
 @return a valid pointer to WlanQtUtils class.
 */
 WlanQtUtils* WlanWizardPrivate::wlanQtUtils() const
 {
-OstTraceFunctionEntry0( WLANWIZARDPRIVATE_WLANQTUTILS_ENTRY );
+OstTraceFunctionEntry0(WLANWIZARDPRIVATE_WLANQTUTILS_ENTRY);
 Q_ASSERT(mWlanQtUtils.data());
-OstTraceFunctionExit0( WLANWIZARDPRIVATE_WLANQTUTILS_EXIT );
+OstTraceFunctionExit0(WLANWIZARDPRIVATE_WLANQTUTILS_EXIT);
 return mWlanQtUtils.data();
 }
 /*!
 Utility method for WLAN Wizard pages to query active wizard plugin object
 @return NULL in case plugin is not active.
 */
 WlanWizardPlugin* WlanWizardPrivate::wlanWizardPlugin() const
 {
-OstTraceFunctionEntry0( WLANWIZARDPRIVATE_WLANWIZARDPLUGIN_ENTRY );
+OstTraceFunctionEntry0(WLANWIZARDPRIVATE_WLANWIZARDPLUGIN_ENTRY);
 WlanWizardPlugin* plugin = NULL;
 if (isEapEnabled()) {
 plugin = mEapWizard.data();
 Q_ASSERT(plugin);
 }
-OstTrace1( TRACE_NORMAL, WLANWIZARDPRIVATE_WLANWIZARDPLUGIN,
+OstTrace1(
+TRACE_NORMAL,
+WLANWIZARDPRIVATE_WLANWIZARDPLUGIN,
 "WlanWizardPrivate::wlanWizardPlugin;plugin=%x",
-plugin );
+plugin);
-OstTraceFunctionExit0( WLANWIZARDPRIVATE_WLANWIZARDPLUGIN_EXIT );
+OstTraceFunctionExit0(WLANWIZARDPRIVATE_WLANWIZARDPLUGIN_EXIT);
 return plugin;
 }
 /*!
 Utility method for WLAN Wizard pages to query if EAP mode is active at the
 @return true in case EAP is currently activated.
 */
 bool WlanWizardPrivate::isEapEnabled() const
 {
-OstTraceFunctionEntry0( WLANWIZARDPRIVATE_ISEAPENABLED_ENTRY );
+OstTraceFunctionEntry0(WLANWIZARDPRIVATE_ISEAPENABLED_ENTRY);
 bool ret = false;
 int secMode = configuration(ConfSecurityMode).toInt();
 if (((secMode == CMManagerShim::WlanSecModeWpa ||
 secMode == CMManagerShim::WlanSecModeWpa2) &&
 !configuration(ConfUsePsk).toBool()) ||
 secMode == CMManagerShim::WlanSecMode802_1x) {
 ret = true;
 }
-OstTrace1( TRACE_NORMAL, WLANWIZARDPRIVATE_ISEAPENABLED,
+OstTrace1(
+TRACE_NORMAL,
+WLANWIZARDPRIVATE_ISEAPENABLED,
 "WlanWizardPrivate::isEapEnabled;ret=%u",
-ret );
+ret);
-OstTraceFunctionExit0( WLANWIZARDPRIVATE_ISEAPENABLED_EXIT );
+OstTraceFunctionExit0(WLANWIZARDPRIVATE_ISEAPENABLED_EXIT);
 return ret;
 }
 /*!
 Creates new iap or updates existing iap.
 @return false in case IAP creation/update failed.
 */
 bool WlanWizardPrivate::handleIap()
 {
-OstTraceFunctionEntry0( WLANWIZARDPRIVATE_HANDLEIAP_ENTRY );
+OstTraceFunctionEntry0(WLANWIZARDPRIVATE_HANDLEIAP_ENTRY);
-OstTrace0( TRACE_FLOW, WLANWIZARDPRIVATE_HANDLEIAP,
-"WlanWizardPrivate::handleIap" );
+OstTrace0(
+TRACE_FLOW,
+WLANWIZARDPRIVATE_HANDLEIAP,
+"WlanWizardPrivate::handleIap");
 bool ret = true;
 bool usePsk = true;
 int securityMode = configuration(ConfSecurityMode).toInt();
 WlanQtUtilsAp wlanAp;
 wlanAp.setValue(WlanQtUtilsAp::ConfIdWepKey3, QString());
 wlanAp.setValue(WlanQtUtilsAp::ConfIdWepKey4, QString());
 // Set configuration
 wlanAp.setValue(WlanQtUtilsAp::ConfIdSsid, configuration(ConfSsid));
-wlanAp.setValue(WlanQtUtilsAp::ConfIdConnectionMode,
+wlanAp.setValue(
+WlanQtUtilsAp::ConfIdConnectionMode,
 configuration(ConfNetworkMode));
-wlanAp.setValue(WlanQtUtilsAp::ConfIdSecurityMode, securityMode );
+wlanAp.setValue(WlanQtUtilsAp::ConfIdSecurityMode, securityMode);
-wlanAp.setValue(WlanQtUtilsAp::ConfIdHidden, configuration(ConfHiddenWlan));
+wlanAp.setValue(WlanQtUtilsAp::ConfIdHidden, false);
+wlanAp.setValue(WlanQtUtilsAp::ConfIdWlanScanSSID, configuration(ConfWlanScanSSID));
 switch (securityMode) {
 case CMManagerShim::WlanSecModeWep:
 wlanAp.setValue(WlanQtUtilsAp::ConfIdWepKey1, configuration(ConfKeyWep1));
 wlanAp.setValue(WlanQtUtilsAp::ConfIdWepKey2, configuration(ConfKeyWep2));
 wlanAp.setValue(WlanQtUtilsAp::ConfIdWepKey3, configuration(ConfKeyWep3));
 }
 // Create IAP if does not exists or update the existing IAP
 int referenceId = configuration(ConfIapId).toInt();
 if (referenceId == WlanQtUtils::IapIdNone) {
-OstTrace0( TRACE_FLOW, WLANWIZARDPRIVATE_HANDLEIAP_CREATE,
+OstTrace0(
-"WlanWizardPrivate::handleIap: Create IAP" );
+TRACE_FLOW,
+WLANWIZARDPRIVATE_HANDLEIAP_CREATE,
+"WlanWizardPrivate::handleIap: Create IAP");
 referenceId = mWlanQtUtils->createIap(&wlanAp);
 setConfiguration(ConfIapId, referenceId);
 if (referenceId == WlanQtUtils::IapIdNone) {
 ret = false;
 }
 } else {
-OstTrace0( TRACE_FLOW, WLANWIZARDPRIVATE_HANDLEIAP_UPDATE,
+OstTrace0(
-"WlanWizardPrivate::handleIap: Update IAP" );
+TRACE_FLOW,
+WLANWIZARDPRIVATE_HANDLEIAP_UPDATE,
+"WlanWizardPrivate::handleIap: Update IAP");
 ret = mWlanQtUtils->updateIap(referenceId, &wlanAp);
 }
 if (ret) {
 // Store Wizard plugin specific settings here.
 WlanWizardPlugin* plugin = wlanWizardPlugin();
 if (plugin) {
-OstTrace0( TRACE_FLOW, WLANWIZARDPRIVATE_HANDLEIAP_PLUGIN,
+OstTrace0(
-"WlanWizardPrivate::handleIap: Plugin" );
+TRACE_FLOW,
+WLANWIZARDPRIVATE_HANDLEIAP_PLUGIN,
+"WlanWizardPrivate::handleIap: Plugin");
 // Plugin gets the IAP ID from configuration
 ret = plugin->storeSettings();
 }
 }
-OstTrace1( TRACE_FLOW, WLANWIZARDPRIVATE_HANDLEIAP_DONE,
+OstTrace1(
+TRACE_FLOW,
+WLANWIZARDPRIVATE_HANDLEIAP_DONE,
 "WlanWizardPrivate::handleIap: Done;ret=%d",
-ret );
+ret);
-OstTraceFunctionExit0( WLANWIZARDPRIVATE_HANDLEIAP_EXIT );
+OstTraceFunctionExit0(WLANWIZARDPRIVATE_HANDLEIAP_EXIT);
 return ret;
 }
 /*!
 See WlanWizardHelper::configuration().
 */
 QVariant WlanWizardPrivate::configuration(ConfigurationId confId) const
 {
-OstTraceFunctionEntry0( WLANWIZARDPRIVATE_CONFIGURATION_ENTRY );
+OstTraceFunctionEntry0(WLANWIZARDPRIVATE_CONFIGURATION_ENTRY);
 Q_ASSERT(mConfigurations.contains(confId));
 #ifdef OST_TRACE_COMPILER_IN_USE
 QString tmp;
 QDebug tmpStream(&tmp);
 tmpStream << mConfigurations[confId];
 TPtrC16 string( tmp.utf16(), tmp.length() );
-OstTraceExt2( TRACE_NORMAL, WLANWIZARDPRIVATE_CONFIGURATIONS,
+OstTraceExt2(
+TRACE_NORMAL,
+WLANWIZARDPRIVATE_CONFIGURATIONS,
 "WlanWizardPrivate::configuration;confId=%{ConfigurationId};string=%S",
-(uint)confId, string );
+(uint)confId,
+string);
 #endif
-OstTraceFunctionExit0( WLANWIZARDPRIVATE_CONFIGURATION_EXIT );
+OstTraceFunctionExit0(WLANWIZARDPRIVATE_CONFIGURATION_EXIT);
 return mConfigurations[confId];
 }
 /*!
 See WlanWizardHelper::setConfiguration().
 */
 void WlanWizardPrivate::setConfiguration(
 ConfigurationId confId,
 const QVariant &value)
 {
-OstTraceFunctionEntry0( WLANWIZARDPRIVATE_SETCONFIGURATION_ENTRY );
+OstTraceFunctionEntry0(WLANWIZARDPRIVATE_SETCONFIGURATION_ENTRY);
 #ifdef OST_TRACE_COMPILER_IN_USE
 QString tmp;
 QDebug tmpStream(&tmp);
 tmpStream << value;
 TPtrC16 string( tmp.utf16(), tmp.length() );
-OstTraceExt2( TRACE_NORMAL, WLANWIZARDPRIVATE_SETCONFIGURATION,
+OstTraceExt2(
+TRACE_NORMAL,
+WLANWIZARDPRIVATE_SETCONFIGURATION,
 "WlanWizardPrivate::setConfiguration;"
 "confId=%{ConfigurationId};string=%S",
-(uint)confId, string );
+(uint)confId,
+string);
 #endif
 mConfigurations[confId] = value;
-OstTraceFunctionExit0( WLANWIZARDPRIVATE_SETCONFIGURATION_EXIT );
+OstTraceFunctionExit0(WLANWIZARDPRIVATE_SETCONFIGURATION_EXIT);
 }
 /*!
 * See WlanWizardHelper::clearConfiguration().
 */
 void WlanWizardPrivate::clearConfiguration(ConfigurationId confId)
 {
-OstTraceFunctionEntry0( WLANWIZARDPRIVATE_CLEARCONFIGURATION_ENTRY );
+OstTraceFunctionEntry0(WLANWIZARDPRIVATE_CLEARCONFIGURATION_ENTRY);
-OstTrace1( TRACE_FLOW, WLANWIZARDPRIVATE_CLEARCONFIGURATION,
+OstTrace1(
+TRACE_FLOW,
+WLANWIZARDPRIVATE_CLEARCONFIGURATION,
 "WlanWizardPrivate::clearConfiguration;confId=%{ConfigurationId}",
-(uint)confId );
+(uint)confId);
 mConfigurations.remove(confId);
-OstTraceFunctionExit0( WLANWIZARDPRIVATE_CLEARCONFIGURATION_EXIT );
+OstTraceFunctionExit0(WLANWIZARDPRIVATE_CLEARCONFIGURATION_EXIT);
 }
 /*!
 * See WlanWizardHelper::configurationExists().
 */
 bool WlanWizardPrivate::configurationExists(ConfigurationId confId)
 {
-OstTraceFunctionEntry0( WLANWIZARDPRIVATE_CONFIGURATIONEXISTS_ENTRY );
+OstTraceFunctionEntry0(WLANWIZARDPRIVATE_CONFIGURATIONEXISTS_ENTRY);
-OstTrace1( TRACE_DUMP, WLANWIZARDPRIVATE_CONFIGURATIONEXISTS,
+OstTrace1(
+TRACE_DUMP,
+WLANWIZARDPRIVATE_CONFIGURATIONEXISTS,
 "WlanWizardPrivate::configurationExists;confId=%{ConfigurationId}",
-(uint)confId );
+(uint)confId);
-OstTraceFunctionExit0( WLANWIZARDPRIVATE_CONFIGURATIONEXISTS_EXIT );
+OstTraceFunctionExit0(WLANWIZARDPRIVATE_CONFIGURATIONEXISTS_EXIT);
 return mConfigurations[confId].isValid();
 }
 /*!
 See WlanWizardHelper::enableNextButton().
 */
 void WlanWizardPrivate::enableNextButton(bool enable)
 {
-OstTraceFunctionEntry0( WLANWIZARDPRIVATE_ENABLENEXTBUTTON_ENTRY );
+OstTraceFunctionEntry0(WLANWIZARDPRIVATE_ENABLENEXTBUTTON_ENTRY);
-OstTraceExt2( TRACE_FLOW, WLANWIZARDPRIVATE_ENABLENEXTBUTTON,
+OstTraceExt2(
+TRACE_FLOW,
+WLANWIZARDPRIVATE_ENABLENEXTBUTTON,
 "WlanWizardPrivate::enableNextButton;this=%x;enable=%x",
-(unsigned)this, (uint)enable );
+(unsigned)this,
+(uint)enable);
 mActionNext->setEnabled(enable);
-OstTraceFunctionExit0( WLANWIZARDPRIVATE_ENABLENEXTBUTTON_EXIT );
+OstTraceFunctionExit0(WLANWIZARDPRIVATE_ENABLENEXTBUTTON_EXIT);
 }
 /*!
 See WlanWizardHelper::addPage().
 */
 void WlanWizardPrivate::addPage(int pageId, WlanWizardPage *page)
 {
-OstTraceFunctionEntry0( WLANWIZARDPRIVATE_ADDPAGE_ENTRY );
+OstTraceFunctionEntry0(WLANWIZARDPRIVATE_ADDPAGE_ENTRY);
-OstTraceExt3( TRACE_FLOW, WLANWIZARDPRIVATE_ADDPAGE,
+OstTraceExt3(
+TRACE_FLOW,
+WLANWIZARDPRIVATE_ADDPAGE,
 "WlanWizardPrivate::addPage;this=%x;pageId=%{PageIds};page=%x",
-(unsigned)this, pageId, (uint)(page) );
+(unsigned)this,
+pageId,
+(uint)(page));
 Q_ASSERT(!mPages.contains(pageId));
 mPages[pageId] = page;
-OstTraceFunctionExit0( WLANWIZARDPRIVATE_ADDPAGE_EXIT );
+OstTraceFunctionExit0(WLANWIZARDPRIVATE_ADDPAGE_EXIT);
 }
 /*!
 See WlanWizardHelper::nextPage().
 */
 void WlanWizardPrivate::nextPage()
 {
-OstTraceFunctionEntry0( WLANWIZARDPRIVATE_NEXTPAGE_ENTRY );
+OstTraceFunctionEntry0(WLANWIZARDPRIVATE_NEXTPAGE_ENTRY);
-OstTrace1( TRACE_FLOW, WLANWIZARDPRIVATE_NEXTPAGE,
+OstTrace1(
+TRACE_FLOW,
+WLANWIZARDPRIVATE_NEXTPAGE,
 "WlanWizardPrivate::nextPage;this=%x",
-this );
+this);
 mPageFinished = true;
 toNextPage();
-OstTraceFunctionExit0( WLANWIZARDPRIVATE_NEXTPAGE_EXIT );
+OstTraceFunctionExit0(WLANWIZARDPRIVATE_NEXTPAGE_EXIT);
 }
 /*!
 See WlanWizardHelper::mainWindow().
 */
 HbMainWindow* WlanWizardPrivate::mainWindow() const
 {
-OstTraceFunctionEntry0( WLANWIZARDPRIVATE_MAINWINDOW_ENTRY );
+OstTraceFunctionEntry0(WLANWIZARDPRIVATE_MAINWINDOW_ENTRY);
-OstTraceFunctionExit0( WLANWIZARDPRIVATE_MAINWINDOW_EXIT );
+OstTraceFunctionExit0(WLANWIZARDPRIVATE_MAINWINDOW_EXIT);
 return mMainWindow;
 }
 /*!
 See WlanWizardHelper::isCurrentPage().
 */
 bool WlanWizardPrivate::isCurrentPage(const HbWidget *page) const
 {
-OstTraceFunctionEntry0( WLANWIZARDPRIVATE_ISCURRENTPAGE_ENTRY );
+OstTraceFunctionEntry0(WLANWIZARDPRIVATE_ISCURRENTPAGE_ENTRY);
 bool ret = false;
 if (mStackedWidget->currentWidget() == page) {
 ret = true;
 }
-OstTraceExt2( TRACE_FLOW, WLANWIZARDPRIVATE_ISCURRENTPAGE,
+OstTraceExt2(
+TRACE_FLOW,
+WLANWIZARDPRIVATE_ISCURRENTPAGE,
 "WlanWizardPrivate::isCurrentPage;page=%x;ret=%d",
-(uint)page, ret);
+(uint)page,
+ret);
-OstTraceFunctionExit0( WLANWIZARDPRIVATE_ISCURRENTPAGE_EXIT );
+OstTraceFunctionExit0(WLANWIZARDPRIVATE_ISCURRENTPAGE_EXIT);
 return ret;
 }
 /*!
 See WlanWizardHelper::nextPageId()
 */
 int WlanWizardPrivate::nextPageId(bool useWps)
 {
-OstTraceFunctionEntry0( WLANWIZARDPRIVATE_NEXTPAGEID_ENTRY );
+OstTraceFunctionEntry0(WLANWIZARDPRIVATE_NEXTPAGEID_ENTRY);
 int ret;
 if (useWps) {
 ret = WlanWizardPage::PageWpsStart;
 } else {
 int secMode = configuration(WlanWizardHelper::ConfSecurityMode).toInt();
 ret = WlanWizardPageInternal::PageProcessSettings;
 break;
 }
 }
-OstTraceExt3( TRACE_NORMAL, WLANWIZARDPRIVATE_NEXTPAGEID,
+OstTraceExt3(
+TRACE_NORMAL,
+WLANWIZARDPRIVATE_NEXTPAGEID,
 "WlanWizardPrivate::nextPageId;this=%x;useWps=%x;ret=%{PageIds}",
-( unsigned )this, ( TUint )( useWps ), ret );
+(unsigned)this,
+(TUint)(useWps),
-OstTraceFunctionExit0( WLANWIZARDPRIVATE_NEXTPAGEID_EXIT );
+ret);
+OstTraceFunctionExit0(WLANWIZARDPRIVATE_NEXTPAGEID_EXIT);
 return ret;
 }
 /*!
 Called when Cancel toolbar button is pressed. In case IAP has been created
 Indicates also to the current wizard page that cancel has been pressed.
 */
 void WlanWizardPrivate::cancelTriggered()
 {
-OstTraceFunctionEntry0( WLANWIZARDPRIVATE_CANCELTRIGGERED_ENTRY );
+OstTraceFunctionEntry0(WLANWIZARDPRIVATE_CANCELTRIGGERED_ENTRY);
-OstTrace1( TRACE_BORDER, WLANWIZARDPRIVATE_CANCELTRIGGERED,
+OstTrace1(
+TRACE_BORDER,
+WLANWIZARDPRIVATE_CANCELTRIGGERED,
 "WlanWizardPrivate::cancelTriggered;this=%x",
-this );
+this);
 // Disconnect receiving more signals from any actions
 disconnectActions();
 mPageTimer->stop();
 setConfiguration(ConfIapId, WlanQtUtils::IapIdNone);
 }
 closeViews();
 Q_ASSERT(q_ptr);
-OstTrace0( TRACE_BORDER, WLANWIZARDPRIVATE_CANCELTRIGGERED_EMIT,
+OstTrace0(
-"WlanWizardPrivate::cancelTriggered - emit cancelled()" );
+TRACE_BORDER,
+WLANWIZARDPRIVATE_CANCELTRIGGERED_EMIT,
+"WlanWizardPrivate::cancelTriggered - emit cancelled()");
 emit q_ptr->cancelled();
-OstTrace1( TRACE_BORDER, WLANWIZARDPRIVATE_CANCELTRIGGERED_DONE,
+OstTrace1(
-"WlanWizardPrivate::cancelTriggered - Done;this=%x", this );
+TRACE_BORDER,
-OstTraceFunctionExit0( WLANWIZARDPRIVATE_CANCELTRIGGERED_EXIT );
+WLANWIZARDPRIVATE_CANCELTRIGGERED_DONE,
+"WlanWizardPrivate::cancelTriggered - Done;this=%x",
+this);
+OstTraceFunctionExit0(WLANWIZARDPRIVATE_CANCELTRIGGERED_EXIT);
 }
 /*!
 Called when Previous toolbar button is pressed. Shows the previous wizard
 page in stacked widget and indicates wizard page that previous has been
 pressed.
 */
 void WlanWizardPrivate::previousTriggered()
 {
-OstTraceFunctionEntry0( WLANWIZARDPRIVATE_PREVIOUSTRIGGERED_ENTRY );
+OstTraceFunctionEntry0(WLANWIZARDPRIVATE_PREVIOUSTRIGGERED_ENTRY);
-OstTrace1( TRACE_BORDER, WLANWIZARDPRIVATE_PREVIOUSTRIGGERED,
+OstTrace1(
+TRACE_BORDER,
+WLANWIZARDPRIVATE_PREVIOUSTRIGGERED,
 "WlanWizardPrivate::previousTriggered;this=%x",
-this );
+this);
 mPageTimer->stop();
 int index = mStackedWidget->currentIndex();
 HbWidget *widget = qobject_cast<HbWidget*>(mStackedWidget->currentWidget());
 // In error case if page (value) is not found default contructed key is
 // returned, in this case default value for int is 0 which means PageNone.
 updateFrame(mPages.key(page));
 enableNextButton(page->showPage());
-OstTrace1( TRACE_BORDER, WLANWIZARDPRIVATE_PREVIOUSTRIGGERED_DONE,
+OstTrace1(
+TRACE_BORDER,
+WLANWIZARDPRIVATE_PREVIOUSTRIGGERED_DONE,
 "WlanWizardPrivate::previousTriggered - Done;this=%x",
-this );
+this);
-OstTraceFunctionExit0( WLANWIZARDPRIVATE_PREVIOUSTRIGGERED_EXIT );
+OstTraceFunctionExit0(WLANWIZARDPRIVATE_PREVIOUSTRIGGERED_EXIT);
 }
 /*!
 Next toolbar button has been pressed. Wizard framework asks from the current
 page what should be the next page id and shows it.
 */
 void WlanWizardPrivate::nextTriggered()
 {
-OstTraceFunctionEntry0( WLANWIZARDPRIVATE_NEXTTRIGGERED_ENTRY );
+OstTraceFunctionEntry0(WLANWIZARDPRIVATE_NEXTTRIGGERED_ENTRY);
-OstTrace1( TRACE_BORDER, WLANWIZARDPRIVATE_NEXTTRIGGERED,
+OstTrace1(
+TRACE_BORDER,
+WLANWIZARDPRIVATE_NEXTTRIGGERED,
 "WlanWizardPrivate::nextTriggered;this=%x",
-this );
+this);
 mPageTimer->stop();
 HbWidget *widget = qobject_cast<HbWidget*>(mStackedWidget->currentWidget());
 Q_ASSERT(widget);
 bool removeFromStack;
 int pageId = mPageMapper[widget]->nextId(removeFromStack);
 showPage(pageId, removeFromStack);
-OstTrace1( TRACE_BORDER, WLANWIZARDPRIVATE_NEXTTRIGGERED_DONE,
+OstTrace1(
+TRACE_BORDER,
+WLANWIZARDPRIVATE_NEXTTRIGGERED_DONE,
 "WlanWizardPrivate::nextTriggered - Done;this=%x",
-this );
+this);
-OstTraceFunctionExit0( WLANWIZARDPRIVATE_NEXTTRIGGERED_EXIT );
+OstTraceFunctionExit0(WLANWIZARDPRIVATE_NEXTTRIGGERED_EXIT);
 }
 /*!
 Finish button has been pressed. Closes the wizard and sends finished()
 signal to the client.
 */
 void WlanWizardPrivate::finishTriggered()
 {
-OstTraceFunctionEntry0( WLANWIZARDPRIVATE_FINISHTRIGGERED_ENTRY );
+OstTraceFunctionEntry0(WLANWIZARDPRIVATE_FINISHTRIGGERED_ENTRY);
-OstTrace1( TRACE_BORDER, WLANWIZARDPRIVATE_FINISHTRIGGERED,
+OstTrace1(
+TRACE_BORDER,
+WLANWIZARDPRIVATE_FINISHTRIGGERED,
 "WlanWizardPrivate::finishTriggered;this=%x",
-this );
+this);
 // Disconnect receiving more signals from any actions
 disconnectActions();
 mPageTimer->stop();
 Q_ASSERT(q_ptr);
 emit q_ptr->finished(
 configuration(ConfIapId).toInt(),
 configuration(ConfConnected).toBool());
-OstTrace1( TRACE_BORDER, WLANWIZARDPRIVATE_FINISHTRIGGERED_DONE,
+OstTrace1(
+TRACE_BORDER,
+WLANWIZARDPRIVATE_FINISHTRIGGERED_DONE,
 "WlanWizardPrivate::finishTriggered - Done;this=%x",
-this );
+this);
-OstTraceFunctionExit0( WLANWIZARDPRIVATE_FINISHTRIGGERED_EXIT );
+OstTraceFunctionExit0(WLANWIZARDPRIVATE_FINISHTRIGGERED_EXIT);
 }
 /*!
 In case wizard page is using timer protection for the page, this is the
 slot to handle the callback from the timer.
 */
 void WlanWizardPrivate::onTimeOut()
 {
-OstTraceFunctionEntry0( WLANWIZARDPRIVATE_ONTIMEOUT_ENTRY );
+OstTraceFunctionEntry0(WLANWIZARDPRIVATE_ONTIMEOUT_ENTRY);
-OstTrace1( TRACE_BORDER, WLANWIZARDPRIVATE_ONTIMEOUT,
+OstTrace1(
+TRACE_BORDER,
+WLANWIZARDPRIVATE_ONTIMEOUT,
 "WlanWizardPrivate::onTimeOut;this=%x",
-this );
+this);
 toNextPage();
-OstTrace1( TRACE_BORDER, WLANWIZARDPRIVATE_ONTIMEOUT_DONE,
+OstTrace1(
+TRACE_BORDER,
+WLANWIZARDPRIVATE_ONTIMEOUT_DONE,
 "WlanWizardPrivate::onTimeOut - Done;this=%x",
-this );
+this);
-OstTraceFunctionExit0( WLANWIZARDPRIVATE_ONTIMEOUT_EXIT );
+OstTraceFunctionExit0(WLANWIZARDPRIVATE_ONTIMEOUT_EXIT);
 }
 /*!
 Slot to start wizard page operation asynchronous. Starts also the timer
 to protect the wizard page.
 */
 void WlanWizardPrivate::startPageOperation()
 {
-OstTraceFunctionEntry0( WLANWIZARDPRIVATE_STARTPAGEOPERATION_ENTRY );
+OstTraceFunctionEntry0(WLANWIZARDPRIVATE_STARTPAGEOPERATION_ENTRY);
 // Process this if wizard has not been closed
 if (mClosed == false) {
-OstTrace1( TRACE_BORDER, WLANWIZARDPRIVATE_STARTPAGEOPERATION,
+OstTrace1(
+TRACE_BORDER,
+WLANWIZARDPRIVATE_STARTPAGEOPERATION,
 "WlanWizardPrivate::startPageOperation;this=%x",
-this );
+this);
 HbWidget *widget =
 qobject_cast<HbWidget*>(mStackedWidget->currentWidget());
 Q_ASSERT(widget);
 mPageFinished = false;
 mPageTimer->start(PageTimeout);
 mPageMapper[widget]->startOperation();
-OstTrace1( TRACE_BORDER, WLANWIZARDPRIVATE_STARTPAGEOPERATION_DONE,
+OstTrace1(
+TRACE_BORDER,
+WLANWIZARDPRIVATE_STARTPAGEOPERATION_DONE,
 "WlanWizardPrivate::startPageOperation - DONE;this=%x",
-this );
+this);
 }
-OstTraceFunctionExit0( WLANWIZARDPRIVATE_STARTPAGEOPERATION_EXIT );
+OstTraceFunctionExit0(WLANWIZARDPRIVATE_STARTPAGEOPERATION_EXIT);
 }
 /*!
 In case the wizard page uses timer protection this method determines when
 the next page is shown.
 */
 void WlanWizardPrivate::toNextPage()
 {
-OstTraceFunctionEntry0( WLANWIZARDPRIVATE_TONEXTPAGE_ENTRY );
+OstTraceFunctionEntry0(WLANWIZARDPRIVATE_TONEXTPAGE_ENTRY);
 if (mPageFinished && !(mPageTimer->isActive())) {
-OstTrace1( TRACE_FLOW, WLANWIZARDPRIVATE_TONEXTPAGE,
+OstTrace1(
+TRACE_FLOW,
+WLANWIZARDPRIVATE_TONEXTPAGE,
 "WlanWizardPrivate::toNextPage;this=%x",
-this );
+this);
 // process this asynchronous. Main purpose is to release the current
 // call stack and process the page change using new call stack
 QMetaObject::invokeMethod(this, "nextTriggered", Qt::QueuedConnection);
 }
-OstTraceFunctionExit0( WLANWIZARDPRIVATE_TONEXTPAGE_EXIT );
+OstTraceFunctionExit0(WLANWIZARDPRIVATE_TONEXTPAGE_EXIT);
 }
 /*!
 Show requested page and removes the current wizard page from the stack if
 required. This method updates the title and toolbar accordingly.
 @param [in] removeFromStack if true the current wizard page is removed from
 the stackedwidget.
 */
 void WlanWizardPrivate::showPage(int pageId, bool removeFromStack)
 {
-OstTraceFunctionEntry0( WLANWIZARDPRIVATE_SHOWPAGE_ENTRY );
+OstTraceFunctionEntry0(WLANWIZARDPRIVATE_SHOWPAGE_ENTRY);
-OstTraceExt3( TRACE_FLOW, WLANWIZARDPRIVATE_SHOWPAGE,
+OstTraceExt3(
+TRACE_FLOW,
+WLANWIZARDPRIVATE_SHOWPAGE,
 "WlanWizardPrivate::showPage;this=%x;"
 "pageId=%{PageIds};removeFromStack=%x",
-( unsigned )this, pageId, ( TUint )( removeFromStack ) );
+(unsigned)this,
+pageId,
+(TUint)(removeFromStack));
 // PageNone is returned by wizard pages when some validation of page content
 // has not passed and the page does not want to process wizard to next page
 if (pageId == WlanWizardPage::PageNone) {
-OstTraceFunctionExit0( WLANWIZARDPRIVATE_SHOWPAGE_EXIT );
+OstTraceFunctionExit0(WLANWIZARDPRIVATE_SHOWPAGE_EXIT);
 return;
 }
 //  PageProcessSettings is shown only when WLAN AP is found in scanning
 // 1/ when client calls setParameters()
 setConfiguration(
 ConfGenericErrorPageStepsBackwards,
 WlanWizardPage::OneStepBackwards);
 }
-OstTraceExt2( TRACE_FLOW, WLANWIZARDPRIVATE_SHOWPAGE_UPDATE,
+OstTraceExt2(
+TRACE_FLOW,
+WLANWIZARDPRIVATE_SHOWPAGE_UPDATE,
 "WlanWizardPrivate::showPage - change page;this=%x;"
 "pageId=%{PageIds}",
-( unsigned )this, pageId);
+(unsigned)this,
+pageId);
 }
 }
 // Create visualization of next page and store it to mappers
 WlanWizardPage* page = mPages[pageId];
 // If wizard page needs to start some control operation trigger it
 // asyncronously so that the UI gets more priority to get painted correctly
 // before any operation takes place in wizard page. This is important for
 // timer protected pages. Makes wizard to work smother from UI perspective
 if (page->requiresStartOperation()) {
-OstTrace0( TRACE_FLOW, WLANWIZARDPRIVATE_SHOWPAGE_INVOKE,
+OstTrace0(
-"WlanWizardPrivate::showPage - Invoke startOperation" );
+TRACE_FLOW,
+WLANWIZARDPRIVATE_SHOWPAGE_INVOKE,
+"WlanWizardPrivate::showPage - Invoke startOperation");
 QMetaObject::invokeMethod(this, "startPageOperation", Qt::QueuedConnection);
 }
-OstTraceFunctionExit0( DUP1_WLANWIZARDPRIVATE_SHOWPAGE_EXIT );
+OstTraceFunctionExit0(DUP1_WLANWIZARDPRIVATE_SHOWPAGE_EXIT);
 }
 /*!
 Creates all control objects of WLAN wizard pages which are inherited from
 WlanWizardPage and adds those into a internal database.
 */
 void WlanWizardPrivate::createPages()
 {
-OstTraceFunctionEntry0( WLANWIZARDPRIVATE_CREATEPAGES_ENTRY );
+OstTraceFunctionEntry0(WLANWIZARDPRIVATE_CREATEPAGES_ENTRY);
 OstTrace0(
 TRACE_NORMAL,
 WLANWIZARDPRIVATE_CREATEPAGES,
 "WlanWizardPrivate::createPages");
 new WlanWizardPageNetworkMode(this));
 addPage(
 WlanWizardPageInternal::PageNetworkSecurity,
 new WlanWizardPageSecurityMode(this));
-OstTraceFunctionExit0( WLANWIZARDPRIVATE_CREATEPAGES_EXIT );
+OstTraceFunctionExit0(WLANWIZARDPRIVATE_CREATEPAGES_EXIT);
 }
 /*!
 Called when wizard is closed
 - cancelled by the user
 - finished by the user
 */
 void WlanWizardPrivate::closeViews()
 {
-OstTraceFunctionEntry0( WLANWIZARDPRIVATE_CLOSEVIEWS_ENTRY );
+OstTraceFunctionEntry0(WLANWIZARDPRIVATE_CLOSEVIEWS_ENTRY);
 mDialog->hide();
 mClosed = true;
-OstTraceFunctionExit0( WLANWIZARDPRIVATE_CLOSEVIEWS_EXIT );
+OstTraceFunctionExit0(WLANWIZARDPRIVATE_CLOSEVIEWS_EXIT);
 }
 /*!
 This method takes care of the title of wizard and toolbutton. Correct items
 are selected based on the \a pageId and the amount of objects in the stacked
 @param [in] pageId Wizard Page Id
 */
 void WlanWizardPrivate::updateFrame(int pageId)
 {
-OstTraceFunctionEntry0( WLANWIZARDPRIVATE_UPDATEFRAME_ENTRY );
+OstTraceFunctionEntry0(WLANWIZARDPRIVATE_UPDATEFRAME_ENTRY);
 int currentIndex = mStackedWidget->currentIndex();
-OstTraceExt3( TRACE_FLOW, WLANWIZARDPRIVATE_UPDATEFRAME,
+OstTraceExt3(
+TRACE_FLOW,
+WLANWIZARDPRIVATE_UPDATEFRAME,
 "WlanWizardPrivate::updateFrame;this=%x;pageId=%{PageIds};currentIndex=%d",
-(unsigned)this, pageId, (uint)(currentIndex) );
+(unsigned)this,
+pageId,
+(uint)(currentIndex));
 // For last page (summary) show Finish instead of Next button
 if (pageId == WlanWizardPageInternal::PageSummary) {
 mTitle->setPlainText(hbTrId("txt_occ_title_wlan_setup_wizard_summary"));
 mActionFinish->setVisible(true);
 } else {
 mActionPrevious->setEnabled(true);
 }
 }
 }
-OstTraceFunctionExit0( WLANWIZARDPRIVATE_UPDATEFRAME_EXIT );
+OstTraceFunctionExit0(WLANWIZARDPRIVATE_UPDATEFRAME_EXIT);
 }
 /*!
 Loads widgets and objects from the docml file.
 */
 void WlanWizardPrivate::loadDocml()
 {
-OstTraceFunctionEntry0( WLANWIZARDPRIVATE_LOADDOCML_ENTRY );
+OstTraceFunctionEntry0(WLANWIZARDPRIVATE_LOADDOCML_ENTRY);
 bool ok = true;
 mDocLoader->load(":/docml/occ_wlan_wizard_main.docml", &ok);
 Q_ASSERT(ok);
 ok = true;
 ok = connect(mPageTimer, SIGNAL(timeout()), this, SLOT(onTimeOut()));
 Q_ASSERT(ok);
 ok = connect(
-mActionNext, SIGNAL(triggered()),
+mActionNext,
-this, SLOT(nextTriggered()));
+SIGNAL(triggered()),
+this,
+SLOT(nextTriggered()));
 Q_ASSERT(ok);
 ok = connect(
-mActionPrevious, SIGNAL(triggered()),
+mActionPrevious,
-this, SLOT(previousTriggered()));
+SIGNAL(triggered()),
+this,
+SLOT(previousTriggered()));
 Q_ASSERT(ok);
 ok = connect(
-mActionFinish, SIGNAL(triggered()),
+mActionFinish,
-this, SLOT(finishTriggered()));
+SIGNAL(triggered()),
+this,
+SLOT(finishTriggered()));
 Q_ASSERT(ok);
 ok = connect(
-mActionCancel, SIGNAL(triggered()),
+mActionCancel,
-this, SLOT(cancelTriggered()));
+SIGNAL(triggered()),
+this,
+SLOT(cancelTriggered()));
 Q_ASSERT(ok);
 // TODO: workaround for full screen dialog, with docml it is possible to
 // define fullscreen dialog, mut resize is not done correctly when orientation
 // is changed. See TSW Error: MTAA-854DK8
 ok = HbStyleLoader::registerFilePath(":/css/custom.css");
 Q_ASSERT(ok);
-OstTraceFunctionExit0( WLANWIZARDPRIVATE_LOADDOCML_EXIT );
+OstTraceFunctionExit0(WLANWIZARDPRIVATE_LOADDOCML_EXIT);
 }
 /*!
 Disconnect receiving triggered() signal from any toolbar action.
 */
 void WlanWizardPrivate::disconnectActions()
 {
-OstTraceFunctionEntry0( WLANWIZARDPRIVATE_DISCONNECTACTIONS_ENTRY );
+OstTraceFunctionEntry0(WLANWIZARDPRIVATE_DISCONNECTACTIONS_ENTRY);
 disconnect(
-mActionNext, SIGNAL(triggered()),
+mActionNext,
-this, SLOT(nextTriggered()));
+SIGNAL(triggered()),
+this,
+SLOT(nextTriggered()));
 disconnect(
-mActionPrevious, SIGNAL(triggered()),
+mActionPrevious,
-this, SLOT(previousTriggered()));
+SIGNAL(triggered()),
+this,
+SLOT(previousTriggered()));
 disconnect(
-mActionFinish, SIGNAL(triggered()),
+mActionFinish,
-this, SLOT(finishTriggered()));
+SIGNAL(triggered()),
+this,
+SLOT(finishTriggered()));
 disconnect(
-mActionCancel, SIGNAL(triggered()),
+mActionCancel,
-this, SLOT(cancelTriggered()));
+SIGNAL(triggered()),
-OstTraceFunctionExit0( WLANWIZARDPRIVATE_DISCONNECTACTIONS_EXIT );
+this,
-}
+SLOT(cancelTriggered()));
+OstTraceFunctionExit0(WLANWIZARDPRIVATE_DISCONNECTACTIONS_EXIT);
+}

changeset 53	bdc64aa9b954
parent 43	72ebcbb64834
child 58	301aeb18ae47