author | mickeyl <mickeyl> | 2003-01-21 00:37:32 (UTC) |
---|---|---|
committer | mickeyl <mickeyl> | 2003-01-21 00:37:32 (UTC) |
commit | 2f708339e301f28aadc622f4d58a2d22e0b598fb (patch) (unidiff) | |
tree | 58cc0564a3e888acdcf5868ca48d21ef8f82ccec /noncore/apps | |
parent | c5c75d4622f9c7d6aa1a8fd2ce3aed415032d932 (diff) | |
download | opie-2f708339e301f28aadc622f4d58a2d22e0b598fb.zip opie-2f708339e301f28aadc622f4d58a2d22e0b598fb.tar.gz opie-2f708339e301f28aadc622f4d58a2d22e0b598fb.tar.bz2 |
fixed a lot of errors and sloppyness to make it compile again...
-rw-r--r-- | noncore/apps/opie-console/MyPty.cpp | 4 | ||||
-rw-r--r-- | noncore/apps/opie-console/io_bt.cpp | 12 | ||||
-rw-r--r-- | noncore/apps/opie-console/io_bt.h | 13 | ||||
-rw-r--r-- | noncore/apps/opie-console/io_irda.cpp | 12 | ||||
-rw-r--r-- | noncore/apps/opie-console/io_irda.h | 13 | ||||
-rw-r--r-- | noncore/apps/opie-console/io_layer.cpp | 1 | ||||
-rw-r--r-- | noncore/apps/opie-console/io_layer.h | 0 | ||||
-rw-r--r-- | noncore/apps/opie-console/io_modem.cpp | 11 | ||||
-rw-r--r-- | noncore/apps/opie-console/io_modem.h | 13 | ||||
-rw-r--r-- | noncore/apps/opie-console/io_serial.h | 17 | ||||
-rw-r--r-- | noncore/apps/opie-console/opie-console.pro | 8 |
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 | |||
@@ -210,6 +210,6 @@ int MyPty::openPty() | |||
210 | int ttyfd; | 210 | int ttyfd; |
211 | if ( openpty(&ptyfd,&ttyfd,ttynam,0,0) ) | 211 | if ( openpty(&ptyfd,&ttyfd,m_ttynam,0,0) ) |
212 | ptyfd = -1; | 212 | ptyfd = -1; |
213 | else | 213 | else |
214 | close(ttyfd); // we open the ttynam ourselves. | 214 | ::close(ttyfd); // we open the ttynam ourselves. |
215 | #else | 215 | #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 ){ | |||
80 | } | 80 | } |
81 | |||
82 | QBitArray IOBt::supports() const { | ||
83 | return QBitArray( 3 ); | ||
84 | } | ||
85 | |||
86 | bool IOBt::isConnected() { | ||
87 | return false; | ||
88 | } | ||
89 | |||
90 | void IOBt::send(const QByteArray &data) { | ||
91 | qDebug( "Please overload me..." ); | ||
92 | } | ||
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: | |||
27 | 27 | ||
28 | QString identifier() const; | 28 | virtual QString identifier() const; |
29 | QString name() const; | 29 | virtual QString name() const; |
30 | virtual QBitArray supports() const; | ||
31 | virtual bool isConnected(); | ||
30 | 32 | ||
@@ -35,5 +37,6 @@ signals: | |||
35 | public slots: | 37 | public slots: |
36 | bool open(); | 38 | virtual void send( const QByteArray& ); |
37 | void close(); | 39 | virtual bool open(); |
38 | void reload(const Profile &); | 40 | virtual void close(); |
41 | virtual void reload(const Profile &); | ||
39 | 42 | ||
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 ){ | |||
65 | } | 65 | } |
66 | |||
67 | QBitArray IOIrda::supports()const { | ||
68 | return QBitArray( 3 ); | ||
69 | } | ||
70 | |||
71 | bool IOIrda::isConnected() { | ||
72 | return false; | ||
73 | } | ||
74 | |||
75 | void IOIrda::send(const QByteArray &data) { | ||
76 | qDebug( "Please overload me..." ); | ||
77 | } | ||
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: | |||
25 | 25 | ||
26 | QString identifier() const; | 26 | virtual QString identifier() const; |
27 | QString name() const; | 27 | virtual QString name() const; |
28 | virtual QBitArray supports() const; | ||
29 | virtual bool isConnected(); | ||
28 | 30 | ||
@@ -33,5 +35,6 @@ signals: | |||
33 | public slots: | 35 | public slots: |
34 | bool open(); | 36 | virtual void send( const QByteArray& ); |
35 | void close(); | 37 | virtual bool open(); |
36 | void reload(const Profile &); | 38 | virtual void close(); |
39 | virtual void reload(const Profile &); | ||
37 | 40 | ||
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 ) { | |||
22 | } | 22 | } |
23 | |||
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 | |||
@@ -95 +95,12 @@ void IOModem::slotExited(OProcess* proc ){ | |||
95 | 95 | ||
96 | QBitArray IOModem::supports()const { | ||
97 | return QBitArray( 3 ); | ||
98 | } | ||
99 | |||
100 | bool IOModem::isConnected() { | ||
101 | return false; | ||
102 | } | ||
103 | |||
104 | void IOModem::send(const QByteArray &data) { | ||
105 | qDebug( "Please overload me..." ); | ||
106 | } | ||
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: | |||
45 | 45 | ||
46 | QString identifier() const; | 46 | virtual QString identifier() const; |
47 | QString name() const; | 47 | virtual QString name() const; |
48 | virtual QBitArray supports() const; | ||
49 | virtual bool isConnected(); | ||
48 | 50 | ||
@@ -53,5 +55,6 @@ signals: | |||
53 | public slots: | 55 | public slots: |
54 | bool open(); | 56 | virtual void send( const QByteArray& ); |
55 | void close(); | 57 | virtual bool open(); |
56 | void reload(const Profile &); | 58 | virtual void close(); |
59 | virtual void reload(const Profile &); | ||
57 | 60 | ||
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: | |||
35 | 35 | ||
36 | QString identifier() const; | 36 | virtual QString identifier() const; |
37 | QString name() const; | 37 | virtual QString name() const; |
38 | int rawIO()const; | 38 | int rawIO()const; |
39 | void closeRawIO(int fd ); | 39 | void closeRawIO(int fd ); |
40 | QBitArray supports()const; | 40 | virtual QBitArray supports() const; |
41 | bool isConnected(); | 41 | virtual bool isConnected(); |
42 | |||
42 | /*signals: | 43 | /*signals: |
@@ -46,6 +47,6 @@ public: | |||
46 | public slots: | 47 | public slots: |
47 | void send(const QByteArray &); | 48 | virtual void send(const QByteArray &); |
48 | bool open(); | 49 | virtual bool open(); |
49 | void close(); | 50 | virtual void close(); |
50 | void reload(const Profile &); | 51 | virtual void reload(const Profile &); |
51 | protected: | 52 | 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 @@ | |||
1 | TEMPLATE = app | 1 | TEMPLATE = app |
2 | TMAKE_CXXFLAGS=-DHAVE_OPENPTY | 2 | TMAKE_CXXFLAGS+= -DHAVE_OPENPTY |
3 | CONFIG = qt warn_on release | 3 | CONFIG += qt warn_on release |
4 | #CONFIG = qt debug | 4 | #CONFIG = qt debug |
@@ -32,3 +32,3 @@ HEADERS = io_layer.h io_serial.h io_irda.h io_bt.h io_modem.h \ | |||
32 | emulation_handler.h TECommon.h \ | 32 | emulation_handler.h TECommon.h \ |
33 | TEHistroy.h TEScreen.h TEWidget.h \ | 33 | TEHistory.h TEScreen.h TEWidget.h \ |
34 | TEmuVt102.h TEmulation.h MyPty.h \ | 34 | TEmuVt102.h TEmulation.h MyPty.h \ |
@@ -70,3 +70,3 @@ INCLUDEPATH += $(OPIEDIR)/include | |||
70 | DEPENDPATH += $(OPIEDIR)/include | 70 | DEPENDPATH += $(OPIEDIR)/include |
71 | LIBS += -lqpe -lopie | 71 | LIBS += -lqpe -lopie -lutil |
72 | TARGET = opie-console | 72 | TARGET = opie-console |