1 files changed, 21 insertions, 14 deletions

diff --git a/noncore/net/opietooth/manager/rfcpopup.cpp b/noncore/net/opietooth/manager/rfcpopup.cpp
index d95f14b..04bfe48 100644
--- a/noncore/net/opietooth/manager/rfcpopup.cpp
+++ b/noncore/net/opietooth/manager/rfcpopup.cpp
@@ -1,4 +1,2 @@
 
-#include <qtimer.h>
-
 #include "pppdialog.h"
@@ -7,2 +5,8 @@
 
+/* OPIE */
+#include <qpe/qpeapplication.h>
+
+/* QT */
+#include <qtimer.h>
+
 using namespace OpieTooth;
@@ -13,3 +17,4 @@ using namespace OpieTooth;
 RfcCommPopup::RfcCommPopup( OpieTooth::BTDeviceItem* item  )
-    : QPopupMenu()  {
+        : QPopupMenu()
+{
     qWarning("RfcCommPopup c'tor");
@@ -55,3 +60,4 @@ RfcCommPopup::RfcCommPopup( OpieTooth::BTDeviceItem* item  )
 
-RfcCommPopup::~RfcCommPopup() {
+RfcCommPopup::~RfcCommPopup()
+{
 /*  delete m_con;
@@ -63,3 +69,4 @@ RfcCommPopup::~RfcCommPopup() {
 
-void RfcCommPopup::slotConnect() {
+void RfcCommPopup::slotConnect()
+{
 
@@ -67,7 +74,4 @@ void RfcCommPopup::slotConnect() {
 
-
-
     PPPDialog pppDialog;
-    pppDialog.showMaximized();
-    pppDialog.exec();
+    QPEApplication::execDialog( &pppDialog );
 }
@@ -75,3 +79,4 @@ void RfcCommPopup::slotConnect() {
 
-void RfcCommPopup::slotDisconnect() {
+void RfcCommPopup::slotDisconnect()
+{
     qWarning("slot disconnected");
@@ -80,9 +85,10 @@ void RfcCommPopup::slotDisconnect() {
 
-void RfcCommPopup::slotBind() {
+void RfcCommPopup::slotBind()
+{
     RfcommAssignDialog rfcommAssign ( this, "RfcommAssignDialog", true, WStyle_ContextHelp  );
 
-    rfcommAssign.showMaximized();
     rfcommAssign.newDevice( m_item->mac() );
 
-    if ( rfcommAssign.exec() == QDialog::Accepted )  {
+    if ( QPEApplication::execDialog( &rfcommAssign ) == QDialog::Accepted )
+    {
         rfcommAssign.saveConfig();
@@ -92,3 +98,4 @@ void RfcCommPopup::slotBind() {
 
-void RfcCommPopup::slotBar() {
+void RfcCommPopup::slotBar()
+{
     qWarning("slotBar");