Moved movieFile() into three seperate functions instead of returning QStringList (thanks Fred Emmott).

7 files changed, 34 insertions, 20 deletions

diff --git a/moviefileselectorpage.cpp b/moviefileselectorpage.cpp
index 6a038ba..6243cae 100644
--- a/moviefileselectorpage.cpp
+++ b/moviefileselectorpage.cpp
@@ -28,14 +28,20 @@ void MovieFileHolder::populate(const QString &directory)
 	}
 	emit itemSelectionChanged();
 }
-QStringList MovieFileHolder::movieFile()
+QString MovieFileHolder::movieFile() const
 {
-	QStringList list;
-	if (!currentItem()) return list;
-	list.append(currentItem()->text());
-	list.append(currentItem()->data(Qt::UserRole + 0).toString());
-	list.append(currentItem()->data(Qt::UserRole + 1).toString());
-	return list;
+	if (!currentItem()) return QString::null;
+	return currentItem()->data(Qt::UserRole + 0).toString();
+}
+QString MovieFileHolder::movieTitle() const
+{
+	if (!currentItem()) return QString::null;
+	return currentItem()->text();
+}
+QString MovieFileHolder::subtitleFile() const
+{
+	if (!currentItem()) return QString::null;
+	return currentItem()->data(Qt::UserRole + 1).toString();
 }
 MovieFileSelectorPage::MovieFileSelectorPage(QWidget *parent)
 		: QWizardPage(parent)
@@ -44,7 +50,9 @@ MovieFileSelectorPage::MovieFileSelectorPage(QWidget *parent)
 	setSubTitle(tr("Select the MP4 of the movie for which you'd like to find subtitles"));
 	QVBoxLayout *layout = new QVBoxLayout;
 	m_movieList = new MovieFileHolder;
-	registerField("movie*", m_movieList, "movieFile", SIGNAL(itemSelectionChanged()));
+	registerField("movieFile*", m_movieList, "movieFile", SIGNAL(itemSelectionChanged()));
+	registerField("movieTitle*", m_movieList, "movieTitle", SIGNAL(itemSelectionChanged()));
+	registerField("subtitleFile*", m_movieList, "subtitleFile", SIGNAL(itemSelectionChanged()));
 	layout->addWidget(m_movieList);
 	setLayout(layout);
 }
@@ -55,5 +63,5 @@ void MovieFileSelectorPage::initializePage()
 }
 bool MovieFileSelectorPage::isComplete() const
 {
-	return m_movieList->movieFile().length() == 3;
+	return !m_movieList->movieTitle().isNull();
 }
diff --git a/moviefileselectorpage.h b/moviefileselectorpage.h
index e36a37a..cee0665 100644
--- a/moviefileselectorpage.h
+++ b/moviefileselectorpage.h
@@ -8,10 +8,14 @@
 class MovieFileHolder : public QListWidget
 {
 	Q_OBJECT
-	Q_PROPERTY(QStringList movieFile READ movieFile NOTIFY currentItemChanged)
+	Q_PROPERTY(QString movieFile READ movieFile NOTIFY currentItemChanged)
+	Q_PROPERTY(QString movieTitle READ movieTitle NOTIFY currentItemChanged)
+	Q_PROPERTY(QString subtitleFile READ subtitleFile NOTIFY currentItemChanged)
 public:
 	MovieFileHolder(QWidget *parent = 0);
-	QStringList movieFile();
+	QString movieFile() const;
+	QString subtitleFile() const;
+	QString movieTitle() const;
 	void populate(const QString &directory);
 };
 class MovieFileSelectorPage : public QWizardPage
