From 816b84b7a4263c587c661e4c7178f3b6721e4cfe Mon Sep 17 00:00:00 2001 From: Arno Date: Sat, 15 Feb 2014 04:55:46 +0100 Subject: Replace ArchiveModel::FileType with #define These constants are used all over the place and aren't really specific to ArchiveModel, so use the preprocessor. --- archivebrowser.cpp | 6 +++--- archivebrowsermodel.cpp | 2 +- archivecontroller.cpp | 16 ++++++++-------- archivemodel.cpp | 6 +++--- archivemodel.h | 1 - newmoviewizard.cpp | 2 +- smglobals.cpp | 8 ++++---- smglobals.h | 6 ++++++ 8 files changed, 26 insertions(+), 21 deletions(-) diff --git a/archivebrowser.cpp b/archivebrowser.cpp index 8f715c8..ceabc1f 100644 --- a/archivebrowser.cpp +++ b/archivebrowser.cpp @@ -127,7 +127,7 @@ void ArchiveBrowser::moveToBurn() { QFileInfo current(child.data(ArchiveBrowserModel::FullPathRole).toString()); int type = child.data(ArchiveBrowserModel::FileTypeRole).toInt(); QString destination = QString("%1/%2").arg(burnDirS).arg(current.fileName()); - if(type == 1){ //movie + if(type == FT_MOVIE){ QFile::rename(current.absoluteFilePath(), destination); filesToUpdate << child.data(ArchiveBrowserModel::GenericIdRole).toInt(); }else{ @@ -175,10 +175,10 @@ void ArchiveBrowser::itemDoubleClicked(QModelIndex cur){ if(cur.data(ArchiveBrowserModel::NodeTypeRole).toInt() == ArchiveBrowserModel::FileNode){ int fileType = cur.data(ArchiveBrowserModel::FileTypeRole).toInt(); PictureViewer2 *picView = SmGlobals::instance()->pictureViewer(); - if(fileType == 1){ //movie + if(fileType == FT_MOVIE){ QPixmap pm = Helper::preview(cur.data(ArchiveBrowserModel::FullPathRole).toString()); picView->setPixmap(pm); - }else if(fileType == 2 || fileType == 3){ //pic + }else{ picView->setFile(cur.data(ArchiveBrowserModel::FullPathRole).toString()); } picView->show(); diff --git a/archivebrowsermodel.cpp b/archivebrowsermodel.cpp index ce81d1b..202a406 100644 --- a/archivebrowsermodel.cpp +++ b/archivebrowsermodel.cpp @@ -173,7 +173,7 @@ void ArchiveBrowserModel::populate(){ QList fileData; fileData << QVariant() << localFilesQ.value(0) << localFilesQ.value(4) << FileNode << localFilesQ.value(1) << localFilesQ.value(3) << localFilesQ.value(2) << Helper::createArchivePath(localFilesQ.value(0).toString(), localFilesQ.value(5).toString()) << false; totalSize += localFilesQ.value(1).toDouble(); - if(localFilesQ.value(2) == 1){ //this is a movie file, no need for another enum + if(localFilesQ.value(2) == FT_MOVIE){ int q = localFilesQ.value(3).toInt(); quality = q; if(!mAvailableQualities.contains(q)){ diff --git a/archivecontroller.cpp b/archivecontroller.cpp index 574b9c1..a7d0501 100644 --- a/archivecontroller.cpp +++ b/archivecontroller.cpp @@ -71,7 +71,7 @@ void ArchiveController::playSelectedFiles(){ QModelIndexList sel = mFileSelection->selectedRows(); QStringList files; foreach(QModelIndex i, sel){ - if(i.data(ArchiveFilesModel::FileTypeRole).toInt() == ArchiveFilesModel::Movie){ + if(i.data(ArchiveFilesModel::FileTypeRole).toInt() == FT_MOVIE){ QString fullPath = i.data(ArchiveFilesModel::FullPathRole).toString(); QFileInfo fi(fullPath); if(fi.exists()){ @@ -132,13 +132,13 @@ void ArchiveController::editFileType(){ if(ok && !item.isEmpty()){ int newType = 0; if(item == tr("Movie")){ - newType = ArchiveFilesModel::Movie; + newType = FT_MOVIE; }else if(item == tr("Front Cover")){ - newType = ArchiveFilesModel::FrontCover; + newType = FT_FRONTCOVER; }else if(item == tr("Back Cover")){ - newType = ArchiveFilesModel::BackCover; + newType = FT_BACKCOVER; }else if(item == tr("General Cover")){ - newType = ArchiveFilesModel::GeneralCover; + newType = FT_GENERALCOVER; } if(newType){ foreach(QModelIndex i, sel){ @@ -189,7 +189,7 @@ void ArchiveController::showPreview(){ QFileInfo fi(first); if(!fi.exists()){ pv->setFile(); - }else if(sel.first().data(ArchiveFilesModel::FileTypeRole).toInt() == ArchiveFilesModel::Movie){ + }else if(sel.first().data(ArchiveFilesModel::FileTypeRole).toInt() == FT_MOVIE){ qApp->setOverrideCursor(Qt::BusyCursor); QPixmap preview = Helper::preview(first); if(!preview.isNull()){ @@ -279,7 +279,7 @@ void ArchiveController::fileSelectionChanged(const QItemSelection &selected, con foreach(QModelIndex i, sel){ size += i.data(ArchiveFilesModel::SizeRole).toInt(); int type = i.data(ArchiveFilesModel::FileTypeRole).toInt(); - if(type == ArchiveFilesModel::Movie){ + if(type == FT_MOVIE){ int dur = i.data(ArchiveFilesModel::SizeDurRole).toInt(); duration += dur; if(dur == 0){ @@ -296,7 +296,7 @@ void ArchiveController::fileDoubleClicked(const QModelIndex &idx){ return; } int type = idx.data(ArchiveFilesModel::FileTypeRole).toInt(); - if(type == ArchiveFilesModel::Movie){ + if(type == FT_MOVIE){ QString fullPath = idx.data(ArchiveFilesModel::FullPathRole).toString(); QFileInfo fi(fullPath); if(!fi.exists()){ diff --git a/archivemodel.cpp b/archivemodel.cpp index 388833d..3fcd34e 100644 --- a/archivemodel.cpp +++ b/archivemodel.cpp @@ -486,7 +486,7 @@ void ArchiveModel::addCovers(int partId, const QStringList covers){ qint64 size = fi.size(); QString md5sum = Helper::md5Sum(c); QVariant picSize = Helper::picSize(c); - int type = ArchiveFilesModel::GeneralCover; + int type = FT_GENERALCOVER; QString archivedFile = Helper::moveToArchive(c, md5sum, true); if(archivedFile.isEmpty()){ //copy failed @@ -853,7 +853,7 @@ int ArchiveFilesModel::nextDvd() const{ } bool ArchiveFilesModel::isMovie(const QModelIndex &idx) const{ - return idx.data(FileTypeRole).toInt() == Movie; + return idx.data(FileTypeRole).toInt() == FT_MOVIE; } void ArchiveFilesModel::populate(const QSet &seriesPartIds){ @@ -886,7 +886,7 @@ void ArchiveFilesModel::populate(const QSet &seriesPartIds){ } QString fullPath = Helper::createArchivePath(data.at(Filename).toString(), data.at(Md5Sum).toString()); data << fullPath; - if(data.at(FileType).toInt() == Movie){ + if(data.at(FileType).toInt() == FT_MOVIE){ SmTreeItem *newItem = new SmTreeItem(data, movies); movies->appendChild(newItem); if((data.at(DvdNo).toInt() < 0) && (data.at(SizeDur) == 0)){ diff --git a/archivemodel.h b/archivemodel.h index 2985e55..e4cd571 100644 --- a/archivemodel.h +++ b/archivemodel.h @@ -92,7 +92,6 @@ class ArchiveFilesModel : public SmTreeModel { public: enum CustomRoles { ExpansionRole = Qt::UserRole + 1, SeriesPartIdRole = Qt::UserRole + 2, FilenameRole = Qt::UserRole + 3, Md5SumRole = Qt::UserRole + 4, SizeRole = Qt::UserRole + 5, DvdNoRole = Qt::UserRole + 6, FileTypeRole = Qt::UserRole + 7, FileNumberRole = Qt::UserRole + 8, QualityRole = Qt::UserRole + 9, FileIdRole = Qt::UserRole + 10, SizeDurRole = Qt::UserRole + 11, FullPathRole = Qt::UserRole + 12 }; enum Fields { Expansion = 0, SeriesPartId = 1, Filename = 2, Md5Sum = 3, Size = 4, DvdNo = 5, FileType = 6, FileNumber = 7, Quality = 8, FileId = 9, SizeDur = 10, FullPath = 11 }; - enum FileType { Movie = 1, FrontCover = 2, BackCover = 3, GeneralCover = 4 }; enum { NumFields = 12 }; explicit ArchiveFilesModel(const QStringList &headers, QObject *parent = 0); virtual QVariant data(const QModelIndex &index, int role) const; diff --git a/newmoviewizard.cpp b/newmoviewizard.cpp index 76a007d..a1ab2f3 100644 --- a/newmoviewizard.cpp +++ b/newmoviewizard.cpp @@ -125,7 +125,7 @@ void NewMovieWizard::accept(){ QString picSize; int type = fData.value(WizardTreeModel::FileType).toInt(); QVariant quality; - if(type == ArchiveFilesModel::Movie){ + if(type == FT_MOVIE){ QVariantMap m = Helper::ffmpegData(fullPath); secs = m.value("duration").toDouble(); quality = field("quality").toInt(); diff --git a/smglobals.cpp b/smglobals.cpp index e5c67f4..24a89bf 100644 --- a/smglobals.cpp +++ b/smglobals.cpp @@ -165,8 +165,8 @@ SmGlobals::SmGlobals() : mPictureViewer(0), mArchiveController(0){ mIcons.insert("Dick in a cage", ":/dick_in_cage.png"); mIcons.insert("Used tampon", ":/used_tampon.png"); mIcons.insert("Clean tampon", ":/clean_tampon.png"); - mFiletypeMap.insert(ArchiveFilesModel::Movie, tr("Movie")); - mFiletypeMap.insert(ArchiveFilesModel::FrontCover, tr("Front Cover")); - mFiletypeMap.insert(ArchiveFilesModel::BackCover, tr("Back Cover")); - mFiletypeMap.insert(ArchiveFilesModel::GeneralCover, tr("General Cover")); + mFiletypeMap.insert(FT_MOVIE, tr("Movie")); + mFiletypeMap.insert(FT_FRONTCOVER, tr("Front Cover")); + mFiletypeMap.insert(FT_BACKCOVER, tr("Back Cover")); + mFiletypeMap.insert(FT_GENERALCOVER, tr("General Cover")); } diff --git a/smglobals.h b/smglobals.h index e01a500..9bd6fd2 100644 --- a/smglobals.h +++ b/smglobals.h @@ -21,6 +21,12 @@ class ArchiveController; // this was: 4707319808 - 20 * 1024 *1024 #define DVDSIZE 4686348288 +// File type: used all over the place +#define FT_MOVIE 1 +#define FT_FRONTCOVER 2 +#define FT_BACKCOVER 3 +#define FT_GENERALCOVER 4 + class SmGlobals : public QObject { Q_OBJECT public: -- cgit v1.2.3-70-g09d2