Fix some deprecation warnings
[mspang/inapt.git] / inapt.h
diff --git a/inapt.h b/inapt.h
index de97ae9..50bbd05 100644 (file)
--- a/inapt.h
+++ b/inapt.h
@@ -2,8 +2,16 @@
 #include <apt-pkg/pkgcache.h>
 
 struct inapt_conditional;
+struct inapt_package;
+
+struct inapt_action {
+    enum action_t { INSTALL, REMOVE } action;
+    std::vector<std::string> predicates;
+    std::vector<inapt_package *> packages;
+};
 
 struct inapt_package {
+    enum inapt_action::action_t action;
     std::vector<std::string> alternates;
     std::vector<std::string> predicates;
     pkgCache::PkgIterator pkg;
@@ -11,19 +19,19 @@ struct inapt_package {
     int linenum;
 };
 
-struct inapt_action {
-    enum action_t { INSTALL, REMOVE } action;
+struct inapt_profiles {
     std::vector<std::string> predicates;
-    std::vector<inapt_package *> packages;
+    std::vector<std::string> profiles;
 };
 
 struct inapt_block {
     std::vector<inapt_action *> actions;
     std::vector<inapt_conditional *> children;
+    std::vector<inapt_profiles *> profiles;
 };
 
 struct inapt_conditional {
-    const char *condition;
+    std::vector<std::string> predicates;
     struct inapt_block *then_block;
     struct inapt_block *else_block;
 };