1 files changed, 39 insertions, 18 deletions

diff --git a/src/mimetypes/qmimedatabase_p.h b/src/mimetypes/qmimedatabase_p.h
index f2d4220..7e98548 100644
--- a/src/mimetypes/qmimedatabase_p.h
+++ b/src/mimetypes/qmimedatabase_p.h
@@ -1,42 +1,63 @@
 /****************************************************************************
 **
-** This file is part of QMime
-**
-** Based on Qt Creator source code
-**
-** Qt Creator Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
 **
+** This file is part of the QtCore module of the Qt Toolkit.
 **
+** $QT_BEGIN_LICENSE:LGPL$
 ** GNU Lesser General Public License Usage
-**
 ** This file may be used under the terms of the GNU Lesser General Public
 ** License version 2.1 as published by the Free Software Foundation and
-** appearing in the file LICENSE.LGPL included in the packaging of this file.
-** Please review the following information to ensure the GNU Lesser General
-** Public License version 2.1 requirements will be met:
+** appearing in the file LICENSE.LGPL included in the packaging of this
+** file. Please review the following information to ensure the GNU Lesser
+** General Public License version 2.1 requirements will be met:
 ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
+** In addition, as a special exception, Nokia gives you certain additional
+** rights. These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU General
+** Public License version 3.0 as published by the Free Software Foundation
+** and appearing in the file LICENSE.GPL included in the packaging of this
+** file. Please review the following information to ensure the GNU General
+** Public License version 3.0 requirements will be met:
+** http://www.gnu.org/copyleft/gpl.html.
+**
+** Other Usage
+** Alternatively, this file may be used in accordance with the terms and
+** conditions contained in a signed written agreement between you and Nokia.
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
 ****************************************************************************/
 
-#ifndef QMIMEDATABASE_P_H_INCLUDED
-#define QMIMEDATABASE_P_H_INCLUDED
 
-#include <QtCore/QMultiHash>
-#include <QtCore/QMutex>
+#ifndef QMIMEDATABASE_P_H
+#define QMIMEDATABASE_P_H
+
+#include <QtCore/qhash.h>
+#include <QtCore/qmutex.h>
 
 #include "qmimetype.h"
 #include "qmimetype_p.h"
 #include "qmimeglobpattern_p.h"
 
-// ------------------------------------------------------------------------------------------------
-
 QT_BEGIN_NAMESPACE
 
 class QMimeDatabase;
 class QMimeProviderBase;
 
-struct QMimeDatabasePrivate
+class QMimeDatabasePrivate
 {
+public:
     Q_DISABLE_COPY(QMimeDatabasePrivate)
 
     QMimeDatabasePrivate();
@@ -47,7 +68,7 @@ struct QMimeDatabasePrivate
     QMimeProviderBase *provider();
     void setProvider(QMimeProviderBase *theProvider);
 
-    QString defaultMimeType() const { return m_defaultMimeType; }
+    inline QString defaultMimeType() const { return m_defaultMimeType; }
 
     bool inherits(const QString &mime, const QString &parent);
 
@@ -66,4 +87,4 @@ struct QMimeDatabasePrivate
 
 QT_END_NAMESPACE
 
-#endif   // QMIMEDATABASE_P_H_INCLUDED
+#endif   // QMIMEDATABASE_P_H