fixed a lot of errors and sloppyness to make it compile again...

11 files changed, 75 insertions, 29 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
@@ -208,10 +208,10 @@ int MyPty::openPty()
 
 #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++) {
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
@@ -78,3 +78,15 @@ 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
@@ -25,17 +25,20 @@ 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;
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
@@ -63,3 +63,15 @@ 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
@@ -23,17 +23,20 @@ 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
@@ -20,3 +20,4 @@ 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
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
@@ -93,3 +93,14 @@ void IOModem::slotExited(OProcess* proc ){
     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
@@ -43,17 +43,20 @@ 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:
 
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
@@ -33,21 +33,22 @@ public:
     IOSerial(const Profile &);
     ~IOSerial();
 
-    QString identifier() const;
-    QString name() const;
+    virtual QString identifier() const;
+    virtual QString name() const;
     int rawIO()const;
     void closeRawIO(int fd );
-    QBitArray supports()const;
-    bool isConnected();
+    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();
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,6 +1,6 @@
 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 \
@@ -30,7 +30,7 @@ HEADERS      = io_layer.h io_serial.h io_irda.h io_bt.h io_modem.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
 
@@ -68,7 +68,7 @@ SOURCES      = io_layer.cpp io_serial.cpp io_irda.cpp io_bt.cpp io_modem.cpp \
 INTERFACES   = configurebase.ui editbase.ui
 INCLUDEPATH += $(OPIEDIR)/include
 DEPENDPATH  += $(OPIEDIR)/include
-LIBS        += -lqpe -lopie 
+LIBS        += -lqpe -lopie -lutil
 TARGET       = opie-console