From a1d8412143397c40d63fea00c8742f8d9cf2e74c Mon Sep 17 00:00:00 2001 From: birkeh Date: Mon, 12 Nov 2018 16:44:13 +0100 Subject: [PATCH] minor changes --- cartist.h | 8 +- cdiscover.cpp | 2 +- cepisode.cpp | 22 ++--- cepisode.h | 37 +++---- cfanart.cpp | 4 +- cfanart.h | 9 +- cmainwindow.cpp | 228 +++++++++++++++++++++----------------------- cmainwindow.h | 2 +- cmovie.h | 1 + cmoviediscover.cpp | 2 +- cmoviesearch.cpp | 4 +- cmoviesearch.h | 4 +- cpicturesthread.cpp | 2 +- csearch.cpp | 2 +- csearch.h | 4 +- cseason.cpp | 36 +++---- cseason.h | 16 ++-- cseasondelegate.cpp | 4 +- cserie.cpp | 44 ++++----- cserie.h | 52 +++++----- csplashscreen.cpp | 35 +++++++ csplashscreen.h | 26 +++++ cthemoviedbv3.cpp | 44 ++++----- cthemoviedbv3.h | 8 +- main.cpp | 14 ++- qtMultimediaDB.pro | 6 +- 26 files changed, 342 insertions(+), 274 deletions(-) create mode 100644 csplashscreen.cpp create mode 100644 csplashscreen.h diff --git a/cartist.h b/cartist.h index d56c40c..0a39aca 100644 --- a/cartist.h +++ b/cartist.h @@ -84,9 +84,9 @@ private: QString m_szArtistAlernate; QString m_szLabel; qint32 m_iLabelID; - qint16 m_iFormedYear; - qint16 m_iBornYear; - qint16 m_iDiedYear; + qint32 m_iFormedYear; + qint32 m_iBornYear; + qint32 m_iDiedYear; QString m_szDisbanded; QString m_szStyle; QString m_szGenre; @@ -96,7 +96,7 @@ private: QString m_szTwitter; QString m_szBiography; QString m_szGender; - qint16 m_iMembers; + qint32 m_iMembers; QString m_szCountry; QString m_szCountryCode; QString m_szArtistThumb; diff --git a/cdiscover.cpp b/cdiscover.cpp index 6f25e09..d24a97c 100644 --- a/cdiscover.cpp +++ b/cdiscover.cpp @@ -69,7 +69,7 @@ void cDiscover::spanChanged(int lower, int upper) void cDiscover::on_m_lpDiscover_clicked() { QString szText = ui->m_lpText->text(); - qint16 iYear = ui->m_lpYear->value(); + qint32 iYear = ui->m_lpYear->value(); qreal voteMin = (qreal)ui->m_lpVoting->lowerValue()/10; qreal voteMax = (qreal)ui->m_lpVoting->upperValue()/10; diff --git a/cepisode.cpp b/cepisode.cpp index 8795fa5..48934ac 100644 --- a/cepisode.cpp +++ b/cepisode.cpp @@ -2,7 +2,7 @@ #include "common.h" -#define DELETE(x) { if(x) delete x;x = 0;} +#define DELETE(x) { if(x) delete x;x = nullptr;} cEpisode::cEpisode() : m_iID(-1), @@ -54,12 +54,12 @@ QString cEpisode::name() return(m_szName); } -void cEpisode::setEpisodeNumber(const qint16& iEpisodeNumber) +void cEpisode::setEpisodeNumber(const qint32& iEpisodeNumber) { m_iEpisodeNumber = iEpisodeNumber; } -qint16 cEpisode::episodeNumber() +qint32 cEpisode::episodeNumber() { return(m_iEpisodeNumber); } @@ -114,12 +114,12 @@ QString cEpisode::productionCode() return(m_szProductionCode); } -void cEpisode::setSeasonNumber(const qint16& iSeasonNumber) +void cEpisode::setSeasonNumber(const qint32& iSeasonNumber) { m_iSeasonNumber = iSeasonNumber; } -qint16 cEpisode::seasonNumber() +qint32 cEpisode::seasonNumber() { return(m_iSeasonNumber); } @@ -164,12 +164,12 @@ qreal cEpisode::voteAverage() return(m_dVoteAverage); } -void cEpisode::setVoteCount(const qint16& iVoteCount) +void cEpisode::setVoteCount(const qint32& iVoteCount) { m_iVoteCount = iVoteCount; } -qint16 cEpisode::voteCount() +qint32 cEpisode::voteCount() { return(m_iVoteCount); } @@ -238,22 +238,22 @@ QString cEpisode::fileName() return(m_szFileName); } -void cEpisode::setThumbHeight(const qint16& iThumbHeight) +void cEpisode::setThumbHeight(const qint32& iThumbHeight) { m_iThumbHeight = iThumbHeight; } -qint16 cEpisode::thumbHeight() +qint32 cEpisode::thumbHeight() { return(m_iThumbHeight); } -void cEpisode::setThumbWidth(const qint16& iThumbWidth) +void cEpisode::setThumbWidth(const qint32& iThumbWidth) { m_iThumbWidth = iThumbWidth; } -qint16 cEpisode::thumbWidth() +qint32 cEpisode::thumbWidth() { return(m_iThumbWidth); } diff --git a/cepisode.h b/cepisode.h index 1d2eddb..704877d 100644 --- a/cepisode.h +++ b/cepisode.h @@ -76,14 +76,14 @@ public: \fn setEpisodeNumber \param iEpisodeNumber */ - void setEpisodeNumber(const qint16& iEpisodeNumber); + void setEpisodeNumber(const qint32& iEpisodeNumber); /*! \brief \fn episodeNumber - \return qint16 + \return qint32 */ - qint16 episodeNumber(); + qint32 episodeNumber(); /*! \brief @@ -165,14 +165,14 @@ public: \fn setSeasonNumber \param iSeasonNumber */ - void setSeasonNumber(const qint16& iSeasonNumber); + void setSeasonNumber(const qint32& iSeasonNumber); /*! \brief \fn seasonNumber - \return qint16 + \return qint32 */ - qint16 seasonNumber(); + qint32 seasonNumber(); /*! \brief @@ -240,14 +240,14 @@ public: \fn setVoteCount \param iVoteCount */ - void setVoteCount(const qint16& iVoteCount); + void setVoteCount(const qint32& iVoteCount); /*! \brief \fn voteCount - \return qint16 + \return qint32 */ - qint16 voteCount(); + qint32 voteCount(); /*! \brief @@ -307,14 +307,14 @@ public: \fn setThumbHeight \param iThumbHeight */ - void setThumbHeight(const qint16& iThumbHeight); + void setThumbHeight(const qint32& iThumbHeight); /*! \brief \fn thumbHeight - \return qint16 + \return qint32 */ - qint16 thumbHeight(); + qint32 thumbHeight(); /*! \brief @@ -322,14 +322,14 @@ public: \fn setThumbWidth \param iThumbWidth */ - void setThumbWidth(const qint16& iThumbWidth); + void setThumbWidth(const qint32& iThumbWidth); /*! \brief \fn thumbWidth - \return qint16 + \return qint32 */ - qint16 thumbWidth(); + qint32 thumbWidth(); /*! \brief @@ -390,17 +390,17 @@ public: private: qint32 m_iID; /*!< TODO: describe */ QString m_szName; /*!< TODO: describe */ - qint16 m_iEpisodeNumber; /*!< TODO: describe */ + qint32 m_iEpisodeNumber; /*!< TODO: describe */ QDate m_airDate; /*!< TODO: describe */ QStringList m_szGuestStars; /*!< TODO: describe */ QString m_szOverview; /*!< TODO: describe */ QString m_szProductionCode; /*!< TODO: describe */ - qint16 m_iSeasonNumber; /*!< TODO: describe */ + qint32 m_iSeasonNumber; /*!< TODO: describe */ qint32 m_iSeasonID; /*!< TODO: describe */ qint32 m_iSeriesID; /*!< TODO: describe */ QString m_szStillPath; /*!< TODO: describe */ qreal m_dVoteAverage; /*!< TODO: describe */ - qint16 m_iVoteCount; /*!< TODO: describe */ + qint32 m_iVoteCount; /*!< TODO: describe */ QStringList m_szCrew; /*!< TODO: describe */ State m_state; /*!< TODO: describe */ QButtonGroup* m_lpGroup; /*!< TODO: describe */ @@ -411,5 +411,6 @@ private: }; Q_DECLARE_METATYPE(cEpisode*) +Q_DECLARE_METATYPE(cEpisode::State) #endif // CEPISODE_H diff --git a/cfanart.cpp b/cfanart.cpp index 1110304..417a9c5 100644 --- a/cfanart.cpp +++ b/cfanart.cpp @@ -64,12 +64,12 @@ qint32 cFanart::likes() return(m_iLikes); } -void cFanart::setSeason(const qint16& iSeason) +void cFanart::setSeason(const qint32& iSeason) { m_iSeason = iSeason; } -qint16 cFanart::season() +qint32 cFanart::season() { return(m_iSeason); } diff --git a/cfanart.h b/cfanart.h index 9f4ced9..5d7328b 100644 --- a/cfanart.h +++ b/cfanart.h @@ -129,14 +129,14 @@ public: \fn setSeason \param iSeason */ - void setSeason(const qint16& iSeason); + void setSeason(const qint32& iSeason); /*! \brief \fn season - \return qint16 + \return qint32 */ - qint16 season(); + qint32 season(); /*! \brief @@ -188,13 +188,14 @@ private: QString m_szURL; /*!< TODO: describe */ QString m_szLanguage; /*!< TODO: describe */ qint32 m_iLikes; /*!< TODO: describe */ - qint16 m_iSeason; /*!< TODO: describe */ + qint32 m_iSeason; /*!< TODO: describe */ QString m_szDisc; /*!< TODO: describe */ QString m_szDiscType; /*!< TODO: describe */ bool m_bActive; /*!< TODO: describe */ }; Q_DECLARE_METATYPE(cFanart*) +Q_DECLARE_METATYPE(cFanart::Type) /*! \brief diff --git a/cmainwindow.cpp b/cmainwindow.cpp index 57dc265..ebddd33 100644 --- a/cmainwindow.cpp +++ b/cmainwindow.cpp @@ -58,41 +58,41 @@ static bool serieSort(cSerie* s1, cSerie* s2) return(str1 < str2); } -static bool movieSort(cMovie* s1, cMovie* s2) -{ - QString collection1 = s1->belongsToCollection(); - QString collection2 = s2->belongsToCollection(); +//static bool movieSort(cMovie* s1, cMovie* s2) +//{ +// QString collection1 = s1->belongsToCollection(); +// QString collection2 = s2->belongsToCollection(); - QString title1 = s1->movieTitle(); - QString title2 = s2->movieTitle(); +// QString title1 = s1->movieTitle(); +// QString title2 = s2->movieTitle(); - if(collection1.isEmpty() && collection2.isEmpty()) - return(title1 < title2); +// if(collection1.isEmpty() && collection2.isEmpty()) +// return(title1 < title2); - if(!collection1.isEmpty() && !collection2.isEmpty()) - { - if(collection1 == collection2) - return(title1 < title2); - return(collection1 < collection2); - } +// if(!collection1.isEmpty() && !collection2.isEmpty()) +// { +// if(collection1 == collection2) +// return(title1 < title2); +// return(collection1 < collection2); +// } - return(title1 < title2); -} +// return(title1 < title2); +//} cMainWindow::cMainWindow(QWidget *parent) : QMainWindow(parent), ui(new Ui::cMainWindow), m_szOldSelected(""), - m_lpMessageDialog(0), - m_lpPicturesThread(0), + m_lpMessageDialog(nullptr), + m_lpPicturesThread(nullptr), m_bProcessing(false), - m_lpShortcutAdd(0), - m_lpShortcutFind(0), + m_lpShortcutAdd(nullptr), + m_lpShortcutFind(nullptr), m_szFind(""), m_szFindMovie(""), - m_lpFileMenu(0), - m_lpFileExportAction(0), - m_lpFileExitAction(0) + m_lpFileMenu(nullptr), + m_lpFileExportAction(nullptr), + m_lpFileExitAction(nullptr) { QSettings settings; @@ -108,17 +108,17 @@ cMainWindow::cMainWindow(QWidget *parent) : ui->m_lpMainTab->setCurrentIndex(0); ui->m_lpSeriesFilter->setChecked(settings.value("seriesFilter/enabled", QVariant::fromValue(false)).toBool()); - ui->m_lpSeriesFilterInitialized->setCheckState(static_cast(settings.value("seriesFilter/hasInit", (uint)Qt::PartiallyChecked).toUInt())); - ui->m_lpSeriesFilterProgress->setCheckState(static_cast(settings.value("seriesFilter/hasProgress", (uint)Qt::PartiallyChecked).toUInt())); - ui->m_lpSeriesFilterDone->setCheckState(static_cast(settings.value("seriesFilter/hasDone", (uint)Qt::PartiallyChecked).toUInt())); - ui->m_lpSeriesFilterWithLink->setCheckState(static_cast(settings.value("seriesFilter/hasLink", (uint)Qt::PartiallyChecked).toUInt())); - ui->m_lpSeriesFilterNotFinished->setCheckState(static_cast(settings.value("seriesFilter/hasNotFinished", (uint)Qt::PartiallyChecked).toUInt())); - ui->m_lpSeriesFilterCliffhanger->setCheckState(static_cast(settings.value("seriesFilter/isCliffhanger", (uint)Qt::PartiallyChecked).toUInt())); + ui->m_lpSeriesFilterInitialized->setCheckState(static_cast(settings.value("seriesFilter/hasInit", Qt::PartiallyChecked).toUInt())); + ui->m_lpSeriesFilterProgress->setCheckState(static_cast(settings.value("seriesFilter/hasProgress", Qt::PartiallyChecked).toUInt())); + ui->m_lpSeriesFilterDone->setCheckState(static_cast(settings.value("seriesFilter/hasDone", Qt::PartiallyChecked).toUInt())); + ui->m_lpSeriesFilterWithLink->setCheckState(static_cast(settings.value("seriesFilter/hasLink", Qt::PartiallyChecked).toUInt())); + ui->m_lpSeriesFilterNotFinished->setCheckState(static_cast(settings.value("seriesFilter/hasNotFinished", Qt::PartiallyChecked).toUInt())); + ui->m_lpSeriesFilterCliffhanger->setCheckState(static_cast(settings.value("seriesFilter/isCliffhanger", Qt::PartiallyChecked).toUInt())); ui->m_lpMoviesFilter->setChecked(settings.value("movieFilter/enabled", QVariant::fromValue(false)).toBool()); - ui->m_lpMoviesFilterInitialized->setCheckState(static_cast(settings.value("movieFilter/hasInit", (uint)Qt::PartiallyChecked).toUInt())); - ui->m_lpMoviesFilterProgress->setCheckState(static_cast(settings.value("movieFilter/hasProgress", (uint)Qt::PartiallyChecked).toUInt())); - ui->m_lpMoviesFilterDone->setCheckState(static_cast(settings.value("movieFilter/hasDone", (uint)Qt::PartiallyChecked).toUInt())); + ui->m_lpMoviesFilterInitialized->setCheckState(static_cast(settings.value("movieFilter/hasInit", Qt::PartiallyChecked).toUInt())); + ui->m_lpMoviesFilterProgress->setCheckState(static_cast(settings.value("movieFilter/hasProgress", Qt::PartiallyChecked).toUInt())); + ui->m_lpMoviesFilterDone->setCheckState(static_cast(settings.value("movieFilter/hasDone", Qt::PartiallyChecked).toUInt())); m_lpSeriesListModel = new QStandardItemModel(0, 3); initDB(); @@ -140,24 +140,24 @@ cMainWindow::cMainWindow(QWidget *parent) : displaySeries(); displayMovies(); - qint16 iX = settings.value("main/x", QVariant::fromValue(-1)).toInt(); - qint16 iY = settings.value("main/y", QVariant::fromValue(-1)).toInt(); - qint16 iWidth = settings.value("main/width", QVariant::fromValue(-1)).toInt(); - qint16 iHeight = settings.value("main/height", QVariant::fromValue(-1)).toInt(); + qint32 iX = settings.value("main/x", QVariant::fromValue(-1)).toInt(); + qint32 iY = settings.value("main/y", QVariant::fromValue(-1)).toInt(); + qint32 iWidth = settings.value("main/width", QVariant::fromValue(-1)).toInt(); + qint32 iHeight = settings.value("main/height", QVariant::fromValue(-1)).toInt(); if(iWidth != -1 && iHeight != -1) resize(iWidth, iHeight); if(iX != -1 && iY != -1) move(iX, iY); - qint16 iWindowWidth = iWidth; - qint16 iSubtract = 50; + qint32 iWindowWidth = iWidth; + qint32 iSubtract = 50; if(settings.value("main/maximized").toBool()) iWindowWidth = QApplication::desktop()->geometry().width(); - qint16 iWidth1 = 0; - qint16 iWidth2; + qint32 iWidth1 = 0; + qint32 iWidth2; for(int z = 0;z < 3;z++) iWidth1 += ui->m_lpSeriesList1->columnWidth(z); @@ -367,7 +367,7 @@ void cMainWindow::convertSeries() QSqlQuery query; QString szOldIMDBID = ""; cTheMovieDBV3 theMovieDB; - cSerie* lpSerie = 0; + cSerie* lpSerie = nullptr; if(query.exec("SELECT s.imdbid, s.download, s.cliffhanger, e.episodeNumber, e.seasonNumber, e.state FROM serie_old s LEFT JOIN episode_old e ON s.id = e.seriesID WHERE s.imdbid IS NOT NULL AND s.imdbid <> \"\" ORDER BY s.imdbid, e.seasonNumber, e.episodeNumber;")) { @@ -383,7 +383,7 @@ void cMainWindow::convertSeries() { lpSerie->save(m_db); delete lpSerie; - lpSerie = 0; + lpSerie = nullptr; } szOldIMDBID = szIMDBID; @@ -402,7 +402,7 @@ void cMainWindow::convertSeries() { cEpisode* lpEpisode = lpSeason->findEpisode(query.value("episodeNumber").toInt()); if(lpEpisode) - lpEpisode->setState((cEpisode::State)query.value("state").toInt()); + lpEpisode->setState(query.value("state").value()); } } } @@ -412,7 +412,7 @@ void cMainWindow::convertSeries() { lpSerie->save(m_db); delete lpSerie; - lpSerie = 0; + lpSerie = nullptr; } } @@ -426,9 +426,9 @@ void cMainWindow::loadSeriesDB() qint32 iOldSeasonNumber = -1; qint32 iSeriesID; qint32 iSeasonNumber; - cSeason* lpSeason; - cEpisode* lpEpisode; - cSerie* lpSerie = 0; + cSeason* lpSeason = nullptr; + cEpisode* lpEpisode = nullptr; + cSerie* lpSerie = nullptr; QString szQuery = " SELECT serie.seriesID seriesID," @@ -568,7 +568,7 @@ void cMainWindow::loadSeriesDB() lpEpisode->setVoteAverage(query.value("e_voteAverage").toDouble()); lpEpisode->setVoteCount(query.value("e_voteCount").toInt()); lpEpisode->setCrew(query.value("e_crew").toString()); - lpEpisode->setState((cEpisode::State)query.value("e_state").toInt()); + lpEpisode->setState(query.value("e_state").value()); } iOldSeriesID = -1; @@ -577,7 +577,7 @@ void cMainWindow::loadSeriesDB() szQuery = "SELECT id, type, url, language, likes, season, active, seriesID FROM fanart ORDER BY seriesID;"; if(query.exec(szQuery)) { - cSerie* lpSerie = 0; + cSerie* lpSerie = nullptr; while(query.next()) { @@ -594,7 +594,7 @@ void cMainWindow::loadSeriesDB() iOldSeriesID = iSeriesID; } - cFanart* lpFanart = fanartList.add((cFanart::Type)query.value("type").toInt()); + cFanart* lpFanart = fanartList.add(query.value("type").value()); lpFanart->setActive(query.value("active").toBool()); lpFanart->setID(query.value("id").toInt()); lpFanart->setURL(query.value("url").toString()); @@ -649,7 +649,7 @@ void cMainWindow::loadMoviesDB() lpMovie->setVoteCount(query.value("voteCount").toInt()); lpMovie->setCast(query.value("cast").toString().split("|")); lpMovie->setCrew(query.value("crew").toString().split("|")); - lpMovie->setState((cMovie::State)query.value("state").toInt()); + lpMovie->setState(query.value("state").value()); } qint32 iOldMovieID = -1; @@ -657,7 +657,7 @@ void cMainWindow::loadMoviesDB() if(query.exec("SELECT id, type, url, language, likes, discType, disc, active, movieID FROM fanart ORDER BY movieID;")) { - cMovie* lpMovie = 0; + cMovie* lpMovie = nullptr; while(query.next()) { @@ -674,7 +674,7 @@ void cMainWindow::loadMoviesDB() iOldMovieID = iMovieID; } - cFanart* lpFanart = fanartList.add((cFanart::Type)query.value("type").toInt()); + cFanart* lpFanart = fanartList.add(query.value("type").value()); lpFanart->setActive(query.value("active").toBool()); lpFanart->setID(query.value("id").toInt()); lpFanart->setURL(query.value("url").toString()); @@ -700,11 +700,10 @@ void cMainWindow::setSeriesStyle(QListlpItems) if(!lpSerie) return; - qint16 iMin = m_serieList.minSeason(); - qint16 iEpisodes = 0; + qint32 iMin = m_serieList.minSeason(); + qint32 iEpisodes = 0; bool bHasInit = false; bool bHasProg = false; - bool bHasDone = false; QString szOpen; @@ -759,9 +758,6 @@ void cMainWindow::setSeriesStyle(QListlpItems) szDone.append(QString("%1").arg(lpSeason->episodeList().at(y)->episodeNumber())); else szDone.append(QString(", %1").arg(lpSeason->episodeList().at(y)->episodeNumber())); - - if(lpSeason->seasonNumber()) - bHasDone = true; } } @@ -856,11 +852,11 @@ void cMainWindow::displaySeries() { m_lpSeriesListModel->clear(); - qint16 iMin = m_serieList.minSeason(); - qint16 iMax = m_serieList.maxSeason(); + qint32 iMin = m_serieList.minSeason(); + qint32 iMax = m_serieList.maxSeason(); - qint16 iSeries = 0; - qint16 iEpisodes = 0; + qint32 iSeries = 0; + qint32 iEpisodes = 0; m_lpSeriesListModel->setColumnCount(iMax-iMin+2); @@ -946,7 +942,7 @@ void cMainWindow::displaySeries() void cMainWindow::displayMovies() { - qint16 iMovies = 0; + qint32 iMovies = 0; m_lpMoviesListModel->clear(); m_lpMoviesListModel->setColumnCount(1); @@ -957,7 +953,7 @@ void cMainWindow::displayMovies() m_lpMoviesListModel->setHorizontalHeaderLabels(header); QString szOldCollection(""); - QStandardItem* lpRoot = 0; + QStandardItem* lpRoot = nullptr; for(int x = 0;x < m_movieList.count();x++) { @@ -969,7 +965,7 @@ void cMainWindow::displayMovies() { szOldCollection = lpMovie->belongsToCollection(); if(szOldCollection.isEmpty()) - lpRoot = 0; + lpRoot = nullptr; else { lpRoot = new QStandardItem(QString("%1").arg(szOldCollection)); @@ -1115,10 +1111,10 @@ bool cMainWindow::runEdit(cSerie* lpSerie, QString& szDownload) lpEdit->setSerie(lpSerie); QSettings settings; - qint16 iX = settings.value("edit/x", QVariant::fromValue(-1)).toInt(); - qint16 iY = settings.value("edit/y", QVariant::fromValue(-1)).toInt(); - qint16 iWidth = settings.value("edit/width", QVariant::fromValue(-1)).toInt(); - qint16 iHeight = settings.value("edit/height", QVariant::fromValue(-1)).toInt(); + qint32 iX = settings.value("edit/x", QVariant::fromValue(-1)).toInt(); + qint32 iY = settings.value("edit/y", QVariant::fromValue(-1)).toInt(); + qint32 iWidth = settings.value("edit/width", QVariant::fromValue(-1)).toInt(); + qint32 iHeight = settings.value("edit/height", QVariant::fromValue(-1)).toInt(); if(iX != -1 && iY != -1) lpEdit->move(iX, iY); @@ -1127,7 +1123,7 @@ bool cMainWindow::runEdit(cSerie* lpSerie, QString& szDownload) delete lpDialog; - qint16 ret = lpEdit->exec(); + qint32 ret = lpEdit->exec(); settings.setValue("edit/width", QVariant::fromValue(lpEdit->size().width())); settings.setValue("edit/height", QVariant::fromValue(lpEdit->size().height())); @@ -1154,9 +1150,9 @@ bool cMainWindow::runEdit(cSerie* lpSerie, QString& szDownload) cEpisode* lpEpisode = episodeList.at(y); if(lpEpisode) { - lpEpisode->setButton1(0); - lpEpisode->setButton2(0); - lpEpisode->setButton3(0); + lpEpisode->setButton1(nullptr); + lpEpisode->setButton2(nullptr); + lpEpisode->setButton3(nullptr); } } } @@ -1186,10 +1182,10 @@ bool cMainWindow::runMovieEdit(cMovie *lpMovie) lpMovieEdit->setMovie(lpMovie); QSettings settings; - qint16 iX = settings.value("movieEdit/x", QVariant::fromValue(-1)).toInt(); - qint16 iY = settings.value("movieEdit/y", QVariant::fromValue(-1)).toInt(); - qint16 iWidth = settings.value("movieEdit/width", QVariant::fromValue(-1)).toInt(); - qint16 iHeight = settings.value("movieEdit/height", QVariant::fromValue(-1)).toInt(); + qint32 iX = settings.value("movieEdit/x", QVariant::fromValue(-1)).toInt(); + qint32 iY = settings.value("movieEdit/y", QVariant::fromValue(-1)).toInt(); + qint32 iWidth = settings.value("movieEdit/width", QVariant::fromValue(-1)).toInt(); + qint32 iHeight = settings.value("movieEdit/height", QVariant::fromValue(-1)).toInt(); if(iX != -1 && iY != -1) lpMovieEdit->move(iX, iY); @@ -1198,7 +1194,7 @@ bool cMainWindow::runMovieEdit(cMovie *lpMovie) delete lpDialog; - qint16 ret = lpMovieEdit->exec(); + qint32 ret = lpMovieEdit->exec(); settings.setValue("movieEdit/width", QVariant::fromValue(lpMovieEdit->size().width())); settings.setValue("movieEdit/height", QVariant::fromValue(lpMovieEdit->size().height())); @@ -1233,10 +1229,10 @@ void cMainWindow::onActionAdd() cSearch* lpSearch = new cSearch(this); QSettings settings; - qint16 iX = settings.value("search/x", QVariant::fromValue(-1)).toInt(); - qint16 iY = settings.value("search/y", QVariant::fromValue(-1)).toInt(); - qint16 iWidth = settings.value("search/width", QVariant::fromValue(-1)).toInt(); - qint16 iHeight = settings.value("search/height", QVariant::fromValue(-1)).toInt(); + qint32 iX = settings.value("search/x", QVariant::fromValue(-1)).toInt(); + qint32 iY = settings.value("search/y", QVariant::fromValue(-1)).toInt(); + qint32 iWidth = settings.value("search/width", QVariant::fromValue(-1)).toInt(); + qint32 iHeight = settings.value("search/height", QVariant::fromValue(-1)).toInt(); if(iX != -1 && iY != -1) lpSearch->move(iX, iY); @@ -1257,11 +1253,11 @@ void cMainWindow::onActionAdd() qint32 id = lpSearch->id(); QString szPlaceholder = lpSearch->placeholderName(); bool bPlaceholder = lpSearch->placeholder(); - qint16 iYear = lpSearch->year(); + qint32 iYear = lpSearch->year(); delete lpSearch; - cSerie* lpSerie = 0; + cSerie* lpSerie = nullptr; cMessageAnimateDialog* lpDialog = new cMessageAnimateDialog(this); lpDialog->setTitle("Refresh"); @@ -1329,10 +1325,10 @@ void cMainWindow::onActionMovieAdd() cMovieSearch* lpSearch = new cMovieSearch(this); QSettings settings; - qint16 iX = settings.value("movieSearch/x", QVariant::fromValue(-1)).toInt(); - qint16 iY = settings.value("movieSearch/y", QVariant::fromValue(-1)).toInt(); - qint16 iWidth = settings.value("movieSearch/width", QVariant::fromValue(-1)).toInt(); - qint16 iHeight = settings.value("movieSearch/height", QVariant::fromValue(-1)).toInt(); + qint32 iX = settings.value("movieSearch/x", QVariant::fromValue(-1)).toInt(); + qint32 iY = settings.value("movieSearch/y", QVariant::fromValue(-1)).toInt(); + qint32 iWidth = settings.value("movieSearch/width", QVariant::fromValue(-1)).toInt(); + qint32 iHeight = settings.value("movieSearch/height", QVariant::fromValue(-1)).toInt(); if(iX != -1 && iY != -1) lpSearch->move(iX, iY); @@ -1353,11 +1349,11 @@ void cMainWindow::onActionMovieAdd() QList idList = lpSearch->id(); QString szPlaceholder = lpSearch->placeholderName(); bool bPlaceholder = lpSearch->placeholder(); - qint16 iYear = lpSearch->year(); + qint32 iYear = lpSearch->year(); delete lpSearch; - cMovie* lpMovie = 0; + cMovie* lpMovie = nullptr; if(!bPlaceholder) { @@ -1476,9 +1472,7 @@ void cMainWindow::onActionExport() { cExportDialog* lpExportDialog = new cExportDialog(this); - int x; - - if(x = lpExportDialog->exec() == QDialog::Rejected) + if(lpExportDialog->exec() == QDialog::Rejected) { delete lpExportDialog; return; @@ -1690,7 +1684,7 @@ void cMainWindow::updateDone() if(m_lpMessageDialog) delete m_lpMessageDialog; - m_lpMessageDialog = 0; + m_lpMessageDialog = nullptr; } void cMainWindow::onActionDelete() @@ -1923,7 +1917,7 @@ void cMainWindow::onActionLoadPictures() if(!serieList.count()) return; - qint16 iTotal = 0; + qint32 iTotal = 0; for(int z = 0;z < serieList.count();z++) { @@ -1967,11 +1961,11 @@ void cMainWindow::picturesDone() { if(m_lpPicturesThread) delete m_lpPicturesThread; - m_lpPicturesThread = 0; + m_lpPicturesThread = nullptr; if(m_lpMessageDialog) delete m_lpMessageDialog; - m_lpMessageDialog = 0; + m_lpMessageDialog = nullptr; } void cMainWindow::on_m_lpSeriesList1_pressed(const QModelIndex &/*index*/) @@ -2156,12 +2150,12 @@ void cMainWindow::applySeriesFilter() QSettings settings; settings.setValue("seriesFilter/enabled", QVariant::fromValue(ui->m_lpSeriesFilter->isChecked())); - settings.setValue("seriesFilter/hasInit", (uint)ui->m_lpSeriesFilterInitialized->checkState()); - settings.setValue("seriesFilter/hasProgress", (uint)ui->m_lpSeriesFilterProgress->checkState()); - settings.setValue("seriesFilter/hasDone", (uint)ui->m_lpSeriesFilterDone->checkState()); - settings.setValue("seriesFilter/hasLink", (uint)ui->m_lpSeriesFilterWithLink->checkState()); - settings.setValue("seriesFilter/hasNotFinished", (uint)ui->m_lpSeriesFilterNotFinished->checkState()); - settings.setValue("seriesFilter/isCliffhanger", (uint)ui->m_lpSeriesFilterCliffhanger->checkState()); + settings.setValue("seriesFilter/hasInit", ui->m_lpSeriesFilterInitialized->checkState()); + settings.setValue("seriesFilter/hasProgress", ui->m_lpSeriesFilterProgress->checkState()); + settings.setValue("seriesFilter/hasDone", ui->m_lpSeriesFilterDone->checkState()); + settings.setValue("seriesFilter/hasLink", ui->m_lpSeriesFilterWithLink->checkState()); + settings.setValue("seriesFilter/hasNotFinished", ui->m_lpSeriesFilterNotFinished->checkState()); + settings.setValue("seriesFilter/isCliffhanger", ui->m_lpSeriesFilterCliffhanger->checkState()); for(int x = 0;x < m_lpSeriesListModel->rowCount();x++) { @@ -2206,9 +2200,9 @@ void cMainWindow::applyMoviesFilter() QSettings settings; settings.setValue("movieFilter/enabled", QVariant::fromValue(ui->m_lpMoviesFilter->isChecked())); - settings.setValue("movieFilter/hasInit", (uint)ui->m_lpMoviesFilterInitialized->checkState()); - settings.setValue("movieFilter/hasProgress", (uint)ui->m_lpMoviesFilterProgress->checkState()); - settings.setValue("movieFilter/hasDone", (uint)ui->m_lpMoviesFilterDone->checkState()); + settings.setValue("movieFilter/hasInit", ui->m_lpMoviesFilterInitialized->checkState()); + settings.setValue("movieFilter/hasProgress", ui->m_lpMoviesFilterProgress->checkState()); + settings.setValue("movieFilter/hasDone", ui->m_lpMoviesFilterDone->checkState()); for(int x = 0;x < m_lpMoviesListModel->rowCount();x++) { @@ -2222,7 +2216,7 @@ void cMainWindow::applyMoviesFilter() } } -bool cMainWindow::applyMoviesFilter(qint16 i, cMovie* lpMovie) +bool cMainWindow::applyMoviesFilter(qint32 i, cMovie* lpMovie) { bool bDisplay = false; @@ -2462,10 +2456,10 @@ void cMainWindow::onActionDiscover() cDiscover* lpDiscover = new cDiscover(m_serieList, this); QSettings settings; - qint16 iX = settings.value("serieDiscover/x", QVariant::fromValue(-1)).toInt(); - qint16 iY = settings.value("serieDiscover/y", QVariant::fromValue(-1)).toInt(); - qint16 iWidth = settings.value("serieDiscover/width", QVariant::fromValue(-1)).toInt(); - qint16 iHeight = settings.value("serieDiscover/height", QVariant::fromValue(-1)).toInt(); + qint32 iX = settings.value("serieDiscover/x", QVariant::fromValue(-1)).toInt(); + qint32 iY = settings.value("serieDiscover/y", QVariant::fromValue(-1)).toInt(); + qint32 iWidth = settings.value("serieDiscover/width", QVariant::fromValue(-1)).toInt(); + qint32 iHeight = settings.value("serieDiscover/height", QVariant::fromValue(-1)).toInt(); if(iX != -1 && iY != -1) lpDiscover->move(iX, iY); @@ -2493,10 +2487,10 @@ void cMainWindow::onActionMovieDiscover() cMovieDiscover* lpMovieDiscover = new cMovieDiscover(m_movieList, this); QSettings settings; - qint16 iX = settings.value("movieDiscover/x", QVariant::fromValue(-1)).toInt(); - qint16 iY = settings.value("movieDiscover/y", QVariant::fromValue(-1)).toInt(); - qint16 iWidth = settings.value("movieDiscover/width", QVariant::fromValue(-1)).toInt(); - qint16 iHeight = settings.value("movieDiscover/height", QVariant::fromValue(-1)).toInt(); + qint32 iX = settings.value("movieDiscover/x", QVariant::fromValue(-1)).toInt(); + qint32 iY = settings.value("movieDiscover/y", QVariant::fromValue(-1)).toInt(); + qint32 iWidth = settings.value("movieDiscover/width", QVariant::fromValue(-1)).toInt(); + qint32 iHeight = settings.value("movieDiscover/height", QVariant::fromValue(-1)).toInt(); if(iX != -1 && iY != -1) lpMovieDiscover->move(iX, iY); @@ -2518,7 +2512,7 @@ void cMainWindow::onActionMovieDiscover() delete lpMovieDiscover; - cMovie* lpMovie = 0; + cMovie* lpMovie = nullptr; for(int x = 0;x < idList.count();x++) { diff --git a/cmainwindow.h b/cmainwindow.h index ce86718..759f154 100644 --- a/cmainwindow.h +++ b/cmainwindow.h @@ -598,7 +598,7 @@ private: \param lpMovie \return bool */ - bool applyMoviesFilter(qint16 i, cMovie* lpMovie); + bool applyMoviesFilter(qint32 i, cMovie* lpMovie); /*! \brief diff --git a/cmovie.h b/cmovie.h index b45ec95..7b82b63 100644 --- a/cmovie.h +++ b/cmovie.h @@ -553,6 +553,7 @@ private: }; Q_DECLARE_METATYPE(cMovie*) +Q_DECLARE_METATYPE(cMovie::State) /*! \brief diff --git a/cmoviediscover.cpp b/cmoviediscover.cpp index d224df9..2af3e00 100644 --- a/cmoviediscover.cpp +++ b/cmoviediscover.cpp @@ -70,7 +70,7 @@ void cMovieDiscover::on_m_lpDiscover_clicked() { QString szText = ui->m_lpText->text(); bool bAdult = ui->m_lpIncludeAdult->isChecked(); - qint16 iYear = ui->m_lpYear->value(); + qint32 iYear = ui->m_lpYear->value(); qreal voteMin = (qreal)ui->m_lpVoting->lowerValue()/10; qreal voteMax = (qreal)ui->m_lpVoting->upperValue()/10; diff --git a/cmoviesearch.cpp b/cmoviesearch.cpp index 3c461de..1f5977e 100644 --- a/cmoviesearch.cpp +++ b/cmoviesearch.cpp @@ -50,7 +50,7 @@ void cMovieSearch::on_m_lpSearchButton_clicked() cTheMovieDBV3 theMovieDBV3; QString szSearchText = ui->m_lpSearch->text(); - qint16 iYear = -1; + qint32 iYear = -1; if(szSearchText.contains("(") && szSearchText.contains(")")) { @@ -128,7 +128,7 @@ bool cMovieSearch::placeholder() return(ui->m_lpTabWidget->currentIndex() == 1); } -qint16 cMovieSearch::year() +qint32 cMovieSearch::year() { return(ui->m_lpYear->value()); } diff --git a/cmoviesearch.h b/cmoviesearch.h index 436c5f4..eb96bf8 100644 --- a/cmoviesearch.h +++ b/cmoviesearch.h @@ -60,9 +60,9 @@ public: \brief \fn year - \return qint16 + \return qint32 */ - qint16 year(); + qint32 year(); private slots: /*! diff --git a/cpicturesthread.cpp b/cpicturesthread.cpp index b406eba..7b46c0e 100644 --- a/cpicturesthread.cpp +++ b/cpicturesthread.cpp @@ -22,7 +22,7 @@ void cPicturesThread::stop() void cPicturesThread::run() { - qint16 iCurrent = 0; + qint32 iCurrent = 0; for(int z = 0;z < m_items.count();z++) { diff --git a/csearch.cpp b/csearch.cpp index 68c39d1..a6f84b4 100644 --- a/csearch.cpp +++ b/csearch.cpp @@ -103,7 +103,7 @@ bool cSearch::placeholder() return(ui->m_lpTabWidget->currentIndex() == 1); } -qint16 cSearch::year() +qint32 cSearch::year() { return(ui->m_lpYear->value()); } diff --git a/csearch.h b/csearch.h index a625ccf..9fa49e6 100644 --- a/csearch.h +++ b/csearch.h @@ -60,9 +60,9 @@ public: \brief \fn year - \return qint16 + \return qint32 */ - qint16 year(); + qint32 year(); private slots: /*! diff --git a/cseason.cpp b/cseason.cpp index e5b46e3..8d83c8d 100644 --- a/cseason.cpp +++ b/cseason.cpp @@ -1,6 +1,6 @@ #include "cseason.h" -#define DELETE(x) { if(x) delete x; x=0; } +#define DELETE(x) { if(x) delete x; x=nullptr; } cSeason::cSeason() : m_i_ID(-1), @@ -10,15 +10,15 @@ cSeason::cSeason() : m_iID(-1), m_szPosterPath(""), m_iSeasonNumber(-1), - m_lpGroupBox(0), - m_lpGridLayout(0), - m_lpGrid(0), - m_lpLabel1(0), - m_lpAllInit(0), - m_lpAllProgress(0), - m_lpAllDone(0), - m_lpSpacer(0), - m_lpSerie(0) + m_lpGroupBox(nullptr), + m_lpGridLayout(nullptr), + m_lpGrid(nullptr), + m_lpLabel1(nullptr), + m_lpAllInit(nullptr), + m_lpAllProgress(nullptr), + m_lpAllDone(nullptr), + m_lpSpacer(nullptr), + m_lpSerie(nullptr) { } @@ -93,12 +93,12 @@ QString cSeason::posterPath() return(m_szPosterPath); } -void cSeason::setSeasonNumber(const qint16& iSeasonNumber) +void cSeason::setSeasonNumber(const qint32& iSeasonNumber) { m_iSeasonNumber = iSeasonNumber; } -qint16 cSeason::seasonNumber() +qint32 cSeason::seasonNumber() { return(m_iSeasonNumber); } @@ -113,7 +113,7 @@ cSerie* cSeason::serie() return(m_lpSerie); } -cEpisode* cSeason::addEpisode(qint16 iNumber) +cEpisode* cSeason::addEpisode(qint32 iNumber) { cEpisode* lpNew = new cEpisode; lpNew->setEpisodeNumber(iNumber); @@ -125,7 +125,7 @@ cEpisode* cSeason::addEpisode(qint16 iNumber) cEpisode* cSeason::addEpisode(cEpisode* lpEpisode) { if(episodeList().contains(lpEpisode)) - return(0); + return(nullptr); m_episodeList.append(lpEpisode); return(lpEpisode); } @@ -135,19 +135,19 @@ QList cSeason::episodeList() return(m_episodeList); } -cEpisode* cSeason::findEpisode(qint16 iNumber) +cEpisode* cSeason::findEpisode(qint32 iNumber) { for(int x = 0;x < m_episodeList.count();x++) { if(m_episodeList.at(x)->episodeNumber() == iNumber) return(m_episodeList.at(x)); } - return(0); + return(nullptr); } -qint16 cSeason::episodeCount() +qint32 cSeason::episodeCount() { - qint16 iTotal = -1; + qint32 iTotal = -1; for(int z = 0;z < m_episodeList.count();z++) { cEpisode* lpEpisode = m_episodeList.at(z); diff --git a/cseason.h b/cseason.h index a681ccb..ef647ba 100644 --- a/cseason.h +++ b/cseason.h @@ -135,14 +135,14 @@ public: \fn setSeasonNumber \param iSeasonNumber */ - void setSeasonNumber(const qint16& iSeasonNumber); + void setSeasonNumber(const qint32& iSeasonNumber); /*! \brief \fn seasonNumber - \return qint16 + \return qint32 */ - qint16 seasonNumber(); + qint32 seasonNumber(); /*! \brief @@ -166,7 +166,7 @@ public: \param iNumber \return cEpisode */ - cEpisode* addEpisode(qint16 iNumber); + cEpisode* addEpisode(qint32 iNumber); /*! \brief @@ -189,15 +189,15 @@ public: \param iNumber \return cEpisode */ - cEpisode* findEpisode(qint16 iNumber); + cEpisode* findEpisode(qint32 iNumber); /*! \brief \fn episodeCount - \return qint16 + \return qint32 */ - qint16 episodeCount(); + qint32 episodeCount(); /*! \brief @@ -338,7 +338,7 @@ private: QString m_szOverview; /*!< TODO: describe */ qint32 m_iID; /*!< TODO: describe */ QString m_szPosterPath; /*!< TODO: describe */ - qint16 m_iSeasonNumber; /*!< TODO: describe */ + qint32 m_iSeasonNumber; /*!< TODO: describe */ QList m_episodeList; /*!< TODO: describe */ QGroupBox* m_lpGroupBox; /*!< TODO: describe */ QGridLayout* m_lpGridLayout; /*!< TODO: describe */ diff --git a/cseasondelegate.cpp b/cseasondelegate.cpp index ccec2e1..5d3bd20 100644 --- a/cseasondelegate.cpp +++ b/cseasondelegate.cpp @@ -86,8 +86,8 @@ QSize cSeasonDelegate::sizeHint(const QStyleOptionViewItem &option, const QModel { if(index.column() > 2) { - qint16 iTotal = -1; - qint16 z; + qint32 iTotal = -1; + qint32 z; cSeason* lpSeason = 0; if(index.data(Qt::UserRole).canConvert()) diff --git a/cserie.cpp b/cserie.cpp index 0ed35d4..8cb4ad5 100644 --- a/cserie.cpp +++ b/cserie.cpp @@ -146,22 +146,22 @@ QStringList cSerie::networks() return(m_szNetworks); } -void cSerie::setEpisodes(const qint16& iEpisodes) +void cSerie::setEpisodes(const qint32& iEpisodes) { m_iEpisodes = iEpisodes; } -qint16 cSerie::episodes() +qint32 cSerie::episodes() { return(m_iEpisodes); } -void cSerie::setSeasons(const qint16& iSeasons) +void cSerie::setSeasons(const qint32& iSeasons) { m_iSeasons = iSeasons; } -qint16 cSerie::seasons() +qint32 cSerie::seasons() { return(m_iSeasons); } @@ -245,12 +245,12 @@ qreal cSerie::voteAverage() return(m_dVoteAverage); } -void cSerie::setVoteCount(const qint16& iVoteCount) +void cSerie::setVoteCount(const qint32& iVoteCount) { m_iVoteCount = iVoteCount; } -qint16 cSerie::voteCount() +qint32 cSerie::voteCount() { return(m_iVoteCount); } @@ -397,7 +397,7 @@ bool cSerie::cliffhanger() return(m_bCliffhanger); } -cSeason* cSerie::addSeason(const qint16& iSeason) +cSeason* cSerie::addSeason(const qint32& iSeason) { cSeason* lpNew = new cSeason; lpNew->setSeasonNumber(iSeason); @@ -406,7 +406,7 @@ cSeason* cSerie::addSeason(const qint16& iSeason) return(lpNew); } -cSeason* cSerie::findSeason(const qint16& iSeason) +cSeason* cSerie::findSeason(const qint32& iSeason) { for(int z = 0;z < m_seasonList.count();z++) { @@ -421,9 +421,9 @@ QList cSerie::seasonList() return(m_seasonList); } -qint16 cSerie::minSeason() +qint32 cSerie::minSeason() { - qint16 iMin = 9999; + qint32 iMin = 9999; for(int z = 0;z < m_seasonList.count();z++) { if(m_seasonList.at(z)->seasonNumber() < iMin) @@ -434,9 +434,9 @@ qint16 cSerie::minSeason() return(iMin); } -qint16 cSerie::maxSeason() +qint32 cSerie::maxSeason() { - qint16 iMax = -1; + qint32 iMax = -1; for(int z = 0;z < m_seasonList.count();z++) { if(m_seasonList.at(z)->seasonNumber() > iMax) @@ -468,9 +468,9 @@ bool cSerie::isValid() return(false); } -qint16 cSerie::maxEpisode() +qint32 cSerie::maxEpisode() { - qint16 iMax = -1; + qint32 iMax = -1; for(int z = 0;z < m_seasonList.count();z++) { if(m_seasonList.at(z)->episodeCount() > iMax) @@ -781,7 +781,7 @@ cSerie* cSerieList::add(cSerie* lpSerie) for(int z = 0;z < count();z++) { if(at(z) == lpSerie) - return(0); + return(nullptr); } append(lpSerie); return(lpSerie); @@ -794,12 +794,12 @@ cSerie* cSerieList::find(const qint32& iID) if(at(x)->seriesID() == iID) return(at(x)); } - return(0); + return(nullptr); } -qint16 cSerieList::minSeason() +qint32 cSerieList::minSeason() { - qint16 iMin = 9999; + qint32 iMin = 9999; for(int z = 0;z < count();z++) { if(at(z)->minSeason() < iMin) @@ -811,9 +811,9 @@ qint16 cSerieList::minSeason() return(iMin); } -qint16 cSerieList::maxSeason() +qint32 cSerieList::maxSeason() { - qint16 iMax = -1; + qint32 iMax = -1; for(int z = 0;z < count();z++) { if(at(z)->maxSeason() > iMax) @@ -826,9 +826,9 @@ qint16 cSerieList::maxSeason() return(iMax); } -qint16 cSerieList::maxEpisode() +qint32 cSerieList::maxEpisode() { - qint16 iMax = -1; + qint32 iMax = -1; for(int z = 0;z < count();z++) { if(at(z)->maxEpisode() > iMax) diff --git a/cserie.h b/cserie.h index 1f32830..f5a3c71 100644 --- a/cserie.h +++ b/cserie.h @@ -189,14 +189,14 @@ public: \fn setEpisodes \param iEpisodes */ - void setEpisodes(const qint16& iEpisodes); + void setEpisodes(const qint32& iEpisodes); /*! \brief \fn episodes - \return qint16 + \return qint32 */ - qint16 episodes(); + qint32 episodes(); /*! \brief @@ -204,14 +204,14 @@ public: \fn setSeasons \param iSeasons */ - void setSeasons(const qint16& iSeasons); + void setSeasons(const qint32& iSeasons); /*! \brief \fn seasons - \return qint16 + \return qint32 */ - qint16 seasons(); + qint32 seasons(); /*! \brief @@ -338,14 +338,14 @@ public: \fn setVoteCount \param iVoteCount */ - void setVoteCount(const qint16& iVoteCount); + void setVoteCount(const qint32& iVoteCount); /*! \brief \fn voteCount - \return qint16 + \return qint32 */ - qint16 voteCount(); + qint32 voteCount(); /*! \brief @@ -563,7 +563,7 @@ public: \param iSeason \return cSeason */ - cSeason* addSeason(const qint16& iSeason); + cSeason* addSeason(const qint32& iSeason); /*! \brief @@ -579,30 +579,30 @@ public: \param iSeason \return cSeason */ - cSeason* findSeason(const qint16& iSeason); + cSeason* findSeason(const qint32& iSeason); /*! \brief \fn minSeason - \return qint16 + \return qint32 */ - qint16 minSeason(); + qint32 minSeason(); /*! \brief \fn maxSeason - \return qint16 + \return qint32 */ - qint16 maxSeason(); + qint32 maxSeason(); /*! \brief \fn maxEpisode - \return qint16 + \return qint32 */ - qint16 maxEpisode(); + qint32 maxEpisode(); /*! \brief @@ -752,8 +752,8 @@ private: QDate m_lastAired; /*!< TODO: describe */ QStringList m_szLanguages; /*!< TODO: describe */ QStringList m_szNetworks; /*!< TODO: describe */ - qint16 m_iEpisodes; /*!< TODO: describe */ - qint16 m_iSeasons; /*!< TODO: describe */ + qint32 m_iEpisodes; /*!< TODO: describe */ + qint32 m_iSeasons; /*!< TODO: describe */ QStringList m_szOriginCountries; /*!< TODO: describe */ QString m_szOriginalLanguage; /*!< TODO: describe */ qreal m_dPopularity; /*!< TODO: describe */ @@ -761,7 +761,7 @@ private: QStringList m_szProductionCompanies; /*!< TODO: describe */ QString m_szType; /*!< TODO: describe */ qreal m_dVoteAverage; /*!< TODO: describe */ - qint16 m_iVoteCount; /*!< TODO: describe */ + qint32 m_iVoteCount; /*!< TODO: describe */ QString m_szOverview; /*!< TODO: describe */ QDate m_firstAired; /*!< TODO: describe */ QStringList m_szCast; /*!< TODO: describe */ @@ -819,24 +819,24 @@ public: \brief \fn minSeason - \return qint16 + \return qint32 */ - qint16 minSeason(); + qint32 minSeason(); /*! \brief \fn maxSeason - \return qint16 + \return qint32 */ - qint16 maxSeason(); + qint32 maxSeason(); /*! \brief \fn maxEpisode - \return qint16 + \return qint32 */ - qint16 maxEpisode(); + qint32 maxEpisode(); }; #endif // CSERIE_H diff --git a/csplashscreen.cpp b/csplashscreen.cpp new file mode 100644 index 0000000..9ac5791 --- /dev/null +++ b/csplashscreen.cpp @@ -0,0 +1,35 @@ +#include "csplashscreen.h" +#include "common.h" + + +cSplashScreen::cSplashScreen(const QPixmap& pixmap, QFont& font) : + QSplashScreen(pixmap) +{ + setFont(font); + m_textDocument.setDefaultFont(font); +} + +void cSplashScreen::drawContents(QPainter *painter) +{ + painter->translate(m_rect.topLeft()); + m_textDocument.setHtml(m_szMessage); + m_textDocument.drawContents(painter); +} + +void cSplashScreen::showStatusMessage(const QString& message) +{ + m_szMessage = message; + showMessage(m_szMessage); +} + +void cSplashScreen::addStatusMessage(const QString& message) +{ + m_szMessage.append(message); + showMessage(m_szMessage); +} + +void cSplashScreen::setMessageRect(QRect rect) +{ + m_rect = rect; + m_textDocument.setTextWidth(rect.width()); +} diff --git a/csplashscreen.h b/csplashscreen.h new file mode 100644 index 0000000..5c2477c --- /dev/null +++ b/csplashscreen.h @@ -0,0 +1,26 @@ +#ifndef CSPLASHSCREEN_H +#define CSPLASHSCREEN_H + + +#include +#include +#include + + +class cSplashScreen : public QSplashScreen +{ +public: + cSplashScreen(const QPixmap& pixmap, QFont &font); + + virtual void drawContents(QPainter *painter); + void showStatusMessage(const QString &message); + void addStatusMessage(const QString &message); + void setMessageRect(QRect rect); + +private: + QTextDocument m_textDocument; + QString m_szMessage; + QRect m_rect; +}; + +#endif // CSPLASHSCREEN_H diff --git a/cthemoviedbv3.cpp b/cthemoviedbv3.cpp index c063647..e6ef4f2 100644 --- a/cthemoviedbv3.cpp +++ b/cthemoviedbv3.cpp @@ -22,7 +22,7 @@ cTheMovieDBV3::~cTheMovieDBV3() { } -QList cTheMovieDBV3::searchMovie(const QString& szMovie, const qint16& year, const QString& szLanguage) +QList cTheMovieDBV3::searchMovie(const QString& szMovie, const qint32& year, const QString& szLanguage) { if(m_genres.isEmpty()) m_genres = genresMovie("de-DE"); @@ -30,7 +30,7 @@ QList cTheMovieDBV3::searchMovie(const QString& szMovie, const qint16& QList movieList; QNetworkAccessManager networkManager; QString szRequest = QString("https://api.themoviedb.org/3/search/movie?api_key=%1").arg(m_szToken); - qint16 page = 1; + qint32 page = 1; if(!szLanguage.contains("all")) szRequest.append(QString("&language=%1").arg(szLanguage)); @@ -54,7 +54,7 @@ QList cTheMovieDBV3::searchMovie(const QString& szMovie, const qint16& if (reply->error() == QNetworkReply::NoError) { - QString strReply = (QString)reply->readAll(); + QString strReply = QString(reply->readAll()); QJsonDocument jsonResponse = QJsonDocument::fromJson(strReply.toUtf8()); QJsonObject jsonObj = jsonResponse.object(); QJsonArray jsonArray = jsonObj["results"].toArray(); @@ -105,12 +105,12 @@ QList cTheMovieDBV3::searchMovie(const QString& szMovie, const qint16& return(movieList); } -QList cTheMovieDBV3::searchSerie(const QString& szSerie, const qint16& year, const QString& szLanguage) +QList cTheMovieDBV3::searchSerie(const QString& szSerie, const qint32& year, const QString& szLanguage) { QList serieList; QNetworkAccessManager networkManager; QString szRequest = QString("https://api.themoviedb.org/3/search/tv?api_key=%1").arg(m_szToken); - qint16 page = 1; + qint32 page = 1; if(!szLanguage.contains("all")) szRequest.append(QString("&language=%1").arg(szLanguage)); @@ -216,7 +216,7 @@ QList cTheMovieDBV3::searchSerie(const QString& szSerie, const qint16& cMovie* cTheMovieDBV3::loadMovie(const qint32 &iID, const QString &szLanguage) { - cMovie* lpMovie = 0; + cMovie* lpMovie = nullptr; QNetworkAccessManager networkManager; QNetworkRequest request(QUrl(QString("https://api.themoviedb.org/3/movie/%1?api_key=%2&language=%3").arg(iID).arg(m_szToken).arg(szLanguage))); @@ -235,7 +235,7 @@ cMovie* cTheMovieDBV3::loadMovie(const qint32 &iID, const QString &szLanguage) if (reply->error() == QNetworkReply::NoError) { - QString strReply = (QString)reply->readAll(); + QString strReply = QString(reply->readAll()); QJsonDocument jsonResponse = QJsonDocument::fromJson(strReply.toUtf8()); QJsonObject jsonObj = jsonResponse.object(); @@ -320,7 +320,7 @@ cMovie* cTheMovieDBV3::loadMovie(const qint32 &iID, const QString &szLanguage) if (reply->error() == QNetworkReply::NoError) { - strReply = (QString)reply->readAll(); + strReply = QString(reply->readAll()); jsonResponse = QJsonDocument::fromJson(strReply.toUtf8()); QJsonObject jsonCast = jsonResponse.object(); QJsonArray jsonArrayCast = jsonCast["cast"].toArray(); @@ -373,7 +373,7 @@ cSerie* cTheMovieDBV3::loadSerie(const QString& szIMDBID) if (reply->error() == QNetworkReply::NoError) { - QString strReply = (QString)reply->readAll(); + QString strReply = QString(reply->readAll()); QJsonDocument jsonResponse = QJsonDocument::fromJson(strReply.toUtf8()); QJsonObject jsonObj = jsonResponse.object(); @@ -390,12 +390,12 @@ cSerie* cTheMovieDBV3::loadSerie(const QString& szIMDBID) } else qDebug() << reply->errorString(); - return(0); + return(nullptr); } cSerie* cTheMovieDBV3::loadSerie(const qint32 &iID, const QString& szLanguage) { - cSerie* lpSerie = 0; + cSerie* lpSerie = nullptr; QNetworkAccessManager networkManager; QNetworkRequest request(QUrl(QString("https://api.themoviedb.org/3/tv/%1?api_key=%2&language=%3&append_to_response=credits,external_ids").arg(iID).arg(m_szToken).arg(szLanguage))); @@ -414,7 +414,7 @@ cSerie* cTheMovieDBV3::loadSerie(const qint32 &iID, const QString& szLanguage) if (reply->error() == QNetworkReply::NoError) { - QString strReply = (QString)reply->readAll(); + QString strReply = QString(reply->readAll()); QJsonDocument jsonResponse = QJsonDocument::fromJson(strReply.toUtf8()); QJsonObject jsonObj = jsonResponse.object(); @@ -516,7 +516,7 @@ cSerie* cTheMovieDBV3::loadSerie(const qint32 &iID, const QString& szLanguage) for(int x = 0; x < tmpArray.count();x++) { QJsonObject seasonObj = tmpArray.at(x).toObject(); - qint16 seasonNumber = seasonObj["season_number"].toInt(); + qint32 seasonNumber = seasonObj["season_number"].toInt(); cSeason* lpSeason = lpSerie->addSeason(seasonNumber); request.setUrl(QUrl(QString("https://api.themoviedb.org/3/tv/%1/season/%2?api_key=%3&language=%4").arg(iID).arg(seasonNumber).arg(m_szToken).arg(szLanguage))); @@ -534,7 +534,7 @@ cSerie* cTheMovieDBV3::loadSerie(const qint32 &iID, const QString& szLanguage) if (reply->error() == QNetworkReply::NoError) { - strReply = (QString)reply->readAll(); + strReply = QString(reply->readAll()); jsonResponse = QJsonDocument::fromJson(strReply.toUtf8()); QJsonObject jsonEpisodes = jsonResponse.object(); QJsonArray jsonArrayEpisodes = jsonEpisodes["episodes"].toArray(); @@ -614,7 +614,7 @@ QMap cTheMovieDBV3::genresMovie(const QString& szLanguage) if(reply->error() == QNetworkReply::NoError) { - QString strReply = (QString)reply->readAll(); + QString strReply = QString(reply->readAll()); QJsonDocument jsonResponse = QJsonDocument::fromJson(strReply.toUtf8()); QJsonObject jsonObj = jsonResponse.object(); QJsonArray jsonArray = jsonObj["genres"].toArray(); @@ -637,7 +637,7 @@ QMap cTheMovieDBV3::genresMovie(const QString& szLanguage) return(genres); } -QList cTheMovieDBV3::discoverMovie(const QString& szText, const bool& bAdult, const qint16& iYear, const QList& genres, const qreal& voteMin, const qreal& voteMax, const QString& szLanguage) +QList cTheMovieDBV3::discoverMovie(const QString& szText, const bool& bAdult, const qint32& iYear, const QList& genres, const qreal& voteMin, const qreal& voteMax, const QString& szLanguage) { if(m_genres.isEmpty()) m_genres = genresMovie("de-DE"); @@ -645,7 +645,7 @@ QList cTheMovieDBV3::discoverMovie(const QString& szText, const bool& b QList movieList; QNetworkAccessManager networkManager; QString szRequest = QString("https://api.themoviedb.org/3/discover/movie?api_key=%1").arg(m_szToken); - qint16 page = 1; + qint32 page = 1; if(!szLanguage.contains("all")) szRequest.append(QString("&language=%1").arg(szLanguage)); @@ -748,7 +748,7 @@ QMap cTheMovieDBV3::genresSerie(const QString& szLanguage) if(reply->error() == QNetworkReply::NoError) { - QString strReply = (QString)reply->readAll(); + QString strReply = QString(reply->readAll()); QJsonDocument jsonResponse = QJsonDocument::fromJson(strReply.toUtf8()); QJsonObject jsonObj = jsonResponse.object(); QJsonArray jsonArray = jsonObj["genres"].toArray(); @@ -815,7 +815,7 @@ void cTheMovieDBV3::loadCastMovie(cMovie* lpMovie) if (reply->error() == QNetworkReply::NoError) { - QString strReply = (QString)reply->readAll(); + QString strReply = QString(reply->readAll()); QJsonDocument jsonResponse = QJsonDocument::fromJson(strReply.toUtf8()); QJsonObject jsonCast = jsonResponse.object(); QJsonArray jsonArrayCast = jsonCast["cast"].toArray(); @@ -845,7 +845,7 @@ void cTheMovieDBV3::loadCastMovie(cMovie* lpMovie) } } -QList cTheMovieDBV3::discoverSerie(const QString& szText, const qint16& iYear, const QList& genres, const qreal& voteMin, const qreal& voteMax, const QString& szLanguage) +QList cTheMovieDBV3::discoverSerie(const QString& szText, const qint32& iYear, const QList& genres, const qreal& voteMin, const qreal& voteMax, const QString& szLanguage) { if(m_genres.isEmpty()) m_genres = genresMovie("de-DE"); @@ -853,7 +853,7 @@ QList cTheMovieDBV3::discoverSerie(const QString& szText, const qint16& QList serieList; QNetworkAccessManager networkManager; QString szRequest = QString("https://api.themoviedb.org/3/discover/tv?api_key=%1").arg(m_szToken); - qint16 page = 1; + qint32 page = 1; if(!szLanguage.contains("all")) szRequest.append(QString("&language=%1").arg(szLanguage)); @@ -885,7 +885,7 @@ QList cTheMovieDBV3::discoverSerie(const QString& szText, const qint16& if (reply->error() == QNetworkReply::NoError) { - QString strReply = (QString)reply->readAll(); + QString strReply = QString(reply->readAll()); QJsonDocument jsonResponse = QJsonDocument::fromJson(strReply.toUtf8()); QJsonObject jsonObj = jsonResponse.object(); QJsonArray jsonArray = jsonObj["results"].toArray(); diff --git a/cthemoviedbv3.h b/cthemoviedbv3.h index 9c8791c..e7699f1 100644 --- a/cthemoviedbv3.h +++ b/cthemoviedbv3.h @@ -36,7 +36,7 @@ public: \param szLanguage \return QList */ - QList searchMovie(const QString& szMovie, const qint16& year = -1, const QString& szLanguage = "all"); + QList searchMovie(const QString& szMovie, const qint32& year = -1, const QString& szLanguage = "all"); /*! \brief @@ -67,7 +67,7 @@ public: \param szLanguage \return QList */ - QList discoverMovie(const QString& szText, const bool& bAdult, const qint16& iYear, const QList& genres, const qreal& voteMin, const qreal& voteMax, const QString& szLanguage = "all"); + QList discoverMovie(const QString& szText, const bool& bAdult, const qint32& iYear, const QList& genres, const qreal& voteMin, const qreal& voteMax, const QString& szLanguage = "all"); /*! \brief @@ -85,7 +85,7 @@ public: \param szLanguage \return QList */ - QList searchSerie(const QString& szSerie, const qint16& year = -1, const QString& szLanguage = "all"); + QList searchSerie(const QString& szSerie, const qint32& year = -1, const QString& szLanguage = "all"); /*! \brief @@ -123,7 +123,7 @@ public: \param szLanguage \return QList */ - QList discoverSerie(const QString& szText, const qint16& iYear, const QList& genres, const qreal& voteMin, const qreal& voteMax, const QString& szLanguage = "all"); + QList discoverSerie(const QString& szText, const qint32& iYear, const QList& genres, const qreal& voteMin, const qreal& voteMax, const QString& szLanguage = "all"); /*! \brief diff --git a/main.cpp b/main.cpp index 5eeb3d0..fa7eb50 100644 --- a/main.cpp +++ b/main.cpp @@ -1,7 +1,8 @@ #include "cmainwindow.h" #include #include -#include + +#include "csplashscreen.h" #define SHOW_SPLASH @@ -23,9 +24,16 @@ int main(int argc, char *argv[]) QPixmap pixmap(":/splashEmpty.png"); #endif - QSplashScreen splash(pixmap); + QFont splashFont; + + splashFont.setPixelSize(18); + splashFont.setBold(true); + + cSplashScreen splash(pixmap, splashFont); + splash.setMessageRect(QRect(85, 310, 200, 100)); + splash.show(); - splash.showMessage("initializing..."); + splash.showStatusMessage("
initializing...
"); a.processEvents(); cMainWindow w; diff --git a/qtMultimediaDB.pro b/qtMultimediaDB.pro index 9210c94..c6eaa21 100644 --- a/qtMultimediaDB.pro +++ b/qtMultimediaDB.pro @@ -47,7 +47,8 @@ SOURCES += main.cpp\ cmoviedetails.cpp \ cseriedetails.cpp \ ctheaudiodbv1.cpp \ - cartist.cpp + cartist.cpp \ + csplashscreen.cpp HEADERS += cmainwindow.h \ cserie.h \ @@ -84,7 +85,8 @@ HEADERS += cmainwindow.h \ cmoviedetails.h \ cseriedetails.h \ ctheaudiodbv1.h \ - cartist.h + cartist.h \ + csplashscreen.h FORMS += cmainwindow.ui \ csearch.ui \