[libcalamaresui] Unrelated typedef for JobList

7 years ago · 2d31e987c0
parent eed207ae2e
commit 2d31e987c0
20 changed files with 31 additions and 29 deletions
--- a/src/libcalamares/JobQueue.cpp
+++ b/src/libcalamares/JobQueue.cpp
@ -46,7 +46,7 @@ public:
 #endif
    }

-    void setJobs( const QList< job_ptr >& jobs )
+    void setJobs( const JobList& jobs )
    {
        m_jobs = jobs;
    }
@ -73,7 +73,7 @@ public:
    }

 private:
-    QList< job_ptr > m_jobs;
+    JobList m_jobs;
    JobQueue* m_queue;
    int m_jobIndex;

@ -164,7 +164,7 @@ JobQueue::enqueue( const job_ptr& job )


 void
-JobQueue::enqueue( const QList< job_ptr >& jobs )
+JobQueue::enqueue( const JobList& jobs )
 {
    Q_ASSERT( !m_thread->isRunning() );
    m_jobs.append( jobs );
--- a/src/libcalamares/JobQueue.h
+++ b/src/libcalamares/JobQueue.h
@ -42,11 +42,11 @@ public:
    GlobalStorage* globalStorage() const;

    void enqueue( const job_ptr& job );
-    void enqueue( const QList< job_ptr >& jobs );
+    void enqueue( const JobList& jobs );
    void start();

 signals:
-    void queueChanged( const QList< job_ptr >& jobs );
+    void queueChanged( const JobList& jobs );
    void progress( qreal percent, const QString& prettyName );
    void finished();
    void failed( const QString& message, const QString& details );
@ -54,7 +54,7 @@ signals:
 private:
    static JobQueue* s_instance;

-    QList< job_ptr > m_jobs;
+    JobList m_jobs;
    JobThread* m_thread;
    GlobalStorage* m_storage;
 };
--- a/src/libcalamares/Typedefs.h
+++ b/src/libcalamares/Typedefs.h
@ -19,6 +19,7 @@
 #ifndef TYPEDEFS_H
 #define TYPEDEFS_H

+#include <QList>
 #include <QSharedPointer>

 namespace Calamares
@ -26,6 +27,7 @@ namespace Calamares
 class Job;

 typedef QSharedPointer< Job > job_ptr;
+using JobList = QList< job_ptr >;

 enum ModuleAction : char
 {
--- a/src/libcalamaresui/ExecutionViewStep.cpp
+++ b/src/libcalamaresui/ExecutionViewStep.cpp
@ -148,10 +148,10 @@ ExecutionViewStep::onActivate()
 }


-QList< Calamares::job_ptr >
+JobList
 ExecutionViewStep::jobs() const
 {
-    return QList< Calamares::job_ptr >();
+    return JobList();
 }


--- a/src/libcalamaresui/ExecutionViewStep.h
+++ b/src/libcalamaresui/ExecutionViewStep.h
@ -52,7 +52,7 @@ public:

    void onActivate() override;

-    QList< job_ptr > jobs() const override;
+    JobList jobs() const override;

    void appendJobModuleInstanceKey( const QString& instanceKey );

--- a/src/libcalamaresui/modulesystem/CppJobModule.cpp
+++ b/src/libcalamaresui/modulesystem/CppJobModule.cpp
@ -75,10 +75,10 @@ CppJobModule::loadSelf()
 }


-QList< job_ptr >
+JobList
 CppJobModule::jobs() const
 {
-    return QList< job_ptr >() << m_job;
+    return JobList() << m_job;
 }


--- a/src/libcalamaresui/modulesystem/CppJobModule.h
+++ b/src/libcalamaresui/modulesystem/CppJobModule.h
@ -36,7 +36,7 @@ public:
    Interface interface() const override;

    void loadSelf() override;
-    QList< job_ptr > jobs() const override;
+    JobList jobs() const override;

 protected:
    void initFrom( const QVariantMap& moduleDescriptor ) override;
--- a/src/libcalamaresui/modulesystem/Module.h
+++ b/src/libcalamaresui/modulesystem/Module.h
@ -70,7 +70,6 @@ public:
        ProcessInterface,
        PythonQtInterface
    };
-    virtual ~Module();

    /**
     * @brief fromDescriptor creates a new Module object of the correct type.
@ -84,6 +83,7 @@ public:
                                   const QString& instanceId,
                                   const QString& configFileName,
                                   const QString& moduleDirectory );
+    virtual ~Module();

    /**
     * @brief name returns the name of this module.
@ -159,7 +159,7 @@ public:
     * @brief jobs returns any jobs exposed by this module.
     * @return a list of jobs (can be empty).
     */
