summaryrefslogtreecommitdiff
authorzecke <zecke>2005-02-20 13:06:59 (UTC)
committer zecke <zecke>2005-02-20 13:06:59 (UTC)
commitcc00ea4b5def00b6664bd5d9c5e5d59f5ce62732 (patch) (unidiff)
tree23c51eb79b9d81519b6cd50221b0bbb051415634
parentbdbe220d0096667f26c8c25c1e1011c32fc54524 (diff)
downloadopie-cc00ea4b5def00b6664bd5d9c5e5d59f5ce62732.zip
opie-cc00ea4b5def00b6664bd5d9c5e5d59f5ce62732.tar.gz
opie-cc00ea4b5def00b6664bd5d9c5e5d59f5ce62732.tar.bz2
-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)
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/net/opietooth/blue-pin/main.cc9
-rw-r--r--noncore/net/opietooth/blue-pin/pindlg.cc26
-rw-r--r--noncore/net/opietooth/blue-pin/pindlg.h9
-rw-r--r--noncore/net/opietooth/blue-pin/pindlgbase.ui56
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
@@ -6,6 +6,11 @@
6#include <opie2/oapplicationfactory.h> 6#include <opie2/oapplicationfactory.h>
7 7
8#include "pindlg.h" 8#include "pindlg.h"
9 9
10using namespace Opie::Core; 10int main(int argc, char *argv[]) {
11OPIE_EXPORT_APP( OApplicationFactory<OpieTooth::PinDlg> ) 11 QPEApplication oapp(argc, argv);
12
13 OpieTooth::PinDlg dlg;
14 return oapp.exec();
15}
16
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
@@ -14,20 +14,8 @@
14#include <stdio.h> 14#include <stdio.h>
15 15
16using namespace OpieTooth; 16using namespace OpieTooth;
17 17
18PinDlg::PinDlg( const QString& status,
19 const QString& mac, QWidget* parent,
20 const char* name )
21 : PinDlgBase( parent, name, WType_Modal )
22{
23 m_mac = mac;
24 test( mac );
25 txtStatus->setText(status);
26 if(!m_mac.isEmpty())
27 QPEApplication::showDialog( this );
28}
29
30PinDlg::PinDlg(QWidget* parent, 18PinDlg::PinDlg(QWidget* parent,
31 const char* name, 19 const char* name,
32 Qt::WFlags f ) 20 Qt::WFlags f )
33 : PinDlgBase( parent, name, f ) 21 : PinDlgBase( parent, name, f )
@@ -37,15 +25,15 @@ PinDlg::PinDlg(QWidget* parent,
37 if(m_mac.isEmpty()) 25 if(m_mac.isEmpty())
38 { 26 {
39 // can't obtain MAC 27 // can't obtain MAC
40 printf("ERR\n"); 28 printf("ERR\n");
41 qApp->quit(); 29 ::exit(0);
42 } 30 }
43 else 31 else
44 { 32 {
45 test( m_mac ); 33 test( m_mac );
46 txtStatus->setText(makeTextFromArgs()); 34 txtStatus->setText(makeTextFromArgs());
47 QPEApplication::showDialog( this ) ; 35 QPEApplication::showDialog( this , true) ;
48 } 36 }
49} 37}
50 38
51PinDlg::~PinDlg() 39PinDlg::~PinDlg()
@@ -67,14 +55,9 @@ void PinDlg::test( const QString& mac )
67 { 55 {
68 Config cfg("bluepin"); 56 Config cfg("bluepin");
69 cfg.setGroup(mac); 57 cfg.setGroup(mac);
70 lnePin->setText(cfg.readEntryCrypt("pin", QString::null ) ); 58 lnePin->setText(cfg.readEntryCrypt("pin", QString::null ) );
71 if ( !lnePin->text().isEmpty() )
72 {
73 //QTimer::singleShot(100, this, SLOT(accept() ) );
74 }
75 } 59 }
76
77} 60}
78 61
79QString PinDlg::makeTextFromArgs() 62QString PinDlg::makeTextFromArgs()
80{ 63{
@@ -99,15 +82,15 @@ QString PinDlg::makeTextFromArgs()
99 82
100 return status ; 83 return status ;
101 } 84 }
102 else 85 else
103 return QString(); 86 return QString::null;
104} 87}
105 88
106QString PinDlg::makeMacFromArgs() 89QString PinDlg::makeMacFromArgs()
107{ 90{
108 if(qApp->argc() < 3) 91 if(qApp->argc() < 3)
109 return QString(); 92 return QString::null;
110 else 93 else
111 return qApp->argv()[2] ; 94 return qApp->argv()[2] ;
112} 95}
113 96
@@ -121,5 +104,6 @@ void PinDlg::accept()
121 } 104 }
122 printf("PIN:%s\n", lnePin->text().latin1()); 105 printf("PIN:%s\n", lnePin->text().latin1());
123 QDialog::accept(); 106 QDialog::accept();
124 qApp->quit(); 107 qApp->quit();
108 ::exit(0);
125} 109}
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
@@ -9,16 +9,9 @@ namespace OpieTooth {
9 9
10 Q_OBJECT 10 Q_OBJECT
11 11
12 public: 12 public:
13 PinDlg(const QString& text="", 13 PinDlg(QWidget* parent = 0,const char* name = 0, Qt::WFlags f = 0);
14 const QString& mac="",
15 QWidget* parent = 0,
16 const char* name= 0 );
17
18 PinDlg(QWidget* parent,
19 const char* name,
20 Qt::WFlags f );
21 14
22 ~PinDlg(); 15 ~PinDlg();
23 void setMac( const QString& ); 16 void setMac( const QString& );
24 QString pin() const; 17 QString pin() const;
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
@@ -11,47 +11,26 @@
11 <name>geometry</name> 11 <name>geometry</name>
12 <rect> 12 <rect>
13 <x>0</x> 13 <x>0</x>
14 <y>0</y> 14 <y>0</y>
15 <width>254</width> 15 <width>267</width>
16 <height>245</height> 16 <height>161</height>
17 </rect> 17 </rect>
18 </property> 18 </property>
19 <property stdset="1"> 19 <property stdset="1">
20 <name>caption</name> 20 <name>caption</name>
21 <string>Please enter pin</string> 21 <string>Please enter pin</string>
22 </property> 22 </property>
23 <vbox> 23 <grid>
24 <property stdset="1"> 24 <property stdset="1">
25 <name>margin</name> 25 <name>margin</name>
26 <number>11</number> 26 <number>11</number>
27 </property> 27 </property>
28 <property stdset="1"> 28 <property stdset="1">
29 <name>spacing</name> 29 <name>spacing</name>
30 <number>6</number> 30 <number>6</number>
31 </property> 31 </property>
32 <spacer> 32 <widget row="0" column="0" >
33 <property>
34 <name>name</name>
35 <cstring>Spacer4_2</cstring>
36 </property>
37 <property stdset="1">
38 <name>orientation</name>
39 <enum>Vertical</enum>
40 </property>
41 <property stdset="1">
42 <name>sizeType</name>
43 <enum>Expanding</enum>
44 </property>
45 <property>
46 <name>sizeHint</name>
47 <size>
48 <width>20</width>
49 <height>20</height>
50 </size>
51 </property>
52 </spacer>
53 <widget>
54 <class>QLabel</class> 33 <class>QLabel</class>
55 <property stdset="1"> 34 <property stdset="1">
56 <name>name</name> 35 <name>name</name>
57 <cstring>txtStatus</cstring> 36 <cstring>txtStatus</cstring>
@@ -64,9 +43,9 @@
64 <name>textFormat</name> 43 <name>textFormat</name>
65 <enum>RichText</enum> 44 <enum>RichText</enum>
66 </property> 45 </property>
67 </widget> 46 </widget>
68 <widget> 47 <widget row="1" column="0" >
69 <class>QLayoutWidget</class> 48 <class>QLayoutWidget</class>
70 <property stdset="1"> 49 <property stdset="1">
71 <name>name</name> 50 <name>name</name>
72 <cstring>Layout6</cstring> 51 <cstring>Layout6</cstring>
@@ -152,30 +131,9 @@
152 </property> 131 </property>
153 </widget> 132 </widget>
154 </vbox> 133 </vbox>
155 </widget> 134 </widget>
156 <spacer> 135 <widget row="2" column="0" >
157 <property>
158 <name>name</name>
159 <cstring>Spacer5</cstring>
160 </property>
161 <property stdset="1">
162 <name>orientation</name>
163 <enum>Vertical</enum>
164 </property>
165 <property stdset="1">
166 <name>sizeType</name>
167 <enum>Expanding</enum>
168 </property>
169 <property>
170 <name>sizeHint</name>
171 <size>
172 <width>20</width>
173 <height>20</height>
174 </size>
175 </property>
176 </spacer>
177 <widget>
178 <class>QLayoutWidget</class> 136 <class>QLayoutWidget</class>
179 <property stdset="1"> 137 <property stdset="1">
180 <name>name</name> 138 <name>name</name>
181 <cstring>Layout7</cstring> 139 <cstring>Layout7</cstring>
@@ -254,9 +212,9 @@
254 </property> 212 </property>
255 </spacer> 213 </spacer>
256 </hbox> 214 </hbox>
257 </widget> 215 </widget>
258 </vbox> 216 </grid>
259</widget> 217</widget>
260<connections> 218<connections>
261 <connection> 219 <connection>
262 <sender>PushButton1</sender> 220 <sender>PushButton1</sender>