From 63569a68d2fd5ca90c4660e632fba2f3f3b37d73 Mon Sep 17 00:00:00 2001 From: Sze Howe Koh Date: Sat, 29 Dec 2012 02:09:39 +0800 Subject: Doc: Fix module name format Follow the conventions at http://qt-project.org/wiki/Spelling_Module_Names_in_Qt_Documentation QtCore -> Qt Core QtDBus -> Qt D-Bus QtDesigner -> Qt Designer QtGui -> Qt GUI QtImageFormats -> Qt Image Formats QtNetwork -> Qt Network QtPrintSupport -> Qt Print Support QtScript -> Qt Script QtSql -> Qt SQL QtSvg -> Qt SVG QtTest -> Qt Test QtWebKit -> Qt WebKit QtWidgets -> Qt Widgets QtXml -> Qt XML QtConcurrent -> Qt Concurrent (partial) QtQuick -> Qt Quick (partial) Also, distinguish between "module" and "library" Change-Id: Icb8aa695ae60b0e45920b0c8fce4dc763a12b0cd Reviewed-by: Jerome Pasion --- src/gui/image/qimagereader.cpp | 5 ++--- src/gui/image/qimagewriter.cpp | 5 ++--- src/gui/image/qplatformpixmap.cpp | 2 +- 3 files changed, 5 insertions(+), 7 deletions(-) (limited to 'src/gui/image') diff --git a/src/gui/image/qimagereader.cpp b/src/gui/image/qimagereader.cpp index 6836035e59..71408ecd23 100644 --- a/src/gui/image/qimagereader.cpp +++ b/src/gui/image/qimagereader.cpp @@ -1456,9 +1456,8 @@ void supportedImageHandlerFormats(QFactoryLoader *loader, \row \li SVG \li Scalable Vector Graphics \endtable - Reading and writing SVG files is supported through Qt's - \l{QtSvg Module}{SVG Module}. The \l{QtImageFormats Module}{Image Formats Module} - provides support for additional image formats. + Reading and writing SVG files is supported through the \l{Qt SVG} module. + The \l{Qt Image Formats} module provides support for additional image formats. Note that the QApplication instance must be created before this function is called. diff --git a/src/gui/image/qimagewriter.cpp b/src/gui/image/qimagewriter.cpp index 3270a5ca01..8e0f3fdcf0 100644 --- a/src/gui/image/qimagewriter.cpp +++ b/src/gui/image/qimagewriter.cpp @@ -697,9 +697,8 @@ void supportedImageHandlerFormats(QFactoryLoader *loader, \row \li XPM \li X11 Pixmap \endtable - Reading and writing SVG files is supported through Qt's - \l{QtSvg Module}{SVG Module}. The \l{QtImageFormats Module}{Image Formats Module} - provides support for additional image formats. + Reading and writing SVG files is supported through the \l{Qt SVG} module. + The \l{Qt Image Formats} module provides support for additional image formats. Note that the QApplication instance must be created before this function is called. diff --git a/src/gui/image/qplatformpixmap.cpp b/src/gui/image/qplatformpixmap.cpp index ba8a52d14f..ce66972dc3 100644 --- a/src/gui/image/qplatformpixmap.cpp +++ b/src/gui/image/qplatformpixmap.cpp @@ -83,7 +83,7 @@ QPlatformPixmap::QPlatformPixmap(PixelType pixelType, int objectId) QPlatformPixmap::~QPlatformPixmap() { // Sometimes the pixmap cleanup hooks will be called from derrived classes, which will - // then set is_cached to false. For example, on X11 QtGui needs to delete the GLXPixmap + // then set is_cached to false. For example, on X11 Qt GUI needs to delete the GLXPixmap // or EGL Pixmap Surface for a given pixmap _before_ the native X11 pixmap is deleted, // otherwise some drivers will leak the GL surface. In this case, QX11PlatformPixmap will // call the cleanup hooks itself before deleting the native pixmap and set is_cached to -- cgit v1.2.3