summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/unsupported/gsmtool/gsmtool.cpp18
-rw-r--r--noncore/unsupported/gsmtool/gsmtool.h1
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 )
me = NULL;
- port = NULL;
setConnected(FALSE);
@@ -140,2 +139,4 @@ void GSMTool::doConnectButton()
{
+ gsmlib::Port *port;
+
speed_t rate;
@@ -152,9 +153,4 @@ void GSMTool::doConnectButton()
if (me) {
- // delete me;
me = NULL;
}
- if (port) {
- // delete port;
- port = NULL;
- }
@@ -162,2 +158,3 @@ void GSMTool::doConnectButton()
qDebug("lockDevice() failed\n");
+ MfrText->setText("Lock port failed");
};
@@ -170,2 +167,3 @@ void GSMTool::doConnectButton()
qDebug("port failed");
+ MfrText->setText("Open port failed");
return;
@@ -178,4 +176,4 @@ void GSMTool::doConnectButton()
qDebug("meta failed");
- delete port;
- port = NULL;
+ MfrText->setText("Initialise GSM unit failed");
+ me = NULL;
unlockDevice();
@@ -194,6 +192,4 @@ void GSMTool::doConnectButton()
qDebug("getMEInfo failed");
- delete me;
+ MfrText->setText("Query GSM unit failed");
me = NULL;
- delete port;
- port = NULL;
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:
gsmlib::MeTa *me;
- gsmlib::Port *port;