| -rw-r--r-- | library/network.cpp | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/library/network.cpp b/library/network.cpp index e6d2781..185b147 100644 --- a/library/network.cpp +++ b/library/network.cpp @@ -1,8 +1,8 @@ /********************************************************************** -** Copyright (C) 2000 Trolltech AS. All rights reserved. +** Copyright (C) 2000-2002 Trolltech AS. All rights reserved. ** -** This file is part of Qtopia Environment. +** This file is part of the Qtopia Environment. ** ** This file may be distributed and/or modified under the terms of the ** GNU General Public License version 2 as published by the Free Software ** Foundation and appearing in the file LICENSE.GPL included in the @@ -24,9 +24,11 @@ #include "qpe/global.h" #include "qpe/config.h" #include "qpe/resource.h" #include "qpe/qpeapplication.h" +#ifdef QWS #include <qpe/qcopenvelope_qws.h> +#endif #include <qpe/qlibrary.h> #include <qlistbox.h> #include <qdir.h> @@ -35,8 +37,9 @@ #include <qtranslator.h> #include <stdlib.h> +#ifndef QT_NO_COP class NetworkEmitter : public QCopChannel { Q_OBJECT public: NetworkEmitter() : QCopChannel("QPE/Network",qApp) @@ -67,8 +70,9 @@ void Network::start(const QString& choice, const QString& password) /*! \class Network network.h \brief The Network class provides network access functionality. + \internal */ // copy the proxy settings of the active config over to the Proxies.conf file /*! @@ -112,16 +116,18 @@ void Network::connectChoiceChange(QObject* receiver, const char* slot) emitter = new NetworkEmitter; QObject::connect(emitter,SIGNAL(changed()),receiver,slot); } +#endif // QT_NO_COP /*! \internal */ QString Network::settingsDir() { return Global::applicationFileName("Network", "modules"); } +#ifndef QT_NO_COP /*! \internal */ QStringList Network::choices(QListBox* lb, const QString& dir) @@ -151,9 +157,9 @@ QStringList Network::choices(QListBox* lb, const QString& dir) class NetworkServer : public QCopChannel { Q_OBJECT public: - NetworkServer(QObject* parent) : QCopChannel("QPE/Network",parent) + NetworkServer(QObject* parent) : QCopChannel("QPE/Network",parent), wait(0) { up = FALSE; examineNetworks( TRUE ); QCopChannel* card = new QCopChannel("QPE/Card",parent); @@ -436,4 +442,5 @@ NetworkInterface* Network::loadPlugin(const QString& type) #endif } #include "network.moc" +#endif // QT_NO_COP |