projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Bump version.inc for release
[quassel.git]
/
src
/
common
/
util.h
diff --git
a/src/common/util.h
b/src/common/util.h
index
c7e89da
..
d7bac87
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
-2012 by the Quassel Project
*
* devel@quassel-irc.org *
* *
* This program is free software; you can redistribute it and/or modify *
* 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>
#define UTIL_H
#include <QDir>
-#include <QLocale>
#include <QVariant>
#include <QString>
#include <QMetaMethod>
#include <QVariant>
#include <QString>
#include <QMetaMethod>
@@
-37,6
+36,9
@@
bool isChannelName(QString str);
//! Strip mIRC format codes
QString stripFormatCodes(QString);
//! 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.
QString secondsToString(int timeInSeconds);
//! Take a string and decode it using the specified text codec, recognizing utf8.
@@
-50,10
+52,24
@@
QString decodeString(const QByteArray &input, QTextCodec *codec = 0);
uint editingDistance(const QString &s1, const QString &s2);
uint editingDistance(const QString &s1, const QString &s2);
-QByteArray methodName(const QMetaMethod &method);
+template<typename T>
+QVariantList toVariantList(const QList<T> &list) {
+ QVariantList variants;
+ for(int i = 0; i < list.count(); i++) {
+ variants << QVariant::fromValue<T>(list[i]);
+ }
+ return variants;
+}
-QDir quasselDir();
+template<typename T>
+QList<T> fromVariantList(const QVariantList &variants) {
+ QList<T> list;
+ for(int i = 0; i < variants.count(); i++) {
+ list << variants[i].value<T>();
+ }
+ return list;
+}
-
void loadTranslation(const QLocale &locale
);
+
QByteArray prettyDigest(const QByteArray &digest
);
#endif
#endif