X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fuisupport%2Fuistyle.cpp;h=3ed50c19b790290637259bb7a0166b55c9ec4661;hb=7909b6a0a1a1c0090bea437e1af2ea6936263ce9;hp=8228b8fed4fb2182c5c0c1ed240a90f0eb108312;hpb=a6c419727506abd19f41d8de6e02de015a7aa8e5;p=quassel.git

diff --git a/src/uisupport/uistyle.cpp b/src/uisupport/uistyle.cpp
index 8228b8fe..3ed50c19 100644
--- a/src/uisupport/uistyle.cpp
+++ b/src/uisupport/uistyle.cpp
@@ -665,14 +665,11 @@ void UiStyle::StyledMessage::style() const
     QString t;
     switch (type()) {
     case Message::Plain:
-        //: Plain Message
-        t = tr("%1").arg(txt); break;
+        t = QString("%1").arg(txt); break;
     case Message::Notice:
-        //: Notice Message
-        t = tr("%1").arg(txt); break;
+        t = QString("%1").arg(txt); break;
     case Message::Action:
-        //: Action Message
-        t = tr("%DN%1%DN %2").arg(nick).arg(txt);
+        t = QString("%DN%1%DN %2").arg(nick).arg(txt);
         break;
     case Message::Nick:
         //: Nick Message
@@ -709,14 +706,11 @@ void UiStyle::StyledMessage::style() const
     //case Message::Kill: FIXME
 
     case Message::Server:
-        //: Server Message
-        t = tr("%1").arg(txt); break;
+        t = QString("%1").arg(txt); break;
     case Message::Info:
-        //: Info Message
-        t = tr("%1").arg(txt); break;
+        t = QString("%1").arg(txt); break;
     case Message::Error:
-        //: Error Message
-        t = tr("%1").arg(txt); break;
+        t = QString("%1").arg(txt); break;
     case Message::DayChange:
     {
         //: Day Change Message
@@ -724,8 +718,7 @@ void UiStyle::StyledMessage::style() const
     }
         break;
     case Message::Topic:
-        //: Topic Message
-        t = tr("%1").arg(txt); break;
+        t = QString("%1").arg(txt); break;
     case Message::NetsplitJoin:
     {
         QStringList users = txt.split("#:#");
@@ -758,10 +751,9 @@ void UiStyle::StyledMessage::style() const
     }
     break;
     case Message::Invite:
-        //: Invite Message
-        t = tr("%1").arg(txt); break;
+        t = QString("%1").arg(txt); break;
     default:
-        t = tr("[%1]").arg(txt);
+        t = QString("[%1]").arg(txt);
     }
     _contents = UiStyle::styleString(t, UiStyle::formatType(type()));
 }
@@ -807,9 +799,9 @@ QString UiStyle::StyledMessage::decoratedSender() const
 {
     switch (type()) {
     case Message::Plain:
-        return tr("<%1>").arg(plainSender()); break;
+        return QString("<%1>").arg(plainSender()); break;
     case Message::Notice:
-        return tr("[%1]").arg(plainSender()); break;
+        return QString("[%1]").arg(plainSender()); break;
     case Message::Action:
         return "-*-"; break;
     case Message::Nick:
@@ -862,7 +854,7 @@ quint8 UiStyle::StyledMessage::senderHash() const
         if (chopCount < nick.size())
             nick.chop(chopCount);
     }
-    quint16 hash = qChecksum(nick.toAscii().data(), nick.toAscii().size());
+    quint16 hash = qChecksum(nick.toLatin1().data(), nick.toLatin1().size());
     return (_senderHash = (hash & 0xf) + 1);
 }