napcok/calamares
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Namespace fixage.

Browse Source
This commit is contained in:
Teo Mrnjavac 2015-09-09 18:59:31 +02:00
parent 9042616a8a
commit 9cb4e60b31
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/libcalamares/Job.cpp
View File

@ -22,7 +22,7 @@ namespace Calamares
{ {
Calamares::JobResult::operator bool() const JobResult::operator bool() const
{ {
return m_ok; return m_ok;
} }

6
src/libcalamares/JobQueue.cpp
View File

@ -46,7 +46,7 @@ public:
#endif #endif
} }
void setJobs( const QList< Calamares::job_ptr >& jobs ) void setJobs( const QList< job_ptr >& jobs )
{ {
m_jobs = jobs; m_jobs = jobs;
} }
@ -73,7 +73,7 @@ public:
} }
private: private:
QList< Calamares::job_ptr > m_jobs; QList< job_ptr > m_jobs;
JobQueue* m_queue; JobQueue* m_queue;
int m_jobIndex; int m_jobIndex;
@ -155,7 +155,7 @@ JobQueue::start()
void void
JobQueue::enqueue( const Calamares::job_ptr& job ) JobQueue::enqueue( const job_ptr& job )
{ {
Q_ASSERT( !m_thread->isRunning() ); Q_ASSERT( !m_thread->isRunning() );
m_jobs.append( job ); m_jobs.append( job );

8
src/libcalamares/JobQueue.h
View File

@ -41,12 +41,12 @@ public:
GlobalStorage* globalStorage() const; GlobalStorage* globalStorage() const;
void enqueue( const Calamares::job_ptr& job ); void enqueue( const job_ptr& job );
void enqueue( const QList< Calamares::job_ptr >& jobs ); void enqueue( const QList< job_ptr >& jobs );
void start(); void start();
signals: signals:
void queueChanged( const QList< Calamares::job_ptr >& jobs ); void queueChanged( const QList< job_ptr >& jobs );
void progress( qreal percent, const QString& prettyName ); void progress( qreal percent, const QString& prettyName );
void finished(); void finished();
void failed( const QString& message, const QString& details ); void failed( const QString& message, const QString& details );
@ -54,7 +54,7 @@ signals:
private: private:
static JobQueue* s_instance; static JobQueue* s_instance;
QList< Calamares::job_ptr > m_jobs; QList< job_ptr > m_jobs;
JobThread* m_thread; JobThread* m_thread;
GlobalStorage* m_storage; GlobalStorage* m_storage;
}; };