diff options
Diffstat (limited to 'src/core/kconfiggroup.cpp')
-rw-r--r-- | src/core/kconfiggroup.cpp | 39 |
1 files changed, 20 insertions, 19 deletions
diff --git a/src/core/kconfiggroup.cpp b/src/core/kconfiggroup.cpp index 92c58f6e..c7b8cb67 100644 --- a/src/core/kconfiggroup.cpp +++ b/src/core/kconfiggroup.cpp @@ -25,6 +25,7 @@ #include "kconfig.h" #include "kconfig_p.h" +#include "kconfig_core_log_settings.h" #include "ksharedconfig.h" #include "kconfigdata.h" @@ -260,7 +261,7 @@ QVariant KConfigGroup::convertToQVariant(const char *pKey, const QByteArray &val const auto list = asIntList(value); if (list.count() != 2) { - qWarning() << errString(pKey, value, aDefault) + qCWarning(KCONFIG_CORE_LOG) << errString(pKey, value, aDefault) << formatError(2, list.count()); return aDefault; } @@ -270,7 +271,7 @@ QVariant KConfigGroup::convertToQVariant(const char *pKey, const QByteArray &val const auto list = asRealList(value); if (list.count() != 2) { - qWarning() << errString(pKey, value, aDefault) + qCWarning(KCONFIG_CORE_LOG) << errString(pKey, value, aDefault) << formatError(2, list.count()); return aDefault; } @@ -280,13 +281,13 @@ QVariant KConfigGroup::convertToQVariant(const char *pKey, const QByteArray &val const auto list = asIntList(value); if (list.count() != 4) { - qWarning() << errString(pKey, value, aDefault) + qCWarning(KCONFIG_CORE_LOG) << errString(pKey, value, aDefault) << formatError(4, list.count()); return aDefault; } const QRect rect(list.at(0), list.at(1), list.at(2), list.at(3)); if (!rect.isValid()) { - qWarning() << errString(pKey, value, aDefault); + qCWarning(KCONFIG_CORE_LOG) << errString(pKey, value, aDefault); return aDefault; } return rect; @@ -295,13 +296,13 @@ QVariant KConfigGroup::convertToQVariant(const char *pKey, const QByteArray &val const auto list = asRealList(value); if (list.count() != 4) { - qWarning() << errString(pKey, value, aDefault) + qCWarning(KCONFIG_CORE_LOG) << errString(pKey, value, aDefault) << formatError(4, list.count()); return aDefault; } const QRectF rect(list.at(0), list.at(1), list.at(2), list.at(3)); if (!rect.isValid()) { - qWarning() << errString(pKey, value, aDefault); + qCWarning(KCONFIG_CORE_LOG) << errString(pKey, value, aDefault); return aDefault; } return rect; @@ -310,13 +311,13 @@ QVariant KConfigGroup::convertToQVariant(const char *pKey, const QByteArray &val const auto list = asIntList(value); if (list.count() != 2) { - qWarning() << errString(pKey, value, aDefault) + qCWarning(KCONFIG_CORE_LOG) << errString(pKey, value, aDefault) << formatError(2, list.count()); return aDefault; } const QSize size(list.at(0), list.at(1)); if (!size.isValid()) { - qWarning() << errString(pKey, value, aDefault); + qCWarning(KCONFIG_CORE_LOG) << errString(pKey, value, aDefault); return aDefault; } return size; @@ -325,13 +326,13 @@ QVariant KConfigGroup::convertToQVariant(const char *pKey, const QByteArray &val const auto list = asRealList(value); if (list.count() != 2) { - qWarning() << errString(pKey, value, aDefault) + qCWarning(KCONFIG_CORE_LOG) << errString(pKey, value, aDefault) << formatError(2, list.count()); return aDefault; } const QSizeF size(list.at(0), list.at(1)); if (!size.isValid()) { - qWarning() << errString(pKey, value, aDefault); + qCWarning(KCONFIG_CORE_LOG) << errString(pKey, value, aDefault); return aDefault; } return size; @@ -339,7 +340,7 @@ QVariant KConfigGroup::convertToQVariant(const char *pKey, const QByteArray &val case QMetaType::QDateTime: { const auto list = asIntList(value); if (list.count() != 6) { - qWarning() << errString(pKey, value, aDefault) + qCWarning(KCONFIG_CORE_LOG) << errString(pKey, value, aDefault) << formatError(6, list.count()); return aDefault; } @@ -347,7 +348,7 @@ QVariant KConfigGroup::convertToQVariant(const char *pKey, const QByteArray &val const QTime time(list.at(3), list.at(4), list.at(5)); const QDateTime dt(date, time); if (!dt.isValid()) { - qWarning() << errString(pKey, value, aDefault); + qCWarning(KCONFIG_CORE_LOG) << errString(pKey, value, aDefault); return aDefault; } return dt; @@ -358,20 +359,20 @@ QVariant KConfigGroup::convertToQVariant(const char *pKey, const QByteArray &val list = list.mid(0, 3); // don't break config files that stored QDate as QDateTime } if (list.count() != 3) { - qWarning() << errString(pKey, value, aDefault) + qCWarning(KCONFIG_CORE_LOG) << errString(pKey, value, aDefault) << formatError(3, list.count()); return aDefault; } const QDate date(list.at(0), list.at(1), list.at(2)); if (!date.isValid()) { - qWarning() << errString(pKey, value, aDefault); + qCWarning(KCONFIG_CORE_LOG) << errString(pKey, value, aDefault); return aDefault; } return date; } case QMetaType::QColor: case QMetaType::QFont: - qWarning() << "KConfigGroup::readEntry was passed GUI type '" + qCWarning(KCONFIG_CORE_LOG) << "KConfigGroup::readEntry was passed GUI type '" << aDefault.typeName() << "' but KConfigGui isn't linked! If it is linked to your program, " "this is a platform bug. Please inform the KDE developers"; @@ -383,7 +384,7 @@ QVariant KConfigGroup::convertToQVariant(const char *pKey, const QByteArray &val break; } - qWarning() << "unhandled type " << aDefault.typeName(); + qCWarning(KCONFIG_CORE_LOG) << "unhandled type " << aDefault.typeName(); return QVariant(); } @@ -955,7 +956,7 @@ void KConfigGroup::writeEntry(const char *key, const QVariant &value, break; case QMetaType::QVariantList: if (!value.canConvert(QMetaType::QStringList)) - qWarning() << "not all types in \"" << key << "\" can convert to QString," + qCWarning(KCONFIG_CORE_LOG) << "not all types in \"" << key << "\" can convert to QString," " information will be lost"; Q_FALLTHROUGH(); case QMetaType::QStringList: @@ -1065,7 +1066,7 @@ void KConfigGroup::writeEntry(const char *key, const QVariant &value, case QMetaType::QColor: case QMetaType::QFont: - qWarning() << "KConfigGroup::writeEntry was passed GUI type '" + qCWarning(KCONFIG_CORE_LOG) << "KConfigGroup::writeEntry was passed GUI type '" << value.typeName() << "' but KConfigGui isn't linked! If it is linked to your program, this is a platform bug. " "Please inform the KDE developers"; @@ -1074,7 +1075,7 @@ void KConfigGroup::writeEntry(const char *key, const QVariant &value, data = QUrl(value.toUrl()).toString().toUtf8(); break; default: - qWarning() << "KConfigGroup::writeEntry - unhandled type" << value.typeName() << "in group" << name(); + qCWarning(KCONFIG_CORE_LOG) << "KConfigGroup::writeEntry - unhandled type" << value.typeName() << "in group" << name(); } writeEntry(key, data, flags); |