feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Gerrit: Refactor preparing the introduction of a hierarchical model.

Browse Source 
Change model and dialog methods to use QModelIndex and remove
obsolete methods. Split out method to populate a list of standard items
from a change. Change GerritModel::itemForId() to recurse
over the tree.

Change-Id: I9393f498ffbdf63ba3ad78146d041bcda3835527
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
This commit is contained in:
Friedemann Kleint
2014-06-20 09:52:29 +02:00
parent d33b27e6d5
commit bb4031dccf
4 changed files with 89 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
src/plugins/git/gerrit/gerritdialog.cpp
View File

@@ -228,8 +228,9 @@ GerritDialog::~GerritDialog()
void GerritDialog::slotActivated(const QModelIndex &i)
{
if (const QStandardItem *item = itemAt(i))
QDesktopServices::openUrl(QUrl(m_model->change(item->row())->url));
const QModelIndex source = m_filterModel->mapToSource(i);
if (source.isValid())
QDesktopServices::openUrl(QUrl(m_model->change(source)->url));
}
void GerritDialog::slotRefreshStateChanged(bool v)
@@ -244,20 +245,23 @@ void GerritDialog::slotRefreshStateChanged(bool v)
void GerritDialog::slotFetchDisplay()
{
if (const QStandardItem *item = currentItem())
emit fetchDisplay(m_model->change(item->row()));
const QModelIndex index = currentIndex();
if (index.isValid())
emit fetchDisplay(m_model->change(index));
}
void GerritDialog::slotFetchCherryPick()
{
if (const QStandardItem *item = currentItem())
emit fetchCherryPick(m_model->change(item->row()));
const QModelIndex index = currentIndex();
if (index.isValid())
emit fetchCherryPick(m_model->change(index));
}
void GerritDialog::slotFetchCheckout()
{
if (const QStandardItem *item = currentItem())
emit fetchCheckout(m_model->change(item->row()));
const QModelIndex index = currentIndex();
if (index.isValid())
emit fetchCheckout(m_model->change(index));
}
void GerritDialog::slotRefresh()
@@ -268,22 +272,10 @@ void GerritDialog::slotRefresh()
m_treeView->sortByColumn(-1);
}
const QStandardItem *GerritDialog::itemAt(const QModelIndex &i, int column) const
{
if (i.isValid()) {
const QModelIndex source = m_filterModel->mapToSource(i);
if (source.isValid())
return m_model->item(source.row(), column);
}
return 0;
}
const QStandardItem *GerritDialog::currentItem(int column) const
QModelIndex GerritDialog::currentIndex() const
{
const QModelIndex index = m_treeView->selectionModel()->currentIndex();
if (index.isValid())
return itemAt(index, column);
return 0;
return index.isValid() ? m_filterModel->mapToSource(index) : QModelIndex();
}
void GerritDialog::updateButtons()
@@ -296,14 +288,8 @@ void GerritDialog::updateButtons()
void GerritDialog::slotCurrentChanged()
{
const QModelIndex current = m_treeView->selectionModel()->currentIndex();
const bool valid = current.isValid();
if (valid) {
const int row = m_filterModel->mapToSource(current).row();
m_detailsBrowser->setText(m_model->toHtml(row));
} else {
m_detailsBrowser->setText(QString());
}
const QModelIndex current = currentIndex();
m_detailsBrowser->setText(current.isValid() ? m_model->toHtml(current) : QString());
updateButtons();
}