diff --git a/reader/ddlog.h b/reader/ddlog.h index 0e7419cd..7d592a0c 100644 --- a/reader/ddlog.h +++ b/reader/ddlog.h @@ -4,7 +4,9 @@ #ifndef DDLOG_H #define DDLOG_H +#ifdef DTKCORE_CLASS_DConfigFile #include +#endif #include DCORE_USE_NAMESPACE diff --git a/reader/logger.cpp b/reader/logger.cpp index 14cb1808..d04e1e90 100644 --- a/reader/logger.cpp +++ b/reader/logger.cpp @@ -7,12 +7,16 @@ #include #include +#ifdef DTKCORE_CLASS_DConfigFile #include - +#endif DCORE_USE_NAMESPACE MLogger::MLogger(QObject *parent) - : QObject(parent), m_rules(""), m_config(nullptr) + : QObject(parent), m_rules("") +#ifdef DTKCORE_CLASS_DConfigFile + , m_config(nullptr) +#endif { QByteArray logRules = qgetenv("QT_LOGGING_RULES"); // qunsetenv 之前一定不要有任何日志打印,否则取消环境变量设置不会生效 @@ -21,6 +25,7 @@ MLogger::MLogger(QObject *parent) // set env m_rules = logRules; +#ifdef DTKCORE_CLASS_DConfigFile // set dconfig m_config = DConfig::create("org.deepin.reader", "org.deepin.reader"); logRules = m_config->value("log_rules").toByteArray(); @@ -33,11 +38,18 @@ MLogger::MLogger(QObject *parent) setRules(m_config->value(key).toByteArray()); } }); +#else + setRules(m_rules); +#endif } MLogger::~MLogger() { - m_config->deleteLater(); +#ifdef DTKCORE_CLASS_DConfigFile + if (m_config) { + m_config->deleteLater(); + } +#endif } void MLogger::setRules(const QString &rules) diff --git a/reader/logger.h b/reader/logger.h index 473ed5d6..761b7d48 100644 --- a/reader/logger.h +++ b/reader/logger.h @@ -5,9 +5,11 @@ #include #include +#ifdef DTKCORE_CLASS_DConfigFile DCORE_BEGIN_NAMESPACE class DConfig; DCORE_END_NAMESPACE +#endif class MLogger : public QObject { @@ -24,5 +26,7 @@ class MLogger : public QObject private: QString m_rules; +#ifdef DTKCORE_CLASS_DConfigFile Dtk::Core::DConfig *m_config; +#endif };