# # # patch "src/view/dialogs/ChangesetBrowser.cpp" # from [37b2506331a987c5795e91e653d3309a4cb44215] # to [65ce06e79421562327de65c51f30824d09872b6e] # # patch "src/view/dialogs/KeyManagement.h" # from [1c8c59a3e48915e5486e582b3410c3fecc9340a2] # to [f9121cb1b7b400b9b5fd2da1d30fcc1f4d669fa4] # ============================================================ --- src/view/dialogs/ChangesetBrowser.cpp 37b2506331a987c5795e91e653d3309a4cb44215 +++ src/view/dialogs/ChangesetBrowser.cpp 65ce06e79421562327de65c51f30824d09872b6e @@ -22,7 +22,7 @@ ChangesetBrowser::ChangesetBrowser(QWidg #include "Settings.h" ChangesetBrowser::ChangesetBrowser(QWidget * parent, const DatabaseFile & db) - : Dialog(parent), databaseFile(db) + : Dialog(parent), databaseFile(db), branchModel(0) { setupUi(this); Dialog::init(); @@ -40,8 +40,6 @@ ChangesetBrowser::ChangesetBrowser(QWidg !tree ? tr("display branches as tree") : tr("display branches flat") ); - branchModel = 0; - initTreeWidget(); connect( ============================================================ --- src/view/dialogs/KeyManagement.h 1c8c59a3e48915e5486e582b3410c3fecc9340a2 +++ src/view/dialogs/KeyManagement.h f9121cb1b7b400b9b5fd2da1d30fcc1f4d669fa4 @@ -34,7 +34,6 @@ public: public: KeyManagement(QWidget *, const DatabaseFile &); ~KeyManagement(); - void contextMenuEvent(QContextMenuEvent *); public slots: void readKeys(); @@ -43,6 +42,7 @@ private: void generateKeypair(); private: + void contextMenuEvent(QContextMenuEvent *); Key * getKeyFromSelection() const; Keys * model;