1 files changed, 14 insertions, 17 deletions
diff --git a/src/ui/struct/GpgOperaResultContext.h b/src/ui/struct/GpgOperaResultContext.h
index 25a6ff28..526c1ef7 100644
--- a/src/ui/struct/GpgOperaResultContext.h
+++ b/src/ui/struct/GpgOperaResultContext.h
@@ -38,23 +38,9 @@ struct GpgOperaCategory {
   QStringList o_paths;
 };
 
-struct GpgOperaContext {
-  QContainer<OperaWaitingCb>& operas;
-  QContainer<GpgOperaResult>& opera_results;
-  GpgKeyList& keys;
-  GpgKeyList& singer_keys;
-  QStringList& unknown_fprs;
-  bool ascii;
-
-  QStringList paths;
-  QStringList o_paths;
-
-  GpgOperaContext(QContainer<OperaWaitingCb>& operas,
-                  QContainer<GpgOperaResult>& opera_results, GpgKeyList& keys,
-                  GpgKeyList& singer_keys, QStringList& unknown_fprs, bool ascii);
-};
+struct GpgOperaContext;
 
-struct GpgOperaContexts {
+struct GpgOperaContextBasement {
   QContainer<OperaWaitingCb> operas;
   QContainer<GpgOperaResult> opera_results;
   GpgKeyList keys;
@@ -71,8 +57,19 @@ struct GpgOperaContexts {
   auto GetAllPath() -> QStringList;
 
   auto GetAllOutPath() -> QStringList;
+};
+
+struct GpgOperaContext {
+  QSharedPointer<GpgOperaContextBasement> base;
 
-  auto GetContext(int category) -> QSharedPointer<GpgOperaContext>;
+  QStringList paths;
+  QStringList o_paths;
+
+  explicit GpgOperaContext(QSharedPointer<GpgOperaContextBasement> base);
 };
 
+auto GetGpgOperaContextFromBasement(
+    const QSharedPointer<GpgOperaContextBasement>& base,
+    int category) -> QSharedPointer<GpgOperaContext>;
+
 }  // namespace GpgFrontend::UI
 \ No newline at end of file