author | dwmw2 <dwmw2> | 2002-04-02 16:51:01 (UTC) |
---|---|---|
committer | dwmw2 <dwmw2> | 2002-04-02 16:51:01 (UTC) |
commit | ac91ca1bd03f14eef87711efcddddae0e6475b44 (patch) (unidiff) | |
tree | 7357bc0302c4dc91120a125816391753990a2790 /noncore/unsupported | |
parent | 42e978133012df5c8e7a367e565ea1454f9beb9b (diff) | |
download | opie-ac91ca1bd03f14eef87711efcddddae0e6475b44.zip opie-ac91ca1bd03f14eef87711efcddddae0e6475b44.tar.gz opie-ac91ca1bd03f14eef87711efcddddae0e6475b44.tar.bz2 |
Remove all deletions of 'port' and 'me'. It's got a silly pointless automatic
ref-counting thingy. Gsmlib _really_ needs rewriting without the gratuitous bloat.
-rw-r--r-- | noncore/unsupported/gsmtool/gsmtool.cpp | 18 | ||||
-rw-r--r-- | noncore/unsupported/gsmtool/gsmtool.h | 1 |
2 files changed, 7 insertions, 12 deletions
diff --git a/noncore/unsupported/gsmtool/gsmtool.cpp b/noncore/unsupported/gsmtool/gsmtool.cpp index 14ef368..38c8c59 100644 --- a/noncore/unsupported/gsmtool/gsmtool.cpp +++ b/noncore/unsupported/gsmtool/gsmtool.cpp | |||
@@ -24,3 +24,2 @@ GSMTool::GSMTool( QWidget* parent, const char* name, WFlags fl ) | |||
24 | me = NULL; | 24 | me = NULL; |
25 | port = NULL; | ||
26 | setConnected(FALSE); | 25 | setConnected(FALSE); |
@@ -140,2 +139,4 @@ void GSMTool::doConnectButton() | |||
140 | { | 139 | { |
140 | gsmlib::Port *port; | ||
141 | |||
141 | speed_t rate; | 142 | speed_t rate; |
@@ -152,9 +153,4 @@ void GSMTool::doConnectButton() | |||
152 | if (me) { | 153 | if (me) { |
153 | // delete me; | ||
154 | me = NULL; | 154 | me = NULL; |
155 | } | 155 | } |
156 | if (port) { | ||
157 | // delete port; | ||
158 | port = NULL; | ||
159 | } | ||
160 | 156 | ||
@@ -162,2 +158,3 @@ void GSMTool::doConnectButton() | |||
162 | qDebug("lockDevice() failed\n"); | 158 | qDebug("lockDevice() failed\n"); |
159 | MfrText->setText("Lock port failed"); | ||
163 | }; | 160 | }; |
@@ -170,2 +167,3 @@ void GSMTool::doConnectButton() | |||
170 | qDebug("port failed"); | 167 | qDebug("port failed"); |
168 | MfrText->setText("Open port failed"); | ||
171 | return; | 169 | return; |
@@ -178,4 +176,4 @@ void GSMTool::doConnectButton() | |||
178 | qDebug("meta failed"); | 176 | qDebug("meta failed"); |
179 | delete port; | 177 | MfrText->setText("Initialise GSM unit failed"); |
180 | port = NULL; | 178 | me = NULL; |
181 | unlockDevice(); | 179 | unlockDevice(); |
@@ -194,6 +192,4 @@ void GSMTool::doConnectButton() | |||
194 | qDebug("getMEInfo failed"); | 192 | qDebug("getMEInfo failed"); |
195 | delete me; | 193 | MfrText->setText("Query GSM unit failed"); |
196 | me = NULL; | 194 | me = NULL; |
197 | delete port; | ||
198 | port = NULL; | ||
199 | unlockDevice(); | 195 | unlockDevice(); |
diff --git a/noncore/unsupported/gsmtool/gsmtool.h b/noncore/unsupported/gsmtool/gsmtool.h index cb19f54..1625cb1 100644 --- a/noncore/unsupported/gsmtool/gsmtool.h +++ b/noncore/unsupported/gsmtool/gsmtool.h | |||
@@ -29,3 +29,2 @@ private: | |||
29 | gsmlib::MeTa *me; | 29 | gsmlib::MeTa *me; |
30 | gsmlib::Port *port; | ||
31 | 30 | ||