tests: Convert ExpressionMatchTests into a GTest-based test case

[quassel.git] / src / common / quassel.cpp

diff --git a/src/common/quassel.cpp b/src/common/quassel.cpp
index ae39b03..14d6a63 100644 (file)
--- a/src/common/quassel.cpp
+++ b/src/common/quassel.cpp
@@ -56,6 +56,9 @@ Quassel::Quassel()
     : Singleton<Quassel>{this}
     , _logger{new Logger{this}}
 {
+#ifdef EMBED_DATA
+    Q_INIT_RESOURCE(i18n);
+#endif
 }
 
 
@@ -290,7 +293,7 @@ void Quassel::setupSignalHandling()
 #else
     _signalWatcher = new WindowsSignalWatcher(this);
 #endif
-    connect(_signalWatcher, SIGNAL(handleSignal(AbstractSignalWatcher::Action)), this, SLOT(handleSignal(AbstractSignalWatcher::Action)));
+    connect(_signalWatcher, &AbstractSignalWatcher::handleSignal, this, &Quassel::handleSignal);
 }
 
 
@@ -586,8 +589,8 @@ QString Quassel::translationDirPath()
 
 void Quassel::loadTranslation(const QLocale &locale)
 {
-    QTranslator *qtTranslator = QCoreApplication::instance()->findChild<QTranslator *>("QtTr");
-    QTranslator *quasselTranslator = QCoreApplication::instance()->findChild<QTranslator *>("QuasselTr");
+    auto *qtTranslator = QCoreApplication::instance()->findChild<QTranslator *>("QtTr");
+    auto *quasselTranslator = QCoreApplication::instance()->findChild<QTranslator *>("QuasselTr");
 
     if (qtTranslator)
         qApp->removeTranslator(qtTranslator);
@@ -666,7 +669,7 @@ Quassel::Features::Features(const QStringList &features, LegacyFeatures legacyFe
 
 bool Quassel::Features::isEnabled(Feature feature) const
 {
-    size_t i = static_cast<size_t>(feature);
+    auto i = static_cast<size_t>(feature);
     return i < _features.size() ? _features[i] : false;
 }