/***************************************************************************
- * Copyright (C) 2005-2016 by the Quassel Project *
+ * Copyright (C) 2005-2018 by the Quassel Project *
* devel@quassel-irc.org *
* *
* This program is free software; you can redistribute it and/or modify *
#include "quassel.h"
+#include <algorithm>
#include <iostream>
+
#include <signal.h>
#if !defined Q_OS_WIN && !defined Q_OS_MAC
# include <sys/types.h>
#include <QFileInfo>
#include <QHostAddress>
#include <QLibraryInfo>
+#include <QMetaEnum>
#include <QSettings>
#include <QTranslator>
#include <QUuid>
return false;
}
- // set up logging
- if (Quassel::runMode() != Quassel::ClientOnly) {
- if (isOptionSet("loglevel")) {
- QString level = optionValue("loglevel");
-
- if (level == "Debug")
- setLogLevel(DebugLevel);
- else if (level == "Info")
- setLogLevel(InfoLevel);
- else if (level == "Warning")
- setLogLevel(WarningLevel);
- else if (level == "Error")
- setLogLevel(ErrorLevel);
- else {
- qWarning() << qPrintable(tr("Invalid log level %1; supported are Debug|Info|Warning|Error").arg(level));
- return false;
- }
+ // Set up logging
+ if (isOptionSet("loglevel")) {
+ QString level = optionValue("loglevel").toLower();
+
+ if (level == "debug")
+ setLogLevel(DebugLevel);
+ else if (level == "info")
+ setLogLevel(InfoLevel);
+ else if (level == "warning")
+ setLogLevel(WarningLevel);
+ else if (level == "error")
+ setLogLevel(ErrorLevel);
+ else {
+ qWarning() << qPrintable(tr("Invalid log level %1; supported are Debug|Info|Warning|Error").arg(level));
+ return false;
}
+ }
- QString logfilename = optionValue("logfile");
- if (!logfilename.isEmpty()) {
- instance()->_logFile.reset(new QFile{logfilename});
- if (!logFile()->open(QIODevice::Append | QIODevice::Text)) {
- qWarning() << "Could not open log file" << logfilename << ":" << logFile()->errorString();
- instance()->_logFile.reset();
- }
+ QString logfilename = optionValue("logfile");
+ if (!logfilename.isEmpty()) {
+ instance()->_logFile.reset(new QFile{logfilename});
+ if (!logFile()->open(QIODevice::Append | QIODevice::Text)) {
+ qWarning() << qPrintable(tr("Could not open log file \"%1\": %2").arg(logfilename, logFile()->errorString()));
+ instance()->_logFile.reset();
}
+ }
#ifdef HAVE_SYSLOG
- instance()->_logToSyslog = isOptionSet("syslog");
+ instance()->_logToSyslog = isOptionSet("syslog");
+#endif
+
+#if QT_VERSION < 0x050000
+ qInstallMsgHandler(Logger::logMessage);
+#else
+ qInstallMessageHandler(Logger::logMessage);
#endif
- }
return true;
}
if (!QString(GIT_HEAD).isEmpty()) {
buildInfo.commitHash = GIT_HEAD;
QDateTime date;
- date.setTime_t(GIT_COMMIT_DATE);
+#if QT_VERSION >= 0x050800
+ date.setSecsSinceEpoch(GIT_COMMIT_DATE);
+#else
+ // toSecsSinceEpoch() was added in Qt 5.8. Manually downconvert to seconds for now.
+ // See https://doc.qt.io/qt-5/qdatetime.html#toMSecsSinceEpoch
+ // Warning generated if not converting the 1000 to a qint64 first.
+ date.setMSecsSinceEpoch(GIT_COMMIT_DATE * (qint64)1000);
+#endif
buildInfo.commitDate = date.toString();
}
else if (!QString(DIST_HASH).contains("Format")) {
}
-Quassel::Features Quassel::features()
-{
- Features feats = 0;
- for (int i = 1; i <= NumFeatures; i <<= 1)
- feats |= (Feature)i;
-
- // Disable DCC until it is ready
- feats &= ~Feature::DccFileTransfer;
-
- return feats;
-}
-
-
const QString &Quassel::coreDumpFileName()
{
if (_coreDumpFileName.isEmpty()) {
quasselTranslator->load(QString("%1").arg(locale.name()), translationDirPath());
#endif
}
+
+
+// ---- Quassel::Features ---------------------------------------------------------------------------------------------
+
+Quassel::Features::Features()
+{
+ QStringList features;
+
+ // TODO Qt5: Use QMetaEnum::fromType()
+ auto featureEnum = Quassel::staticMetaObject.enumerator(Quassel::staticMetaObject.indexOfEnumerator("Feature"));
+ _features.resize(featureEnum.keyCount(), true); // enable all known features to true
+}
+
+
+Quassel::Features::Features(const QStringList &features, LegacyFeatures legacyFeatures)
+{
+ // TODO Qt5: Use QMetaEnum::fromType()
+ auto featureEnum = Quassel::staticMetaObject.enumerator(Quassel::staticMetaObject.indexOfEnumerator("Feature"));
+ _features.resize(featureEnum.keyCount(), false);
+
+ for (auto &&feature : features) {
+ int i = featureEnum.keyToValue(qPrintable(feature));
+ if (i >= 0) {
+ _features[i] = true;
+ }
+ else {
+ _unknownFeatures << feature;
+ }
+ }
+
+ if (legacyFeatures) {
+ // TODO Qt5: Use QMetaEnum::fromType()
+ auto legacyFeatureEnum = Quassel::staticMetaObject.enumerator(Quassel::staticMetaObject.indexOfEnumerator("LegacyFeature"));
+ for (quint32 mask = 0x0001; mask <= 0x8000; mask <<=1) {
+ if (static_cast<quint32>(legacyFeatures) & mask) {
+ int i = featureEnum.keyToValue(legacyFeatureEnum.valueToKey(mask));
+ if (i >= 0) {
+ _features[i] = true;
+ }
+ }
+ }
+ }
+}
+
+
+bool Quassel::Features::isEnabled(Feature feature) const
+{
+ size_t i = static_cast<size_t>(feature);
+ return i < _features.size() ? _features[i] : false;
+}
+
+
+QStringList Quassel::Features::toStringList(bool enabled) const
+{
+ // Check if any feature is enabled
+ if (!enabled && std::all_of(_features.cbegin(), _features.cend(), [](bool feature) { return !feature; })) {
+ return QStringList{} << "NoFeatures";
+ }
+
+ QStringList result;
+
+ // TODO Qt5: Use QMetaEnum::fromType()
+ auto featureEnum = Quassel::staticMetaObject.enumerator(Quassel::staticMetaObject.indexOfEnumerator("Feature"));
+ for (quint32 i = 0; i < _features.size(); ++i) {
+ if (_features[i] == enabled) {
+ result << featureEnum.key(i);
+ }
+ }
+ return result;
+}
+
+
+Quassel::LegacyFeatures Quassel::Features::toLegacyFeatures() const
+{
+ // TODO Qt5: Use LegacyFeatures (flag operators for enum classes not supported in Qt4)
+ quint32 result{0};
+ // TODO Qt5: Use QMetaEnum::fromType()
+ auto featureEnum = Quassel::staticMetaObject.enumerator(Quassel::staticMetaObject.indexOfEnumerator("Feature"));
+ auto legacyFeatureEnum = Quassel::staticMetaObject.enumerator(Quassel::staticMetaObject.indexOfEnumerator("LegacyFeature"));
+
+ for (quint32 i = 0; i < _features.size(); ++i) {
+ if (_features[i]) {
+ int v = legacyFeatureEnum.keyToValue(featureEnum.key(i));
+ if (v >= 0) {
+ result |= v;
+ }
+ }
+ }
+ return static_cast<LegacyFeatures>(result);
+}
+
+
+QStringList Quassel::Features::unknownFeatures() const
+{
+ return _unknownFeatures;
+}
projects / quassel.git / blobdiff