--- a/wlanutilities/wlanentryplugin/src/cpwlanentryitemdata.cpp	Wed Aug 18 10:52:46 2010 +0300
+++ b/wlanutilities/wlanentryplugin/src/cpwlanentryitemdata.cpp	Thu Sep 02 21:36:44 2010 +0300
@@ -25,6 +25,7 @@
 #include <xqservicelog.h>
 #endif
 #include <xqappmgr.h>
+#include <xqaiwdecl.h>
 #include <xqaiwdeclplat.h>
 
 // This workaround can be removed when XQOP_WLAN_SNIFFER is correctly
@@ -77,7 +78,7 @@
         SIGNAL(statusUpdated()),
         this,
         SLOT(statusUpdate()));
-    Q_ASSERT(connectStatus == true);
+    Q_ASSERT(connectStatus);
     
     // Update to show initial WLAN status.
     statusUpdate();
@@ -124,8 +125,7 @@
     
     // Window title needs to be set to "Control Panel"
     XQRequestInfo reqInfo;
-    // TODO: Start using the official define when available
-    reqInfo.setInfo("WindowTitle", hbTrId("txt_cp_title_control_panel"));
+    reqInfo.setInfo(XQINFO_KEY_WINDOW_TITLE, hbTrId("txt_cp_title_control_panel"));
     request->setInfo(reqInfo);
     
     bool status = request->send();