projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Some small stuff, like adding semicolons to Qt macro defs in order to not
[quassel.git]
/
src
/
client
/
buffer.h
diff --git
a/src/client/buffer.h
b/src/client/buffer.h
index
2c361d3
..
68de96a
100644
(file)
--- a/
src/client/buffer.h
+++ b/
src/client/buffer.h
@@
-21,18
+21,14
@@
#ifndef _BUFFER_H_
#define _BUFFER_H_
#ifndef _BUFFER_H_
#define _BUFFER_H_
-#include <QtCore>
-
#include "global.h"
#include "global.h"
-#include "message.h"
-#include "quasselui.h"
+class AbstractUiMsg;
+class Message;
struct BufferState;
//!\brief Encapsulates the contents of a single channel, query or server status context.
struct BufferState;
//!\brief Encapsulates the contents of a single channel, query or server status context.
-/** A Buffer maintains a list of existing nicks and their status. New messages can be appended using
- * displayMsg(). A buffer displays its contents by way of a BufferWidget, which can be shown
- * (and created on demand) by calling showWidget().
+/** A Buffer maintains a list of existing nicks and their status.
*/
class Buffer : public QObject {
Q_OBJECT
*/
class Buffer : public QObject {
Q_OBJECT
@@
-49,7
+45,7
@@
class Buffer : public QObject {
NewMessage = 0x02,
Highlight = 0x40
};
NewMessage = 0x02,
Highlight = 0x40
};
- Q_DECLARE_FLAGS(ActivityLevel, Activity)
+ Q_DECLARE_FLAGS(ActivityLevel, Activity)
;
Type bufferType() const;
bool isActive() const;
Type bufferType() const;
bool isActive() const;
@@
-59,14
+55,14
@@
class Buffer : public QObject {
QString displayName() const;
BufferId bufferId() const;
QList<AbstractUiMsg *> contents() const;
QString displayName() const;
BufferId bufferId() const;
QList<AbstractUiMsg *> contents() const;
-
Var
Map nickList() const;
+
QVariant
Map nickList() const;
QString topic() const;
QString ownNick() const;
bool isStatusBuffer() const;
signals:
void userInput(const BufferId &, QString);
QString topic() const;
QString ownNick() const;
bool isStatusBuffer() const;
signals:
void userInput(const BufferId &, QString);
- void nickListChanged(
Var
Map nicks);
+ void nickListChanged(
QVariant
Map nicks);
void topicSet(QString topic);
void ownNickSet(QString ownNick);
void bufferUpdated(Buffer *);
void topicSet(QString topic);
void ownNickSet(QString ownNick);
void bufferUpdated(Buffer *);
@@
-83,10
+79,10
@@
class Buffer : public QObject {
bool layoutMsg();
void setTopic(QString);
//void setNicks(QStringList);
bool layoutMsg();
void setTopic(QString);
//void setNicks(QStringList);
- void addNick(QString nick,
Var
Map props);
+ void addNick(QString nick,
QVariant
Map props);
void renameNick(QString oldnick, QString newnick);
void removeNick(QString nick);
void renameNick(QString oldnick, QString newnick);
void removeNick(QString nick);
- void updateNick(QString nick,
Var
Map props);
+ void updateNick(QString nick,
QVariant
Map props);
void setOwnNick(QString nick);
void processUserInput(QString);
void setOwnNick(QString nick);
void processUserInput(QString);
@@
-96,7
+92,7
@@
class Buffer : public QObject {
bool active;
Type type;
bool active;
Type type;
-
Var
Map nicks;
+
QVariant
Map nicks;
QString _topic;
QString _ownNick;
QString _networkName, _bufferName;
QString _topic;
QString _ownNick;
QString _networkName, _bufferName;
@@
-106,6
+102,6
@@
class Buffer : public QObject {
QList<AbstractUiMsg *> layoutedMsgs;
};
QList<AbstractUiMsg *> layoutedMsgs;
};
-Q_DECLARE_OPERATORS_FOR_FLAGS(Buffer::ActivityLevel)
+Q_DECLARE_OPERATORS_FOR_FLAGS(Buffer::ActivityLevel)
#endif
#endif