[Qt5-feedback] Patch for qmime documentation

[Wolf-Michael Bolle]

Hi David or Иван,

Could you please review and apply the patch for qmime that I attached? It 
corrects the documentation to the new naming scheme.

Thanks

Michael

diff --git a/src/magicmatcher.cpp b/src/magicmatcher.cpp
index 7996b03..5588225 100644
--- a/src/magicmatcher.cpp
+++ b/src/magicmatcher.cpp
@@ -40,7 +40,7 @@ static const char littleEndianByteOrderMarkC[] = "\xFF\xFE";
     It exists to enable reading the file contents "on demand"
     (as opposed to each mime type trying to open and read while checking).
 
-    \sa MimeType, MimeDatabase, MagicRuleMatcher, MagicRule, MagicStringRule, MagicByteRule, GlobPattern
+    \sa QMimeType, QMimeDatabase, QMimeMagicRuleMatcher, MagicRule, MagicStringRule, MagicByteRule, GlobPattern
     \sa BinaryMatcher, HeuristicTextMagicMatcher
     \sa BaseMimeTypeParser, MimeTypeParser
 */
@@ -71,13 +71,13 @@ QByteArray FileMatchContext::data()
 }
 
 /*!
-    \class MagicRuleMatcher
+    \class QMimeMagicRuleMatcher
 
     \brief A Magic matcher that checks a number of rules based on operator "or".
 
     It is used for rules parsed from XML files.
 
-    \sa MimeType, MimeDatabase, MagicRule, MagicStringRule, MagicByteRule, GlobPattern
+    \sa QMimeType, QMimeDatabase, MagicRule, MagicStringRule, MagicByteRule, GlobPattern
     \sa BinaryMatcher, HeuristicTextMagicMatcher
     \sa BaseMimeTypeParser, MimeTypeParser
 */
diff --git a/src/mimetypeparser.cpp b/src/mimetypeparser.cpp
index 61fd6b9..6dce53e 100644
--- a/src/mimetypeparser.cpp
+++ b/src/mimetypeparser.cpp
@@ -62,7 +62,7 @@ const char *const matchMaskAttributeC = "mask";
 
     Populates MimeDataBase
 
-    \sa MimeDatabase, MagicRuleMatcher, MagicRule, MagicStringRule, MagicByteRule, GlobPattern
+    \sa QMimeDatabase, QMimeMagicRuleMatcher, MagicRule, MagicStringRule, MagicByteRule, GlobPattern
     \sa BinaryMatcher, HeuristicTextMagicMatcher
     \sa MimeTypeParser
 */
@@ -72,9 +72,9 @@ const char *const matchMaskAttributeC = "mask";
     \class BaseMimeTypeParser
     \brief Generic parser for a sequence of <mime-type>.
 
-    Calls abstract handler function process for MimeType it finds.
+    Calls abstract handler function process for QMimeType it finds.
 
-    \sa MimeDatabase, MagicRuleMatcher, MagicRule, MagicStringRule, MagicByteRule, GlobPattern
+    \sa QMimeDatabase, QMimeMagicRuleMatcher, MagicRule, MagicStringRule, MagicByteRule, GlobPattern
     \sa BinaryMatcher, HeuristicTextMagicMatcher
     \sa MimeTypeParser
 */
diff --git a/src/mimetypeparser_p.h b/src/mimetypeparser_p.h
index 35435ff..7091ac7 100644
--- a/src/mimetypeparser_p.h
+++ b/src/mimetypeparser_p.h
@@ -61,7 +61,7 @@ private:
 };
 
 
-// Parser that builds MimeDB hierarchy by adding to MimeDatabasePrivate
+// Parser that builds MimeDB hierarchy by adding to QMimeDatabasePrivate
 class MimeTypeParser : public BaseMimeTypeParser
 {
 public:
diff --git a/src/qmimedatabase.cpp b/src/qmimedatabase.cpp
index a7372a4..d111199 100644
--- a/src/qmimedatabase.cpp
+++ b/src/qmimedatabase.cpp
@@ -367,7 +367,7 @@ QStringList QMimeDatabasePrivate::fromGlobPatterns(const QList<QMimeGlobPattern>
 
 
 /*!
-    \class MimeDatabase
+    \class QMimeDatabase
     \brief Mime data base to which the plugins can add the mime types they handle.
 
     The class is protected by a QMutex and can therefore be accessed by threads.
@@ -392,7 +392,7 @@ QStringList QMimeDatabasePrivate::fromGlobPatterns(const QList<QMimeGlobPattern>
     \list
     \o An alias map QString->QString for mapping aliases to types
     \o A Map QString->MimeMapEntry for the types (MimeMapEntry being a pair of
-       MimeType and (hierarchy) level.
+       QMimeType and (hierarchy) level.
     \o A map  QString->QString representing parent->child relations (enabling
        recursing over children)
     \o Using strings avoids dangling pointers.
@@ -406,7 +406,7 @@ QStringList QMimeDatabasePrivate::fromGlobPatterns(const QList<QMimeGlobPattern>
     to check the most specific types first). Starting a recursion from the
     leaves is not suitable since it will hit parent nodes several times.
 
-    \sa MimeType, MagicRuleMatcher, MagicRule, MagicStringRule, MagicByteRule, GlobPattern
+    \sa QMimeType, QMimeMagicRuleMatcher, MagicRule, MagicStringRule, MagicByteRule, GlobPattern
     \sa BinaryMatcher, HeuristicTextMagicMatcher
     \sa BaseMimeTypeParser, MimeTypeParser
 */
diff --git a/src/qmimetype.cpp b/src/qmimetype.cpp
index a78591d..844cb65 100644
--- a/src/qmimetype.cpp
+++ b/src/qmimetype.cpp
@@ -32,7 +32,7 @@ QT_BEGIN_NAMESPACE
     \class QMimeGlobPattern
     \brief Glob pattern for file names for mime type matching.
 
-    \sa QMimeType, QMimeDatabase, MagicRuleMatcher, QMimeMagicRule
+    \sa QMimeType, QMimeDatabase, QMimeMagicRuleMatcher, QMimeMagicRule
     \sa BinaryMatcher, HeuristicTextMagicMatcher
     \sa BaseMimeTypeParser, MimeTypeParser
 */
@@ -125,7 +125,7 @@ unsigned QMimeTypeData::matchesData(const QByteArray &data) const
 }
 
 /*!
-    \class MimeType
+    \class QMimeType
 
     \brief Mime type data used in Qt Creator.
 

_______________________________________________
Qt5-feedback mailing list
Qt5-feedback@qt.nokia.com
http://lists.qt.nokia.com/mailman/listinfo/qt5-feedback