projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
uint -> NetworkId, uint -> BufferId almost everywhere. Conversion will be made explic...
[quassel.git]
/
src
/
client
/
networkmodel.cpp
diff --git
a/src/client/networkmodel.cpp
b/src/client/networkmodel.cpp
index
59485da
..
e3739ae
100644
(file)
--- a/
src/client/networkmodel.cpp
+++ b/
src/client/networkmodel.cpp
@@
-527,14
+527,14
@@
bool NetworkModel::dropMimeData(const QMimeData *data, Qt::DropAction action, in
if(targetType != BufferItem::QueryType)
return false;
if(targetType != BufferItem::QueryType)
return false;
- QList< QPair<
uint, uint
> > bufferList = mimeDataToBufferList(data);
+ QList< QPair<
NetworkId, BufferId
> > bufferList = mimeDataToBufferList(data);
// exactly one buffer has to be dropped
if(bufferList.count() != 1)
return false;
// exactly one buffer has to be dropped
if(bufferList.count() != 1)
return false;
-
uint
netId = bufferList.first().first;
-
uint
bufferId = bufferList.first().second;
+
NetworkId
netId = bufferList.first().first;
+
BufferId
bufferId = bufferList.first().second;
// no self merges (would kill us)
if(bufferId == parent.data(BufferIdRole).value<BufferId>())
// no self merges (would kill us)
if(bufferId == parent.data(BufferIdRole).value<BufferId>())