1 files changed, 90 insertions, 57 deletions

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,4 +112,5 @@ PPPModule::~PPPModule(){
  */
-void PPPModule::setProfile(const QString &newProfile){
-  profile = newProfile;
+void PPPModule::setProfile(const QString &newProfile)
+{
+    profile = newProfile;
 }
@@ -108,4 +122,5 @@ void PPPModule::setProfile(const QString &newProfile){
  */
-QString PPPModule::getPixmapName(Interface* ){
-  return "ppp";
+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,7 +141,8 @@ bool PPPModule::isOwner(Interface *i){
  */
-QWidget *PPPModule::configure(Interface *i){
+QWidget *PPPModule::configure(Interface *i)
+{
     qDebug("return ModemWidget");
     PPPConfigWidget *pppconfig = new PPPConfigWidget( (InterfacePPP*)i,
-                                                      0, "PPPConfig", false,
-                                                      (Qt::WDestructiveClose | Qt::WStyle_ContextHelp));
+                                 0, "PPPConfig", false,
+                                 (Qt::WDestructiveClose | Qt::WStyle_ContextHelp));
     return pppconfig;
@@ -137,7 +154,8 @@ QWidget *PPPModule::configure(Interface *i){
  */
-QWidget *PPPModule::information(Interface *i){
-  // We don't have any advanced pppd information widget yet :-D
-  // TODO ^
+QWidget *PPPModule::information(Interface *i)
+{
+    // We don't have any advanced pppd information widget yet :-D
+    // TODO ^
 
-   return new InterfaceInformationPPP( 0, "InterfaceInformationPPP", i );
+    return new InterfaceInformationPPP( 0, "InterfaceInformationPPP", i );
 }
@@ -149,6 +167,7 @@ QWidget *PPPModule::information(Interface *i){
  */
-QList<Interface> PPPModule::getInterfaces(){
-  // List all of the files in the peer directory
+QList<Interface> PPPModule::getInterfaces()
+{
+    // List all of the files in the peer directory
     qDebug("PPPModule::getInterfaces");
-  return list;
+    return list;
 }
@@ -161,19 +180,23 @@ QList<Interface> PPPModule::getInterfaces(){
  */
-Interface *PPPModule::addNewInterface(const QString &newInterface){
-
-  InterfacePPP *ifaceppp;
-  Interface *iface;
-  ifaceppp = new InterfacePPP();
-  PPPConfigWidget imp(ifaceppp, 0, "PPPConfigImp", true);
-  imp.showMaximized();
-  if(imp.exec() == QDialog::Accepted ){
-      iface = (InterfacePPP*) ifaceppp;
-      iface->setModuleOwner( this );
-      list.append( iface );
-      return iface;
-  }else {
-      delete ifaceppp;
-      iface = NULL;
-  }
-  return iface;
+Interface *PPPModule::addNewInterface(const QString &newInterface)
+{
+
+    InterfacePPP *ifaceppp;
+    Interface *iface;
+    ifaceppp = new InterfacePPP();
+    PPPConfigWidget imp(ifaceppp, 0, "PPPConfigImp", true);
+
+    if( QPEApplication::execDialog( &imp ) == QDialog::Accepted )
+    {
+        iface = (InterfacePPP*) ifaceppp;
+        iface->setModuleOwner( this );
+        list.append( iface );
+        return iface;
+    }
+    else
+    {
+        delete ifaceppp;
+        iface = NULL;
+    }
+    return iface;
 }
@@ -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);