1 files changed, 42 insertions, 23 deletions

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
@@ -21,22 +21,26 @@
  *
  * You should have received a copy of the GNU Library General Public
  * License along with this program; if not, write to the Free
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#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>
 
 ModemTransfer::ModemTransfer(Modem *mo, QWidget *parent, const char *name)
     : QDialog(parent, name,TRUE, WStyle_Customize|WStyle_NormalBorder),
     _modem(mo)
 {
   setCaption(QObject::tr("ATI Query"));
@@ -90,60 +94,67 @@ ModemTransfer::ModemTransfer(Modem *mo, QWidget *parent, const char *name)
   timeout_timer->start(15000,TRUE); // 15 secs single shot
   QTimer::singleShot(500, this, SLOT(init()));
 
 }
 
 
-void ModemTransfer::ati_done() {
+void ModemTransfer::ati_done()
+{
   scripttimer->stop();
   timeout_timer->stop();
   _modem->closetty();
   _modem->unlockdevice();
   hide();
 
   // open the result window
   ModemInfo *mi = new ModemInfo(this);
   for(int i = 0; i < NUM_OF_ATI; i++)
     mi->setAtiString(i, ati_query_strings[i]);
-  mi->showMaximized();
-  mi->exec();
+
+    QPEApplication::execDialog( mi );
   delete mi;
 
   accept();
 }
 
 
-void ModemTransfer::time_out_slot() {
+void ModemTransfer::time_out_slot()
+{
   timeout_timer->stop();
   scripttimer->stop();
 
   QMessageBox::warning(this, tr("Error"), QObject::tr("Modem Query timed out."));
   reject();
 }
 
 
-void ModemTransfer::init() {
+void ModemTransfer::init()
+{
 
   qApp->processEvents();
 
   int lock = _modem->lockdevice();
-  if (lock == 1) {
+    if (lock == 1)
+    {
 
     statusBar->setText(QObject::tr("Modem device is locked."));
     return;
   }
 
-  if (lock == -1) {
+    if (lock == -1)
+    {
 
     statusBar->setText(QObject::tr("Unable to create modem lock file."));
     return;
   }
 
 
-  if(_modem->opentty()) {
-    if(_modem->hangup()) {
+    if(_modem->opentty())
+    {
+        if(_modem->hangup())
+        {
       usleep(100000);  // wait 0.1 secs
       _modem->writeLine("ATE0Q1V1"); // E0 don't echo the commands I send ...
 
       statusBar->setText(QObject::tr("Modem Ready"));
       qApp->processEvents();
       usleep(100000);  // wait 0.1 secs
@@ -162,17 +173,19 @@ void ModemTransfer::init() {
   statusBar->setText(_modem->modemMessage());
   step = 99; // wait until cancel is pressed
   _modem->unlockdevice();
 }
 
 
-void ModemTransfer::do_script() {
+void ModemTransfer::do_script()
+{
   QString msg;
   QString query;
 
-  switch(step) {
+    switch(step)
+    {
   case 0:
     readtty();
     statusBar->setText("ATI...");
     progressBar->setProgress( progressBar->progress() + 1);
     _modem->writeLine("ATI\n");
     break;
@@ -196,18 +209,20 @@ void ModemTransfer::do_script() {
     readtty();
     ati_done();
   }
   step++;
 }
 
-void ModemTransfer::readChar(unsigned char c) {
+void ModemTransfer::readChar(unsigned char c)
+{
   if(readbuffer.length() < 255)
     readbuffer += c;
 }
 
-void ModemTransfer::readtty() {
+void ModemTransfer::readtty()
+{
 
   if (step == 0)
     return;
 
   readbuffer.replace(QRegExp("[\n\r]")," ");         // remove stray \n and \r
   readbuffer = readbuffer.stripWhiteSpace(); // strip of leading or trailing white
@@ -217,13 +232,14 @@ void ModemTransfer::readtty() {
     ati_query_strings[step-1] = readbuffer.copy();
 
   readbuffer = "";
 }
 
 
-void ModemTransfer::cancelbutton() {
+void ModemTransfer::cancelbutton()
+{
   scripttimer->stop();
   _modem->stop();
   timeout_timer->stop();
 
   statusBar->setText(QObject::tr("One moment please..."));
   qApp->processEvents();
@@ -233,13 +249,14 @@ void ModemTransfer::cancelbutton() {
   _modem->closetty();
   _modem->unlockdevice();
   reject();
 }
 
 
-void ModemTransfer::closeEvent( QCloseEvent *e ) {
+void ModemTransfer::closeEvent( QCloseEvent *e )
+{
   cancelbutton();
   e->accept();
 }
 
 
 ModemInfo::ModemInfo(QWidget *parent, const char* name)
@@ -251,13 +268,14 @@ ModemInfo::ModemInfo(QWidget *parent, const char* name)
   // KWin::setIcons(winId(), kapp->icon(), kapp->miniIcon());
 
   QVBoxLayout *tl = new QVBoxLayout(this, 10, 10);
 
   QGridLayout *l1 = new QGridLayout(NUM_OF_ATI, 2, 5);
   tl->addLayout(l1, 1);
-  for(int  i = 0 ; i < NUM_OF_ATI ; i++) {
+    for(int  i = 0 ; i < NUM_OF_ATI ; i++)
+    {
 
     label_text = "";
     if ( i == 0)
       label_text.sprintf("ATI :");
     else
       label_text.sprintf("ATI %d:", i );
@@ -283,12 +301,13 @@ ModemInfo::ModemInfo(QWidget *parent, const char* name)
   l2->addWidget(ok);
 
   setMinimumSize(sizeHint());
 }
 
 
-void ModemInfo::setAtiString(int i, QString s) {
+void ModemInfo::setAtiString(int i, QString s)
+{
   if(i < NUM_OF_ATI)
     ati_label_result[i]->setText(s);
 }
 
 //#include "modeminfo.moc"