summaryrefslogtreecommitdiff
authorzecke <zecke>2002-10-09 01:58:20 (UTC)
committer zecke <zecke>2002-10-09 01:58:20 (UTC)
commit849316bd18f06e43e7dfa2f107ad96d5bedbe7f1 (patch) (side-by-side diff)
treef793cbfc60377d2dbb2cd5b1066bdadec5738dc4
parenta74bf68065b94efaacb73736c7127ccb74474645 (diff)
downloadopie-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
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/apps/opie-console/io_serial.cpp3
-rw-r--r--noncore/apps/opie-console/mainwindow.cpp7
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
@@ -4,8 +4,10 @@
#include <unistd.h>
#include "io_serial.h"
IOSerial::IOSerial(const Profile &config) : IOLayer(config) {
+ m_read = 0l;
+ m_error = 0l;
m_fd = 0;
reload(config);
}
@@ -111,8 +113,9 @@ bool IOSerial::open() {
connect(m_error, SIGNAL(activated(int)), this, SLOT(errorOccured()));
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
@@ -68,9 +68,9 @@ 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();
a->setText( tr("Close Window") );
@@ -187,16 +187,17 @@ void MainWindow::slotConfigure() {
* delete it
* 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 );
}
/*
* We will get the name