projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
minor code cleanup
[quassel.git]
/
src
/
uisupport
/
bufferview.cpp
diff --git
a/src/uisupport/bufferview.cpp
b/src/uisupport/bufferview.cpp
index
37d0be5
..
840f5d7
100644
(file)
--- a/
src/uisupport/bufferview.cpp
+++ b/
src/uisupport/bufferview.cpp
@@
-19,7
+19,6
@@
***************************************************************************/
#include "client.h"
***************************************************************************/
#include "client.h"
-//#include "buffer.h"
#include "bufferview.h"
#include "networkmodel.h"
#include "bufferview.h"
#include "networkmodel.h"
@@
-84,12
+83,14
@@
void BufferView::setModel(QAbstractItemModel *model) {
}
void BufferView::joinChannel(const QModelIndex &index) {
}
void BufferView::joinChannel(const QModelIndex &index) {
- BufferI
tem::Type bufferType = (BufferItem::Type)index.data(NetworkModel::BufferTypeRole).toInt
();
+ BufferI
nfo::Type bufferType = (BufferInfo::Type)index.data(NetworkModel::BufferTypeRole).value<int>
();
- if(bufferType != BufferI
tem::ChannelType
)
+ if(bufferType != BufferI
nfo::ChannelBuffer
)
return;
return;
+
+ BufferInfo bufferInfo = index.data(NetworkModel::BufferInfoRole).value<BufferInfo>();
- Client::
fakeInput(index.data(NetworkModel::BufferIdRole).value<BufferId>(), QString("/JOIN %1").arg(index.sibling(index.row(), 0).data().toString
()));
+ Client::
userInput(bufferInfo, QString("/JOIN %1").arg(bufferInfo.bufferName
()));
}
void BufferView::keyPressEvent(QKeyEvent *event) {
}
void BufferView::keyPressEvent(QKeyEvent *event) {