| author | zecke <zecke> | 2002-10-09 01:58:20 (UTC) |
|---|---|---|
| committer | zecke <zecke> | 2002-10-09 01:58:20 (UTC) |
| commit | 849316bd18f06e43e7dfa2f107ad96d5bedbe7f1 (patch) (side-by-side diff) | |
| tree | f793cbfc60377d2dbb2cd5b1066bdadec5738dc4 | |
| parent | a74bf68065b94efaacb73736c7127ccb74474645 (diff) | |
| download | opie-849316bd18f06e43e7dfa2f107ad96d5bedbe7f1.zip opie-849316bd18f06e43e7dfa2f107ad96d5bedbe7f1.tar.gz opie-849316bd18f06e43e7dfa2f107ad96d5bedbe7f1.tar.bz2 | |
IOSerial fixlet
if failed to ioctl m_fd is != 0
so set it 0
and initialize m_read, m_error properly
TabWidget was a OTabWidget again but there is a bug somewhere in the
removePage code. I hopefully kindly asked drw to take a look at it
MainWindiw
Close does not terminate
Screen is funny to look at... everytime a different background.
when using QTabWidget I see nothing when using OTabWidget i've vertical scrollbars and see the content
| -rw-r--r-- | noncore/apps/opie-console/io_serial.cpp | 3 | ||||
| -rw-r--r-- | noncore/apps/opie-console/mainwindow.cpp | 7 |
2 files changed, 7 insertions, 3 deletions
diff --git a/noncore/apps/opie-console/io_serial.cpp b/noncore/apps/opie-console/io_serial.cpp index b495f39..77ced85 100644 --- a/noncore/apps/opie-console/io_serial.cpp +++ b/noncore/apps/opie-console/io_serial.cpp @@ -5,6 +5,8 @@ #include "io_serial.h" IOSerial::IOSerial(const Profile &config) : IOLayer(config) { + m_read = 0l; + m_error = 0l; m_fd = 0; reload(config); } @@ -112,6 +114,7 @@ bool IOSerial::open() { return TRUE; } else { emit error(Refuse, tr("Device is already connected")); + m_fd = 0; return FALSE; } } diff --git a/noncore/apps/opie-console/mainwindow.cpp b/noncore/apps/opie-console/mainwindow.cpp index aeb3742..0bd6a13 100644 --- a/noncore/apps/opie-console/mainwindow.cpp +++ b/noncore/apps/opie-console/mainwindow.cpp @@ -69,7 +69,7 @@ void MainWindow::initUI() { m_terminate = new QAction(); m_terminate->setText( tr("Terminate") ); m_terminate->addTo( m_console ); - connect(m_disconnect, SIGNAL(activated() ), + connect(m_terminate, SIGNAL(activated() ), this, SLOT(slotTerminate() ) ); a = new QAction(); @@ -188,14 +188,15 @@ void MainWindow::slotConfigure() { * and set the currentSession() */ void MainWindow::slotClose() { + qWarning("close"); if (!currentSession() ) return; tabWidget()->remove( currentSession() ); - tabWidget()->setCurrent( m_sessions.first() ); + /*it's autodelete */ m_sessions.remove( m_curSession ); - delete m_curSession; m_curSession = m_sessions.first(); + tabWidget()->setCurrent( m_curSession ); } /* |