fixing dupe channels / users in the client

[quassel.git] / src / common / util.h

diff --git a/src/common/util.h b/src/common/util.h
index 0b372b6..36ef813 100644 (file)
--- a/src/common/util.h
+++ b/src/common/util.h
@@ -18,11 +18,11 @@
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
 
-#ifndef _UTIL_H_
-#define _UTIL_H_
+#ifndef UTIL_H
+#define UTIL_H
 
 #include <QDir>
-#include <QIODevice>
+#include <QLocale>
 #include <QVariant>
 #include <QString>
 #include <QMetaMethod>
@@ -35,6 +35,8 @@ QString hostFromMask(QString mask);
 bool isChannelName(QString str);
 
 
+QString secondsToString(int timeInSeconds);
+
 //! Take a string and decode it using the specified text codec, recognizing utf8.
 /** This function takes a string and first checks if it is encoded in utf8, in which case it is
  *  decoded appropriately. Otherwise, the specified text codec is used to transform the string.
@@ -44,14 +46,12 @@ bool isChannelName(QString str);
  */
 QString decodeString(const QByteArray &input, QTextCodec *codec = 0);
 
-// NOTE: We have static copies of these in SignalProxy...
-//void writeDataToDevice(QIODevice *, const QVariant &);
-//bool readDataFromDevice(QIODevice *, quint32 &, QVariant &);
-
 uint editingDistance(const QString &s1, const QString &s2);
 
 QByteArray methodName(const QMetaMethod &method);
 
 QDir quasselDir();
 
+void loadTranslation(const QLocale &locale);
+
 #endif