X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcommon%2Futil.h;h=36ef8139694005a1574dd2a933146d9c22463866;hp=0179723344055936d6e99e16eb1c4be0614b7a78;hb=6f0a3994d3dfd440746d396681f767bcb559f424;hpb=a762b470185f27dbca6d75e58a29e3a055b2969c

diff --git a/src/common/util.h b/src/common/util.h
index 01797233..36ef8139 100644
--- a/src/common/util.h
+++ b/src/common/util.h
@@ -1,11 +1,11 @@
 /***************************************************************************
- *   Copyright (C) 2005/06 by The Quassel Team                             *
+ *   Copyright (C) 2005/06 by the Quassel Project                          *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *
  *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
+ *   (at your option) version 3.                                           *
  *                                                                         *
  *   This program is distributed in the hope that it will be useful,       *
  *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
@@ -18,43 +18,40 @@
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
 
-#ifndef _UTIL_H_
-#define _UTIL_H_
+#ifndef UTIL_H
+#define UTIL_H
 
-#include <QIODevice>
+#include <QDir>
+#include <QLocale>
 #include <QVariant>
 #include <QString>
+#include <QMetaMethod>
 
+
+// TODO Use versions from Network instead
 QString nickFromMask(QString mask);
 QString userFromMask(QString mask);
 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.
  *  \param input The input string containing encoded data
- *  \param encoding The text encoding we assume if it's not utf8
+ *  \param codec The text codec we use if the input is not utf8
  *  \return The decoded string.
  */
-QString decodeString(QByteArray input, QString encoding = "ISO-8859-15");
-
-bool isChannelName(QString str);
+QString decodeString(const QByteArray &input, QTextCodec *codec = 0);
 
-/**
- *  Writes a QVariant to a device. The data item is prefixed with the resulting blocksize,
- *  so the corresponding function readDataFromDevice() can check if enough data is available
- *  at the device to reread the item.
- */
-void writeDataToDevice(QIODevice *, const QVariant &);
-
-/** Reads a data item from a device that has previously been written by writeDataToDevice().
- *  If not enough data bytes are available, the function returns false and the QVariant reference
- *  remains untouched.
- */
-bool readDataFromDevice(QIODevice *, quint32 &, QVariant &);
+uint editingDistance(const QString &s1, const QString &s2);
 
+QByteArray methodName(const QMetaMethod &method);
 
-uint editingDistance(const QString &s1, const QString &s2);
+QDir quasselDir();
 
+void loadTranslation(const QLocale &locale);
 
 #endif