X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=main%2Futil.cpp;h=b86525325cc0808dff99d8de7df14a0bd282f5c4;hp=71c19132941a0f12ccdc8c59de52cedf6b1d24c0;hb=7a2708fff6cff5329002a3a16da266be51f1a3a1;hpb=04e21ce26ebabdde9586ca9d2a3168431e448df5

diff --git a/main/util.cpp b/main/util.cpp
index 71c19132..b8652532 100644
--- a/main/util.cpp
+++ b/main/util.cpp
@@ -22,10 +22,30 @@
 
 #include <QtCore>
 
+QString nickFromMask(QString mask) {
+  return mask.section('!', 0, 0);
+}
+
+QString userFromMask(QString mask) {
+  QString userhost = mask.section('!', 1);
+  if(userhost.isEmpty()) return QString();
+  return userhost.section('@', 0, 0);
+}
+
+QString hostFromMask(QString mask) {
+  QString userhost = mask.section('!', 1);
+  if(userhost.isEmpty()) return QString();
+  return userhost.section('@', 1);
+}
+
+bool isChannelName(QString str) {
+  return QString("#&!+").contains(str[0]);
+}
+
 void writeDataToDevice(QIODevice *dev, const QVariant &item) {
   QByteArray block;
   QDataStream out(&block, QIODevice::WriteOnly);
-  out.setVersion(QDataStream::Qt_4_1);
+  out.setVersion(QDataStream::Qt_4_2);
   out << (quint32)0 << item;
   out.device()->seek(0);
   out << (quint32)(block.size() - sizeof(quint32));
@@ -34,7 +54,7 @@ void writeDataToDevice(QIODevice *dev, const QVariant &item) {
 
 bool readDataFromDevice(QIODevice *dev, quint32 &blockSize, QVariant &item) {
   QDataStream in(dev);
-  in.setVersion(QDataStream::Qt_4_1);
+  in.setVersion(QDataStream::Qt_4_2);
 
   if(blockSize == 0) {
     if(dev->bytesAvailable() < (int)sizeof(quint32)) return false;