Changeset c81f30a in confclerk_git for src/gui/conflictsdialog.h


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/conflictsdialog.h

    rdc66a91 rc81f30a  
    2828    Q_OBJECT
    2929public:
    30     ConflictsDialog(int aEventId, QWidget *aParent = NULL);
     30    ConflictsDialog(int aEventId, int aConferenceId, QWidget *aParent = NULL);
    3131    ~ConflictsDialog();
    3232signals:
    33     void eventHasChanged(int aEventId, bool aReloadModel = false);
     33    void eventChanged(int aEventId, bool favouriteChanged);
    3434};
    3535
Note: See TracChangeset for help on using the changeset viewer.