author | zecke <zecke> | 2002-09-10 12:09:49 (UTC) |
---|---|---|
committer | zecke <zecke> | 2002-09-10 12:09:49 (UTC) |
commit | 6b77a1cdb9536b1c135eb86d53a6b2c22c19b0a4 (patch) (unidiff) | |
tree | 6ebc93c6432f4ed9d00ef1448b6a047ef522a79a /library/qcopenvelope_qws.h | |
parent | d10cddb3c9ce75bc90b14add14bc133737fe35aa (diff) | |
download | opie-6b77a1cdb9536b1c135eb86d53a6b2c22c19b0a4.zip opie-6b77a1cdb9536b1c135eb86d53a6b2c22c19b0a4.tar.gz opie-6b77a1cdb9536b1c135eb86d53a6b2c22c19b0a4.tar.bz2 |
Qtopia1-6 merge
still to test
bic changes to be resolved
more changes to be made?
-rw-r--r-- | library/qcopenvelope_qws.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/library/qcopenvelope_qws.h b/library/qcopenvelope_qws.h index f2a94d3..67aa843 100644 --- a/library/qcopenvelope_qws.h +++ b/library/qcopenvelope_qws.h | |||
@@ -1,10 +1,10 @@ | |||
1 | /********************************************************************** | 1 | /********************************************************************** |
2 | ** Copyright (C) 2000 Trolltech AS. All rights reserved. | 2 | ** Copyright (C) 2000-2002 Trolltech AS. All rights reserved. |
3 | ** | 3 | ** |
4 | ** This file is part of Qtopia Environment. | 4 | ** This file is part of the Qtopia Environment. |
5 | ** | 5 | ** |
6 | ** This file may be distributed and/or modified under the terms of the | 6 | ** This file may be distributed and/or modified under the terms of the |
7 | ** GNU General Public License version 2 as published by the Free Software | 7 | ** GNU General Public License version 2 as published by the Free Software |
8 | ** Foundation and appearing in the file LICENSE.GPL included in the | 8 | ** Foundation and appearing in the file LICENSE.GPL included in the |
9 | ** packaging of this file. | 9 | ** packaging of this file. |
10 | ** | 10 | ** |
@@ -17,16 +17,14 @@ | |||
17 | ** not clear to you. | 17 | ** not clear to you. |
18 | ** | 18 | ** |
19 | **********************************************************************/ | 19 | **********************************************************************/ |
20 | #ifndef QCOPENVELOPE_H | 20 | #ifndef QCOPENVELOPE_H |
21 | #define QCOPENVELOPE_H | 21 | #define QCOPENVELOPE_H |
22 | 22 | ||
23 | #ifndef QT_H | ||
24 | #include <qcopchannel_qws.h> | 23 | #include <qcopchannel_qws.h> |
25 | #include <qdatastream.h> | 24 | #include <qdatastream.h> |
26 | #endif // QT_H | ||
27 | 25 | ||
28 | #ifndef QT_NO_COP | 26 | #ifndef QT_NO_COP |
29 | 27 | ||
30 | class QCopEnvelope : public QDataStream { | 28 | class QCopEnvelope : public QDataStream { |
31 | QCString ch, msg; | 29 | QCString ch, msg; |
32 | public: | 30 | public: |