Merge remote-tracking branch 'remotes/origin/Develop' into archive_conflicts_2

1 files changed, 6 insertions, 3 deletions

diff --git a/src/downloadlist.h b/src/downloadlist.h
index e8833f0f..bf0cdc37 100644
--- a/src/downloadlist.h
+++ b/src/downloadlist.h
@@ -22,7 +22,6 @@ along with Mod Organizer.  If not, see <http://www.gnu.org/licenses/>.
 

 #include <QAbstractTableModel>

 

-

 class DownloadManager;

 

 

@@ -38,9 +37,9 @@ public:
 

   enum EColumn {

     COL_NAME = 0,

-    COL_FILETIME,

     COL_STATUS,

-    COL_SIZE

+    COL_SIZE,

+    COL_FILETIME

   };

 

 public:

@@ -53,6 +52,8 @@ public:
    **/

   explicit DownloadList(DownloadManager *manager, QObject *parent = 0);

 

+  void setMetaDisplay(bool metaDisplay);

+

   /**

    * @brief retrieve the number of rows to display. Invoked by Qt

    *

@@ -91,7 +92,9 @@ public slots:
 private:

 

   DownloadManager *m_Manager;

+  bool m_MetaDisplay;

 

+  QString sizeFormat(quint64 size) const;

 };

 

 #endif // DOWNLOADLIST_H