Merge remote-tracking branch 'origin/api_changes'

Change-Id: I964b0a6f5c38351fdfafb8a2a128a349ff8c89d1

5 files changed, 5 insertions, 34 deletions

diff --git a/src/gui/image/qmovie.h b/src/gui/image/qmovie.h
index 9d4cb87b15..e11dea6ad3 100644
--- a/src/gui/image/qmovie.h
+++ b/src/gui/image/qmovie.h
@@ -83,7 +83,7 @@ public:
         CacheAll
     };
 
-    QMovie(QObject *parent = 0);
+    explicit QMovie(QObject *parent = 0);
     explicit QMovie(QIODevice *device, const QByteArray &format = QByteArray(), QObject *parent = 0);
     explicit QMovie(const QString &fileName, const QByteArray &format = QByteArray(), QObject *parent = 0);
     ~QMovie();
diff --git a/src/gui/image/qpicture.cpp b/src/gui/image/qpicture.cpp
index 089cc5011c..8bb9f211e8 100644
--- a/src/gui/image/qpicture.cpp
+++ b/src/gui/image/qpicture.cpp
@@ -828,26 +828,6 @@ bool QPicture::exec(QPainter *painter, QDataStream &s, int nrecords)
             }
             painter->setBrush(brush);
             break;
-// #ifdef Q_Q3PAINTER
-//         case QPicturePrivate::PdcSetTabStops:
-//                 s >> i_16;
-//                 painter->setTabStops(i_16);
-//                 break;
-//             case QPicturePrivate::PdcSetTabArray:
-//                 s >> i_16;
-//                 if (i_16 == 0) {
-//                     painter->setTabArray(0);
-//                 } else {
-//                     int *ta = new int[i_16];
-//                     for (int i=0; i<i_16; i++) {
-//                         s >> i1_16;
-//                         ta[i] = i1_16;
-//                     }
-//                     painter->setTabArray(ta);
-//                     delete [] ta;
-//                 }
-//                 break;
-// #endif
         case QPicturePrivate::PdcSetVXform:
             s >> i_8;
             painter->setViewTransformEnabled(i_8);
@@ -884,14 +864,6 @@ bool QPicture::exec(QPainter *painter, QDataStream &s, int nrecords)
             // i_8 is always false due to updateXForm() in qpaintengine_pic.cpp
             painter->setTransform(matrix * worldMatrix, i_8);
             break;
-// #ifdef Q_Q3PAINTER
-//             case QPicturePrivate::PdcSaveWMatrix:
-//                 painter->saveWorldMatrix();
-//                 break;
-//             case QPicturePrivate::PdcRestoreWMatrix:
-//                 painter->restoreWorldMatrix();
-//                 break;
-// #endif
         case QPicturePrivate::PdcSetClip:
             s >> i_8;
             painter->setClipping(i_8);
diff --git a/src/gui/image/qpicture.h b/src/gui/image/qpicture.h
index c3dbab25c5..b94171abf8 100644
--- a/src/gui/image/qpicture.h
+++ b/src/gui/image/qpicture.h
@@ -109,7 +109,6 @@ private:
 
     QExplicitlySharedDataPointer<QPicturePrivate> d_ptr;
     friend class QPicturePaintEngine;
-    friend class Q3Picture;
     friend class QAlphaPaintEngine;
     friend class QPreviewPaintEngine;
 
diff --git a/src/gui/image/qpixmap.h b/src/gui/image/qpixmap.h
index 3d78a43917..0b21be5c8e 100644
--- a/src/gui/image/qpixmap.h
+++ b/src/gui/image/qpixmap.h
@@ -67,10 +67,10 @@ public:
     QPixmap();
     explicit QPixmap(QPlatformPixmap *data);
     QPixmap(int w, int h);
-    QPixmap(const QSize &);
+    explicit QPixmap(const QSize &);
     QPixmap(const QString& fileName, const char *format = 0, Qt::ImageConversionFlags flags = Qt::AutoColor);
 #ifndef QT_NO_IMAGEFORMAT_XPM
-    QPixmap(const char * const xpm[]);
+    explicit QPixmap(const char * const xpm[]);
 #endif
     QPixmap(const QPixmap &);
     ~QPixmap();
diff --git a/src/gui/image/qpnghandler.cpp b/src/gui/image/qpnghandler.cpp
index 7acad067b5..c3ae0a41da 100644
--- a/src/gui/image/qpnghandler.cpp
+++ b/src/gui/image/qpnghandler.cpp
@@ -184,7 +184,7 @@ void CALLBACK_CALL_TYPE iod_read_fn(png_structp png_ptr, png_bytep data, png_siz
     if (d->state == QPngHandlerPrivate::ReadingEnd && !in->isSequential() && (in->size() - in->pos()) < 4 && length == 4) {
         // Workaround for certain malformed PNGs that lack the final crc bytes
         uchar endcrc[4] = { 0xae, 0x42, 0x60, 0x82 };
-        qMemCopy(data, endcrc, 4);
+        memcpy(data, endcrc, 4);
         in->seek(in->size());
         return;
     }
@@ -664,7 +664,7 @@ static void set_text(const QImage &image, png_structp png_ptr, png_infop info_pt
         return;
 
     png_textp text_ptr = new png_text[text.size()];
-    qMemSet(text_ptr, 0, text.size() * sizeof(png_text));
+    memset(text_ptr, 0, text.size() * sizeof(png_text));
 
     QMap<QString, QString>::ConstIterator it = text.constBegin();
     int i = 0;