1 files changed, 35 insertions, 27 deletions

diff --git a/noncore/settings/networksettings/ppp/general.cpp b/noncore/settings/networksettings/ppp/general.cpp
index 5540946..ff1b11b 100644
--- a/noncore/settings/networksettings/ppp/general.cpp
+++ b/noncore/settings/networksettings/ppp/general.cpp
@@ -26,5 +26,13 @@
 
-#include <termios.h>
-#include <string.h>
+#include "general.h"
+#include "interfaceppp.h"
+#include "modeminfo.h"
+#include "modemcmds.h"
+#include "pppdata.h"
 
+/* OPIE */
+#include <qpe/config.h>
+#include <qpe/qpeapplication.h>
+
+/* QT */
 #include <qcheckbox.h>
@@ -37,16 +45,6 @@
 #include <qwhatsthis.h>
-#include <qpe/config.h>
-// #include <qgroupbox.h>
-
-
-#include "general.h"
-#include "interfaceppp.h"
-//#include "miniterm.h"
-#include "modeminfo.h"
-#include "modemcmds.h"
-//#include "devices.h"
-#include "pppdata.h"
-//#include <klocale.h>
-
 
+/* STD */
+#include <termios.h>
+#include <string.h>
 
@@ -150,3 +148,4 @@ ModemWidget::ModemWidget( PPPData *pd, QWidget *parent, const char *name )
 
-  static const char *baudrates[] = {
+    static const char *baudrates[] =
+        {
 
@@ -172,3 +171,4 @@ ModemWidget::ModemWidget( PPPData *pd, QWidget *parent, const char *name )
     "2400",
-    0};
+            0
+        };
 
@@ -192,3 +192,4 @@ ModemWidget::ModemWidget( PPPData *pd, QWidget *parent, const char *name )
 
-  for(int i=0; i <= enter->count()-1; i++) {
+    for(int i=0; i <= enter->count()-1; i++)
+    {
     if(_pppdata->enter() == enter->text(i))
@@ -239,3 +240,4 @@ ModemWidget::ModemWidget( PPPData *pd, QWidget *parent, const char *name )
   //set stuff from gpppdata
-  for(int i=0; i <= enter->count()-1; i++) {
+    for(int i=0; i <= enter->count()-1; i++)
+    {
     if(_pppdata->enter() == enter->text(i))
@@ -244,3 +246,4 @@ ModemWidget::ModemWidget( PPPData *pd, QWidget *parent, const char *name )
 
-  for(int i=0; i <= modemdevice->count()-1; i++) {
+    for(int i=0; i <= modemdevice->count()-1; i++)
+    {
     if(_pppdata->modemDevice() == modemdevice->text(i))
@@ -249,3 +252,4 @@ ModemWidget::ModemWidget( PPPData *pd, QWidget *parent, const char *name )
 
-  for(int i=0; i <= flowcontrol->count()-1; i++) {
+    for(int i=0; i <= flowcontrol->count()-1; i++)
+    {
     if(_pppdata->flowcontrol() == flowcontrol->text(i))
@@ -275,5 +279,7 @@ ModemWidget::~ModemWidget()
     QString edited = modemdevice->currentText();
-    if ( !( edited ).isEmpty() )  {
+    if ( !( edited ).isEmpty() )
+    {
         edited.simplifyWhiteSpace();
-        if ( devs.contains( edited ) == 0 )  {
+        if ( devs.contains( edited ) == 0 )
+        {
             devs << edited;
@@ -472,6 +478,7 @@ ModemWidget2::ModemWidget2( PPPData *pd, InterfacePPP *ip, QWidget *parent,
 
-void ModemWidget2::modemcmdsbutton() {
+void ModemWidget2::modemcmdsbutton()
+{
   ModemCommands mc(_ifaceppp->data(), this, "commands" , true, Qt::WStyle_ContextHelp);
-  mc.showMaximized();
-  mc.exec();
+
+    QPEApplication::execDialog( &mc );
 }
@@ -479,3 +486,4 @@ void ModemWidget2::modemcmdsbutton() {
 
-void ModemWidget2::query_modem() {
+void ModemWidget2::query_modem()
+{
   ModemTransfer mt(_ifaceppp->modem(), this);