projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
SignalProxy will no longer attempt to deliver data types unknown to Qt's MetaSystem
[quassel.git]
/
src
/
common
/
bufferinfo.h
diff --git
a/src/common/bufferinfo.h
b/src/common/bufferinfo.h
index
8229363
..
5e2b5f2
100644
(file)
--- a/
src/common/bufferinfo.h
+++ b/
src/common/bufferinfo.h
@@
-1,5
+1,5
@@
/***************************************************************************
/***************************************************************************
- * Copyright (C) 2005-0
7 by the Quassel IRC Team
*
+ * Copyright (C) 2005-0
8 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 *
@@
-21,6
+21,7
@@
#define _BUFFERINFO_H_
#include <QtCore>
#define _BUFFERINFO_H_
#include <QtCore>
+#include "types.h"
class QString;
class QDataStream;
class QString;
class QDataStream;
@@
-28,10
+29,10
@@
class QDataStream;
class BufferInfo {
public:
BufferInfo();
class BufferInfo {
public:
BufferInfo();
- BufferInfo(
uint id, uint
networkid, uint gid = 0, QString net = QString(), QString buf = QString());
+ BufferInfo(
BufferId id, NetworkId
networkid, uint gid = 0, QString net = QString(), QString buf = QString());
- inline
uint
uid() const { return _id; }
- inline
uint
networkId() const { return _netid; }
+ inline
BufferId
uid() const { return _id; }
+ inline
NetworkId
networkId() const { return _netid; }
inline uint groupId() const { return _gid; }
inline QString network() const { return _networkName; }
QString buffer() const;
inline uint groupId() const { return _gid; }
inline QString network() const { return _networkName; }
QString buffer() const;
@@
-41,8
+42,8
@@
public:
inline bool operator==(const BufferInfo &other) const { return _id == other._id; }
private:
inline bool operator==(const BufferInfo &other) const { return _id == other._id; }
private:
-
uint
_id;
-
uint
_netid;
+
BufferId
_id;
+
NetworkId
_netid;
uint _gid;
QString _networkName; // WILL BE REMOVED
QString _bufferName;
uint _gid;
QString _networkName; // WILL BE REMOVED
QString _bufferName;