From cc00ea4b5def00b6664bd5d9c5e5d59f5ce62732 Mon Sep 17 00:00:00 2001
From: zecke <zecke>
Date: Sun, 20 Feb 2005 13:06:59 +0000
Subject: -Use own main method

-Remove default c'tor and use the remaining one as default
-QString() -> QString::null (for Qt4 we will do the opposite)
-use qApp->quit() and exit to be sure to really exit

Still open: do not use the depcreated latin1 c'tor of QString,
it is safe to use it here though (we only get IN/OUT and a mac address)
---
(limited to 'noncore/net/opietooth/blue-pin/pindlg.cc')

diff --git a/noncore/net/opietooth/blue-pin/pindlg.cc b/noncore/net/opietooth/blue-pin/pindlg.cc
index 96be1e5..e40fe33 100644
--- a/noncore/net/opietooth/blue-pin/pindlg.cc
+++ b/noncore/net/opietooth/blue-pin/pindlg.cc
@@ -15,18 +15,6 @@
 
 using namespace OpieTooth;
 
-PinDlg::PinDlg( const QString& status,
-                const QString& mac, QWidget* parent,
-                const char* name )
-        : PinDlgBase( parent, name, WType_Modal )
-{
-    m_mac = mac;
-    test( mac );
-    txtStatus->setText(status);
-    if(!m_mac.isEmpty())
-	    QPEApplication::showDialog( this );
-}
-
 PinDlg::PinDlg(QWidget* parent,
                const char* name, 
                Qt::WFlags f )
@@ -38,13 +26,13 @@ PinDlg::PinDlg(QWidget* parent,
     {
         // can't obtain MAC
         printf("ERR\n"); 
-	qApp->quit();
+	::exit(0);
     }
     else
     {
         test( m_mac );
         txtStatus->setText(makeTextFromArgs());
-        QPEApplication::showDialog( this ) ; 
+        QPEApplication::showDialog( this , true) ; 
     }
 }
 
@@ -68,12 +56,7 @@ void PinDlg::test( const QString& mac )
         Config cfg("bluepin");
         cfg.setGroup(mac);
         lnePin->setText(cfg.readEntryCrypt("pin", QString::null ) );
-        if ( !lnePin->text().isEmpty() )
-        {
-            //QTimer::singleShot(100,  this,  SLOT(accept() ) );
-        }
     }
-
 }
 
 QString PinDlg::makeTextFromArgs()
@@ -100,13 +83,13 @@ QString PinDlg::makeTextFromArgs()
         return status ;
     }
     else
-        return QString();
+        return QString::null;
 }
 
 QString PinDlg::makeMacFromArgs()
 {
     if(qApp->argc() < 3)
-        return QString();
+        return QString::null;
     else
         return qApp->argv()[2] ;
 }
@@ -122,4 +105,5 @@ void PinDlg::accept()
     printf("PIN:%s\n", lnePin->text().latin1());
     QDialog::accept();
     qApp->quit();
+    ::exit(0);
 }
--
cgit v0.9.0.2