Get rid of a lot of unused code

Well, sanitize the sliding madness. Replace it by a dialog and just one
timer. Seems to work so far...

1 files changed, 0 insertions, 42 deletions

diff --git a/pictureviewer2.h b/pictureviewer2.h
index f8e7a06..9f333fc 100644
--- a/pictureviewer2.h
+++ b/pictureviewer2.h
@@ -51,7 +51,6 @@ class PictureViewer2 : public QGraphicsView {
         void addFiles(const PicDataList &files, bool clear = true);
         void addFiles(const QString &dir, bool clear = true);
         void addFiles(const QStringList &files, bool clear = true);
-        void addFile(const QString &fullPath, int fileId = -1);
         void setFile(const PicData &file);
         void setFile(QString fullPath = mDefaultFile);
         void setPixmap(const QPixmap &pm);
@@ -69,15 +68,8 @@ class PictureViewer2 : public QGraphicsView {
         void selectPic(const QString &path);
         void stopSlide();
         void startSlide();
-        void startSlideAll();
-        void startSlideRecent();
-        void toggleSlide(bool slide);
-        void slide(bool);
-        void slideThrouhghAll(bool);
-        void slideThrougRecent(bool);
         void readSettings();
         void writeSettings();
-        void shuffle();
         void initActions();
         void copyCurrent();
         void deleteCurrent();
@@ -85,7 +77,6 @@ class PictureViewer2 : public QGraphicsView {
         void addToNewPics();
         void markCurrent();
         void clearMarks();
-        void doControl(QGraphicsItem *item);
         void showSlide();
         void doSlide();
 
@@ -103,14 +94,10 @@ class PictureViewer2 : public QGraphicsView {
         void constructInfoItem(const PicData &file, QSize picSize, bool converted = false);
         void constructMappingItem(const PicData &file);
         void docFromTree(SmTreeItem *start, QTextCursor *cur, int indent);
-        void nextFromAll();
-        void nextFromRecent();
 
     private:
-        void constructControlItem();
         void setGradient(const QPixmap &pic);
         void showNext();
-        void setNextBatch();
         QTextDocument *treeToString(const SmTreeItem *root) const;
         void treeToStringRecursive(const SmTreeItem *parent, QTextCursor *cursor, int indent) const;
         QPointF getPos(QGraphicsItem *item, int pos, const QPointF &movPos);
@@ -121,7 +108,6 @@ class PictureViewer2 : public QGraphicsView {
         QGraphicsPixmapItem *mCur;
         PictureViewerSlideDlg *mSlideDlg;
         QList<QList<QVariant> > mPicData;
-        //QStringList mFullPaths;
         int mTotal;
         int mNextSlideCtr;
 
@@ -130,25 +116,10 @@ class PictureViewer2 : public QGraphicsView {
         int mConfigMapPos;
         int mCursorOffset;
         QTimer *mTimer;
-        QTimer *mSlideTimer;
-        QTimer *mSlideTimerAll;
-        QTimer *mSlideTimerRecent;
-        QTimer *mCurTimer;
-        bool mSlideTimerAllRestart;
         bool mSlideTimerRecentRestart;
         const static QString mDefaultFile;
         PictureViewer2Item *mFnItem;
         PictureViewer2Item *mMappingItem;
-        BoundingRectItem *mBoundingRectItem;
-        QGraphicsTextItem *mNextC;
-        QGraphicsTextItem *mPreviousC;
-        QGraphicsTextItem *mSkipForwardC;
-        QGraphicsTextItem *mSkipBackwardC;
-        QGraphicsTextItem *mShuffleC;
-        QGraphicsTextItem *mSlideStopC;
-        QGraphicsTextItem *mSlideC;
-        QGraphicsTextItem *mSlideAllC;
-        QGraphicsTextItem *mSlideRecentC;
         bool mUseGradient;
         QColor mBgColor;
         QColor mDefaultTextColor;
@@ -158,14 +129,12 @@ class PictureViewer2 : public QGraphicsView {
         QAction *mHideA;
         QAction *mMarkA;
         QAction *mDeleteA;
-        MappingTreeModel *mMappingTreeModel;
         PicFilesModel *mPicFilesModel;
         PicData mCurPicData;
         NewPicsDialog *mNewPicsDlg;
         bool mShowInfoItem;
         bool mShowMappingItem;
         bool mShowMarkItem;
-        bool mShuffle;
         QString mCurrentDir;
         QString mArchiveDir;
 };
@@ -216,17 +185,6 @@ class PictureViewer2Item : public QGraphicsItem {
         QTextDocument *mDoc;
 };
 
-class BoundingRectItem : public QGraphicsItem {
-    public:
-        explicit BoundingRectItem(const QSize &size, QGraphicsItem *parent = 0) : QGraphicsItem(parent), mSize(size) {}
-        QRectF boundingRect() const;
-        virtual void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget);
-
-    private:
-        QSize mSize;
-
-};
-
 class PictureViewerGraphicsScene : public QGraphicsScene {
     Q_OBJECT
     public: