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/network.cpp | |
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/network.cpp | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/library/network.cpp b/library/network.cpp index e6d2781..185b147 100644 --- a/library/network.cpp +++ b/library/network.cpp | |||
@@ -1,5 +1,5 @@ | |||
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 | ** |
@@ -27,3 +27,5 @@ | |||
27 | #include "qpe/qpeapplication.h" | 27 | #include "qpe/qpeapplication.h" |
28 | #ifdef QWS | ||
28 | #include <qpe/qcopenvelope_qws.h> | 29 | #include <qpe/qcopenvelope_qws.h> |
30 | #endif | ||
29 | #include <qpe/qlibrary.h> | 31 | #include <qpe/qlibrary.h> |
@@ -38,2 +40,3 @@ | |||
38 | 40 | ||
41 | #ifndef QT_NO_COP | ||
39 | class NetworkEmitter : public QCopChannel { | 42 | class NetworkEmitter : public QCopChannel { |
@@ -70,2 +73,3 @@ void Network::start(const QString& choice, const QString& password) | |||
70 | \brief The Network class provides network access functionality. | 73 | \brief The Network class provides network access functionality. |
74 | \internal | ||
71 | */ | 75 | */ |
@@ -115,2 +119,3 @@ void Network::connectChoiceChange(QObject* receiver, const char* slot) | |||
115 | 119 | ||
120 | #endif// QT_NO_COP | ||
116 | /*! | 121 | /*! |
@@ -123,2 +128,3 @@ QString Network::settingsDir() | |||
123 | 128 | ||
129 | #ifndef QT_NO_COP | ||
124 | /*! | 130 | /*! |
@@ -136,3 +142,3 @@ QStringList Network::choices(QListBox* lb, const QString& dir) | |||
136 | settingsdir.mkdir(adir); | 142 | settingsdir.mkdir(adir); |
137 | 143 | ||
138 | QStringList files = settingsdir.entryList("*.conf"); | 144 | QStringList files = settingsdir.entryList("*.conf"); |
@@ -154,3 +160,3 @@ class NetworkServer : public QCopChannel { | |||
154 | public: | 160 | public: |
155 | NetworkServer(QObject* parent) : QCopChannel("QPE/Network",parent) | 161 | NetworkServer(QObject* parent) : QCopChannel("QPE/Network",parent), wait(0) |
156 | { | 162 | { |
@@ -439 +445,2 @@ NetworkInterface* Network::loadPlugin(const QString& type) | |||
439 | #include "network.moc" | 445 | #include "network.moc" |
446 | #endif// QT_NO_COP | ||