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

    rdc66a91 rc81f30a  
    2929public:
    3030    ConflictDialogContainer(QWidget *aParent);
    31     virtual ~ConflictDialogContainer(){}
     31    virtual ~ConflictDialogContainer() {}
    3232
    33     void setEventId(int aEventId) { mEventId = aEventId; }
     33public slots:
     34    void setEventId(int aEventId, int conferenceId);
     35    void loadEvents(); // update the conflicts
    3436
    3537protected:
    36     virtual void loadEvents( const QDate &aDate, const int aConferenceId );
    37 
    38 protected slots:
    39     virtual void updateTreeView(const QDate &aDate);
     38    virtual void loadEvents(const QDate &aDate, const int aConferenceId); // the date and conference are ignored
    4039
    4140private:
    4241    int mEventId;
     42    int mConferenceId;
    4343};
    4444
Note: See TracChangeset for help on using the changeset viewer.