projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Yearly copyright bump :)
[quassel.git]
/
src
/
core
/
coresession.h
diff --git
a/src/core/coresession.h
b/src/core/coresession.h
index
f8ada9a
..
22cfaf2
100644
(file)
--- a/
src/core/coresession.h
+++ b/
src/core/coresession.h
@@
-1,5
+1,5
@@
/***************************************************************************
/***************************************************************************
- * Copyright (C) 2005-0
8
by the Quassel Project *
+ * Copyright (C) 2005-0
9
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 *
@@
-28,8
+28,8
@@
#include "corealiasmanager.h"
#include "message.h"
#include "corealiasmanager.h"
#include "message.h"
-class BufferSyncer;
class CoreBacklogManager;
class CoreBacklogManager;
+class CoreBufferSyncer;
class CoreBufferViewManager;
class CoreIrcListHelper;
class Identity;
class CoreBufferViewManager;
class CoreIrcListHelper;
class Identity;
@@
-78,7
+78,8
@@
public slots:
//! Create an identity and propagate the changes to the clients.
/** \param identity The identity to be created.
*/
//! Create an identity and propagate the changes to the clients.
/** \param identity The identity to be created.
*/
- void createIdentity(const Identity &identity, const QVariantMap &additional = QVariantMap());
+ void createIdentity(const Identity &identity, const QVariantMap &additional);
+ void createIdentity(const CoreIdentity &identity);
//! Remove identity and propagate that fact to the clients.
/** \param identity The identity to be removed.
//! Remove identity and propagate that fact to the clients.
/** \param identity The identity to be removed.
@@
-95,17
+96,10
@@
public slots:
*/
void removeNetwork(NetworkId network);
*/
void removeNetwork(NetworkId network);
- //! Remove a buffer and it's backlog permanently
- /** \param bufferId The id of the buffer to be removed.
- * emits bufferRemoved(bufferId) on success.
- */
- void removeBufferRequested(BufferId bufferId);
-
//! Rename a Buffer for a given network
/* \param networkId The id of the network the buffer belongs to
* \param newName The new name of the buffer
* \param oldName The old name of the buffer
//! Rename a Buffer for a given network
/* \param networkId The id of the network the buffer belongs to
* \param newName The new name of the buffer
* \param oldName The old name of the buffer
- * emits bufferRenamed(bufferId, newName) on success.
*/
void renameBuffer(const NetworkId &networkId, const QString &newName, const QString &oldName);
*/
void renameBuffer(const NetworkId &networkId, const QString &newName, const QString &oldName);
@@
-135,8
+129,6
@@
signals:
void networkCreated(NetworkId);
void networkRemoved(NetworkId);
void networkCreated(NetworkId);
void networkRemoved(NetworkId);
- void bufferRemoved(BufferId);
- void bufferRenamed(BufferId, QString);
private slots:
void removeClient(QIODevice *dev);
private slots:
void removeClient(QIODevice *dev);
@@
-146,13
+138,13
@@
private slots:
void destroyNetwork(NetworkId);
void destroyNetwork(NetworkId);
- void storeBufferLastSeenMsg(BufferId buffer, const MsgId &msgId);
-
void scriptRequest(QString script);
void clientsConnected();
void clientsDisconnected();
void scriptRequest(QString script);
void clientsConnected();
void clientsDisconnected();
+ void updateIdentityBySender();
+
private:
void loadSettings();
void initScriptEngine();
private:
void loadSettings();
void initScriptEngine();
@@
-166,7
+158,7
@@
private:
// QHash<NetworkId, CoreNetwork *> _networksToRemove;
QHash<IdentityId, CoreIdentity *> _identities;
// QHash<NetworkId, CoreNetwork *> _networksToRemove;
QHash<IdentityId, CoreIdentity *> _identities;
- BufferSyncer *_bufferSyncer;
+
Core
BufferSyncer *_bufferSyncer;
CoreBacklogManager *_backlogManager;
CoreBufferViewManager *_bufferViewManager;
CoreIrcListHelper *_ircListHelper;
CoreBacklogManager *_backlogManager;
CoreBufferViewManager *_bufferViewManager;
CoreIrcListHelper *_ircListHelper;