diff --git a/subtitlebrowserpage.cpp b/subtitlebrowserpage.cpp
index 6fe016a..a5548cf 100644
--- a/subtitlebrowserpage.cpp
+++ b/subtitlebrowserpage.cpp
@@ -65,7 +65,7 @@ SubtitleBrowserPage::SubtitleBrowserPage(QWidget *parent)
 void SubtitleBrowserPage::initializePage()
 {
 	m_subtitleHolder->setSubtitleParser(0);
-	m_browser->load(QUrl(QString("http://subscene.com/filmsearch.aspx?q=%1").arg(field("movie").toStringList().at(0))));
+	m_browser->load(QUrl(QString("http://subscene.com/filmsearch.aspx?q=%1").arg(field("movieTitle").toString())));
 }
 void SubtitleBrowserPage::subtitleRequested(QNetworkReply *reply)
 {
diff --git a/subtitleparser.cpp b/subtitleparser.cpp
index 066bf88..6527ae2 100644
--- a/subtitleparser.cpp
+++ b/subtitleparser.cpp
@@ -27,7 +27,7 @@ bool Subtitle::isAfter(quint64 time) const
 {
 	return (m_stop + m_offset) > time;
 }
-const QString Subtitle::formatTime(quint64 time) const
+QString Subtitle::formatTime(quint64 time) const
 {
 	quint64 hours = time / (1000 * 60 * 60);
 	quint64 leftover = time % (1000 * 60 * 60);
@@ -42,7 +42,7 @@ const QString Subtitle::formatTime(quint64 time) const
 			arg(seconds, 2, 10, zero).
 			arg(QString(QString::number(milliseconds) + QLatin1String("00")).left(3));
 }
-const QString Subtitle::toString() const
+QString Subtitle::toString() const
 {
 	return QString("%1 --> %2\n%3\n").arg(formatTime(m_start + m_offset)).arg(formatTime(m_stop + m_offset)).arg(m_text);
 }
diff --git a/subtitleparser.h b/subtitleparser.h
index d694734..a006761 100644
--- a/subtitleparser.h
+++ b/subtitleparser.h
@@ -14,9 +14,9 @@ public:
 	void offsetTime(qint64 time);
 	QString text() const;
 	bool isAfter(quint64 time) const;
-	const QString toString() const;
+	QString toString() const;
 private:
-	const QString formatTime(quint64 time) const;
+	QString formatTime(quint64 time) const;
 	quint64 m_start;
 	quint64 m_stop;
 	qint64 m_offset;
diff --git a/subtitlepreviewpage.cpp b/subtitlepreviewpage.cpp
index 636c88c..de3256f 100644
--- a/subtitlepreviewpage.cpp
+++ b/subtitlepreviewpage.cpp
@@ -52,7 +52,7 @@ SubtitlePreviewPage::SubtitlePreviewPage(QWidget *parent)
 void SubtitlePreviewPage::initializePage()
 {
 	m_subtitleParser = field("subtitle").value<SubtitleParser*>();
-	m_videoPlayer->play(field("movie").toStringList().at(1));
+	m_videoPlayer->play(field("movieFile").toString());
 	m_offsetTime->setValue(0);
 }
 void SubtitlePreviewPage::cleanupPage()
diff --git a/subtitlesavedpage.cpp b/subtitlesavedpage.cpp
index 695cffa..b9e1276 100644
--- a/subtitlesavedpage.cpp
+++ b/subtitlesavedpage.cpp
@@ -19,10 +19,12 @@ SubtitleSavedPage::SubtitleSavedPage(QWidget *parent)
 }
 void SubtitleSavedPage::initializePage()
 {
-	QStringList list = field("movie").toStringList();
-	QFile subFile(list.at(2));
+	QFile subFile(field("subtitleFile").toString());
 	subFile.open(QIODevice::WriteOnly | QIODevice::Text);
 	field("subtitle").value<SubtitleParser*>()->writeOut(&subFile);
 	subFile.close();
-	m_recap->setText(tr("The subtitle for %1 (%2) has been saved to %3.<br><br><i>To find subtitles for more movies, choose \"More Subtitles\".").arg(list.at(0)).arg(list.at(1)).arg(list.at(2)));
+	m_recap->setText(tr("The subtitle for %1 (%2) has been saved to %3.<br><br><i>To find subtitles for more movies, choose \"More Subtitles\".").
+					 arg(field("movieTitle").toString()).
+					 arg(field("movieFile").toString()).
+					 arg(field("subtitleFile").toString()));
 }