summaryrefslogtreecommitdiff
authormickeyl <mickeyl>2003-01-21 00:37:32 (UTC)
committer mickeyl <mickeyl>2003-01-21 00:37:32 (UTC)
commit2f708339e301f28aadc622f4d58a2d22e0b598fb (patch) (side-by-side diff)
tree58cc0564a3e888acdcf5868ca48d21ef8f82ccec
parentc5c75d4622f9c7d6aa1a8fd2ce3aed415032d932 (diff)
downloadopie-2f708339e301f28aadc622f4d58a2d22e0b598fb.zip
opie-2f708339e301f28aadc622f4d58a2d22e0b598fb.tar.gz
opie-2f708339e301f28aadc622f4d58a2d22e0b598fb.tar.bz2
fixed a lot of errors and sloppyness to make it compile again...
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/apps/opie-console/MyPty.cpp4
-rw-r--r--noncore/apps/opie-console/io_bt.cpp12
-rw-r--r--noncore/apps/opie-console/io_bt.h13
-rw-r--r--noncore/apps/opie-console/io_irda.cpp12
-rw-r--r--noncore/apps/opie-console/io_irda.h13
-rw-r--r--noncore/apps/opie-console/io_layer.cpp1
-rw-r--r--noncore/apps/opie-console/io_layer.h4
-rw-r--r--noncore/apps/opie-console/io_modem.cpp11
-rw-r--r--noncore/apps/opie-console/io_modem.h13
-rw-r--r--noncore/apps/opie-console/io_serial.h21
-rw-r--r--noncore/apps/opie-console/opie-console.pro12
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
@@ -210,6 +210,6 @@ int MyPty::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
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
@@ -80 +80,13 @@ void IOBt::slotExited( OProcess* 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
@@ -27,4 +27,6 @@ public:
- QString identifier() const;
- QString name() const;
+ virtual QString identifier() const;
+ virtual QString name() const;
+ virtual QBitArray supports() const;
+ virtual bool isConnected();
@@ -35,5 +37,6 @@ signals:
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 &);
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
@@ -65 +65,13 @@ void IOIrda::slotExited(OProcess* 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
@@ -25,4 +25,6 @@ public:
- QString identifier() const;
- QString name() const;
+ virtual QString identifier() const;
+ virtual QString name() const;
+ virtual QBitArray supports() const;
+ virtual bool isConnected();
@@ -33,5 +35,6 @@ signals:
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 &);
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
@@ -22 +22,2 @@ 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
@@ -67,3 +67,3 @@ public:
*/
- virtual int rawIO()const;
+ virtual int rawIO() const;
@@ -79,3 +79,3 @@ public:
*/
- virtual QBitArray supports()const = 0;
+ virtual QBitArray supports() const = 0;
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
@@ -95 +95,12 @@ void IOModem::slotExited(OProcess* 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
@@ -45,4 +45,6 @@ public:
- QString identifier() const;
- QString name() const;
+ virtual QString identifier() const;
+ virtual QString name() const;
+ virtual QBitArray supports() const;
+ virtual bool isConnected();
@@ -53,5 +55,6 @@ signals:
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 &);
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
@@ -35,8 +35,9 @@ public:
- 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:
@@ -46,6 +47,6 @@ public:
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:
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,4 +1,4 @@
TEMPLATE = app
-TMAKE_CXXFLAGS =-DHAVE_OPENPTY
-CONFIG = qt warn_on release
+TMAKE_CXXFLAGS += -DHAVE_OPENPTY
+CONFIG += qt warn_on release
#CONFIG = qt debug
@@ -32,5 +32,5 @@ HEADERS = io_layer.h io_serial.h io_irda.h io_bt.h io_modem.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
@@ -64,3 +64,3 @@ SOURCES = io_layer.cpp io_serial.cpp io_irda.cpp io_bt.cpp io_modem.cpp \
TEmuVt102.cpp TEmulation.cpp MyPty.cpp \
- consoleconfigwidget.cpp
+ consoleconfigwidget.cpp
@@ -70,3 +70,3 @@ INCLUDEPATH += $(OPIEDIR)/include
DEPENDPATH += $(OPIEDIR)/include
-LIBS += -lqpe -lopie
+LIBS += -lqpe -lopie -lutil
TARGET = opie-console