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,6 +1,6 @@
 /**********************************************************************
-** 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
@@ -26,5 +26,7 @@
 #include "qpe/resource.h"
 #include "qpe/qpeapplication.h"
+#ifdef QWS
 #include <qpe/qcopenvelope_qws.h>
+#endif
 #include <qpe/qlibrary.h>
 
@@ -37,4 +39,5 @@
 #include <stdlib.h>
 
+#ifndef QT_NO_COP
 class NetworkEmitter : public QCopChannel {
     Q_OBJECT
@@ -69,4 +72,5 @@ void Network::start(const QString& choice, const QString& password)
   \class Network network.h
   \brief The Network class provides network access functionality.
+  \internal
 */
 
@@ -114,4 +118,5 @@ void Network::connectChoiceChange(QObject* receiver, const char* slot)
 }
 
+#endif	// QT_NO_COP
 /*!
   \internal
@@ -122,4 +127,5 @@ QString Network::settingsDir()
 }
 
+#ifndef QT_NO_COP
 /*!
   \internal
@@ -135,5 +141,5 @@ QStringList Network::choices(QListBox* lb, const QString& dir)
     QDir settingsdir(adir);
     settingsdir.mkdir(adir);
-    
+
     QStringList files = settingsdir.entryList("*.conf");
     for (QStringList::ConstIterator it=files.begin(); it!=files.end(); ++it ) {
@@ -153,5 +159,5 @@ 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;
@@ -438,2 +444,3 @@ NetworkInterface* Network::loadPlugin(const QString& type)
 
 #include "network.moc"
+#endif	// QT_NO_COP