Changeset c81f30a in confclerk_git for src/gui/tabcontainer.cpp


Ignore:
Timestamp:
10/17/11 21:04:20 (11 years ago)
Author:
Philipp Spitzer <philipp@…>
Branches:
master, qt5
Children:
1ca13ef
Parents:
dc66a91
Message:

The conflict editor works again.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • src/gui/tabcontainer.cpp

    rdc66a91 rc81f30a  
    7777void TabContainer::displayConflicts(const QModelIndex &aIndex)
    7878{
    79     ConflictsDialog dialog(static_cast<Event*>(aIndex.internalPointer())->id(),this);
     79    Event* event = static_cast<Event*>(aIndex.internalPointer());
     80    ConflictsDialog dialog(event->id(), event->conferenceId(), this);
    8081#ifdef N810
    8182    dialog.setFixedWidth(static_cast<QWidget*>(parent())->width());
Note: See TracChangeset for help on using the changeset viewer.