Merged branches from BRANCH_1_0

1 files changed, 64 insertions, 0 deletions

diff --git a/library/mimetype.cpp b/library/mimetype.cpp
index ef5d619..d0a578e 100644
--- a/library/mimetype.cpp
+++ b/library/mimetype.cpp
@@ -132,2 +132,20 @@ MimeType::Private& MimeType::data()
 
+/*!
+    \class MimeType mimetype.h
+    \brief The MimeType class provides MIME type information.
+
+    A MimeType object is a light-weight value which
+    provides information about a MIME type.
+
+    \ingroup qtopiaemb
+*/
+
+/*!
+    Constructs a MimeType.
+    Normally, \a ext_or_id is a MIME type,
+    but if \a ext_or_id starts with / or contains no /,
+    it is interpretted as a filename and the
+    extension (eg. .txt) is used as the
+    MIME type.
+*/
 MimeType::MimeType( const QString& ext_or_id )
@@ -137,2 +155,5 @@ MimeType::MimeType( const QString& ext_or_id )
 
+/*!
+    Constructs a MimeType from the type() of \a lnk.
+*/
 MimeType::MimeType( const DocLnk& lnk )
@@ -142,2 +163,5 @@ MimeType::MimeType( const DocLnk& lnk )
 
+/*!
+    Returns the MIME type identifier.
+*/
 QString MimeType::id() const
@@ -147,2 +171,6 @@ QString MimeType::id() const
 
+/*!
+    Returns a description of the MIME Type. This is usually based
+    on the application() associated with the type.
+*/
 QString MimeType::description() const
@@ -153,2 +181,5 @@ QString MimeType::description() const
 
+/*!
+    Returns a small QPixmap appropriate for the MIME type.
+*/
 QPixmap MimeType::pixmap() const
@@ -159,2 +190,6 @@ QPixmap MimeType::pixmap() const
 
+/*!
+    \internal
+    This function is not generally available.
+*/
 QString MimeType::extension() const
@@ -164,2 +199,7 @@ QString MimeType::extension() const
 
+
+/*!
+    \internal
+    This function is not generally available.
+*/
 QStringList MimeType::extensions() const
@@ -170,2 +210,5 @@ QStringList MimeType::extensions() const
 
+/*!
+    Returns a larger QPixmap appropriate for the MIME type.
+*/
 QPixmap MimeType::bigPixmap() const
@@ -176,2 +219,11 @@ QPixmap MimeType::bigPixmap() const
 
+/*!
+    Returns the AppLnk defining the application associated
+    with this MIME type, or 0 if none is associated.
+
+    The caller must not retain the pointer,
+    but of course you can dereference it to take a copy if needed.
+
+    \sa Service::binding()
+*/
 const AppLnk* MimeType::application() const
@@ -191,2 +243,5 @@ static QString serviceBinding(const QString& service)
 
+/*!
+    \internal
+*/
 void MimeType::registerApp( const AppLnk& lnk )
@@ -215,2 +270,5 @@ void MimeType::registerApp( const AppLnk& lnk )
 
+/*!
+    \internal
+*/
 void MimeType::clear()
@@ -288,2 +346,5 @@ MimeTypeData* MimeType::data(const QString& id)
 
+/*!
+    Returns a Qtopia folder containing application definitions.
+*/
 QString MimeType::appsFolderName()
@@ -293,2 +354,5 @@ QString MimeType::appsFolderName()
 
+/*!
+    Reloads application definitions.
+*/
 void MimeType::updateApplications()