diff options
| author | Saturneric <[email protected]> | 2021-07-14 18:01:59 +0000 |
|---|---|---|
| committer | Saturneric <[email protected]> | 2021-07-14 18:01:59 +0000 |
| commit | 74fc3e78aadec387f561811b496061440e70cf82 (patch) | |
| tree | b7cc8483042dff1dc6f5269095a17e1750009d3d /include/MainWindow.h | |
| parent | Merge from github/main. (diff) | |
| parent | Update documentation (diff) | |
| download | GpgFrontend-74fc3e78aadec387f561811b496061440e70cf82.tar.gz GpgFrontend-74fc3e78aadec387f561811b496061440e70cf82.zip | |
Merge branch 'develop' into main
# Conflicts:
# README.md
# docs/quick-start.md
Diffstat (limited to '')
| -rw-r--r-- | include/MainWindow.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/include/MainWindow.h b/include/MainWindow.h index 1137dfed..20f9a0b5 100644 --- a/include/MainWindow.h +++ b/include/MainWindow.h @@ -26,7 +26,6 @@ #define __GPGWIN_H__ #include "gpg/GpgConstants.h" -#include "ui/widgets/Attachments.h" #include "ui/KeyMgmt.h" #include "ui/widgets/TextEdit.h" #include "ui/FileEncryptionDialog.h" @@ -393,9 +392,8 @@ private: KeyList *mKeyList; InfoBoardWidget *infoBoard; - Attachments *mAttachments; /**< TODO */ - GpgME::GpgContext *mCtx; /**< TODO */ - KeyMgmt *keyMgmt; /**< TODO */ + GpgME::GpgContext *mCtx; + KeyMgmt *keyMgmt; KeyServerImportDialog *importDialog; /**< TODO */ QNetworkAccessManager *networkAccessManager; |