| author | zecke <zecke> | 2002-09-10 12:09:49 (UTC) |
|---|---|---|
| committer | zecke <zecke> | 2002-09-10 12:09:49 (UTC) |
| commit | 6b77a1cdb9536b1c135eb86d53a6b2c22c19b0a4 (patch) (side-by-side diff) | |
| 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 @@ /********************************************************************** -** 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. ** @@ -27,3 +27,5 @@ #include "qpe/qpeapplication.h" +#ifdef QWS #include <qpe/qcopenvelope_qws.h> +#endif #include <qpe/qlibrary.h> @@ -38,2 +40,3 @@ +#ifndef QT_NO_COP class NetworkEmitter : public QCopChannel { @@ -70,2 +73,3 @@ void Network::start(const QString& choice, const QString& password) \brief The Network class provides network access functionality. + \internal */ @@ -115,2 +119,3 @@ void Network::connectChoiceChange(QObject* receiver, const char* slot) +#endif // QT_NO_COP /*! @@ -123,2 +128,3 @@ QString Network::settingsDir() +#ifndef QT_NO_COP /*! @@ -136,3 +142,3 @@ QStringList Network::choices(QListBox* lb, const QString& dir) settingsdir.mkdir(adir); - + QStringList files = settingsdir.entryList("*.conf"); @@ -154,3 +160,3 @@ class NetworkServer : public QCopChannel { public: - NetworkServer(QObject* parent) : QCopChannel("QPE/Network",parent) + NetworkServer(QObject* parent) : QCopChannel("QPE/Network",parent), wait(0) { @@ -439 +445,2 @@ NetworkInterface* Network::loadPlugin(const QString& type) #include "network.moc" +#endif // QT_NO_COP |