X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcommon%2Fquassel.cpp;h=84301f96d85d5a416d195e6830d625d6a033c9f5;hp=29b6e55ec87ee428708134ad65b1921d13dbeb7e;hb=9e531f113fbca51739ac6e2cf4eed7005b005c8f;hpb=f5d08a1e466b69f8c35e3b30e4cf898a71bc8b83

diff --git a/src/common/quassel.cpp b/src/common/quassel.cpp
index 29b6e55e..84301f96 100644
--- a/src/common/quassel.cpp
+++ b/src/common/quassel.cpp
@@ -77,7 +77,6 @@ bool Quassel::init() {
   qsrand(QTime(0,0,0).secsTo(QTime::currentTime()));
 
   registerMetaTypes();
-  setupTranslations();
 
   QCoreApplication::setApplicationName(buildInfo().applicationName);
   QCoreApplication::setOrganizationName(buildInfo().organizationName);
@@ -105,6 +104,7 @@ void Quassel::registerMetaTypes() {
   qRegisterMetaType<Message>("Message");
   qRegisterMetaType<BufferInfo>("BufferInfo");
   qRegisterMetaType<NetworkInfo>("NetworkInfo");
+  qRegisterMetaType<Network::Server>("Network::Server");
   qRegisterMetaType<Identity>("Identity");
   qRegisterMetaType<Network::ConnectionState>("Network::ConnectionState");
 
@@ -112,6 +112,7 @@ void Quassel::registerMetaTypes() {
   qRegisterMetaTypeStreamOperators<Message>("Message");
   qRegisterMetaTypeStreamOperators<BufferInfo>("BufferInfo");
   qRegisterMetaTypeStreamOperators<NetworkInfo>("NetworkInfo");
+  qRegisterMetaTypeStreamOperators<Network::Server>("Network::Server");
   qRegisterMetaTypeStreamOperators<Identity>("Identity");
   qRegisterMetaTypeStreamOperators<qint8>("Network::ConnectionState");
 
@@ -130,21 +131,6 @@ void Quassel::registerMetaTypes() {
   qRegisterMetaTypeStreamOperators<MsgId>("MsgId");
 }
 
-void Quassel::setupTranslations() {
-  // Set up i18n support
-  QLocale locale = QLocale::system();
-
-  QTranslator *qtTranslator = new QTranslator(qApp);
-  qtTranslator->setObjectName("QtTr");
-  qtTranslator->load(QString(":i18n/qt_%1").arg(locale.name()));
-  qApp->installTranslator(qtTranslator);
-
-  QTranslator *quasselTranslator = new QTranslator(qApp);
-  quasselTranslator->setObjectName("QuasselTr");
-  quasselTranslator->load(QString(":i18n/quassel_%1").arg(locale.name()));
-  qApp->installTranslator(quasselTranslator);
-}
-
 void Quassel::setupBuildInfo(const QString &generated) {
   _buildInfo.applicationName = "Quassel IRC";
   _buildInfo.coreApplicationName = "Quassel Core";
@@ -215,6 +201,7 @@ void Quassel::handleSignal(int sig) {
   case SIGBUS:
 #endif
     logBacktrace(coreDumpFileName());
+    exit(EXIT_FAILURE);
     break;
   default:
     break;
@@ -228,7 +215,7 @@ void Quassel::logFatalMessage(const char *msg) {
   QFile dumpFile(coreDumpFileName());
   dumpFile.open(QIODevice::Append);
   QTextStream dumpStream(&dumpFile);
-  
+
   dumpStream << "Fatal: " << msg << '\n';
   dumpStream.flush();
   dumpFile.close();