diff options
author | Sze Howe Koh <szehowe.koh@gmail.com> | 2012-12-29 02:09:39 +0800 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-01-25 17:27:44 +0100 |
commit | 63569a68d2fd5ca90c4660e632fba2f3f3b37d73 (patch) | |
tree | 135a8c850a6c8067a6c7a47de2c08579d8d168b4 /src/corelib/kernel | |
parent | e3ac2b6392bfd1449f94393804fe7f4b4207b5a7 (diff) |
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 <jerome.pasion@digia.com>
Diffstat (limited to 'src/corelib/kernel')
-rw-r--r-- | src/corelib/kernel/qcoreapplication.cpp | 2 | ||||
-rw-r--r-- | src/corelib/kernel/qmetaobject.cpp | 4 | ||||
-rw-r--r-- | src/corelib/kernel/qmimedata.cpp | 12 | ||||
-rw-r--r-- | src/corelib/kernel/qvariant.cpp | 4 |
4 files changed, 11 insertions, 11 deletions
diff --git a/src/corelib/kernel/qcoreapplication.cpp b/src/corelib/kernel/qcoreapplication.cpp index 75ff43180c..ec808424f9 100644 --- a/src/corelib/kernel/qcoreapplication.cpp +++ b/src/corelib/kernel/qcoreapplication.cpp @@ -749,7 +749,7 @@ void QCoreApplication::setQuitLockEnabled(bool enabled) */ bool QCoreApplication::notifyInternal(QObject *receiver, QEvent *event) { - // Make it possible for QtScript to hook into events even + // Make it possible for Qt Script to hook into events even // though QApplication is subclassed... bool result = false; void *cbdata[] = { receiver, event, &result }; diff --git a/src/corelib/kernel/qmetaobject.cpp b/src/corelib/kernel/qmetaobject.cpp index b2d3470aee..14d96e96fd 100644 --- a/src/corelib/kernel/qmetaobject.cpp +++ b/src/corelib/kernel/qmetaobject.cpp @@ -2804,7 +2804,7 @@ QVariant QMetaProperty::read(const QObject *object) const } // the status variable is changed by qt_metacall to indicate what it did - // this feature is currently only used by QtDBus and should not be depended + // this feature is currently only used by Qt D-Bus and should not be depended // upon. Don't change it without looking into QDBusAbstractInterface first // -1 (unchanged): normal qt_metacall, result stored in argv[0] // changed: result stored directly in value @@ -2883,7 +2883,7 @@ bool QMetaProperty::write(QObject *object, const QVariant &value) const } // the status variable is changed by qt_metacall to indicate what it did - // this feature is currently only used by QtDBus and should not be depended + // this feature is currently only used by Qt D-Bus and should not be depended // upon. Don't change it without looking into QDBusAbstractInterface first // -1 (unchanged): normal qt_metacall, result stored in argv[0] // changed: result stored directly in value, return the value of status diff --git a/src/corelib/kernel/qmimedata.cpp b/src/corelib/kernel/qmimedata.cpp index a54980513c..6e571d2969 100644 --- a/src/corelib/kernel/qmimedata.cpp +++ b/src/corelib/kernel/qmimedata.cpp @@ -452,8 +452,8 @@ bool QMimeData::hasHtml() const Returns a QVariant storing a QImage if the object can return an image; otherwise returns a null variant. - A QVariant is used because QMimeData belongs to the \l QtCore - library, whereas QImage belongs to \l QtGui. To convert the + A QVariant is used because QMimeData belongs to the Qt Core + module, whereas QImage belongs to Qt GUI. To convert the QVariant to a QImage, simply use qvariant_cast(). For example: \snippet code/src_corelib_kernel_qmimedata.cpp 5 @@ -469,8 +469,8 @@ QVariant QMimeData::imageData() const /*! Sets the data in the object to the given \a image. - A QVariant is used because QMimeData belongs to the \l QtCore - library, whereas QImage belongs to \l QtGui. The conversion + A QVariant is used because QMimeData belongs to the Qt Core + module, whereas QImage belongs to Qt GUI. The conversion from QImage to QVariant is implicit. For example: \snippet code/src_corelib_kernel_qmimedata.cpp 6 @@ -499,8 +499,8 @@ bool QMimeData::hasImage() const color (MIME type \c application/x-color); otherwise returns a null variant. - A QVariant is used because QMimeData belongs to the \l QtCore - library, whereas QColor belongs to \l QtGui. To convert the + A QVariant is used because QMimeData belongs to the Qt Core + module, whereas QColor belongs to Qt GUI. To convert the QVariant to a QColor, simply use qvariant_cast(). For example: \snippet code/src_corelib_kernel_qmimedata.cpp 7 diff --git a/src/corelib/kernel/qvariant.cpp b/src/corelib/kernel/qvariant.cpp index c9e0019710..60ab5506a4 100644 --- a/src/corelib/kernel/qvariant.cpp +++ b/src/corelib/kernel/qvariant.cpp @@ -949,8 +949,8 @@ Q_CORE_EXPORT void QVariantPrivate::registerHandler(const int /* Modules::Names \section1 A Note on GUI Types - Because QVariant is part of the QtCore library, it cannot provide - conversion functions to data types defined in QtGui, such as + Because QVariant is part of the Qt Core module, it cannot provide + conversion functions to data types defined in Qt GUI, such as QColor, QImage, and QPixmap. In other words, there is no \c toColor() function. Instead, you can use the QVariant::value() or the qvariant_cast() template function. For example: |