diff options
| -rw-r--r-- | newmoviewizard.cpp | 6 | ||||
| -rw-r--r-- | newmoviewizard.h | 10 |
2 files changed, 8 insertions, 8 deletions
diff --git a/newmoviewizard.cpp b/newmoviewizard.cpp index a956e4b..79674dd 100644 --- a/newmoviewizard.cpp +++ b/newmoviewizard.cpp @@ -87,7 +87,7 @@ void NewMovieWizard::accept(){ } //now we have a series id, handle seriespart int partNo = field("seriesNo").toInt(); - QString subtitle = field("subtitle").toString(); + QString subtitle = field("subtitle").toString().toLower().trimmed(); QSqlQuery insertPartQ(db); insertPartQ.prepare("INSERT INTO seriesparts (iseries_id, iseriespart, tsubtitle) VALUES(:sid, :pid, :tsub)"); insertPartQ.bindValue(":sid", seriesId); @@ -133,11 +133,11 @@ void NewMovieWizard::accept(){ int type = fData.value(WizardTreeModel::FileType).toInt(); QVariant quality; QString oName, oMD5; - qint64 oSize, oldBitrate; + qint64 oSize = 0, oldBitrate = 0; bool hasOrigin = false; if(type == FT_MOVIE){ QVariantMap m = Helper::ffmpegData(fullPath); - secs = m.value("duration").toDouble(); + secs = static_cast<qint64>(m.value("duration").toDouble()); quality = field("quality").toInt(); //check for origin QModelIndex oIdx = wizardModel->index(0, 0, curIdx); diff --git a/newmoviewizard.h b/newmoviewizard.h index d2deda3..132ae4e 100644 --- a/newmoviewizard.h +++ b/newmoviewizard.h @@ -32,7 +32,7 @@ class MetadataEditorWidget; class NewMovieWizard : public QWizard { Q_OBJECT public: - explicit NewMovieWizard(QWidget *parent = 0); + explicit NewMovieWizard(QWidget *parent = nullptr); virtual void accept(); virtual void reject(); MovieInfoPage *infoPage() { return mInfoPage; } @@ -49,7 +49,7 @@ class NewMovieWizard : public QWizard { class MovieInfoPage : public QWizardPage { Q_OBJECT public: - explicit MovieInfoPage(QWidget *parent = 0); + explicit MovieInfoPage(QWidget *parent = nullptr); WizardTreeModel *model() { return mFileModel; } virtual void initializePage(); void addFile(const QString &file); @@ -97,7 +97,7 @@ class MovieInfoPage : public QWizardPage { class MovieMappingPage : public QWizardPage { Q_OBJECT public: - explicit MovieMappingPage(const QString &table, QWidget *parent = 0); + explicit MovieMappingPage(const QString &table, QWidget *parent = nullptr); MappingEditorWidget *widget() { return mWidget; } virtual void initializePage(); @@ -110,7 +110,7 @@ class MovieMappingPage : public QWizardPage { class MovieMetadataPage : public QWizardPage { Q_OBJECT public: - explicit MovieMetadataPage(QWidget *parent = 0); + explicit MovieMetadataPage(QWidget *parent = nullptr); MetadataEditorWidget *widget() { return mWidget; } virtual void initializePage(); @@ -128,7 +128,7 @@ class WizardTreeModel : public SmTreeModel { enum Fields { FileName = 0, FileSize = 1, FileType = 2, FilePart = 3, FullPath = 4 }; enum { NumFields = 5 }; enum Types { Movie = 1, FrontCover = 2, BackCover = 3, GeneralCover = 4, Origin = 5 }; - explicit WizardTreeModel(QStringList &headers, QObject *parent = 0); + explicit WizardTreeModel(QStringList &headers, QObject *parent = nullptr); //data + flags virtual QVariant data(const QModelIndex &index, int role) const; |