Diffstat (limited to 'noncore/unsupported/gsmtool/gsmtool.cpp') (more/less context) (show whitespace changes)
| -rw-r--r-- | noncore/unsupported/gsmtool/gsmtool.cpp | 18 |
1 files changed, 7 insertions, 11 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 @@ -23,5 +23,4 @@ GSMTool::GSMTool( QWidget* parent, const char* name, WFlags fl ) devicelocked = 0; me = NULL; - port = NULL; setConnected(FALSE); /* FIXME: Persistent settings for device/baudrate */ @@ -139,4 +138,6 @@ void GSMTool::doScanButton() void GSMTool::doConnectButton() { + gsmlib::Port *port; + speed_t rate; devicename = strdup(DeviceName->currentText().local8Bit().data()); @@ -151,14 +152,10 @@ void GSMTool::doConnectButton() setConnected(FALSE); if (me) { - // delete me; me = NULL; } - if (port) { - // delete port; - port = NULL; - } if (lockDevice()) { qDebug("lockDevice() failed\n"); + MfrText->setText("Lock port failed"); }; @@ -169,4 +166,5 @@ void GSMTool::doConnectButton() } catch (GsmException) { qDebug("port failed"); + MfrText->setText("Open port failed"); return; } @@ -177,6 +175,6 @@ void GSMTool::doConnectButton() } catch (GsmException) { qDebug("meta failed"); - delete port; - port = NULL; + MfrText->setText("Initialise GSM unit failed"); + me = NULL; unlockDevice(); return; @@ -193,8 +191,6 @@ void GSMTool::doConnectButton() } catch (GsmException) { qDebug("getMEInfo failed"); - delete me; + MfrText->setText("Query GSM unit failed"); me = NULL; - delete port; - port = NULL; unlockDevice(); return; |