Git-Mirrors/keepassxc
1
0
Fork 0
mirror of https://github.com/keepassxreboot/keepassxc.git synced 2025-08-06 21:44:32 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch '2.0'

Browse source
This commit is contained in:
Felix Geyer 2015-09-26 11:43:27 +02:00
commit 3b2a39fd38
16 changed files with 73 additions and 72 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/gui/group/GroupModel.cpp
View file

@ -357,7 +357,7 @@ QMimeData* GroupModel::mimeData(const QModelIndexList& indexes) const
return nullptr;
}
else {
data->setData(mimeTypes().first(), encoded);
data->setData(mimeTypes().at(0), encoded);
return data;
}
}

4
src/gui/group/GroupModel.h
View file

@ -33,8 +33,8 @@ public:
QModelIndex index(Group* group) const;
Group* groupFromIndex(const QModelIndex& index) const;
int rowCount(const QModelIndex& parent = QModelIndex()) const;
int columnCount(const QModelIndex& parent = QModelIndex()) const;
int rowCount(const QModelIndex& parent = QModelIndex()) const override;
int columnCount(const QModelIndex& parent = QModelIndex()) const override;
QModelIndex index(int row, int column, const QModelIndex& parent = QModelIndex()) const override;
QModelIndex parent(const QModelIndex& index) const override;
QVariant data(const QModelIndex& index, int role = Qt::DisplayRole) const override;

2
src/gui/group/GroupView.h
View file

@ -47,7 +47,7 @@ private Q_SLOTS:
void modelReset();
protected:
void dragMoveEvent(QDragMoveEvent* event);
void dragMoveEvent(QDragMoveEvent* event) Q_DECL_OVERRIDE;
private:
void recInitExpanded(Group* group);