Qtopia1-6 merge

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

1 files changed, 2 insertions, 2 deletions

diff --git a/library/qlibrary.h b/library/qlibrary.h
index d33173b..67ed3bf 100644
--- a/library/qlibrary.h
+++ b/library/qlibrary.h
@@ -1,68 +1,68 @@
 /**********************************************************************
-** 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
 ** packaging of this file.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
 ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
 **
 **********************************************************************/
 
 #ifndef QLIBRARY_H
 #define QLIBRARY_H
 
 #include <qstring.h>
 
 #ifndef QT_NO_COMPONENT
 
 #include <qpe/qcom.h>
 
 class QLibraryPrivate;
 
 class Q_EXPORT QLibrary
 {
 public:
     enum Policy
     {
         Delayed,
         Immediately,
         Manual
     };
 
     QLibrary( const QString& filename, Policy = Delayed );
     ~QLibrary();
 
     void *resolve( const char* );
     static void *resolve( const QString &filename, const char * );
 
     bool unload( bool force = FALSE );
     bool isLoaded() const;
 
     void setPolicy( Policy pol );
     Policy policy() const;
 
     QString library() const;
 
     QRESULT queryInterface( const QUuid&, QUnknownInterface** );
 
 private:
     bool load();
     void createInstanceInternal();
 
     QLibraryPrivate *d;
 
     QString libfile;
     Policy libPol;
     QUnknownInterface *entry;
 
         private:// Disabled copy constructor and operator=