Changeset c81f30a in confclerk_git for src/gui/conflictdialogcontainer.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/conflictdialogcontainer.cpp

    rdc66a91 rc81f30a  
    2222
    2323ConflictDialogContainer::ConflictDialogContainer(QWidget *aParent)
    24     : TabContainer( aParent )
    25 {
     24    : TabContainer( aParent ), mEventId(-1), mConferenceId(-1)
     25{}
     26
     27
     28void ConflictDialogContainer::setEventId(int aEventId, int conferenceId) {
     29    mEventId = aEventId;
     30    mConferenceId = conferenceId;
     31    loadEvents();
    2632}
    2733
    28 void ConflictDialogContainer::loadEvents( const QDate &aDate, const int aConferenceId )
    29 {
    30     Q_UNUSED(aDate);
    3134
    32     static_cast<EventModel*>(treeView->model())->loadConflictEvents( mEventId, aConferenceId );
    33 }
    34 
    35 void ConflictDialogContainer::updateTreeView(const QDate &aDate)
    36 {
    37     TabContainer::updateTreeView(aDate);
     35void ConflictDialogContainer::loadEvents() {
     36    static_cast<EventModel*>(treeView->model())->loadConflictEvents(mEventId, mConferenceId);
    3837    treeView->setAllExpanded(true);
    3938}
    4039
     40
     41void ConflictDialogContainer::loadEvents(const QDate &aDate, const int aConferenceId) {
     42    Q_UNUSED(aDate);
     43    Q_ASSERT(aConferenceId == mConferenceId);
     44    Q_ASSERT(mConferenceId > 0);
     45    Q_ASSERT(mEventId > 0);
     46    loadEvents();
     47}
     48
     49
Note: See TracChangeset for help on using the changeset viewer.