2 files changed, 33 insertions, 32 deletions

diff --git a/src/qmlcompiler/qqmljsloggingutils.cpp b/src/qmlcompiler/qqmljsloggingutils.cpp
index 73767fe510..06298b303b 100644
--- a/src/qmlcompiler/qqmljsloggingutils.cpp
+++ b/src/qmlcompiler/qqmljsloggingutils.cpp
@@ -35,16 +35,9 @@ LoggerCategory::LoggerCategory() : d_ptr{ new LoggerCategoryPrivate } { }
 
 LoggerCategory::LoggerCategory(
         const QString &name, const QString &settingsName, const QString &description, QtMsgType level,
-        bool ignored, bool isDefault)
-    : d_ptr{ new LoggerCategoryPrivate }
+        bool isIgnored, bool isDefault)
+    : d_ptr{ new LoggerCategoryPrivate(name, settingsName, description, level, isIgnored, isDefault) }
 {
-    Q_D(LoggerCategory);
-    d->m_name = name;
-    d->m_settingsName = settingsName;
-    d->m_description = description;
-    d->m_level = level;
-    d->m_ignored = ignored;
-    d->m_isDefault = isDefault;
 }
 
 LoggerCategory::LoggerCategory(const LoggerCategory &other)
@@ -67,37 +60,37 @@ LoggerCategory::~LoggerCategory() = default;
 QString LoggerCategory::name() const
 {
     Q_D(const LoggerCategory);
-    return d->m_name;
+    return d->name();
 }
 
 QString LoggerCategory::settingsName() const
 {
     Q_D(const LoggerCategory);
-    return d->m_settingsName;
+    return d->settingsName();
 }
 
 QString LoggerCategory::description() const
 {
     Q_D(const LoggerCategory);
-    return d->m_description;
+    return d->description();
 }
 
 QtMsgType LoggerCategory::level() const
 {
     Q_D(const LoggerCategory);
-    return d->m_level;
+    return d->level();
 }
 
 bool LoggerCategory::isIgnored() const
 {
     Q_D(const LoggerCategory);
-    return d->m_ignored;
+    return d->isIgnored();
 }
 
 bool LoggerCategory::isDefault() const
 {
     Q_D(const LoggerCategory);
-    return d->m_isDefault;
+    return d->isDefault();
 }
 
 LoggerWarningId LoggerCategory::id() const
@@ -112,6 +105,14 @@ void LoggerCategory::setLevel(QtMsgType type)
     d->setLevel(type);
 }
 
+LoggerCategoryPrivate::LoggerCategoryPrivate(const QString &name, const QString &settingsName,
+                                             const QString &description, QtMsgType level,
+                                             bool isIgnored, bool isDefault)
+    : m_name(name), m_settingsName(settingsName), m_description(description), m_level(level)
+    , m_isIgnored(isIgnored), m_isDefault(isDefault)
+{
+}
+
 void LoggerCategoryPrivate::setLevel(QtMsgType type)
 {
     if (m_level == type)
@@ -129,18 +130,13 @@ void LoggerCategory::setIgnored(bool isIgnored)
 
 void LoggerCategoryPrivate::setIgnored(bool isIgnored)
 {
-    if (m_ignored == isIgnored)
+    if (m_isIgnored == isIgnored)
         return;
 
-    m_ignored = isIgnored;
+    m_isIgnored = isIgnored;
     m_changed = true;
 }
 
-bool LoggerCategoryPrivate::hasChanged() const
-{
-    return m_changed;
-}
-
 LoggerCategoryPrivate *LoggerCategoryPrivate::get(LoggerCategory *loggerCategory)
 {
     Q_ASSERT(loggerCategory);
diff --git a/src/qmlcompiler/qqmljsloggingutils_p.h b/src/qmlcompiler/qqmljsloggingutils_p.h
index b03244da28..6ab4aa5047 100644
--- a/src/qmlcompiler/qqmljsloggingutils_p.h
+++ b/src/qmlcompiler/qqmljsloggingutils_p.h
@@ -65,21 +65,26 @@ private:
 
 class LoggerCategoryPrivate
 {
-    friend class QT_PREPEND_NAMESPACE(QQmlJS::LoggerCategory);
-
 public:
+    LoggerCategoryPrivate() = default;
+    LoggerCategoryPrivate(const QString &name, const QString &settingsName,
+                          const QString &description, QtMsgType level, bool isIgnored,
+                          bool isDefault);
+
     LoggerWarningId id() const { return LoggerWarningId(m_name); }
 
+    QString name() const { return m_name; }
+    QString settingsName() const { return m_settingsName; }
+    QString description() const { return m_description; }
+    bool isDefault() const { return m_isDefault; }
+
+    QtMsgType level() const { return m_level; }
     void setLevel(QtMsgType);
+
+    bool isIgnored() const { return m_isIgnored; }
     void setIgnored(bool);
 
-    QString name() const;
-    QString settingsName() const;
-    QString description() const;
-    QtMsgType level() const;
-    bool isIgnored() const;
-    bool isDefault() const;
-    bool hasChanged() const;
+    bool hasChanged() const { return m_changed; }
 
     static LoggerCategoryPrivate *get(LoggerCategory *);
 
@@ -101,7 +106,7 @@ private:
     QString m_settingsName;
     QString m_description;
     QtMsgType m_level = QtDebugMsg;
-    bool m_ignored = false;
+    bool m_isIgnored = false;
     bool m_isDefault = false; // Whether or not the category can be disabled
     bool m_changed = false;
 };