Simplified QKeccakHash and added self-test function.

[lamexp/LameXP.git] / src / Model_Progress.h

diff --git a/src/Model_Progress.h b/src/Model_Progress.h
index 43dc348..9e86877 100644 (file)
--- a/src/Model_Progress.h
+++ b/src/Model_Progress.h
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////
 // LameXP - Audio Encoder Front-End
-// Copyright (C) 2004-2011 LoRd_MuldeR <MuldeR2@GMX.de>
+// Copyright (C) 2004-2012 LoRd_MuldeR <MuldeR2@GMX.de>
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
@@ -25,7 +25,9 @@
 
 #include <QString>
 #include <QStringList>
-#include <QMap>
+#include <QHash>
+#include <QSet>
+#include <QUuid>
 #include <QIcon>
 #include <QUuid>
 
@@ -46,7 +48,8 @@ public:
                JobFailed = 3,
                JobSystem = 4,
                JobWarning = 5,
-               JobPerformance = 6
+               JobPerformance = 6,
+               JobSkipped = 7
        };
        enum SysMsgType
        {
@@ -62,8 +65,10 @@ public:
        QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const;
 
        //Public functions
-       const QStringList &getLogFile(const QModelIndex &index);
-       const QUuid &getJobId(const QModelIndex &index);
+       const QStringList &getLogFile(const QModelIndex &index) const;
+       const QUuid &getJobId(const QModelIndex &index) const;
+       const JobState getJobState(const QModelIndex &index) const;
+       const QIcon &ProgressModel::getIcon(ProgressModel::JobState state) const;
        void restoreHiddenItems(void);
 
 public slots:
@@ -75,10 +80,12 @@ public slots:
 private:
        QList<QUuid> m_jobList;
        QList<QUuid> m_jobListHidden;
-       QMap<QUuid, QString> m_jobName;
-       QMap<QUuid, QString> m_jobStatus;
-       QMap<QUuid, int> m_jobState;
-       QMap<QUuid, QStringList> m_jobLogFile;
+       QHash<QUuid, QString> m_jobName;
+       QHash<QUuid, QString> m_jobStatus;
+       QHash<QUuid, int> m_jobState;
+       QHash<QUuid, QStringList> m_jobLogFile;
+       QHash<QUuid, int> m_jobIndexCache;
+       QSet<QUuid> m_jobIdentifiers;
 
        const QIcon m_iconRunning;
        const QIcon m_iconPaused;
@@ -87,4 +94,9 @@ private:
        const QIcon m_iconSystem;
        const QIcon m_iconWarning;
        const QIcon m_iconPerformance;
+       const QIcon m_iconSkipped;
+       const QIcon m_iconUndefined;
+
+       const QStringList m_emptyList;
+       const QUuid m_emptyUuid;
 };