Qtopia1-6 merge

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

1 files changed, 9 insertions, 6 deletions

diff --git a/library/mimetype.h b/library/mimetype.h
index b6cca95..94bfe4e 100644
--- a/library/mimetype.h
+++ b/library/mimetype.h
@@ -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.
 **
@@ -22,4 +22,5 @@
 
-#include <qstring.h>
+#include <qstringlist.h>
 #include <qpixmap.h>
+#include <qlist.h>
 
@@ -45,2 +46,4 @@ public:
     QString extension() const;
+    QStringList extensions() const;
+    QList<AppLnk> applications() const;
 #endif
@@ -61,5 +64,5 @@ private:
     void init( const QString& ext_or_id );
-    class Dict;
-    static Dict* d;
-    static Dict& dict();
+    class Private;
+    static Private* d;
+    static Private& data();
     static MimeTypeData* data(const QString& id);