Qtopia1-6 merge

still to test
bic changes to be resolved
more changes to be made?

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 @@
 /**********************************************************************
-** 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
@@ -25,7 +25,9 @@
 #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>
@@ -36,6 +38,7 @@
 
 #include <stdlib.h>
 
+#ifndef QT_NO_COP
 class NetworkEmitter : public QCopChannel {
     Q_OBJECT
 public:
@@ -68,6 +71,7 @@ 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
@@ -113,6 +117,7 @@ void Network::connectChoiceChange(QObject* receiver, const char* slot)
     QObject::connect(emitter,SIGNAL(changed()),receiver,slot);
 }
 
+        #endif// QT_NO_COP
 /*!
   \internal
 */
@@ -121,6 +126,7 @@ QString Network::settingsDir()
     return Global::applicationFileName("Network", "modules");
 }
 
+#ifndef QT_NO_COP
 /*!
   \internal
 */
@@ -134,7 +140,7 @@ QStringList Network::choices(QListBox* lb, const QString& dir)
     QString adir = dir.isEmpty() ? settingsDir() : dir;
     QDir settingsdir(adir);
     settingsdir.mkdir(adir);
-    
+
     QStringList files = settingsdir.entryList("*.conf");
     for (QStringList::ConstIterator it=files.begin(); it!=files.end(); ++it ) {
         QString filename = settingsdir.filePath(*it);
@@ -152,7 +158,7 @@ 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 );
@@ -437,3 +443,4 @@ NetworkInterface* Network::loadPlugin(const QString& type)
 }
 
 #include "network.moc"
+        #endif// QT_NO_COP