Added nicklist for QuasselTopia. Various cosmetic and visual fixes.

[quassel.git] / src / common / global.cpp

diff --git a/src/common/global.cpp b/src/common/global.cpp
index a0c94bb..6081953 100644 (file)
--- a/src/common/global.cpp
+++ b/src/common/global.cpp
@@ -18,12 +18,9 @@
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
 #include <QObject>
-#include <QStringList>
 
 #include "global.h"
 #include "logger.h"
-#include "message.h"
-#include "util.h"
 
 extern void messageHandler(QtMsgType type, const char *msg);
 
@@ -46,36 +43,6 @@ void Global::initIconMap() {
 }
 */
 
-/**************************************************************************************/
-
-
-
-BufferId::BufferId(uint _id, QString _net, QString _buf, uint _gid) : id(_id), gid(_gid), net(_net), buf(_buf) {
-
-
-}
-
-QString BufferId::buffer() const {
-  if(isChannelName(buf)) return buf;
-  else return nickFromMask(buf);
-}
-
-QDataStream &operator<<(QDataStream &out, const BufferId &bufferId) {
-  out << bufferId.id << bufferId.gid << bufferId.net.toUtf8() << bufferId.buf.toUtf8();
-}
-
-QDataStream &operator>>(QDataStream &in, BufferId &bufferId) {
-  QByteArray n, b;
-  BufferId i;
-  in >> bufferId.id >> bufferId.gid >> n >> b;
-  bufferId.net = QString::fromUtf8(n);
-  bufferId.buf = QString::fromUtf8(b);
-}
-
-uint qHash(const BufferId &bid) {
-  return qHash(bid.id);
-}
-
 /**
  * Retrieves an icon determined by its symbolic name. The mapping shall later
  * be performed by a theme manager or something like that.
@@ -90,4 +57,3 @@ uint qHash(const BufferId &bid) {
 //}
 
 Global::RunMode Global::runMode;
-QString Global::quasselDir;