-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)

4 files changed, 20 insertions, 80 deletions

diff --git a/noncore/net/opietooth/blue-pin/main.cc b/noncore/net/opietooth/blue-pin/main.cc
index dbe5b41..90d42e0 100644
--- a/noncore/net/opietooth/blue-pin/main.cc
+++ b/noncore/net/opietooth/blue-pin/main.cc
@@ -9,3 +9,8 @@
 
-using namespace Opie::Core;
-OPIE_EXPORT_APP( OApplicationFactory<OpieTooth::PinDlg> )
+int main(int argc, char *argv[]) {
+    QPEApplication oapp(argc, argv);
+    
+    OpieTooth::PinDlg dlg;
+    return oapp.exec();
+}
+
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
@@ -17,14 +17,2 @@ 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,
@@ -40,3 +28,3 @@ PinDlg::PinDlg(QWidget* parent,
         printf("ERR\n"); 
-	qApp->quit();
+	::exit(0);
     }
@@ -46,3 +34,3 @@ PinDlg::PinDlg(QWidget* parent,
         txtStatus->setText(makeTextFromArgs());
-        QPEApplication::showDialog( this ) ; 
+        QPEApplication::showDialog( this , true) ; 
     }
@@ -70,8 +58,3 @@ void PinDlg::test( const QString& mac )
         lnePin->setText(cfg.readEntryCrypt("pin", QString::null ) );
-        if ( !lnePin->text().isEmpty() )
-        {
-            //QTimer::singleShot(100,  this,  SLOT(accept() ) );
-        }
     }
-
 }
@@ -102,3 +85,3 @@ QString PinDlg::makeTextFromArgs()
     else
-        return QString();
+        return QString::null;
 }
@@ -108,3 +91,3 @@ QString PinDlg::makeMacFromArgs()
     if(qApp->argc() < 3)
-        return QString();
+        return QString::null;
     else
@@ -124,2 +107,3 @@ void PinDlg::accept()
     qApp->quit();
+    ::exit(0);
 }
diff --git a/noncore/net/opietooth/blue-pin/pindlg.h b/noncore/net/opietooth/blue-pin/pindlg.h
index 5f7dc55..8623274 100644
--- a/noncore/net/opietooth/blue-pin/pindlg.h
+++ b/noncore/net/opietooth/blue-pin/pindlg.h
@@ -12,10 +12,3 @@ namespace OpieTooth {
     public:
-        PinDlg(const QString& text="",
-               const QString& mac="",
-               QWidget* parent = 0,
-               const char* name= 0 );
-        
-        PinDlg(QWidget* parent,
-               const char* name, 
-               Qt::WFlags f );
+        PinDlg(QWidget* parent = 0,const char* name = 0, Qt::WFlags f = 0);
 
diff --git a/noncore/net/opietooth/blue-pin/pindlgbase.ui b/noncore/net/opietooth/blue-pin/pindlgbase.ui
index 6784de7..a79bb49 100644
--- a/noncore/net/opietooth/blue-pin/pindlgbase.ui
+++ b/noncore/net/opietooth/blue-pin/pindlgbase.ui
@@ -14,4 +14,4 @@
             <y>0</y>
-            <width>254</width>
-            <height>245</height>
+            <width>267</width>
+            <height>161</height>
         </rect>
@@ -22,3 +22,3 @@
     </property>
-    <vbox>
+    <grid>
         <property stdset="1">
@@ -31,24 +31,3 @@
         </property>
-        <spacer>
-            <property>
-                <name>name</name>
-                <cstring>Spacer4_2</cstring>
-            </property>
-            <property stdset="1">
-                <name>orientation</name>
-                <enum>Vertical</enum>
-            </property>
-            <property stdset="1">
-                <name>sizeType</name>
-                <enum>Expanding</enum>
-            </property>
-            <property>
-                <name>sizeHint</name>
-                <size>
-                    <width>20</width>
-                    <height>20</height>
-                </size>
-            </property>
-        </spacer>
-        <widget>
+        <widget row="0"  column="0" >
             <class>QLabel</class>
@@ -67,3 +46,3 @@
         </widget>
-        <widget>
+        <widget row="1"  column="0" >
             <class>QLayoutWidget</class>
@@ -155,24 +134,3 @@
         </widget>
-        <spacer>
-            <property>
-                <name>name</name>
-                <cstring>Spacer5</cstring>
-            </property>
-            <property stdset="1">
-                <name>orientation</name>
-                <enum>Vertical</enum>
-            </property>
-            <property stdset="1">
-                <name>sizeType</name>
-                <enum>Expanding</enum>
-            </property>
-            <property>
-                <name>sizeHint</name>
-                <size>
-                    <width>20</width>
-                    <height>20</height>
-                </size>
-            </property>
-        </spacer>
-        <widget>
+        <widget row="2"  column="0" >
             <class>QLayoutWidget</class>
@@ -257,3 +215,3 @@
         </widget>
-    </vbox>
+    </grid>
 </widget>