4 files changed, 198 insertions, 112 deletions

diff --git a/noncore/settings/networksettings/ppp/accounts.cpp b/noncore/settings/networksettings/ppp/accounts.cpp
index 28d8732..b8a1925a 100644
--- a/noncore/settings/networksettings/ppp/accounts.cpp
+++ b/noncore/settings/networksettings/ppp/accounts.cpp
@@ -26,4 +26,12 @@
 
+#include "accounts.h"
+#include "authwidget.h"
+#include "pppdata.h"
+#include "edit.h"
+
+/* OPIE */
+#include <qpe/qpeapplication.h>
+
+/* QT */
 #include <qdir.h>
-#include <stdlib.h>
 #include <qlayout.h>
@@ -33,3 +41,2 @@
 #include <qmessagebox.h>
-
 #include <qapplication.h>
@@ -39,6 +46,4 @@
 
-#include "accounts.h"
-#include "authwidget.h"
-#include "pppdata.h"
-#include "edit.h"
+/* STD */
+#include <stdlib.h>
 
@@ -70,3 +75,4 @@ AccountWidget::AccountWidget( PPPData *pd, QWidget *parent, const char *name, WF
 
-   for (uint i = 0; i < listListbox->count(); i++){
+    for (uint i = 0; i < listListbox->count(); i++)
+    {
        if ( listListbox->text(i) == _pppdata->accname() )
@@ -78,3 +84,4 @@ AccountWidget::AccountWidget( PPPData *pd, QWidget *parent, const char *name, WF
 
-void AccountWidget::slotListBoxSelect(int idx) {
+void AccountWidget::slotListBoxSelect(int idx)
+{
     bool ok = _pppdata->setAccount( listListbox->text(idx) );
@@ -86,3 +93,4 @@ void AccountWidget::slotListBoxSelect(int idx) {
 
-void AccountWidget::edit() {
+void AccountWidget::edit()
+{
   _pppdata->setAccount(listListbox->text(listListbox->currentItem()));
@@ -91,3 +99,4 @@ void AccountWidget::edit() {
 
-  if(result == QDialog::Accepted) {
+    if(result == QDialog::Accepted)
+    {
     listListbox->changeItem(_pppdata->accname(),listListbox->currentItem());
@@ -99,3 +108,4 @@ void AccountWidget::edit() {
 
-void AccountWidget::create() {
+void AccountWidget::create()
+{
 
@@ -108,3 +118,4 @@ void AccountWidget::create() {
     int result;
-    if (_pppdata->newaccount() == -1){
+    if (_pppdata->newaccount() == -1)
+    {
         qDebug("_pppdata->newaccount() == -1");
@@ -114,3 +125,4 @@ void AccountWidget::create() {
 
-    if(result == QDialog::Accepted) {
+    if(result == QDialog::Accepted)
+    {
         listListbox->insertItem(_pppdata->accname());
@@ -119,3 +131,4 @@ void AccountWidget::create() {
         _pppdata->save();
-    } else
+    }
+    else
         _pppdata->deleteAccount();
@@ -124,3 +137,4 @@ void AccountWidget::create() {
 
-void AccountWidget::copy() {
+void AccountWidget::copy()
+{
 //   if(listListbox->count() == MAX_ACCOUNTS) {
@@ -130,3 +144,4 @@ void AccountWidget::copy() {
 
-  if(listListbox->currentItem()<0) {
+    if(listListbox->currentItem()<0)
+    {
     QMessageBox::information(this, "sorry", tr("No account selected."));
@@ -143,3 +158,4 @@ void AccountWidget::copy() {
 
-void AccountWidget::remove() {
+void AccountWidget::remove()
+{
 
@@ -166,3 +182,4 @@ void AccountWidget::remove() {
 
-int AccountWidget::doTab(){
+int AccountWidget::doTab()
+{
     QDialog *dlg = new QDialog( 0, "newAccount", true, Qt::WStyle_ContextHelp );
@@ -177,6 +194,9 @@ int AccountWidget::doTab(){
 
-    if(_pppdata->accname().isEmpty()) {
+    if(_pppdata->accname().isEmpty())
+    {
         dlg->setCaption(tr("New Account"));
         isnewaccount = true;
-    } else {
+    }
+    else
+    {
         QString tit = tr("Edit Account: ");
@@ -214,14 +234,20 @@ int AccountWidget::doTab(){
 
-    while (!ok){
-        dlg->showMaximized();
-        result = dlg->exec();
+    while (!ok)
+    {
+        result = QPEApplication::execDialog( dlg );
         ok = true;
 
-        if(result == QDialog::Accepted) {
-            if (!auth_w->check()){
+        if(result == QDialog::Accepted)
+        {
+            if (!auth_w->check())
+            {
                 ok = false;
-            } else if(!dial_w->save()) {
+            }
+            else if(!dial_w->save())
+            {
                 QMessageBox::critical(this, "error", tr( "You must enter a unique account name"));
                 ok = false;
-            }else{
+            }
+            else
+            {
                 ip_w->save();
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);
diff --git a/noncore/settings/networksettings/ppp/modeminfo.cpp b/noncore/settings/networksettings/ppp/modeminfo.cpp
index dbb26db..df0bf9b 100644
--- a/noncore/settings/networksettings/ppp/modeminfo.cpp
+++ b/noncore/settings/networksettings/ppp/modeminfo.cpp
@@ -26,12 +26,16 @@
 
-#include <unistd.h>
+#include "modeminfo.h"
+#include "modem.h"
+
+/* OPIE */
+#include <qpe/qpeapplication.h>
+
+/* QT */
 #include <qregexp.h>
 #include <qlayout.h>
-// #include <kwin.h>
-// #include <kmessagebox.h>
-// #include <kapplication.h>
 #include <qmessagebox.h>
 #include <qapplication.h>
-#include "modeminfo.h"
-#include "modem.h"
+
+/* STD */
+#include <unistd.h>
 
@@ -95,3 +99,4 @@ ModemTransfer::ModemTransfer(Modem *mo, QWidget *parent, const char *name)
 
-void ModemTransfer::ati_done() {
+void ModemTransfer::ati_done()
+{
   scripttimer->stop();
@@ -106,4 +111,4 @@ void ModemTransfer::ati_done() {
     mi->setAtiString(i, ati_query_strings[i]);
-  mi->showMaximized();
-  mi->exec();
+
+    QPEApplication::execDialog( mi );
   delete mi;
@@ -114,3 +119,4 @@ void ModemTransfer::ati_done() {
 
-void ModemTransfer::time_out_slot() {
+void ModemTransfer::time_out_slot()
+{
   timeout_timer->stop();
@@ -123,3 +129,4 @@ void ModemTransfer::time_out_slot() {
 
-void ModemTransfer::init() {
+void ModemTransfer::init()
+{
 
@@ -128,3 +135,4 @@ void ModemTransfer::init() {
   int lock = _modem->lockdevice();
-  if (lock == 1) {
+    if (lock == 1)
+    {
 
@@ -134,3 +142,4 @@ void ModemTransfer::init() {
 
-  if (lock == -1) {
+    if (lock == -1)
+    {
 
@@ -141,4 +150,6 @@ void ModemTransfer::init() {
 
-  if(_modem->opentty()) {
-    if(_modem->hangup()) {
+    if(_modem->opentty())
+    {
+        if(_modem->hangup())
+        {
       usleep(100000);  // wait 0.1 secs
@@ -167,3 +178,4 @@ void ModemTransfer::init() {
 
-void ModemTransfer::do_script() {
+void ModemTransfer::do_script()
+{
   QString msg;
@@ -171,3 +183,4 @@ void ModemTransfer::do_script() {
 
-  switch(step) {
+    switch(step)
+    {
   case 0:
@@ -201,3 +214,4 @@ void ModemTransfer::do_script() {
 
-void ModemTransfer::readChar(unsigned char c) {
+void ModemTransfer::readChar(unsigned char c)
+{
   if(readbuffer.length() < 255)
@@ -206,3 +220,4 @@ void ModemTransfer::readChar(unsigned char c) {
 
-void ModemTransfer::readtty() {
+void ModemTransfer::readtty()
+{
 
@@ -222,3 +237,4 @@ void ModemTransfer::readtty() {
 
-void ModemTransfer::cancelbutton() {
+void ModemTransfer::cancelbutton()
+{
   scripttimer->stop();
@@ -238,3 +254,4 @@ void ModemTransfer::cancelbutton() {
 
-void ModemTransfer::closeEvent( QCloseEvent *e ) {
+void ModemTransfer::closeEvent( QCloseEvent *e )
+{
   cancelbutton();
@@ -256,3 +273,4 @@ ModemInfo::ModemInfo(QWidget *parent, const char* name)
   tl->addLayout(l1, 1);
-  for(int  i = 0 ; i < NUM_OF_ATI ; i++) {
+    for(int  i = 0 ; i < NUM_OF_ATI ; i++)
+    {
 
@@ -288,3 +306,4 @@ ModemInfo::ModemInfo(QWidget *parent, const char* name)
 
-void ModemInfo::setAtiString(int i, QString s) {
+void ModemInfo::setAtiString(int i, QString s)
+{
   if(i < NUM_OF_ATI)
diff --git a/noncore/settings/networksettings/ppp/pppmodule.cpp b/noncore/settings/networksettings/ppp/pppmodule.cpp
index f7dacf6..a7caffe 100644
--- a/noncore/settings/networksettings/ppp/pppmodule.cpp
+++ b/noncore/settings/networksettings/ppp/pppmodule.cpp
@@ -1,6 +1 @@
-#include <errno.h>
-#include <signal.h>
-
-
-#include <qpe/config.h>
 
@@ -13,4 +8,15 @@
 
+/* OPIE */
+#include <qpe/config.h>
+#include <qpe/qpeapplication.h>
+
+/* QT */
+
+/* STD */
+#include <errno.h>
+#include <signal.h>
+
 // don't polute global namespace
-namespace {
+namespace
+{
     /*
@@ -20,3 +26,4 @@ namespace {
      */
-    struct Connection {
+    struct Connection
+    {
         pid_t pid;
@@ -25,3 +32,4 @@ namespace {
     };
-    class InterfaceKeeper {
+    class InterfaceKeeper
+    {
     public:
@@ -55,3 +63,4 @@ PPPModule::PPPModule() : Module()
     qDebug("getting interfaces");
-    for( it = ifaces.begin(); it != ifaces.end(); ++it ){
+    for( it = ifaces.begin(); it != ifaces.end(); ++it )
+    {
         qDebug("ifaces %s %s", it.key().latin1(), it.data().latin1() );
@@ -62,3 +71,4 @@ PPPModule::PPPModule() : Module()
         // check if (*it) is one of the running ifaces
-        if ( running.contains( it.data() ) ) {
+        if ( running.contains( it.data() ) )
+        {
             qDebug("iface is running %s", it.key().latin1() );
@@ -78,3 +88,4 @@ PPPModule::PPPModule() : Module()
  */
-PPPModule::~PPPModule(){
+PPPModule::~PPPModule()
+{
     qDebug("PPPModule::~PPPModule() " );
@@ -83,5 +94,7 @@ PPPModule::~PPPModule(){
     Interface *i;
-    for ( i=list.first(); i != 0; i=list.next() ){
+    for ( i=list.first(); i != 0; i=list.next() )
+    {
         /* if online save the state */
-        if ( i->getStatus() ) {
+        if ( i->getStatus() )
+        {
             qDebug("Iface %s is still up", i->getHardwareName().latin1() );
@@ -99,3 +112,4 @@ PPPModule::~PPPModule(){
  */
-void PPPModule::setProfile(const QString &newProfile){
+void PPPModule::setProfile(const QString &newProfile)
+{
   profile = newProfile;
@@ -108,3 +122,4 @@ void PPPModule::setProfile(const QString &newProfile){
  */
-QString PPPModule::getPixmapName(Interface* ){
+QString PPPModule::getPixmapName(Interface* )
+{
   return "ppp";
@@ -117,3 +132,4 @@ QString PPPModule::getPixmapName(Interface* ){
  */
-bool PPPModule::isOwner(Interface *i){
+bool PPPModule::isOwner(Interface *i)
+{
     return list.find( i ) != -1;
@@ -125,3 +141,4 @@ bool PPPModule::isOwner(Interface *i){
  */
-QWidget *PPPModule::configure(Interface *i){
+QWidget *PPPModule::configure(Interface *i)
+{
     qDebug("return ModemWidget");
@@ -137,3 +154,4 @@ QWidget *PPPModule::configure(Interface *i){
  */
-QWidget *PPPModule::information(Interface *i){
+QWidget *PPPModule::information(Interface *i)
+{
   // We don't have any advanced pppd information widget yet :-D
@@ -149,3 +167,4 @@ QWidget *PPPModule::information(Interface *i){
  */
-QList<Interface> PPPModule::getInterfaces(){
+QList<Interface> PPPModule::getInterfaces()
+{
   // List all of the files in the peer directory
@@ -161,3 +180,4 @@ QList<Interface> PPPModule::getInterfaces(){
  */
-Interface *PPPModule::addNewInterface(const QString &newInterface){
+Interface *PPPModule::addNewInterface(const QString &newInterface)
+{
 
@@ -167,4 +187,5 @@ Interface *PPPModule::addNewInterface(const QString &newInterface){
   PPPConfigWidget imp(ifaceppp, 0, "PPPConfigImp", true);
-  imp.showMaximized();
-  if(imp.exec() == QDialog::Accepted ){
+
+    if( QPEApplication::execDialog( &imp ) == QDialog::Accepted )
+    {
       iface = (InterfacePPP*) ifaceppp;
@@ -173,3 +194,5 @@ Interface *PPPModule::addNewInterface(const QString &newInterface){
       return iface;
-  }else {
+    }
+    else
+    {
       delete ifaceppp;
@@ -184,3 +207,4 @@ Interface *PPPModule::addNewInterface(const QString &newInterface){
  */
-bool PPPModule::remove(Interface *i){
+bool PPPModule::remove(Interface *i)
+{
     return list.remove(i);
@@ -196,9 +220,12 @@ void PPPModule::possibleNewInterfaces(QMap<QString, QString> &newIfaces)
 
-namespace {
-    InterfaceKeeper::InterfaceKeeper( ) {
-    }
-    InterfaceKeeper::~InterfaceKeeper() {
+namespace
+{
+    InterfaceKeeper::InterfaceKeeper( )
+    {}
+    InterfaceKeeper::~InterfaceKeeper()
+    {
         Config cfg("ppp_plugin_keeper");
         QStringList lst = cfg.groupList();
-        for (QStringList::Iterator it = lst.begin(); it != lst.end(); ++it ) {
+        for (QStringList::Iterator it = lst.begin(); it != lst.end(); ++it )
+        {
             Connection con;
@@ -208,3 +235,4 @@ namespace {
 
-        for (QMap<QString, Connection>::Iterator it = m_interfaces.begin(); it != m_interfaces.end(); ++it ) {
+        for (QMap<QString, Connection>::Iterator it = m_interfaces.begin(); it != m_interfaces.end(); ++it )
+        {
             Connection con = it.data();
@@ -215,3 +243,4 @@ namespace {
     }
-    void InterfaceKeeper::addInterface(pid_t pid, const QString& dev, const QString& name ) {
+    void InterfaceKeeper::addInterface(pid_t pid, const QString& dev, const QString& name )
+    {
         Connection con;
@@ -222,3 +251,4 @@ namespace {
     }
-    QMap<QString, Connection> InterfaceKeeper::interfaces()const {
+    QMap<QString, Connection> InterfaceKeeper::interfaces()const
+    {
         Config cfg("ppp_plugin_keeper");
@@ -226,3 +256,4 @@ namespace {
         QStringList lst = cfg.groupList();
-        for (QStringList::Iterator it = lst.begin(); it != lst.end(); ++it ) {
+        for (QStringList::Iterator it = lst.begin(); it != lst.end(); ++it )
+        {
             Connection con;
@@ -239,4 +270,6 @@ namespace {
     }
-    bool InterfaceKeeper::isAvailable( pid_t p)const {
-        if (::kill(p, 0 ) == 0 || errno != ESRCH ) {
+    bool InterfaceKeeper::isAvailable( pid_t p)const
+    {
+        if (::kill(p, 0 ) == 0 || errno != ESRCH )
+        {
             qDebug("isAvailable %d",  p);