Diffstat (limited to 'noncore/unsupported/gsmtool/gsmtool.cpp') (more/less context) (ignore 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 @@ -13,25 +13,24 @@ using namespace gsmlib; /* * Constructs a GSMTool which is a child of 'parent', with the * name 'name' and widget flags set to 'f' */ GSMTool::GSMTool( QWidget* parent, const char* name, WFlags fl ) : GSMToolBase( parent, name, fl ) { devicelocked = 0; me = NULL; - port = NULL; setConnected(FALSE); /* FIXME: Persistent settings for device/baudrate */ connect(ConnectButton, SIGNAL(clicked()), this, SLOT(doConnectButton())); connect(ScanButton, SIGNAL(clicked()), this, SLOT(doScanButton())); connect(TabWidget2, SIGNAL(currentChanged(QWidget *)), this, SLOT(doTabChanged())); timerid = -1; // Is this not possible normally? } /* * Destroys the object and frees any allocated resources */ GSMTool::~GSMTool() @@ -129,80 +128,77 @@ void GSMTool::timerEvent( QTimerEvent * ) } } void GSMTool::doScanButton() { qDebug("ScanButton"); } /* * A simple slot... not very interesting. */ void GSMTool::doConnectButton() { + gsmlib::Port *port; + speed_t rate; devicename = strdup(DeviceName->currentText().local8Bit().data()); rate = baudrates[BaudRate->currentItem()]; qDebug("Connect Button Pressed"); MfrText->setText("Opening..."); ModelText->setText(""); RevisionText->setText(""); SerialText->setText(""); 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"); }; qDebug("Device name is %s\n", devicename); try { port = new UnixSerialPort(devicename, rate, DEFAULT_INIT_STRING, 0); } catch (GsmException) { qDebug("port failed"); + MfrText->setText("Open port failed"); return; } MfrText->setText("Initialising..."); qDebug("got port"); try { me = new MeTa(port); } catch (GsmException) { qDebug("meta failed"); - delete port; - port = NULL; + MfrText->setText("Initialise GSM unit failed"); + me = NULL; unlockDevice(); return; } qDebug("Opened"); MEInfo ifo; MfrText->setText("Querying..."); try { ifo = me->getMEInfo(); } catch (GsmException) { qDebug("getMEInfo failed"); - delete me; + MfrText->setText("Query GSM unit failed"); me = NULL; - delete port; - port = NULL; unlockDevice(); return; } MfrText->setText(ifo._manufacturer.c_str()); ModelText->setText(ifo._model.c_str()); RevisionText->setText(ifo._revision.c_str()); SerialText->setText(ifo._serialNumber.c_str()); setConnected(TRUE); } |