Use a struct instead of QPair for chapters

Ideally, the conversion could be moved to the struct.

Author: tbertels

mainwindow.cpp

@@ -1901,7 +1901,7 @@ void MainWindow::disableChaptersMenus()
     ui->menuNavigateChapters->setEnabled(false);
 }
 
-void MainWindow::setChapters(QList<QPair<double, QString>> chapters)
+void MainWindow::setChapters(QList<Chapter> chapters)
 {
     positionSlider_->clearTicks();
     ui->menuNavigateChapters->clear();
@@ -1910,10 +1910,10 @@ void MainWindow::setChapters(QList<QPair<double, QString>> chapters)
         return;
     ui->menuNavigateChapters->setEnabled(true);
     int64_t index = 0;
-    for (const QPair<double,QString> &chapter : chapters) {
-        positionSlider_->setTick(chapter.first, chapter.second);
+    for (const Chapter &chapter : chapters) {
+        positionSlider_->setTick(chapter.time, chapter.title);
         QAction *action = new QAction(this);
-        action->setText(chapter.second);
+        action->setText(chapter.title);
         connect (action, &QAction::triggered, this, [this,index]() {
            emit chapterSelected(index);
         });

mainwindow.h

@@ -250,7 +250,7 @@ public slots:
     void setPlaybackState(PlaybackManager::PlaybackState state);
     void setPlaybackType(PlaybackManager::PlaybackType type);
     void disableChaptersMenus();
-    void setChapters(QList<QPair<double,QString>> chapters);
+    void setChapters(QList<Chapter> chapters);
     void setAudioTracks(QList<QPair<int64_t,QString>> tracks);
     void setVideoTracks(QList<QPair<int64_t,QString>> tracks);
     void setSubtitleTracks(QList<QPair<int64_t,QString>> tracks);

manager.cpp

@@ -1,8 +1,6 @@
 #include <QRegularExpression>
 #include "manager.h"
-#include "mpvwidget.h"
 #include "playlistwindow.h"
-#include "helpers.h"
 #include "logger.h"
 
 using namespace Helpers;
@@ -683,7 +681,7 @@ void PlaybackManager::checkAfterPlayback()
 
 void PlaybackManager::updateChapters()
 {
-    QList<QPair<double,QString>> list;
+    QList<Chapter> list;
 
     if (!chapters.isEmpty()) {
         for (QVariant &v : chapters) {
@@ -692,7 +690,7 @@ void PlaybackManager::updateChapters()
                     toDateFormatFixed(node["time"].toDouble(),
                                     timeShortMode ? Helpers::ShortFormat : Helpers::LongFormat),
                     node["title"].toString());
-            QPair<double,QString> item(node["time"].toDouble(), text);
+            Chapter item { node["time"].toDouble(), text };
             list.append(item);
         }
     }

manager.h

@@ -12,6 +12,7 @@
 #include <QSize>
 #include <QVariant>
 #include "helpers.h"
+#include "mpvwidget.h"
 
 class MpvObject;
 class PlaylistWindow;
@@ -57,7 +58,7 @@ class PlaybackManager : public QObject
     void fileClosed();
     void typeChanged(PlaybackManager::PlaybackType type);
     // Transmit a map of chapter index to time,description pairs
-    void chaptersAvailable(QList<QPair<double,QString>> chapters);
+    void chaptersAvailable(QList<Chapter> chapters);
     // These signals transmit a list of (id, description) pairs
     void audioTracksAvailable(QList<QPair<int64_t,QString>> tracks);
     void videoTracksAvailable(QList<QPair<int64_t,QString>> tracks);
@@ -222,7 +223,7 @@ private slots:
     QMap<int64_t,TrackData> videoListData;
     QMap<int64_t,TrackData> audioListData;
     QMap<int64_t,TrackData> subtitleListData;
-    QVariantList chapters = QVariantList();
+    QVariantList chapters;
 
     QStringList audioLangPref;
     QStringList subtitleLangPref;

mpvwidget.h

@@ -14,6 +14,11 @@
 #include "qthelper.hpp"
 #include "helpers.h"
 
+struct Chapter {
+    double time;
+    QString title;
+};
+
 class QLayout;
 class QMainWindow;
 class QThread;