11 files changed, 81 insertions, 35 deletions

diff --git a/noncore/apps/opie-console/MyPty.cpp b/noncore/apps/opie-console/MyPty.cpp
index 23d4966..b2f6a74 100644
--- a/noncore/apps/opie-console/MyPty.cpp
+++ b/noncore/apps/opie-console/MyPty.cpp
@@ -207,12 +207,12 @@ int MyPty::openPty()
     int ptyfd = -1;
 
 #ifdef HAVE_OPENPTY
     int ttyfd;
-    if ( openpty(&ptyfd,&ttyfd,ttynam,0,0) )
+    if ( openpty(&ptyfd,&ttyfd,m_ttynam,0,0) )
         ptyfd = -1;
     else
-        close(ttyfd); // we open the ttynam ourselves.
+        ::close(ttyfd); // we open the ttynam ourselves.
 #else
     for (const char* c0 = "pqrstuvwxyzabcde"; ptyfd < 0 && *c0 != 0; c0++) {
         for (const char* c1 = "0123456789abcdef"; ptyfd < 0 && *c1 != 0; c1++) {
             sprintf(m_ptynam,"/dev/pty%c%c",*c0,*c1);
diff --git a/noncore/apps/opie-console/io_bt.cpp b/noncore/apps/opie-console/io_bt.cpp
index 8dd8151..37bf797 100644
--- a/noncore/apps/opie-console/io_bt.cpp
+++ b/noncore/apps/opie-console/io_bt.cpp
@@ -77,4 +77,16 @@ QString IOBt::name() const {
 void IOBt::slotExited( OProcess* proc ){
     close();
     delete proc;
 }
+
+QBitArray IOBt::supports() const {
+    return QBitArray( 3 );
+}
+
+bool IOBt::isConnected() {
+    return false;
+}
+
+void IOBt::send(const QByteArray &data) {
+    qDebug( "Please overload me..." );
+}
diff --git a/noncore/apps/opie-console/io_bt.h b/noncore/apps/opie-console/io_bt.h
index 5e9988c..239eefb 100644
--- a/noncore/apps/opie-console/io_bt.h
+++ b/noncore/apps/opie-console/io_bt.h
@@ -24,19 +24,22 @@ public:
 
     IOBt(const Profile &);
     ~IOBt();
 
-    QString identifier() const;
-    QString name() const;
+    virtual QString identifier() const;
+    virtual QString name() const;
+    virtual QBitArray supports() const;
+    virtual bool isConnected();
 
 signals:
     void received(const QByteArray &);
     void error(int, const QString &);
 
 public slots:
-    bool open();
-    void close();
-    void reload(const Profile &);
+    virtual void send( const QByteArray& );
+    virtual bool open();
+    virtual void close();
+    virtual void reload(const Profile &);
 
 private:
     OProcess *m_attach;
     QString m_mac;
diff --git a/noncore/apps/opie-console/io_irda.cpp b/noncore/apps/opie-console/io_irda.cpp
index b3b693f..e360fb4 100644
--- a/noncore/apps/opie-console/io_irda.cpp
+++ b/noncore/apps/opie-console/io_irda.cpp
@@ -62,4 +62,16 @@ QString IOIrda::name() const {
 void IOIrda::slotExited(OProcess* proc ){
     close();
     delete proc;
 }
+
+QBitArray IOIrda::supports()const {
+    return QBitArray( 3 );
+}
+
+bool IOIrda::isConnected() {
+    return false;
+}
+
+void IOIrda::send(const QByteArray &data) {
+    qDebug( "Please overload me..." );
+}
diff --git a/noncore/apps/opie-console/io_irda.h b/noncore/apps/opie-console/io_irda.h
index 3aee951..14b1ae3 100644
--- a/noncore/apps/opie-console/io_irda.h
+++ b/noncore/apps/opie-console/io_irda.h
@@ -22,19 +22,22 @@ public:
 
     IOIrda(const Profile &);
     ~IOIrda();
 
-    QString identifier() const;
-    QString name() const;
+    virtual QString identifier() const;
+    virtual QString name() const;
+    virtual QBitArray supports() const;
+    virtual bool isConnected();
 
 signals:
     void received(const QByteArray &);
     void error(int, const QString &);
 
 public slots:
-    bool open();
-    void close();
-    void reload(const Profile &);
+    virtual void send( const QByteArray& );
+    virtual bool open();
+    virtual void close();
+    virtual void reload(const Profile &);
 
 private:
     OProcess *m_attach;
 
diff --git a/noncore/apps/opie-console/io_layer.cpp b/noncore/apps/opie-console/io_layer.cpp
index 975ee60..52ec828 100644
--- a/noncore/apps/opie-console/io_layer.cpp
+++ b/noncore/apps/opie-console/io_layer.cpp
@@ -19,4 +19,5 @@ void IOLayer::closeRawIO(int) {
 
 }
 void IOLayer::setSize(int, int ) {
 }
+
diff --git a/noncore/apps/opie-console/io_layer.h b/noncore/apps/opie-console/io_layer.h
index ed4478b..4f9bbe4 100644
--- a/noncore/apps/opie-console/io_layer.h
+++ b/noncore/apps/opie-console/io_layer.h
@@ -64,9 +64,9 @@ public:
      * do any ioctling on it...
      * and it'll stop listening to the before opened
      * device
      */
-    virtual int rawIO()const;
+    virtual int rawIO() const;
 
     /**
      * will close the rawIO stuff
      * and will listen to it's data again...
@@ -76,9 +76,9 @@ public:
     /**
      * What does the IOLayer support?
      * Bits are related to features
      */
-    virtual QBitArray supports()const = 0;
+    virtual QBitArray supports() const = 0;
 
     virtual bool isConnected() = 0;
 
 signals:
diff --git a/noncore/apps/opie-console/io_modem.cpp b/noncore/apps/opie-console/io_modem.cpp
index 896c24f..1ce680a 100644
--- a/noncore/apps/opie-console/io_modem.cpp
+++ b/noncore/apps/opie-console/io_modem.cpp
@@ -92,4 +92,15 @@ void IOModem::slotExited(OProcess* proc ){
     /* delete it afterwards */
     delete proc;
 }
 
+QBitArray IOModem::supports()const {
+    return QBitArray( 3 );
+}
+
+bool IOModem::isConnected() {
+    return false;
+}
+
+void IOModem::send(const QByteArray &data) {
+    qDebug( "Please overload me..." );
+}
diff --git a/noncore/apps/opie-console/io_modem.h b/noncore/apps/opie-console/io_modem.h
index 17228bd..2a926df 100644
--- a/noncore/apps/opie-console/io_modem.h
+++ b/noncore/apps/opie-console/io_modem.h
@@ -42,19 +42,22 @@ public:
 
     IOModem(const Profile &);
     ~IOModem();
 
-    QString identifier() const;
-    QString name() const;
+    virtual QString identifier() const;
+    virtual QString name() const;
+    virtual QBitArray supports() const;
+    virtual bool isConnected();
 
 signals:
     void received(const QByteArray &);
     void error(int, const QString &);
 
 public slots:
-    bool open();
-    void close();
-    void reload(const Profile &);
+    virtual void send( const QByteArray& );
+    virtual bool open();
+    virtual void close();
+    virtual void reload(const Profile &);
 
 private:
 
     QString m_initString, m_resetString, m_dialPref1, m_dialSuf1, m_dialPref2,
diff --git a/noncore/apps/opie-console/io_serial.h b/noncore/apps/opie-console/io_serial.h
index edceac6..20c1ae1 100644
--- a/noncore/apps/opie-console/io_serial.h
+++ b/noncore/apps/opie-console/io_serial.h
@@ -32,23 +32,24 @@ public:
 
     IOSerial(const Profile &);
     ~IOSerial();
 
-    QString identifier() const;
-    QString name() const;
-    int rawIO()const;
-    void closeRawIO(int fd );
-    QBitArray supports()const;
-    bool isConnected();
+    virtual QString identifier() const;
+    virtual QString name() const;
+    int rawIO() const;
+    void closeRawIO (int fd );
+    virtual QBitArray supports() const;
+    virtual bool isConnected();
+    
 /*signals:
     void received(const QByteArray &);
     void error(int, const QString &);
 */
 public slots:
-    void send(const QByteArray &);
-    bool open();
-    void close();
-    void reload(const Profile &);
+    virtual void send(const QByteArray &);
+    virtual bool open();
+    virtual void close();
+    virtual void reload(const Profile &);
 protected:
     int baud(int baud) const;
     void internDetach();
     void internAttach();
diff --git a/noncore/apps/opie-console/opie-console.pro b/noncore/apps/opie-console/opie-console.pro
index 1bb9f35..5ffa46f 100644
--- a/noncore/apps/opie-console/opie-console.pro
+++ b/noncore/apps/opie-console/opie-console.pro
@@ -1,7 +1,7 @@
 TEMPLATE     = app
-        TMAKE_CXXFLAGS=-DHAVE_OPENPTY
-CONFIG       = qt warn_on release
+        TMAKE_CXXFLAGS+= -DHAVE_OPENPTY
+CONFIG       += qt warn_on release
         #CONFIG      = qt debug
 DESTDIR      = $(OPIEDIR)/bin
 HEADERS      = io_layer.h io_serial.h io_irda.h io_bt.h io_modem.h \
                file_layer.h filetransfer.h \
@@ -29,11 +29,11 @@ HEADERS      = io_layer.h io_serial.h io_irda.h io_bt.h io_modem.h \
                script.h \
                dialer.h \
                terminalwidget.h \
                emulation_handler.h TECommon.h \
-               TEHistroy.h TEScreen.h TEWidget.h \
+               TEHistory.h TEScreen.h TEWidget.h \
                TEmuVt102.h TEmulation.h MyPty.h \
-           consoleconfigwidget.h
+               consoleconfigwidget.h
 
 SOURCES      = io_layer.cpp io_serial.cpp io_irda.cpp io_bt.cpp io_modem.cpp \
                file_layer.cpp filetransfer.cpp \
                main.cpp \
@@ -61,15 +61,15 @@ SOURCES      = io_layer.cpp io_serial.cpp io_irda.cpp io_bt.cpp io_modem.cpp \
                terminalwidget.cpp \
                 emulation_handler.cpp TEHistory.cpp \
                 TEScreen.cpp TEWidget.cpp \
                 TEmuVt102.cpp TEmulation.cpp MyPty.cpp \
-        consoleconfigwidget.cpp
+                consoleconfigwidget.cpp
                 
 
 INTERFACES   = configurebase.ui editbase.ui
 INCLUDEPATH += $(OPIEDIR)/include
 DEPENDPATH  += $(OPIEDIR)/include
-LIBS        += -lqpe -lopie 
+LIBS        += -lqpe -lopie -lutil
 TARGET       = opie-console