author | zecke <zecke> | 2002-09-10 12:09:49 (UTC) |
---|---|---|
committer | zecke <zecke> | 2002-09-10 12:09:49 (UTC) |
commit | 6b77a1cdb9536b1c135eb86d53a6b2c22c19b0a4 (patch) (unidiff) | |
tree | 6ebc93c6432f4ed9d00ef1448b6a047ef522a79a /library/mimetype.h | |
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/mimetype.h | 15 |
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,6 +1,6 @@ | |||
1 | /********************************************************************** | 1 | /********************************************************************** |
2 | ** Copyright (C) 2000 Trolltech AS. All rights reserved. | 2 | ** Copyright (C) 2000-2002 Trolltech AS. All rights reserved. |
3 | ** | 3 | ** |
4 | ** This file is part of Qtopia Environment. | 4 | ** This file is part of the Qtopia Environment. |
5 | ** | 5 | ** |
6 | ** This file may be distributed and/or modified under the terms of the | 6 | ** This file may be distributed and/or modified under the terms of the |
@@ -21,6 +21,7 @@ | |||
21 | #define MIMETYPE_H | 21 | #define MIMETYPE_H |
22 | 22 | ||
23 | #include <qstring.h> | 23 | #include <qstringlist.h> |
24 | #include <qpixmap.h> | 24 | #include <qpixmap.h> |
25 | #include <qlist.h> | ||
25 | 26 | ||
26 | class AppLnk; | 27 | class AppLnk; |
@@ -44,4 +45,6 @@ public: | |||
44 | #ifdef QTOPIA_INTERNAL_MIMEEXT | 45 | #ifdef QTOPIA_INTERNAL_MIMEEXT |
45 | QString extension() const; | 46 | QString extension() const; |
47 | QStringList extensions() const; | ||
48 | QList<AppLnk> applications() const; | ||
46 | #endif | 49 | #endif |
47 | 50 | ||
@@ -60,7 +63,7 @@ private: | |||
60 | static void loadExtensions(const QString&); | 63 | static void loadExtensions(const QString&); |
61 | void init( const QString& ext_or_id ); | 64 | void init( const QString& ext_or_id ); |
62 | class Dict; | 65 | class Private; |
63 | static Dict* d; | 66 | static Private* d; |
64 | static Dict& dict(); | 67 | static Private& data(); |
65 | static MimeTypeData* data(const QString& id); | 68 | static MimeTypeData* data(const QString& id); |
66 | QString i; | 69 | QString i; |