Changeset 83020cd for src


Ignore:
Timestamp:
01/28/10 15:59:37 (12 years ago)
Author:
pavelpa <pavelpa@…>
Branches:
master, qt5
Children:
bcf67d6
Parents:
872aeaa
Message:

forgotten in previous commit

Location:
src/gui
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • src/gui/conflictsdialog.cpp

    r872aeaa r83020cd  
    55{
    66    setupUi(this);
    7     connect(container, SIGNAL(eventHasChanged(int)), this, SIGNAL(eventHasChanged(int)));
    8     connect(container, SIGNAL(eventHasChanged(int)), container, SLOT(updateTreeViewModel(int)));
     7    connect(container, SIGNAL(eventHasChanged(int,bool)), this, SIGNAL(eventHasChanged(int,bool)));
     8    connect(container, SIGNAL(eventHasChanged(int,bool)), container, SLOT(updateTreeViewModel(int,bool)));
    99
    1010    container->setEventId(aEventId);
     
    1818ConflictsDialog::~ConflictsDialog()
    1919{
    20     disconnect(container, SIGNAL(eventHasChanged(int)), this, SIGNAL(eventHasChanged(int)));
     20    disconnect(container, SIGNAL(eventHasChanged(int,bool)), this, SIGNAL(eventHasChanged(int,bool)));
    2121}
    2222
  • src/gui/conflictsdialog.h

    r872aeaa r83020cd  
    1212    ~ConflictsDialog();
    1313signals:
    14     void eventHasChanged(int aEventId);
     14    void eventHasChanged(int aEventId, bool aReloadModel = false);
    1515};
    1616
Note: See TracChangeset for help on using the changeset viewer.