Increase maximum days for slide show

Set it to 9999. While at it, remove some dead code and fix includes.

5 files changed, 8 insertions, 39 deletions

diff --git a/mappingdata.cpp b/mappingdata.cpp
index a279c96..d2e061a 100644
--- a/mappingdata.cpp
+++ b/mappingdata.cpp
@@ -5,6 +5,8 @@
   2 of the License, or (at your option) any later version.
 */
 
+#include <QDataStream>
+
 #include "mappingdata.h"
 
 MappingData::MappingData() : mappingId(-1), descId(-1) {}
diff --git a/picfilesmodel.cpp b/picfilesmodel.cpp
index 193a883..313c5a5 100644
--- a/picfilesmodel.cpp
+++ b/picfilesmodel.cpp
@@ -10,10 +10,6 @@
 #include <QFile>
 #include <QLocale>
 
-#include <algorithm>
-#include <random>
-#include <chrono>
-
 #include "picfilesmodel.h"
 #include "smglobals.h"
 #include "smtreeitem.h"
@@ -347,35 +343,6 @@ void PicFilesModel::selectFromSelection(QList<QVariant> ids){
     mCurrentPics = &mAllPics;
 }
 
-// delete this func once the one above works
-void PicFilesModel::allPicIds(){
-    mAllPics.clear();
-    mCurrentBatch = 0;
-    QSqlQuery q("SELECT tfilename, cmd5sum, ipicsid FROM pics", mDb);
-    while(q.next()){
-        QList<QVariant> cur;
-        cur << q.value(0) << q.value(1) << q.value(2);
-        mAllPics << cur;
-    }
-    auto seed = std::chrono::system_clock::now().time_since_epoch().count();
-    std::shuffle(mAllPics.begin(), mAllPics.end(), std::default_random_engine(seed));
-    mCurrentPics = &mAllPics;
-}
-
-void PicFilesModel::recentPicIds(){
-    mRecentPics.clear();
-    mCurrentBatch = 0;
-    QSqlQuery q("SELECT tfilename, cmd5sum, ipicsid FROM pics WHERE dtadded > now() - interval '6 months'", mDb);
-    while(q.next()){
-        QList<QVariant> cur;
-        cur << q.value(0) << q.value(1) << q.value(2);
-        mRecentPics << cur;
-    }
-    auto seed = std::chrono::system_clock::now().time_since_epoch().count();
-    std::shuffle(mRecentPics.begin(), mRecentPics.end(), std::default_random_engine(seed));
-    mCurrentPics = &mRecentPics;
-}
-
 QList<QList<QVariant> > PicFilesModel::getNextBatch(){
     if(mCurrentBatch * 100 >= mAllPics.count()){
         mCurrentBatch = 0;
diff --git a/picfilesmodel.h b/picfilesmodel.h
index 6535f01..0ed11c9 100644
--- a/picfilesmodel.h
+++ b/picfilesmodel.h
@@ -36,8 +36,6 @@ class PicFilesModel : public SmTreeModel {
         void selectFromAll();
         void selectFromRecent(int days);
         void selectFromSelection(QList<QVariant> ids);
-        void allPicIds();
-        void recentPicIds();
         QList<QList<QVariant> > getNextBatch();
         QList<QList<QVariant> > allPics() const { return mAllPics; }
 
diff --git a/picturelistview.cpp b/picturelistview.cpp
index 7ec185d..931d7a0 100644
--- a/picturelistview.cpp
+++ b/picturelistview.cpp
@@ -10,6 +10,7 @@
 #include <QApplication>
 #include <QMessageBox>
 #include <QMenu>
+#include <QContextMenuEvent>
 
 #include "picturelistview.h"
 #include "smglobals.h"
diff --git a/pictureviewer2.cpp b/pictureviewer2.cpp
index ced59d7..5d9ab03 100644
--- a/pictureviewer2.cpp
+++ b/pictureviewer2.cpp
@@ -329,8 +329,8 @@ void PictureViewer2::doSlide(){
     }
     mPicData = mPicFilesModel->allPics();
     if(mSlideDlg->shuffle()){
-        auto seed = std::chrono::system_clock::now().time_since_epoch().count();
-        std::shuffle(mPicData.begin(), mPicData.end(), std::default_random_engine(seed));
+        std::random_device r;
+        std::shuffle(mPicData.begin(), mPicData.end(), std::default_random_engine(r()));
     }
     auto picDataOld = mPicData;
     mPicData.clear();
@@ -668,6 +668,7 @@ PictureViewerSlideDlg::PictureViewerSlideDlg(QWidget *parent, Qt::WindowFlags f)
     QGroupBox *miscGb = new QGroupBox(tr("Misc."));
     mRecentDays = new QSpinBox;
     mRecentDays->setMinimum(1);
+    mRecentDays->setMaximum(9999);
     mRecentDays->setPrefix(tr("Slide last "));
     mRecentDays->setSuffix(tr(" days"));
     mShuffle = new QCheckBox(tr("Shuffle"));
@@ -785,8 +786,8 @@ void PictureViewer2Item::appendText(const QString &text){
 }
 
 void PictureViewer2Item::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget){
-    Q_UNUSED(option);
-    Q_UNUSED(widget);
+    Q_UNUSED(option)
+    Q_UNUSED(widget)
     painter->save();
     painter->setRenderHint(QPainter::Antialiasing, true);
     painter->setRenderHint(QPainter::TextAntialiasing, true);