Style changes. (Thanks Fred Emmott)

11 files changed, 31 insertions, 42 deletions

diff --git a/moviedirectoryselectorpage.h b/moviedirectoryselectorpage.h
index c7a8680..e42fa8e 100644
--- a/moviedirectoryselectorpage.h
+++ b/moviedirectoryselectorpage.h
@@ -2,17 +2,17 @@
 #define MOVIEDIRECTORYSELECTORPAGE_H
 
 #include <QWizardPage>
-
 class QLineEdit;
 class QFileDialog;
+
 class MovieDirectorySelectorPage : public QWizardPage
 {
 	Q_OBJECT
 public:
 	MovieDirectorySelectorPage(QWidget *parent = 0);
 private:
-	QLineEdit *m_directoryEdit;
 	bool isComplete() const;
+	QLineEdit *m_directoryEdit;
 private slots:
 	void showSelector();
 };
diff --git a/moviefileselectorpage.cpp b/moviefileselectorpage.cpp
index c5f91c6..6a038ba 100644
--- a/moviefileselectorpage.cpp
+++ b/moviefileselectorpage.cpp
@@ -12,11 +12,11 @@ MovieFileHolder::MovieFileHolder(QWidget *parent)
 {
 	//customize...
 }
-void MovieFileHolder::populate(QString directory)
+void MovieFileHolder::populate(const QString &directory)
 {
 	clear();
 	QDir dir(directory, QLatin1String("*.mp4"), QDir::Time, QDir::Files);
-	foreach(QFileInfo file, dir.entryInfoList()) {
+	foreach(const QFileInfo &file, dir.entryInfoList()) {
 		QString subtitlePath = file.canonicalFilePath().replace(QLatin1String(".mp4"), QLatin1String(".srt"));
 		if (!QFile(subtitlePath).exists()) {
 			QListWidgetItem *item = new QListWidgetItem;
diff --git a/moviefileselectorpage.h b/moviefileselectorpage.h
index 2788cb4..e36a37a 100644
--- a/moviefileselectorpage.h
+++ b/moviefileselectorpage.h
@@ -12,18 +12,17 @@ class MovieFileHolder : public QListWidget
 public:
 	MovieFileHolder(QWidget *parent = 0);
 	QStringList movieFile();
-	void populate(QString directory);
+	void populate(const QString &directory);
 };
-
 class MovieFileSelectorPage : public QWizardPage
 {
 	Q_OBJECT
 public:
 	MovieFileSelectorPage(QWidget *parent = 0);
 private:
-	MovieFileHolder *m_movieList;
 	void initializePage();
 	bool isComplete() const;
+	MovieFileHolder *m_movieList;
 };
 
 #endif // MOVIEFILESELECTORPAGE_H
diff --git a/subtitlebrowserpage.cpp b/subtitlebrowserpage.cpp
index ebc66fd..6fe016a 100644
--- a/subtitlebrowserpage.cpp
+++ b/subtitlebrowserpage.cpp
@@ -33,7 +33,7 @@ void SubtitleHolder::setSubtitleParser(SubtitleParser *parser)
 	m_label->setText(tr("<big><font color=green>Selected: %1.</font></big>").arg(parser->fileName()));
 	emit subtitleParserChanged();
 }
-void SubtitleHolder::setErrorMessage(QString error)
+void SubtitleHolder::setErrorMessage(const QString &error)
 {
 	m_label->setText(QString("<big><font color=red>%1</font></big>").arg(error));
 }
@@ -46,7 +46,8 @@ SubtitleParser* SubtitleHolder::subtitleParser() const
 	return m_subtitleParser;
 }
 SubtitleBrowserPage::SubtitleBrowserPage(QWidget *parent)
-		: QWizardPage(parent)
+		: QWizardPage(parent),
+		m_downloadReply(0)
 {
 	setTitle(tr("Subtitle Selection"));
 	setSubTitle(tr("Browse for the subtitle on the web"));
@@ -55,7 +56,6 @@ SubtitleBrowserPage::SubtitleBrowserPage(QWidget *parent)
 	registerField("subtitle*", m_subtitleHolder, "subtitleParser", SIGNAL(subtitleParserChanged()));
 	m_browser = new QWebView;
 	m_browser->page()->setForwardUnsupportedContent(true);
-	m_downloadReply = 0;
 	connect(m_browser->page()->networkAccessManager(), SIGNAL(finished(QNetworkReply*)), this, SLOT(subtitleDownloaded(QNetworkReply*)));
 	connect(m_browser->page(), SIGNAL(unsupportedContent(QNetworkReply*)), this, SLOT(subtitleRequested(QNetworkReply*)));
 	layout->addWidget(m_browser);
diff --git a/subtitlebrowserpage.h b/subtitlebrowserpage.h
index b4c2280..948d705 100644
--- a/subtitlebrowserpage.h
+++ b/subtitlebrowserpage.h
@@ -2,44 +2,37 @@
 #define SUBTITLEBROWSERPAGE_H
 
 #include <QWizardPage>
+class SubtitleParser;
 class QWebView;
 class QNetworkReply;
 class QLabel;
-class SubtitleParser;
 
 class SubtitleHolder : public QWidget
 {
 	Q_OBJECT
 	Q_PROPERTY(SubtitleParser* subtitleParser READ subtitleParser WRITE setSubtitleParser NOTIFY subtitleParserChanged)
-
 public:
 	SubtitleHolder(QWidget *parent = 0);
 	SubtitleParser* subtitleParser() const;
 	void setSubtitleParser(SubtitleParser *parser);
-	void setErrorMessage(QString error);
+	void setErrorMessage(const QString &error);
 	void setDownloading();
-
 private:
 	SubtitleParser *m_subtitleParser;
 	QLabel *m_label;
-
 signals:
 	void subtitleParserChanged();
 };
-
 class SubtitleBrowserPage : public QWizardPage
 {
 	Q_OBJECT
-
 public:
 	SubtitleBrowserPage(QWidget *parent = 0);
-
 private:
+	void initializePage();
 	QWebView *m_browser;
 	QNetworkReply *m_downloadReply;
 	SubtitleHolder *m_subtitleHolder;
-	void initializePage();
-
 private slots:
 	void subtitleRequested(QNetworkReply *reply);
 	void subtitleDownloaded(QNetworkReply *reply);
diff --git a/subtitleparser.cpp b/subtitleparser.cpp
index cca19b9..fd575ae 100644
--- a/subtitleparser.cpp
+++ b/subtitleparser.cpp
@@ -3,7 +3,7 @@
 #include <QString>
 #include <QStringList>
 
-Subtitle::Subtitle(QString text, quint64 start, quint64 stop)
+Subtitle::Subtitle(const QString &text, quint64 start, quint64 stop)
 {
 	m_text = text;
 	m_start = start;
@@ -45,7 +45,7 @@ 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);
 }
 
-SubtitleParser::SubtitleParser(QIODevice *toRead, QString fileName)
+SubtitleParser::SubtitleParser(QIODevice *toRead, const QString &fileName)
 {
 	m_fileName = fileName;
 	QTextStream reader(toRead);
@@ -67,7 +67,7 @@ SubtitleParser::SubtitleParser(QIODevice *toRead, QString fileName)
 	}
 	m_searchPosition = m_subtitles.constBegin();
 }
-quint64 SubtitleParser::parseTime(QString time)
+quint64 SubtitleParser::parseTime(const QString &time)
 {
 	QStringList split = time.split(':');
 	if (split.length() != 3)
@@ -109,7 +109,7 @@ QString SubtitleParser::subtitleAtTime(quint64 time)
 }
 void SubtitleParser::offsetTime(qint64 time)
 {
-	for (QLinkedList<Subtitle>::iterator i = m_subtitles.begin(); i != m_subtitles.end(); i++)
+	for (QLinkedList<Subtitle>::iterator i = m_subtitles.begin(); i != m_subtitles.end(); ++i)
 		i->offsetTime(time);
 }
 void SubtitleParser::writeOut(QIODevice *toWrite)
diff --git a/subtitleparser.h b/subtitleparser.h
index babfcc6..d694734 100644
--- a/subtitleparser.h
+++ b/subtitleparser.h
@@ -9,34 +9,34 @@
 class Subtitle
 {
 public:
-	Subtitle(QString text, quint64 start, quint64 stop);
+	Subtitle(const QString &text, quint64 start, quint64 stop);
 	bool isContainedIn(quint64 time) const;
 	void offsetTime(qint64 time);
 	QString text() const;
 	bool isAfter(quint64 time) const;
 	const QString toString() const;
 private:
+	const QString formatTime(quint64 time) const;
 	quint64 m_start;
 	quint64 m_stop;
 	qint64 m_offset;
 	QString m_text;
-	const QString formatTime(quint64 time) const;
 };
 class SubtitleParser
 {
 public:
-	SubtitleParser(QIODevice *toRead, QString fileName);
+	SubtitleParser(QIODevice *toRead, const QString &fileName);
 	void offsetTime(qint64 time);
+	void writeOut(QIODevice *toWrite);
 	QString fileName() const;
 	QString subtitleAtTime(quint64 time);
-	void writeOut(QIODevice *toWrite);
-
 private:
+	quint64 parseTime(const QString &time);
 	QLinkedList<Subtitle> m_subtitles;
-	quint64 parseTime(QString time);
 	QString m_fileName;
 	QLinkedList<Subtitle>::const_iterator m_searchPosition;
 
 };
 Q_DECLARE_METATYPE(SubtitleParser*)
+
 #endif // SUBTITLEPARSER_H
diff --git a/subtitlepreviewpage.cpp b/subtitlepreviewpage.cpp
index a284a13..636c88c 100644
--- a/subtitlepreviewpage.cpp
+++ b/subtitlepreviewpage.cpp
@@ -11,11 +11,11 @@
 #include <QDoubleSpinBox>
 
 SubtitlePreviewPage::SubtitlePreviewPage(QWidget *parent)
-		: QWizardPage(parent)
+		: QWizardPage(parent),
+		m_subtitleParser(0)
 {
 	setTitle(tr("Subtitle Preview"));
 	setSubTitle(tr("Test whether or not you've chosen the correct subtitles"));
-	m_subtitleParser = 0;
 	QVBoxLayout *layout = new QVBoxLayout;
 	m_videoPlayer = new Phonon::VideoPlayer(Phonon::VideoCategory, this);
 	m_videoPlayer->setVolume(1);
diff --git a/subtitlepreviewpage.h b/subtitlepreviewpage.h
index d9cb402..f2faef5 100644
--- a/subtitlepreviewpage.h
+++ b/subtitlepreviewpage.h
@@ -3,25 +3,23 @@
 
 #include <QWizardPage>
 #include <Phonon/VideoPlayer>
-
 class SubtitleParser;
 class QLabel;
 class QDoubleSpinBox;
+
 class SubtitlePreviewPage : public QWizardPage
 {
 	Q_OBJECT
 public:
 	SubtitlePreviewPage(QWidget *parent = 0);
-
 private:
-	SubtitleParser *m_subtitleParser;
 	void initializePage();
-	QLabel *m_subTitle;
-	Phonon::VideoPlayer *m_videoPlayer;
 	void cleanupPage();
 	bool validatePage();
+	SubtitleParser *m_subtitleParser;
+	QLabel *m_subTitle;
 	QDoubleSpinBox *m_offsetTime;
-
+	Phonon::VideoPlayer *m_videoPlayer;
 private slots:
 	void showSub(qint64 time);
 	void offsetSub(double timeOffset);
diff --git a/subtitlesavedpage.h b/subtitlesavedpage.h
index 8ef9d1b..6644b7f 100644
--- a/subtitlesavedpage.h
+++ b/subtitlesavedpage.h
@@ -2,8 +2,8 @@
 #define SUBTITLESAVEDPAGE_H
 
 #include <QWizardPage>
-
 class QLabel;
+
 class SubtitleSavedPage : public QWizardPage
 {
 	Q_OBJECT
diff --git a/subtitlewizard.h b/subtitlewizard.h
index fefd8e4..867fde2 100644
--- a/subtitlewizard.h
+++ b/subtitlewizard.h
@@ -1,14 +1,13 @@
 #ifndef SUBTITLEWIZARD_H
 #define SUBTITLEWIZARD_H
 
-#include <QWizard>
 #include "subtitlebrowserpage.h"
-
+#include <QWizard>
 class SubtitleBrowserPage;
+
 class SubtitleWizard : public QWizard
 {
 	Q_OBJECT
-
 public:
 	SubtitleWizard(QWidget *parent = 0);
 	QSize sizeHint() const;