-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,7 +1,7 @@ | |||
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 |
@@ -25,7 +25,9 @@ | |||
25 | #include "qpe/config.h" | 25 | #include "qpe/config.h" |
26 | #include "qpe/resource.h" | 26 | #include "qpe/resource.h" |
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> |
30 | 32 | ||
31 | #include <qlistbox.h> | 33 | #include <qlistbox.h> |
@@ -36,6 +38,7 @@ | |||
36 | 38 | ||
37 | #include <stdlib.h> | 39 | #include <stdlib.h> |
38 | 40 | ||
41 | #ifndef QT_NO_COP | ||
39 | class NetworkEmitter : public QCopChannel { | 42 | class NetworkEmitter : public QCopChannel { |
40 | Q_OBJECT | 43 | Q_OBJECT |
41 | public: | 44 | public: |
@@ -68,6 +71,7 @@ void Network::start(const QString& choice, const QString& password) | |||
68 | /*! | 71 | /*! |
69 | \class Network network.h | 72 | \class Network network.h |
70 | \brief The Network class provides network access functionality. | 73 | \brief The Network class provides network access functionality. |
74 | \internal | ||
71 | */ | 75 | */ |
72 | 76 | ||
73 | // copy the proxy settings of the active config over to the Proxies.conf file | 77 | // copy the proxy settings of the active config over to the Proxies.conf file |
@@ -113,6 +117,7 @@ void Network::connectChoiceChange(QObject* receiver, const char* slot) | |||
113 | QObject::connect(emitter,SIGNAL(changed()),receiver,slot); | 117 | QObject::connect(emitter,SIGNAL(changed()),receiver,slot); |
114 | } | 118 | } |
115 | 119 | ||
120 | #endif// QT_NO_COP | ||
116 | /*! | 121 | /*! |
117 | \internal | 122 | \internal |
118 | */ | 123 | */ |
@@ -121,6 +126,7 @@ QString Network::settingsDir() | |||
121 | return Global::applicationFileName("Network", "modules"); | 126 | return Global::applicationFileName("Network", "modules"); |
122 | } | 127 | } |
123 | 128 | ||
129 | #ifndef QT_NO_COP | ||
124 | /*! | 130 | /*! |
125 | \internal | 131 | \internal |
126 | */ | 132 | */ |
@@ -134,7 +140,7 @@ QStringList Network::choices(QListBox* lb, const QString& dir) | |||
134 | QString adir = dir.isEmpty() ? settingsDir() : dir; | 140 | QString adir = dir.isEmpty() ? settingsDir() : dir; |
135 | QDir settingsdir(adir); | 141 | QDir settingsdir(adir); |
136 | settingsdir.mkdir(adir); | 142 | settingsdir.mkdir(adir); |
137 | 143 | ||
138 | QStringList files = settingsdir.entryList("*.conf"); | 144 | QStringList files = settingsdir.entryList("*.conf"); |
139 | for (QStringList::ConstIterator it=files.begin(); it!=files.end(); ++it ) { | 145 | for (QStringList::ConstIterator it=files.begin(); it!=files.end(); ++it ) { |
140 | QString filename = settingsdir.filePath(*it); | 146 | QString filename = settingsdir.filePath(*it); |
@@ -152,7 +158,7 @@ QStringList Network::choices(QListBox* lb, const QString& dir) | |||
152 | class NetworkServer : public QCopChannel { | 158 | class NetworkServer : public QCopChannel { |
153 | Q_OBJECT | 159 | Q_OBJECT |
154 | public: | 160 | public: |
155 | NetworkServer(QObject* parent) : QCopChannel("QPE/Network",parent) | 161 | NetworkServer(QObject* parent) : QCopChannel("QPE/Network",parent), wait(0) |
156 | { | 162 | { |
157 | up = FALSE; | 163 | up = FALSE; |
158 | examineNetworks( TRUE ); | 164 | examineNetworks( TRUE ); |
@@ -437,3 +443,4 @@ NetworkInterface* Network::loadPlugin(const QString& type) | |||
437 | } | 443 | } |
438 | 444 | ||
439 | #include "network.moc" | 445 | #include "network.moc" |
446 | #endif// QT_NO_COP | ||