1 files changed, 29 insertions, 12 deletions

diff --git a/src/libs/installer/packagemanagercore_p.h b/src/libs/installer/packagemanagercore_p.h
index f6e2b34dd..c0c55c4cc 100644
--- a/src/libs/installer/packagemanagercore_p.h
+++ b/src/libs/installer/packagemanagercore_p.h
@@ -1,6 +1,6 @@
 /**************************************************************************
 **
-** Copyright (C) 2023 The Qt Company Ltd.
+** Copyright (C) 2024 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the Qt Installer Framework.
@@ -54,11 +54,15 @@ using namespace KDUpdater;
 namespace QInstaller {
 
 struct BinaryLayout;
+struct AliasSource;
+class AliasFinder;
 class ScriptEngine;
 class ComponentModel;
+class ComponentAlias;
 class InstallerCalculator;
 class UninstallerCalculator;
 class RemoteFileEngineHandler;
+class ComponentSortFilterProxyModel;
 
 class PackageManagerCorePrivate : public QObject
 {
@@ -106,6 +110,7 @@ public:
     QString configurationFileName() const;
 
     bool buildComponentTree(QHash<QString, Component*> &components, bool loadScript);
+    bool buildComponentAliases();
 
     template <typename T>
     bool loadComponentScripts(const T &components, const bool postScript = false);
@@ -169,13 +174,11 @@ public:
         m_performedOperationsCurrentSession.clear();
     }
 
-    void unpackComponents(const QList<Component *> &components, double progressOperationSize,
-        bool adminRightsGained = false);
+    void unpackComponents(const QList<Component *> &components, double progressOperationSize);
 
-    void installComponent(Component *component, double progressOperationSize,
-        bool adminRightsGained = false);
+    void installComponent(Component *component, double progressOperationSize);
+    PackageManagerCore::Status fetchComponentsAndInstall(const QStringList& components);
 
-    bool runningProcessesFound();
     void setComponentSelection(const QString &id, Qt::CheckState state);
 
 signals:
@@ -188,8 +191,10 @@ signals:
 
 public:
     UpdateFinder *m_updateFinder;
+    AliasFinder *m_aliasFinder;
     QSet<PackageSource> m_packageSources;
     QSet<PackageSource> m_compressedPackageSources;
+    QSet<AliasSource> m_aliasSources;
     std::shared_ptr<LocalPackageHub> m_localPackageHub;
     QStringList m_filesForDelayedDeletion;
 
@@ -217,6 +222,8 @@ public:
     QList<QInstaller::Component*> m_updaterComponentsDeps;
     QList<QInstaller::Component*> m_updaterDependencyReplacements;
 
+    QHash<QString, QInstaller::ComponentAlias *> m_componentAliases;
+
     OperationList m_ownedOperations;
     OperationList m_performedOperationsOld;
     OperationList m_performedOperationsCurrentSession;
@@ -244,7 +251,7 @@ private slots:
 
 private:
     void unpackAndInstallComponents(const QList<Component *> &components,
-        const double progressOperationSize, const bool adminRightsGained);
+        const double progressOperationSize);
 
     void deleteMaintenanceTool();
     void deleteMaintenanceToolAlias();
@@ -257,24 +264,30 @@ private:
     void writeMaintenanceToolAppBundle(OperationList &performedOperations);
 
     void runUndoOperations(const OperationList &undoOperations, double undoOperationProgressSize,
-        bool adminRightsGained, bool deleteOperation);
+        bool deleteOperation);
 
     PackagesList remotePackages();
     LocalPackagesMap localInstalledPackages();
+    QList<ComponentAlias *> componentAliases();
+
     bool fetchMetaInformationFromRepositories(DownloadType type = DownloadType::All);
-    bool addUpdateResourcesFromRepositories(bool parseChecksum, bool compressedRepository = false);
+    bool addUpdateResourcesFromRepositories(bool compressedRepository = false);
     void processFilesForDelayedDeletion();
-    void findExecutablesRecursive(const QString &path, const QStringList &excludeFiles, QStringList *result);
-    QStringList runningInstallerProcesses(const QStringList &exludeFiles);
     bool calculateComponentsAndRun();
     bool acceptLicenseAgreements() const;
     bool askUserAcceptLicense(const QString &name, const QString &content) const;
+    bool acceptRejectCliQuery() const;
     bool askUserConfirmCommand() const;
     bool packageNeedsUpdate(const LocalPackage &localPackage, const Package *update) const;
     void commitPendingUnstableComponents();
     void createAutoDependencyHash(const QString &componentName, const QString &oldValue, const QString &newValue);
     void createLocalDependencyHash(const QString &componentName, const QString &dependencies);
-    void updateComponentCheckedState();
+    void updateComponentInstallActions();
+
+    bool enableAllCategories();
+    void enableRepositoryCategory(const RepositoryCategory &repoCategory, const bool enable);
+
+    bool installablePackagesFound(const QStringList& components);
 
     // remove once we deprecate isSelected, setSelected etc...
     void restoreCheckState();
@@ -286,6 +299,7 @@ private:
     TempPathDeleter m_tmpPathDeleter;
 
     bool m_updates;
+    bool m_aliases;
     bool m_repoFetched;
     bool m_updateSourcesAdded;
     qint64 m_magicBinaryMarker;
@@ -308,6 +322,7 @@ private:
 
     ComponentModel *m_defaultModel;
     ComponentModel *m_updaterModel;
+    ComponentSortFilterProxyModel *m_componentSortFilterProxyModel;
 
     QObject *m_guiObject;
     QScopedPointer<RemoteFileEngineHandler> m_remoteFileEngineHandler;
@@ -325,6 +340,8 @@ private:
     QHash<QString, QStringList > m_componentReplaces;
 
     QString m_datFileName;
+    bool m_allowCompressedRepositoryInstall;
+    int m_connectedOperations;
 };
 
 } // namespace QInstaller