aboutsummaryrefslogtreecommitdiffstats
path: root/tests/auto
diff options
context:
space:
mode:
authorJ-P Nurmi <jpnurmi@digia.com>2013-08-28 14:23:49 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-08-28 14:44:43 +0200
commit07af94641a1b244063525def6a0dcf3f427e0c24 (patch)
tree09685a302c3ca0c6c979afee9c0ed5021d684fb6 /tests/auto
parent4dfc8907c8cc21e0e75812c561c2036746ac07c6 (diff)
Rename the QWinExtras namespace to QtWinExtras
Change-Id: I24cc4cfa5b51d14bc70a895d625c98e49af4537d Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Diffstat (limited to 'tests/auto')
-rw-r--r--tests/auto/qpixmap/tst_qpixmap.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/tests/auto/qpixmap/tst_qpixmap.cpp b/tests/auto/qpixmap/tst_qpixmap.cpp
index 2cc1da0..72c129f 100644
--- a/tests/auto/qpixmap/tst_qpixmap.cpp
+++ b/tests/auto/qpixmap/tst_qpixmap.cpp
@@ -95,7 +95,7 @@ void tst_QPixmap::toHBITMAP()
QPixmap pm(100, 100);
pm.fill(QColor(red, green, blue));
- const HBITMAP bitmap = QWinExtras::toHBITMAP(pm);
+ const HBITMAP bitmap = QtWinExtras::toHBITMAP(pm);
QVERIFY(bitmap != 0);
@@ -145,7 +145,7 @@ void tst_QPixmap::fromHBITMAP()
const HGDIOBJ oldBrush = SelectObject(bitmapDc, CreateSolidBrush(RGB(red, green, blue)));
Rectangle(bitmapDc, 0, 0, 100, 100);
- const QPixmap pixmap = QWinExtras::fromHBITMAP(bitmap);
+ const QPixmap pixmap = QtWinExtras::fromHBITMAP(bitmap);
QCOMPARE(pixmap.width(), 100);
QCOMPARE(pixmap.height(), 100);
@@ -233,7 +233,7 @@ void tst_QPixmap::toHICON()
const HDC displayDc = GetDC(0);
const HDC bitmapDc = CreateCompatibleDC(displayDc);
- const HBITMAP bitmap = QWinExtras::toHBITMAP(empty, QWinExtras::HBitmapAlpha);
+ const HBITMAP bitmap = QtWinExtras::toHBITMAP(empty, QtWinExtras::HBitmapAlpha);
SelectObject(bitmapDc, bitmap);
const QString imageFileName = pngFileName(image, width, height);
@@ -242,14 +242,14 @@ void tst_QPixmap::toHICON()
const QImage imageFromFile = QImage(imageFileName).convertToFormat(QImage::Format_ARGB32_Premultiplied);
QVERIFY(!imageFromFile.isNull());
- const HICON icon = QWinExtras::toHICON(QPixmap::fromImage(imageFromFile));
+ const HICON icon = QtWinExtras::toHICON(QPixmap::fromImage(imageFromFile));
DrawIconEx(bitmapDc, 0, 0, icon, width, height, 0, 0, DI_NORMAL);
DestroyIcon(icon);
DeleteDC(bitmapDc);
- const QImage imageFromHICON = QWinExtras::fromHBITMAP(bitmap, QWinExtras::HBitmapAlpha).toImage();
+ const QImage imageFromHICON = QtWinExtras::fromHBITMAP(bitmap, QtWinExtras::HBitmapAlpha).toImage();
QVERIFY(!imageFromHICON.isNull());
ReleaseDC(0, displayDc);
@@ -275,7 +275,7 @@ void tst_QPixmap::fromHICON()
QVERIFY2(QFileInfo(iconFileName).exists(), qPrintable(iconFileName));
const HICON icon = (HICON)LoadImage(0, (wchar_t*)(iconFileName).utf16(), IMAGE_ICON, width, height, LR_LOADFROMFILE);
- const QImage imageFromHICON = QWinExtras::fromHICON(icon).toImage();
+ const QImage imageFromHICON = QtWinExtras::fromHICON(icon).toImage();
DestroyIcon(icon);
const QString imageFileName = pngFileName(image, width, height);