author | zecke <zecke> | 2002-09-10 12:09:49 (UTC) |
---|---|---|
committer | zecke <zecke> | 2002-09-10 12:09:49 (UTC) |
commit | 6b77a1cdb9536b1c135eb86d53a6b2c22c19b0a4 (patch) (side-by-side diff) | |
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,8 +1,8 @@ /********************************************************************** -** 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 @@ -19,10 +19,11 @@ **********************************************************************/ #ifndef MIMETYPE_H #define MIMETYPE_H -#include <qstring.h> +#include <qstringlist.h> #include <qpixmap.h> +#include <qlist.h> class AppLnk; class DocLnk; class QStringList; @@ -42,8 +43,10 @@ public: // DON'T define this yourself! #ifdef QTOPIA_INTERNAL_MIMEEXT QString extension() const; + QStringList extensions() const; + QList<AppLnk> applications() const; #endif const AppLnk* application() const; @@ -58,11 +61,11 @@ private: static void updateApplications(AppLnkSet* folder); static void loadExtensions(); static void loadExtensions(const QString&); 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); QString i; }; |