X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Fcommon%2Fquassel.cpp;h=e69d0bd60a464b1ce3285764b52f4c08800ef4b1;hb=edc446b0c31b048efddaf1943cb85eb0db6a0faa;hp=a43a707b21a5ac117aca8f22c4c794bcf5a13b91;hpb=8c16bc6817aac177791686ac1a5ad8ee2d93410c;p=quassel.git
diff --git a/src/common/quassel.cpp b/src/common/quassel.cpp
index a43a707b..e69d0bd6 100644
--- a/src/common/quassel.cpp
+++ b/src/common/quassel.cpp
@@ -50,6 +50,7 @@ bool Quassel::_initialized = false;
bool Quassel::DEBUG = false;
QString Quassel::_coreDumpFileName;
Quassel *Quassel::_instance = 0;
+bool Quassel::_handleCrashes = true;
Quassel::Quassel() {
Q_ASSERT(!_instance);
@@ -58,27 +59,6 @@ Quassel::Quassel() {
// We catch SIGTERM and SIGINT (caused by Ctrl+C) to graceful shutdown Quassel.
signal(SIGTERM, handleSignal);
signal(SIGINT, handleSignal);
-
- // we have crashhandler for win32 and unix (based on execinfo).
- // on mac os we use it's integrated backtrace generator
-#if defined(Q_OS_WIN32) || (defined(HAVE_EXECINFO) && !defined(Q_OS_MAC))
-
-# ifndef Q_OS_WIN32
- // we only handle crashes ourselves if coredumps are disabled
- struct rlimit *limit = (rlimit *) malloc(sizeof(struct rlimit));
- int rc = getrlimit(RLIMIT_CORE, limit);
-
- if(rc == -1 || !((long)limit->rlim_cur > 0 || limit->rlim_cur == RLIM_INFINITY)) {
-# endif
- signal(SIGABRT, handleSignal);
- signal(SIGSEGV, handleSignal);
-# ifndef Q_OS_WIN32
- signal(SIGBUS, handleSignal);
- }
- free(limit);
-# endif
-
-#endif
}
Quassel::~Quassel() {
@@ -89,6 +69,26 @@ bool Quassel::init() {
if(_initialized)
return true; // allow multiple invocations because of MonolithicApplication
+ if (_handleCrashes) {
+ // we have crashhandler for win32 and unix (based on execinfo).
+#if defined(Q_OS_WIN32) || defined(HAVE_EXECINFO)
+# ifndef Q_OS_WIN32
+ // we only handle crashes ourselves if coredumps are disabled
+ struct rlimit *limit = (rlimit *) malloc(sizeof(struct rlimit));
+ int rc = getrlimit(RLIMIT_CORE, limit);
+
+ if(rc == -1 || !((long)limit->rlim_cur > 0 || limit->rlim_cur == RLIM_INFINITY)) {
+# endif /* Q_OS_WIN32 */
+ signal(SIGABRT, handleSignal);
+ signal(SIGSEGV, handleSignal);
+# ifndef Q_OS_WIN32
+ signal(SIGBUS, handleSignal);
+ }
+ free(limit);
+# endif /* Q_OS_WIN32 */
+#endif /* Q_OS_WIN32 || HAVE_EXECINFO */
+ }
+
_initialized = true;
qsrand(QTime(0,0,0).secsTo(QTime::currentTime()));
@@ -178,8 +178,7 @@ void Quassel::setupBuildInfo(const QString &generated) {
_buildInfo.plainVersionString = QString("v%1 (dist-%2)")
.arg(_buildInfo.baseVersion)
.arg(_buildInfo.commitHash.left(7));
- _buildInfo.fancyVersionString
- = QString("v%1 (dist-%2)")
+ _buildInfo.fancyVersionString = QString("v%1 (dist-%2)")
.arg(_buildInfo.baseVersion)
.arg(_buildInfo.commitHash.left(7))
.arg(_buildInfo.commitHash);
@@ -191,13 +190,13 @@ void Quassel::setupBuildInfo(const QString &generated) {
// analyze what we got from git-describe
QRegExp rx("(.*)-(\\d+)-g([0-9a-f]+)$");
if(rx.exactMatch(_buildInfo.generatedVersion)) {
- QString distance = rx.cap(2) == "0" ? QString() : QString(" [+%1]").arg(rx.cap(2));
- _buildInfo.plainVersionString = QString("v%1%2 (git-%3%4)")
- .arg(rx.cap(1), distance, rx.cap(3))
+ QString distance = rx.cap(2) == "0" ? QString() : QString("%1+%2 ").arg(rx.cap(1), rx.cap(2));
+ _buildInfo.plainVersionString = QString("v%1 (%2git-%3%4)")
+ .arg(_buildInfo.baseVersion, distance, rx.cap(3))
.arg(_buildInfo.isSourceDirty ? "*" : "");
if(!_buildInfo.commitHash.isEmpty()) {
- _buildInfo.fancyVersionString = QString("v%1%2 (git-%3%4)")
- .arg(rx.cap(1), distance, rx.cap(3))
+ _buildInfo.fancyVersionString = QString("v%1 (%2git-%3%4)")
+ .arg(_buildInfo.baseVersion, distance, rx.cap(3))
.arg(_buildInfo.isSourceDirty ? "*" : "")
.arg(_buildInfo.commitHash);
}
@@ -247,6 +246,14 @@ void Quassel::logFatalMessage(const char *msg) {
#endif
}
+Quassel::Features Quassel::features() {
+ Features feats = 0;
+ for(int i = 1; i <= NumFeatures; i<<=1)
+ feats |= (Feature) i;
+
+ return feats;
+}
+
const QString &Quassel::coreDumpFileName() {
if(_coreDumpFileName.isEmpty()) {
QDir configDir(configDirPath());
@@ -394,24 +401,27 @@ void Quassel::loadTranslation(const QLocale &locale) {
QTranslator *qtTranslator = QCoreApplication::instance()->findChild("QtTr");
QTranslator *quasselTranslator = QCoreApplication::instance()->findChild("QuasselTr");
- if(!qtTranslator) {
- qtTranslator = new QTranslator(qApp);
- qtTranslator->setObjectName("QtTr");
- qApp->installTranslator(qtTranslator);
- }
- if(!quasselTranslator) {
- quasselTranslator = new QTranslator(qApp);
- quasselTranslator->setObjectName("QuasselTr");
- qApp->installTranslator(quasselTranslator);
- }
-
- QLocale::setDefault(locale);
+ if(qtTranslator)
+ qApp->removeTranslator(qtTranslator);
+ if(quasselTranslator)
+ qApp->removeTranslator(quasselTranslator);
+ // We use QLocale::C to indicate that we don't want a translation
if(locale.language() == QLocale::C)
return;
+ qtTranslator = new QTranslator(qApp);
+ qtTranslator->setObjectName("QtTr");
+ qApp->installTranslator(qtTranslator);
+
+ quasselTranslator = new QTranslator(qApp);
+ quasselTranslator->setObjectName("QuasselTr");
+ qApp->installTranslator(quasselTranslator);
+
+ QLocale::setDefault(locale);
+
bool success = qtTranslator->load(QString("qt_%1").arg(locale.name()), translationDirPath());
if(!success)
qtTranslator->load(QString("qt_%1").arg(locale.name()), QLibraryInfo::location(QLibraryInfo::TranslationsPath));
- quasselTranslator->load(QString("quassel_%1").arg(locale.name()), translationDirPath());
+ quasselTranslator->load(QString("%1").arg(locale.name()), translationDirPath());
}