-    virtual QList< job_ptr > jobs() const = 0;
+    virtual JobList jobs() const = 0;

    /**
     * @brief configurationMap returns the contents of the configuration file for
--- a/src/libcalamaresui/modulesystem/ProcessJobModule.cpp
+++ b/src/libcalamaresui/modulesystem/ProcessJobModule.cpp
@ -53,10 +53,10 @@ ProcessJobModule::loadSelf()
 }


-QList< job_ptr >
+JobList
 ProcessJobModule::jobs() const
 {
-    return QList< job_ptr >() << m_job;
+    return JobList() << m_job;
 }


--- a/src/libcalamaresui/modulesystem/ProcessJobModule.h
+++ b/src/libcalamaresui/modulesystem/ProcessJobModule.h
@ -34,7 +34,7 @@ public:
    Interface interface() const override;

    void loadSelf() override;
-    QList< job_ptr > jobs() const override;
+    JobList jobs() const override;

 protected:
    void initFrom( const QVariantMap& moduleDescriptor ) override;
--- a/src/libcalamaresui/modulesystem/PythonJobModule.cpp
+++ b/src/libcalamaresui/modulesystem/PythonJobModule.cpp
@ -53,10 +53,10 @@ PythonJobModule::loadSelf()
 }


-QList< job_ptr >
+JobList
 PythonJobModule::jobs() const
 {
-    return QList< job_ptr >() << m_job;
+    return JobList() << m_job;
 }


--- a/src/libcalamaresui/modulesystem/PythonJobModule.h
+++ b/src/libcalamaresui/modulesystem/PythonJobModule.h
@ -32,7 +32,7 @@ public:
    Interface interface() const override;

    void loadSelf() override;
-    QList< job_ptr > jobs() const override;
+    JobList jobs() const override;

 protected:
    void initFrom( const QVariantMap& moduleDescriptor ) override;
--- a/src/libcalamaresui/modulesystem/PythonQtViewModule.cpp
+++ b/src/libcalamaresui/modulesystem/PythonQtViewModule.cpp
@ -171,7 +171,7 @@ PythonQtViewModule::loadSelf()
 }


-QList< job_ptr >
+JobList
 PythonQtViewModule::jobs() const
 {
    return m_viewStep->jobs();
--- a/src/libcalamaresui/modulesystem/PythonQtViewModule.h
+++ b/src/libcalamaresui/modulesystem/PythonQtViewModule.h
@ -33,7 +33,7 @@ public:
    Interface interface() const override;

    void loadSelf() override;
-    QList< job_ptr > jobs() const override;
+    JobList jobs() const override;

 protected:
    void initFrom( const QVariantMap& moduleDescriptor ) override;
--- a/src/libcalamaresui/modulesystem/ViewModule.cpp
+++ b/src/libcalamaresui/modulesystem/ViewModule.cpp
@ -76,7 +76,7 @@ ViewModule::loadSelf()
 }


-QList< job_ptr >
+JobList
 ViewModule::jobs() const
 {
    return m_viewStep->jobs();
--- a/src/libcalamaresui/modulesystem/ViewModule.h
+++ b/src/libcalamaresui/modulesystem/ViewModule.h
@ -37,7 +37,7 @@ public:
    Interface interface() const override;

    void loadSelf() override;
-    QList< job_ptr > jobs() const override;
+    JobList jobs() const override;

 protected:
    void initFrom( const QVariantMap& moduleDescriptor ) override;
--- a/src/libcalamaresui/utils/DebugWindow.cpp
+++ b/src/libcalamaresui/utils/DebugWindow.cpp
@ -62,7 +62,7 @@ DebugWindow::DebugWindow()
    // JobQueue page
    jobQueueText->setReadOnly( true );
    connect( JobQueue::instance(), &JobQueue::queueChanged,
-             this, [ this ]( const QList< Calamares::job_ptr >& jobs )
+             this, [ this ]( const JobList& jobs )
    {
        QStringList text;
        for ( const auto &job : jobs )
--- a/src/libcalamaresui/viewpages/PythonQtViewStep.cpp
+++ b/src/libcalamaresui/viewpages/PythonQtViewStep.cpp
@ -159,10 +159,10 @@ PythonQtViewStep::isAtEnd() const
 }


-QList< Calamares::job_ptr >
+JobList
 PythonQtViewStep::jobs() const
 {
-    QList< Calamares::job_ptr > jobs;
+    JobList jobs;

    PythonQtObjectPtr jobsCallable = PythonQt::self()->lookupCallable( m_obj, "jobs" );
    if ( jobsCallable.isNull() )
--- a/src/libcalamaresui/viewpages/PythonQtViewStep.h
+++ b/src/libcalamaresui/viewpages/PythonQtViewStep.h
@ -46,7 +46,7 @@ public:
    bool isAtBeginning() const override;
    bool isAtEnd() const override;

-    QList< Calamares::job_ptr > jobs() const override;
+    JobList jobs() const override;

    void setConfigurationMap( const QVariantMap& configurationMap ) override;

--- a/src/libcalamaresui/viewpages/ViewStep.h
+++ b/src/libcalamaresui/viewpages/ViewStep.h
@ -91,7 +91,7 @@ public:
     */
    virtual void onLeave();

-    virtual QList< job_ptr > jobs() const = 0;
+    virtual JobList jobs() const = 0;

    void setModuleInstanceKey( const QString& instanceKey );
    QString moduleInstanceKey() const