Don't log to stdout if --syslog and/or --logfile are specified

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

diff --git a/src/common/util.h b/src/common/util.h
index 28639ba..aee3499 100644 (file)
--- a/src/common/util.h
+++ b/src/common/util.h
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005/06 by the Quassel Project                          *
+ *   Copyright (C) 2005-2010 by the Quassel Project                        *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -22,7 +22,6 @@
 #define UTIL_H
 
 #include <QDir>
-#include <QLocale>
 #include <QVariant>
 #include <QString>
 #include <QMetaMethod>
@@ -37,6 +36,9 @@ bool isChannelName(QString str);
 //! Strip mIRC format codes
 QString stripFormatCodes(QString);
 
+//! Remove accelerator markers (&) from the string
+QString stripAcceleratorMarkers(const QString &);
+
 QString secondsToString(int timeInSeconds);
 
 //! Take a string and decode it using the specified text codec, recognizing utf8.
@@ -50,25 +52,6 @@ QString decodeString(const QByteArray &input, QTextCodec *codec = 0);
 
 uint editingDistance(const QString &s1, const QString &s2);
 
-QDir quasselDir();
-
-//! Returns a list of data directory paths
-/** There are several locations for applications to install their data files in. On Unix,
- *  a common location is /usr/share; others include $PREFIX/share and additional directories
- *  specified in the env variable XDG_DATA_DIRS.
- *  \return A list of directory paths to look for data files in
- */
-QStringList dataDirPaths();
-
-//! Searches for a data file in the possible data directories
-/** Data files can reside in $DATA_DIR/apps/quassel, where $DATA_DIR is one of the directories
- *  returned by \sa dataDirPaths().
- *  \return The full path to the data file if found; a null QString else
- */
-QString findDataFilePath(const QString &fileName);
-
-void loadTranslation(const QLocale &locale);
-
 template<typename T>
 QVariantList toVariantList(const QList<T> &list) {
   QVariantList variants;
@@ -87,4 +70,6 @@ QList<T> fromVariantList(const QVariantList &variants) {
   return list;
 }
 
+QByteArray prettyDigest(const QByteArray &digest);
+
 #endif