QMovie: move-enable QFrameInfo

All users of the QPixmap ctor can pass rvalues, so take by rvalue-ref
and move into place. Adapt callers to actually pass rvalues.

Change-Id: Iacff2ed893ceaa1665b270ce466ffdc21ba800f1
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>

1 files changed, 5 insertions, 8 deletions

diff --git a/src/gui/image/qmovie.cpp b/src/gui/image/qmovie.cpp
index 4b588527ae..3e975115ab 100644
--- a/src/gui/image/qmovie.cpp
+++ b/src/gui/image/qmovie.cpp
@@ -207,8 +207,8 @@ public:
         : pixmap(QPixmap()), delay(QMOVIE_INVALID_DELAY), endMark(false)
     { }
 
-    inline QFrameInfo(const QPixmap &pixmap, int delay)
-        : pixmap(pixmap), delay(delay), endMark(false)
+    inline QFrameInfo(QPixmap &&pixmap, int delay)
+        : pixmap(std::move(pixmap)), delay(delay), endMark(false)
     { }
 
     inline bool isValid()
@@ -222,6 +222,7 @@ public:
     static inline QFrameInfo endMarker()
     { return QFrameInfo(true); }
 };
+Q_DECLARE_TYPEINFO(QFrameInfo, Q_MOVABLE_TYPE);
 
 class QMoviePrivate : public QObjectPrivate
 {
@@ -380,9 +381,7 @@ QFrameInfo QMoviePrivate::infoForFrame(int frameNumber)
             }
             if (frameNumber > greatestFrameNumber)
                 greatestFrameNumber = frameNumber;
-            QPixmap aPixmap = QPixmap::fromImage(std::move(anImage));
-            int aDelay = reader->nextImageDelay();
-            return QFrameInfo(aPixmap, aDelay);
+            return QFrameInfo(QPixmap::fromImage(std::move(anImage)), reader->nextImageDelay());
         } else if (frameNumber != 0) {
             // We've read all frames now. Return an end marker
             haveReadAll = true;
@@ -406,9 +405,7 @@ QFrameInfo QMoviePrivate::infoForFrame(int frameNumber)
                     return QFrameInfo(); // Invalid
                 }
                 greatestFrameNumber = i;
-                QPixmap aPixmap = QPixmap::fromImage(std::move(anImage));
-                int aDelay = reader->nextImageDelay();
-                QFrameInfo info(aPixmap, aDelay);
+                QFrameInfo info(QPixmap::fromImage(std::move(anImage)), reader->nextImageDelay());
                 // Cache it!
                 frameMap.insert(i, info);
                 if (i == frameNumber) {