projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Don't link to indirect deps anymore, thanks to ewoerner for pointing that out
[quassel.git]
/
src
/
uisupport
/
uistyle.cpp
diff --git
a/src/uisupport/uistyle.cpp
b/src/uisupport/uistyle.cpp
index
b95a530
..
08190ed
100644
(file)
--- a/
src/uisupport/uistyle.cpp
+++ b/
src/uisupport/uistyle.cpp
@@
-19,13
+19,13
@@
***************************************************************************/
#include <QApplication>
***************************************************************************/
#include <QApplication>
+#include "quassel.h"
#include "uistyle.h"
#include "uisettings.h"
#include "util.h"
// FIXME remove with migration code
#include <QSettings>
#include "uistyle.h"
#include "uisettings.h"
#include "util.h"
// FIXME remove with migration code
#include <QSettings>
-#include "global.h"
UiStyle::UiStyle(const QString &settingsKey) : _settingsKey(settingsKey) {
// register FormatList if that hasn't happened yet
UiStyle::UiStyle(const QString &settingsKey) : _settingsKey(settingsKey) {
// register FormatList if that hasn't happened yet
@@
-39,9
+39,9
@@
UiStyle::UiStyle(const QString &settingsKey) : _settingsKey(settingsKey) {
// FIXME remove migration at some point
// We remove old settings if we find them, since they conflict
#ifdef Q_WS_MAC
// FIXME remove migration at some point
// We remove old settings if we find them, since they conflict
#ifdef Q_WS_MAC
- QSettings mys(QCoreApplication::organizationDomain(),
Global::
clientApplicationName);
+ QSettings mys(QCoreApplication::organizationDomain(),
Quassel::buildInfo().
clientApplicationName);
#else
#else
- QSettings mys(QCoreApplication::organizationName(),
Global::
clientApplicationName);
+ QSettings mys(QCoreApplication::organizationName(),
Quassel::buildInfo().
clientApplicationName);
#endif
mys.beginGroup("QtUi");
if(mys.childGroups().contains("Colors")) {
#endif
mys.beginGroup("QtUi");
if(mys.childGroups().contains("Colors")) {
@@
-340,7
+340,7
@@
UiStyle::StyledMessage UiStyle::styleMessage(const Message &msg) {
if(!txt.isEmpty()) t = QString("%1 (%2)").arg(t).arg(txt);
break;
case Message::Quit:
if(!txt.isEmpty()) t = QString("%1 (%2)").arg(t).arg(txt);
break;
case Message::Quit:
- s = tr("%Dq<--"); t = tr("%Dq%DN%
DU%1%DU
%DN %DH(%2@%3)%DH has quit").arg(nick, user, host);
+ s = tr("%Dq<--"); t = tr("%Dq%DN%
1
%DN %DH(%2@%3)%DH has quit").arg(nick, user, host);
if(!txt.isEmpty()) t = QString("%1 (%2)").arg(t).arg(txt);
break;
case Message::Kick:
if(!txt.isEmpty()) t = QString("%1 (%2)").arg(t).arg(txt);
break;
case Message::Kick: