projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Call socketDisconnected() from socketStateChanged()
[quassel.git]
/
src
/
common
/
util.cpp
diff --git
a/src/common/util.cpp
b/src/common/util.cpp
index
45f99e9
..
a6acf58
100644
(file)
--- a/
src/common/util.cpp
+++ b/
src/common/util.cpp
@@
-1,5
+1,5
@@
/***************************************************************************
/***************************************************************************
- * Copyright (C) 2005-201
3
by the Quassel Project *
+ * Copyright (C) 2005-201
5
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 *
@@
-121,8
+121,8
@@
QString decodeString(const QByteArray &input, QTextCodec *codec)
//qDebug() << "Detected utf8:" << s;
return s;
}
//qDebug() << "Detected utf8:" << s;
return s;
}
- //QTextCodec *codec = QTextCodec::codecForName(encoding.to
Ascii
());
- if (!codec) return QString::from
Ascii
(input);
+ //QTextCodec *codec = QTextCodec::codecForName(encoding.to
Latin1
());
+ if (!codec) return QString::from
Latin1
(input);
return codec->toUnicode(input);
}
return codec->toUnicode(input);
}