diff options
Diffstat (limited to 'src')
33 files changed, 343 insertions, 201 deletions
diff --git a/src/corelib/io/qdebug.cpp b/src/corelib/io/qdebug.cpp index 9cb5609dac..b8cd0f70b2 100644 --- a/src/corelib/io/qdebug.cpp +++ b/src/corelib/io/qdebug.cpp @@ -384,7 +384,7 @@ QDebugStateSaver::QDebugStateSaver(QDebug &dbg) /*! Destroyes a QDebugStateSaver instance, which restores the settings - used by \a dbg when the QDebugStateSaver instance was created. + used when the QDebugStateSaver instance was created. \sa QDebug::setAutoInsertSpaces(), QDebug::autoInsertSpaces() */ diff --git a/src/corelib/kernel/qcoreapplication.cpp b/src/corelib/kernel/qcoreapplication.cpp index 1ccf5f2197..f3caa1d918 100644 --- a/src/corelib/kernel/qcoreapplication.cpp +++ b/src/corelib/kernel/qcoreapplication.cpp @@ -2203,7 +2203,7 @@ QString QCoreApplication::organizationDomain() If not set, the application name defaults to the executable name (since 5.0). - \sa organizationName, organizationDomain, applicationVersion, applicationFilePath + \sa organizationName, organizationDomain, applicationVersion, applicationFilePath() */ /*! \fn void QCoreApplication::applicationNameChanged() diff --git a/src/corelib/kernel/qmetatype.cpp b/src/corelib/kernel/qmetatype.cpp index 70c2e236dd..a9ba4aaaad 100644 --- a/src/corelib/kernel/qmetatype.cpp +++ b/src/corelib/kernel/qmetatype.cpp @@ -354,7 +354,7 @@ struct DefinedTypesFilter { This function is typically used together with construct() to perform low-level management of the memory used by a type. - \sa QMetaType::construct(void *where, const void *copy), QMetaType::sizeOf(int) + \sa QMetaType::construct(), QMetaType::sizeOf() */ /*! @@ -363,7 +363,7 @@ struct DefinedTypesFilter { Returns flags of the type for which this QMetaType instance was constructed. - \sa QMetaType::TypeFlags, QMetaType::typeFlags(int type) + \sa QMetaType::TypeFlags, QMetaType::typeFlags() */ /*! @@ -380,7 +380,7 @@ struct DefinedTypesFilter { QMetaType instance was created for. If \a copy is null, creates a default constructed instance. - \sa QMetaType::destroy(void*) + \sa QMetaType::destroy() */ /*! @@ -390,7 +390,7 @@ struct DefinedTypesFilter { Destroys the \a data, assuming it is of the type that this QMetaType instance was created for. - \sa QMetaType::create(const void *) + \sa QMetaType::create() */ /*! diff --git a/src/corelib/thread/qsemaphore.cpp b/src/corelib/thread/qsemaphore.cpp index 1cf893f42c..90e4f2a20a 100644 --- a/src/corelib/thread/qsemaphore.cpp +++ b/src/corelib/thread/qsemaphore.cpp @@ -83,7 +83,7 @@ QT_BEGIN_NAMESPACE A typical application of semaphores is for controlling access to a circular buffer shared by a producer thread and a consumer - thread. The \l{threads/semaphores}{Semaphores} example shows how + thread. The \l{Semaphores Example} shows how to use QSemaphore to solve that problem. A non-computing example of a semaphore would be dining at a diff --git a/src/corelib/thread/qwaitcondition.qdoc b/src/corelib/thread/qwaitcondition.qdoc index 9aa633a210..b1a396d504 100644 --- a/src/corelib/thread/qwaitcondition.qdoc +++ b/src/corelib/thread/qwaitcondition.qdoc @@ -75,7 +75,7 @@ simultaneously are unpredictable. Wait conditions are a powerful thread synchronization primitive. - The \l{threads/waitconditions}{Wait Conditions} example shows how + The \l{Wait Conditions Example} example shows how to use QWaitCondition as an alternative to QSemaphore for controlling access to a circular buffer shared by a producer thread and a consumer thread. diff --git a/src/corelib/tools/qchar.cpp b/src/corelib/tools/qchar.cpp index 5de06d8c4a..ff17a52a75 100644 --- a/src/corelib/tools/qchar.cpp +++ b/src/corelib/tools/qchar.cpp @@ -506,6 +506,7 @@ QT_BEGIN_NAMESPACE \value CarriageReturn \value Space \value Nbsp Non-breaking space. + \value SoftHyphen \value ReplacementCharacter The character shown when a font has no glyph for a certain codepoint. A special question mark character is often used. Codecs use this codepoint when input data cannot be diff --git a/src/corelib/tools/qeasingcurve.cpp b/src/corelib/tools/qeasingcurve.cpp index 67e0711796..23451f095c 100644 --- a/src/corelib/tools/qeasingcurve.cpp +++ b/src/corelib/tools/qeasingcurve.cpp @@ -290,7 +290,7 @@ \value BezierSpline Allows defining a custom easing curve using a cubic bezier spline \sa addCubicBezierSegment() \value TCBSpline Allows defining a custom easing curve using a TCB spline - \sa addTCBSegment + \sa addTCBSegment() \value Custom This is returned if the user specified a custom curve type with setCustomType(). Note that you cannot call setType() with this value, but type() can return it. diff --git a/src/corelib/tools/qregexp.cpp b/src/corelib/tools/qregexp.cpp index 086cdeb108..c0cd419c53 100644 --- a/src/corelib/tools/qregexp.cpp +++ b/src/corelib/tools/qregexp.cpp @@ -285,7 +285,7 @@ int qFindString(const QChar *haystack, int haystackLen, int from, \row \li \b{\\W} \li Matches a non-word character. \row \li \b{\\\e{n}} - \li The \e{n}-th \l backreference, e.g. \\1, \\2, etc. + \li The \e{n}-th backreference, e.g. \\1, \\2, etc. \endtable \b{Note:} The C++ compiler transforms backslashes in strings. diff --git a/src/dbus/qdbusvirtualobject.cpp b/src/dbus/qdbusvirtualobject.cpp index d6d4f01a33..15e01c2f20 100644 --- a/src/dbus/qdbusvirtualobject.cpp +++ b/src/dbus/qdbusvirtualobject.cpp @@ -70,7 +70,7 @@ QT_END_NAMESPACE This function needs to handle all messages to the path of the virtual object, when the SubPath option is specified. - The service, path, interface and methos are all part of the message. + The service, path, interface and methos are all part of the \a message. Must return true when the message is handled, otherwise false (will generate dbus error message). */ @@ -79,7 +79,7 @@ QT_END_NAMESPACE \fn QString QDBusVirtualObject::introspect(const QString &path) const This function needs to handle the introspection of the - virtual object. It must return xml of the form: + virtual object on \a path. It must return xml of the form: \code <interface name="org.qtproject.QtDBus.MyObject" > diff --git a/src/gui/accessible/qaccessibleplugin.cpp b/src/gui/accessible/qaccessibleplugin.cpp index c509d6be72..8cdbca6767 100644 --- a/src/gui/accessible/qaccessibleplugin.cpp +++ b/src/gui/accessible/qaccessibleplugin.cpp @@ -50,8 +50,8 @@ QT_BEGIN_NAMESPACE /*! \class QAccessiblePlugin - \brief The QAccessiblePlugin class provides an abstract base for - accessibility plugins. + \brief The QAccessiblePlugin class provides an abstract base class + for plugins provinding accessibility information for user interface elements. \ingroup plugins \ingroup accessibility @@ -60,7 +60,7 @@ QT_BEGIN_NAMESPACE base class, reimplementing the pure virtual function create(), and exporting the class with the Q_PLUGIN_METADATA() macro. - \sa QAccessibleBridgePlugin, {How to Create Qt Plugins} + \sa {How to Create Qt Plugins} */ /*! diff --git a/src/gui/image/qimage.cpp b/src/gui/image/qimage.cpp index 8e5f6391a7..3d6315a7fe 100644 --- a/src/gui/image/qimage.cpp +++ b/src/gui/image/qimage.cpp @@ -1412,7 +1412,7 @@ qreal QImage::devicePixelRatio() const Sets the the device pixel ratio for the image. This is the ratio between image pixels and device-independent pixels. - The default value is 1.0. Setting it to something else has + The default \a scaleFactor is 1.0. Setting it to something else has two effects: QPainters that are opened on the image will be scaled. For diff --git a/src/gui/image/qmovie.cpp b/src/gui/image/qmovie.cpp index ae526f5ba7..26e35c6db6 100644 --- a/src/gui/image/qmovie.cpp +++ b/src/gui/image/qmovie.cpp @@ -48,7 +48,7 @@ with QImageReader. This class is used to show simple animations without sound. If you want - to display video and media content, use the \l{Phonon Module}{Phonon} + to display video and media content, use the \l{Qt Multimedia} multimedia framework instead. First, create a QMovie object by passing either the name of a file or a diff --git a/src/gui/image/qpicture.cpp b/src/gui/image/qpicture.cpp index e7fbb2a6a9..be7a1e8001 100644 --- a/src/gui/image/qpicture.cpp +++ b/src/gui/image/qpicture.cpp @@ -1742,7 +1742,7 @@ QByteArray QPictureIO::pictureFormat(const QString &fileName) Make sure that \a d is at the right position in the device (for example, at the beginning of the file). - \sa QIODevice::at() + \sa QIODevice::pos() */ QByteArray QPictureIO::pictureFormat(QIODevice *d) diff --git a/src/gui/image/qpixmap.cpp b/src/gui/image/qpixmap.cpp index 04f0da1a83..f98ca04f4d 100644 --- a/src/gui/image/qpixmap.cpp +++ b/src/gui/image/qpixmap.cpp @@ -660,7 +660,7 @@ qreal QPixmap::devicePixelRatio() const Sets the the device pixel ratio for the pixmap. This is the ratio between image pixels and device-independent pixels. - The default value is 1.0. Setting it to something else has + The default \a scaleFactor is 1.0. Setting it to something else has two effects: QPainters that are opened on the pixmap will be scaled. For diff --git a/src/gui/kernel/qkeysequence.cpp b/src/gui/kernel/qkeysequence.cpp index c577831208..9464d97932 100644 --- a/src/gui/kernel/qkeysequence.cpp +++ b/src/gui/kernel/qkeysequence.cpp @@ -270,7 +270,7 @@ void Q_GUI_EXPORT qt_set_sequence_auto_mnemonic(bool b) { qt_sequence_no_mnemoni \row \li MoveToNextPage \li PgDown \li PgDown, Alt+PgDown, Meta+Down, Meta+PgDown\li PgDown \li PgDown \row \li MoveToPreviousPage \li PgUp \li PgUp, Alt+PgUp, Meta+Up, Meta+PgUp \li PgUp \li PgUp \row \li MoveToStartOfLine \li Home \li Ctrl+Left, Meta+Left \li Home \li Home - \row \li MoveToEndOfLine \li End \li Ctrl+Right, Meta+Right \li End \li End + \row \li MoveToEndOfLine \li End \li Ctrl+Right, Meta+Right \li End, Ctrl+E \li End, Ctrl+E \row \li MoveToStartOfBlock \li (none) \li Alt+Up, Meta+A \li (none) \li (none) \row \li MoveToEndOfBlock \li (none) \li Alt+Down, Meta+E \li (none) \li (none) \row \li MoveToStartOfDocument\li Ctrl+Home \li Ctrl+Up, Home \li Ctrl+Home \li Ctrl+Home @@ -292,6 +292,7 @@ void Q_GUI_EXPORT qt_set_sequence_auto_mnemonic(bool b) { qt_sequence_no_mnemoni \row \li DeleteStartOfWord \li Ctrl+Backspace \li Alt+Backspace \li Ctrl+Backspace \li Ctrl+Backspace \row \li DeleteEndOfWord \li Ctrl+Del \li (none) \li Ctrl+Del \li Ctrl+Del \row \li DeleteEndOfLine \li (none) \li (none) \li Ctrl+K \li Ctrl+K + \row \li DeleteCompleteLine \li (none) \li (none) \li Ctrl+U \li Ctrl+U \row \li InsertParagraphSeparator \li Enter \li Enter \li Enter \li Enter \row \li InsertLineSeparator \li Shift+Enter \li Meta+Enter \li Shift+Enter \li Shift+Enter \endtable @@ -668,6 +669,7 @@ static const struct { \value DeleteEndOfLine Delete end of line. \value DeleteEndOfWord Delete word from the end of the cursor. \value DeleteStartOfWord Delete the beginning of a word up to the cursor. + \value DeleteCompleteLine Delete the entire line. \value Find Find in document. \value FindNext Find next result. \value FindPrevious Find previous result. @@ -888,8 +890,6 @@ bool QKeySequence::isEmpty() const in English. At the time of writing, Microsoft and Open Group do not appear to have issued equivalent recommendations for other languages. - - \sa qt_set_sequence_auto_mnemonic() */ QKeySequence QKeySequence::mnemonic(const QString &text) { diff --git a/src/gui/kernel/qkeysequence.h b/src/gui/kernel/qkeysequence.h index 8a989682d8..1c0ff6ca2c 100644 --- a/src/gui/kernel/qkeysequence.h +++ b/src/gui/kernel/qkeysequence.h @@ -141,7 +141,8 @@ public: Preferences, Quit, FullScreen, - Deselect + Deselect, + DeleteCompleteLine }; enum SequenceFormat { diff --git a/src/gui/kernel/qplatformtheme.cpp b/src/gui/kernel/qplatformtheme.cpp index 18ac9dc088..3fb4939b69 100644 --- a/src/gui/kernel/qplatformtheme.cpp +++ b/src/gui/kernel/qplatformtheme.cpp @@ -256,6 +256,7 @@ const QKeyBinding QPlatformThemePrivate::keyBindings[] = { {QKeySequence::MoveToEndOfLine, 0, Qt::META | Qt::Key_Right, KB_Mac}, {QKeySequence::MoveToEndOfLine, 0, Qt::CTRL | Qt::Key_Right, KB_Mac }, {QKeySequence::MoveToEndOfLine, 0, Qt::Key_End, KB_Win | KB_X11}, + {QKeySequence::MoveToEndOfLine, 0, Qt::CTRL + Qt::Key_E, KB_X11}, {QKeySequence::MoveToStartOfBlock, 0, Qt::META | Qt::Key_A, KB_Mac}, {QKeySequence::MoveToStartOfBlock, 0, Qt::ALT | Qt::Key_Up, KB_Mac}, //mac only {QKeySequence::MoveToEndOfBlock, 0, Qt::META | Qt::Key_E, KB_Mac}, @@ -311,7 +312,8 @@ const QKeyBinding QPlatformThemePrivate::keyBindings[] = { {QKeySequence::FullScreen, 0, Qt::CTRL | Qt::SHIFT | Qt::Key_F, KB_KDE}, {QKeySequence::FullScreen, 1, Qt::CTRL | Qt::Key_F11, KB_Gnome}, {QKeySequence::FullScreen, 1, Qt::Key_F11, KB_Win | KB_KDE}, - {QKeySequence::Deselect, 0, Qt::CTRL | Qt::SHIFT | Qt::Key_A, KB_X11} + {QKeySequence::Deselect, 0, Qt::CTRL | Qt::SHIFT | Qt::Key_A, KB_X11}, + {QKeySequence::DeleteCompleteLine, 0, Qt::CTRL | Qt::Key_U, KB_X11} }; const uint QPlatformThemePrivate::numberOfKeyBindings = sizeof(QPlatformThemePrivate::keyBindings)/(sizeof(QKeyBinding)); @@ -547,7 +549,7 @@ QList<QKeySequence> QPlatformTheme::keyBindings(QKeySequence::StandardKey key) c else { //We may have several equal values for different platforms, so we must search in both directions //search forward including current location - for (unsigned int i = mid; i < N - 1 ; ++i) { + for (unsigned int i = mid; i < N ; ++i) { QKeyBinding current = QPlatformThemePrivate::keyBindings[i]; if (current.standardKey != key) break; diff --git a/src/gui/painting/qbackingstore.cpp b/src/gui/painting/qbackingstore.cpp index c1f7c6c738..3a36762502 100644 --- a/src/gui/painting/qbackingstore.cpp +++ b/src/gui/painting/qbackingstore.cpp @@ -84,7 +84,7 @@ public: QBackingStore might be used by an application that wants to use QPainter without OpenGL acceleration and without the extra overhead of using the QWidget or QGraphicsView UI stacks. For an example of how to use - QBackingStore see the \l{gui/rasterwindow}{Raster Window} example. + QBackingStore see the \l{Raster Window Example}. */ /*! diff --git a/src/gui/painting/qpagedpaintdevice.cpp b/src/gui/painting/qpagedpaintdevice.cpp index 0387f0020f..f41d1830fd 100644 --- a/src/gui/painting/qpagedpaintdevice.cpp +++ b/src/gui/painting/qpagedpaintdevice.cpp @@ -162,7 +162,7 @@ QPagedPaintDevice::~QPagedPaintDevice() /*! Sets the size of the a page to \a size. - \sa setPageSizeMM + \sa setPageSizeMM() */ void QPagedPaintDevice::setPageSize(PageSize size) { @@ -205,7 +205,7 @@ QSizeF QPagedPaintDevice::pageSizeMM() const The margins are purely a hint to the drawing method. They don't affect the coordinate system or clipping. - \sa margins + \sa margins() */ void QPagedPaintDevice::setMargins(const Margins &margins) { @@ -215,7 +215,7 @@ void QPagedPaintDevice::setMargins(const Margins &margins) /*! returns the current margins of the paint device. The default is 0. - \sa setMargins + \sa setMargins() */ QPagedPaintDevice::Margins QPagedPaintDevice::margins() const { diff --git a/src/tools/qdoc/codemarker.cpp b/src/tools/qdoc/codemarker.cpp index 8faac66b1b..a1f0068f7d 100644 --- a/src/tools/qdoc/codemarker.cpp +++ b/src/tools/qdoc/codemarker.cpp @@ -94,7 +94,7 @@ void CodeMarker::terminateMarker() */ void CodeMarker::initialize(const Config& config) { - defaultLang = config.getString(QLatin1String(CONFIG_LANGUAGE)); + defaultLang = config.getString(CONFIG_LANGUAGE); QList<CodeMarker *>::ConstIterator m = markers.constBegin(); while (m != markers.constEnd()) { (*m)->initializeMarker(config); diff --git a/src/tools/qdoc/codeparser.cpp b/src/tools/qdoc/codeparser.cpp index 1be67894cc..8f57a691bf 100644 --- a/src/tools/qdoc/codeparser.cpp +++ b/src/tools/qdoc/codeparser.cpp @@ -102,7 +102,7 @@ CodeParser::~CodeParser() */ void CodeParser::initializeParser(const Config& config) { - showInternal = config.getBool(QLatin1String(CONFIG_SHOWINTERNAL)); + showInternal = config.getBool(CONFIG_SHOWINTERNAL); } /*! diff --git a/src/tools/qdoc/config.cpp b/src/tools/qdoc/config.cpp index 48be30c24e..0dd59fd214 100644 --- a/src/tools/qdoc/config.cpp +++ b/src/tools/qdoc/config.cpp @@ -55,6 +55,77 @@ QT_BEGIN_NAMESPACE +QString ConfigStrings::ALIAS = QStringLiteral("alias"); +QString ConfigStrings::BASE = QStringLiteral("base"); +QString ConfigStrings::BASEDIR = QStringLiteral("basedir"); +QString ConfigStrings::BUILDVERSION = QStringLiteral("buildversion"); +QString ConfigStrings::CODEINDENT = QStringLiteral("codeindent"); +QString ConfigStrings::CPPCLASSESPAGE = QStringLiteral("cppclassespage"); +QString ConfigStrings::DEFINES = QStringLiteral("defines"); +QString ConfigStrings::DEPENDS = QStringLiteral("depends"); +QString ConfigStrings::DESCRIPTION = QStringLiteral("description"); +QString ConfigStrings::EDITION = QStringLiteral("edition"); +QString ConfigStrings::ENDHEADER = QStringLiteral("endheader"); +QString ConfigStrings::EXAMPLEDIRS = QStringLiteral("exampledirs"); +QString ConfigStrings::EXAMPLES = QStringLiteral("examples"); +QString ConfigStrings::EXAMPLESINSTALLPATH = QStringLiteral("examplesinstallpath"); +QString ConfigStrings::EXCLUDEDIRS = QStringLiteral("excludedirs"); +QString ConfigStrings::EXCLUDEFILES = QStringLiteral("excludefiles"); +QString ConfigStrings::EXTRAIMAGES = QStringLiteral("extraimages"); +QString ConfigStrings::FALSEHOODS = QStringLiteral("falsehoods"); +QString ConfigStrings::FORMATTING = QStringLiteral("formatting"); +QString ConfigStrings::GENERATEINDEX = QStringLiteral("generateindex"); +QString ConfigStrings::HEADERDIRS = QStringLiteral("headerdirs"); +QString ConfigStrings::HEADERS = QStringLiteral("headers"); +QString ConfigStrings::HEADERSCRIPTS = QStringLiteral("headerscripts"); +QString ConfigStrings::HEADERSTYLES = QStringLiteral("headerstyles"); +QString ConfigStrings::HOMEPAGE = QStringLiteral("homepage"); +QString ConfigStrings::IGNOREDIRECTIVES = QStringLiteral("ignoredirectives"); +QString ConfigStrings::IGNORETOKENS = QStringLiteral("ignoretokens"); +QString ConfigStrings::IMAGEDIRS = QStringLiteral("imagedirs"); +QString ConfigStrings::IMAGES = QStringLiteral("images"); +QString ConfigStrings::INDEXES = QStringLiteral("indexes"); +QString ConfigStrings::LANDINGPAGE = QStringLiteral("landingpage"); +QString ConfigStrings::LANGUAGE = QStringLiteral("language"); +QString ConfigStrings::MACRO = QStringLiteral("macro"); +QString ConfigStrings::MANIFESTMETA = QStringLiteral("manifestmeta"); +QString ConfigStrings::NATURALLANGUAGE = QStringLiteral("naturallanguage"); +QString ConfigStrings::NAVIGATION = QStringLiteral("navigation"); +QString ConfigStrings::NOLINKERRORS = QStringLiteral("nolinkerrors"); +QString ConfigStrings::OBSOLETELINKS = QStringLiteral("obsoletelinks"); +QString ConfigStrings::OUTPUTDIR = QStringLiteral("outputdir"); +QString ConfigStrings::OUTPUTENCODING = QStringLiteral("outputencoding"); +QString ConfigStrings::OUTPUTLANGUAGE = QStringLiteral("outputlanguage"); +QString ConfigStrings::OUTPUTFORMATS = QStringLiteral("outputformats"); +QString ConfigStrings::OUTPUTPREFIXES = QStringLiteral("outputprefixes"); +QString ConfigStrings::PROJECT = QStringLiteral("project"); +QString ConfigStrings::REDIRECTDOCUMENTATIONTODEVNULL = QStringLiteral("redirectdocumentationtodevnull"); +QString ConfigStrings::QHP = QStringLiteral("qhp"); +QString ConfigStrings::QUOTINGINFORMATION = QStringLiteral("quotinginformation"); +QString ConfigStrings::SCRIPTDIRS = QStringLiteral("scriptdirs"); +QString ConfigStrings::SCRIPTS = QStringLiteral("scripts"); +QString ConfigStrings::SHOWINTERNAL = QStringLiteral("showinternal"); +QString ConfigStrings::SOURCEDIRS = QStringLiteral("sourcedirs"); +QString ConfigStrings::SOURCEENCODING = QStringLiteral("sourceencoding"); +QString ConfigStrings::SOURCES = QStringLiteral("sources"); +QString ConfigStrings::SPURIOUS = QStringLiteral("spurious"); +QString ConfigStrings::STYLEDIRS = QStringLiteral("styledirs"); +QString ConfigStrings::STYLE = QStringLiteral("style"); +QString ConfigStrings::STYLES = QStringLiteral("styles"); +QString ConfigStrings::STYLESHEETS = QStringLiteral("stylesheets"); +QString ConfigStrings::SYNTAXHIGHLIGHTING = QStringLiteral("syntaxhighlighting"); +QString ConfigStrings::TEMPLATEDIR = QStringLiteral("templatedir"); +QString ConfigStrings::TABSIZE = QStringLiteral("tabsize"); +QString ConfigStrings::TAGFILE = QStringLiteral("tagfile"); +QString ConfigStrings::TRANSLATORS = QStringLiteral("translators"); +QString ConfigStrings::URL = QStringLiteral("url"); +QString ConfigStrings::VERSION = QStringLiteral("version"); +QString ConfigStrings::VERSIONSYM = QStringLiteral("versionsym"); +QString ConfigStrings::FILEEXTENSIONS = QStringLiteral("fileextensions"); +QString ConfigStrings::IMAGEEXTENSIONS = QStringLiteral("imageextensions"); +QString ConfigStrings::QMLONLY = QStringLiteral("qmlonly"); +QString ConfigStrings::QMLTYPESPAGE = QStringLiteral("qmltypespage"); + /*! An entry in a stack, where each entry is a list of string values. @@ -284,7 +355,7 @@ QString Config::getOutputDir() const { QString t; if (overrideOutputDir.isNull()) - t = getString(QLatin1String(CONFIG_OUTPUTDIR)); + t = getString(CONFIG_OUTPUTDIR); else t = overrideOutputDir; if (!Generator::useOutputSubdirs()) { @@ -305,7 +376,7 @@ QString Config::getOutputDir() const QSet<QString> Config::getOutputFormats() const { if (overrideOutputFormats.isEmpty()) - return getStringSet(QLatin1String(CONFIG_OUTPUTFORMATS)); + return getStringSet(CONFIG_OUTPUTFORMATS); else return overrideOutputFormats; } @@ -635,7 +706,7 @@ QStringList Config::getAllFiles(const QString &filesVar, QStringList result = getStringList(filesVar); QStringList dirs = getCanonicalPathList(dirsVar); - QString nameFilter = getString(filesVar + dot + QLatin1String(CONFIG_FILEEXTENSIONS)); + QString nameFilter = getString(filesVar + dot + CONFIG_FILEEXTENSIONS); QStringList::ConstIterator d = dirs.constBegin(); while (d != dirs.constEnd()) { @@ -665,7 +736,7 @@ QStringList Config::getExampleImageFiles(const QSet<QString> &excludedDirs, { QStringList result; QStringList dirs = getCanonicalPathList("exampledirs"); - QString nameFilter = getString(CONFIG_EXAMPLES + dot + QLatin1String(CONFIG_IMAGEEXTENSIONS)); + QString nameFilter = getString(CONFIG_EXAMPLES + dot + CONFIG_IMAGEEXTENSIONS); QStringList::ConstIterator d = dirs.constBegin(); while (d != dirs.constEnd()) { diff --git a/src/tools/qdoc/config.h b/src/tools/qdoc/config.h index 6efff44442..54ee8de47f 100644 --- a/src/tools/qdoc/config.h +++ b/src/tools/qdoc/config.h @@ -164,76 +164,150 @@ private: static QMap<QString, QStringList> includeFilesMap_; }; -#define CONFIG_ALIAS "alias" -#define CONFIG_BASE "base" -#define CONFIG_BASEDIR "basedir" -#define CONFIG_BUILDVERSION "buildversion" -#define CONFIG_CODEINDENT "codeindent" -#define CONFIG_CPPCLASSESPAGE "cppclassespage" -#define CONFIG_DEFINES "defines" -#define CONFIG_DEPENDS "depends" -#define CONFIG_DESCRIPTION "description" -#define CONFIG_EDITION "edition" -#define CONFIG_ENDHEADER "endheader" -#define CONFIG_EXAMPLEDIRS "exampledirs" -#define CONFIG_EXAMPLES "examples" -#define CONFIG_EXAMPLESINSTALLPATH "examplesinstallpath" -#define CONFIG_EXCLUDEDIRS "excludedirs" -#define CONFIG_EXCLUDEFILES "excludefiles" -#define CONFIG_EXTRAIMAGES "extraimages" -#define CONFIG_FALSEHOODS "falsehoods" -#define CONFIG_FORMATTING "formatting" -#define CONFIG_GENERATEINDEX "generateindex" -#define CONFIG_HEADERDIRS "headerdirs" -#define CONFIG_HEADERS "headers" -#define CONFIG_HEADERSCRIPTS "headerscripts" -#define CONFIG_HEADERSTYLES "headerstyles" -#define CONFIG_HOMEPAGE "homepage" -#define CONFIG_IGNOREDIRECTIVES "ignoredirectives" -#define CONFIG_IGNORETOKENS "ignoretokens" -#define CONFIG_IMAGEDIRS "imagedirs" -#define CONFIG_IMAGES "images" -#define CONFIG_INDEXES "indexes" -#define CONFIG_LANGUAGE "language" -#define CONFIG_LANDINGPAGE "landingpage" -#define CONFIG_MACRO "macro" -#define CONFIG_MANIFESTMETA "manifestmeta" -#define CONFIG_NATURALLANGUAGE "naturallanguage" -#define CONFIG_NAVIGATION "navigation" -#define CONFIG_NOLINKERRORS "nolinkerrors" -#define CONFIG_OBSOLETELINKS "obsoletelinks" -#define CONFIG_OUTPUTDIR "outputdir" -#define CONFIG_OUTPUTENCODING "outputencoding" -#define CONFIG_OUTPUTLANGUAGE "outputlanguage" -#define CONFIG_OUTPUTFORMATS "outputformats" -#define CONFIG_OUTPUTPREFIXES "outputprefixes" -#define CONFIG_PROJECT "project" -#define CONFIG_REDIRECTDOCUMENTATIONTODEVNULL "redirectdocumentationtodevnull" -#define CONFIG_QHP "qhp" -#define CONFIG_QMLTYPESPAGE "qmltypespage" -#define CONFIG_QUOTINGINFORMATION "quotinginformation" -#define CONFIG_SCRIPTDIRS "scriptdirs" -#define CONFIG_SCRIPTS "scripts" -#define CONFIG_SHOWINTERNAL "showinternal" -#define CONFIG_SOURCEDIRS "sourcedirs" -#define CONFIG_SOURCEENCODING "sourceencoding" -#define CONFIG_SOURCES "sources" -#define CONFIG_SPURIOUS "spurious" -#define CONFIG_STYLEDIRS "styledirs" -#define CONFIG_STYLE "style" -#define CONFIG_STYLES "styles" -#define CONFIG_STYLESHEETS "stylesheets" -#define CONFIG_SYNTAXHIGHLIGHTING "syntaxhighlighting" -#define CONFIG_TEMPLATEDIR "templatedir" -#define CONFIG_TABSIZE "tabsize" -#define CONFIG_TAGFILE "tagfile" -#define CONFIG_TRANSLATORS "translators" -#define CONFIG_URL "url" -#define CONFIG_VERSION "version" -#define CONFIG_VERSIONSYM "versionsym" -#define CONFIG_FILEEXTENSIONS "fileextensions" -#define CONFIG_IMAGEEXTENSIONS "imageextensions" -#define CONFIG_QMLONLY "qmlonly" +struct ConfigStrings +{ + static QString ALIAS; + static QString BASE; + static QString BASEDIR; + static QString BUILDVERSION; + static QString CODEINDENT; + static QString CPPCLASSESPAGE; + static QString DEFINES; + static QString DEPENDS; + static QString DESCRIPTION; + static QString EDITION; + static QString ENDHEADER; + static QString EXAMPLEDIRS; + static QString EXAMPLES; + static QString EXAMPLESINSTALLPATH; + static QString EXCLUDEDIRS; + static QString EXCLUDEFILES; + static QString EXTRAIMAGES; + static QString FALSEHOODS; + static QString FORMATTING; + static QString GENERATEINDEX; + static QString HEADERDIRS; + static QString HEADERS; + static QString HEADERSCRIPTS; + static QString HEADERSTYLES; + static QString HOMEPAGE; + static QString IGNOREDIRECTIVES; + static QString IGNORETOKENS; + static QString IMAGEDIRS; + static QString IMAGES; + static QString INDEXES; + static QString LANDINGPAGE; + static QString LANGUAGE; + static QString MACRO; + static QString MANIFESTMETA; + static QString NATURALLANGUAGE; + static QString NAVIGATION; + static QString NOLINKERRORS; + static QString OBSOLETELINKS; + static QString OUTPUTDIR; + static QString OUTPUTENCODING; + static QString OUTPUTLANGUAGE; + static QString OUTPUTFORMATS; + static QString OUTPUTPREFIXES; + static QString PROJECT; + static QString REDIRECTDOCUMENTATIONTODEVNULL; + static QString QHP; + static QString QUOTINGINFORMATION; + static QString SCRIPTDIRS; + static QString SCRIPTS; + static QString SHOWINTERNAL; + static QString SOURCEDIRS; + static QString SOURCEENCODING; + static QString SOURCES; + static QString SPURIOUS; + static QString STYLEDIRS; + static QString STYLE; + static QString STYLES; + static QString STYLESHEETS; + static QString SYNTAXHIGHLIGHTING; + static QString TEMPLATEDIR; + static QString TABSIZE; + static QString TAGFILE; + static QString TRANSLATORS; + static QString URL; + static QString VERSION; + static QString VERSIONSYM; + static QString FILEEXTENSIONS; + static QString IMAGEEXTENSIONS; + static QString QMLONLY; + static QString QMLTYPESPAGE; +}; + +#define CONFIG_ALIAS ConfigStrings::ALIAS +#define CONFIG_BASE ConfigStrings::BASE +#define CONFIG_BASEDIR ConfigStrings::BASEDIR +#define CONFIG_BUILDVERSION ConfigStrings::BUILDVERSION +#define CONFIG_CODEINDENT ConfigStrings::CODEINDENT +#define CONFIG_CPPCLASSESPAGE ConfigStrings::CPPCLASSESPAGE +#define CONFIG_DEFINES ConfigStrings::DEFINES +#define CONFIG_DEPENDS ConfigStrings::DEPENDS +#define CONFIG_DESCRIPTION ConfigStrings::DESCRIPTION +#define CONFIG_EDITION ConfigStrings::EDITION +#define CONFIG_ENDHEADER ConfigStrings::ENDHEADER +#define CONFIG_EXAMPLEDIRS ConfigStrings::EXAMPLEDIRS +#define CONFIG_EXAMPLES ConfigStrings::EXAMPLES +#define CONFIG_EXAMPLESINSTALLPATH ConfigStrings::EXAMPLESINSTALLPATH +#define CONFIG_EXCLUDEDIRS ConfigStrings::EXCLUDEDIRS +#define CONFIG_EXCLUDEFILES ConfigStrings::EXCLUDEFILES +#define CONFIG_EXTRAIMAGES ConfigStrings::EXTRAIMAGES +#define CONFIG_FALSEHOODS ConfigStrings::FALSEHOODS +#define CONFIG_FORMATTING ConfigStrings::FORMATTING +#define CONFIG_GENERATEINDEX ConfigStrings::GENERATEINDEX +#define CONFIG_HEADERDIRS ConfigStrings::HEADERDIRS +#define CONFIG_HEADERS ConfigStrings::HEADERS +#define CONFIG_HEADERSCRIPTS ConfigStrings::HEADERSCRIPTS +#define CONFIG_HEADERSTYLES ConfigStrings::HEADERSTYLES +#define CONFIG_HOMEPAGE ConfigStrings::HOMEPAGE +#define CONFIG_IGNOREDIRECTIVES ConfigStrings::IGNOREDIRECTIVES +#define CONFIG_IGNORETOKENS ConfigStrings::IGNORETOKENS +#define CONFIG_IMAGEDIRS ConfigStrings::IMAGEDIRS +#define CONFIG_IMAGES ConfigStrings::IMAGES +#define CONFIG_INDEXES ConfigStrings::INDEXES +#define CONFIG_LANDINGPAGE ConfigStrings::LANDINGPAGE +#define CONFIG_LANGUAGE ConfigStrings::LANGUAGE +#define CONFIG_MACRO ConfigStrings::MACRO +#define CONFIG_MANIFESTMETA ConfigStrings::MANIFESTMETA +#define CONFIG_NATURALLANGUAGE ConfigStrings::NATURALLANGUAGE +#define CONFIG_NAVIGATION ConfigStrings::NAVIGATION +#define CONFIG_NOLINKERRORS ConfigStrings::NOLINKERRORS +#define CONFIG_OBSOLETELINKS ConfigStrings::OBSOLETELINKS +#define CONFIG_OUTPUTDIR ConfigStrings::OUTPUTDIR +#define CONFIG_OUTPUTENCODING ConfigStrings::OUTPUTENCODING +#define CONFIG_OUTPUTLANGUAGE ConfigStrings::OUTPUTLANGUAGE +#define CONFIG_OUTPUTFORMATS ConfigStrings::OUTPUTFORMATS +#define CONFIG_OUTPUTPREFIXES ConfigStrings::OUTPUTPREFIXES +#define CONFIG_PROJECT ConfigStrings::PROJECT +#define CONFIG_REDIRECTDOCUMENTATIONTODEVNULL ConfigStrings::REDIRECTDOCUMENTATIONTODEVNULL +#define CONFIG_QHP ConfigStrings::QHP +#define CONFIG_QUOTINGINFORMATION ConfigStrings::QUOTINGINFORMATION +#define CONFIG_SCRIPTDIRS ConfigStrings::SCRIPTDIRS +#define CONFIG_SCRIPTS ConfigStrings::SCRIPTS +#define CONFIG_SHOWINTERNAL ConfigStrings::SHOWINTERNAL +#define CONFIG_SOURCEDIRS ConfigStrings::SOURCEDIRS +#define CONFIG_SOURCEENCODING ConfigStrings::SOURCEENCODING +#define CONFIG_SOURCES ConfigStrings::SOURCES +#define CONFIG_SPURIOUS ConfigStrings::SPURIOUS +#define CONFIG_STYLEDIRS ConfigStrings::STYLEDIRS +#define CONFIG_STYLE ConfigStrings::STYLE +#define CONFIG_STYLES ConfigStrings::STYLES +#define CONFIG_STYLESHEETS ConfigStrings::STYLESHEETS +#define CONFIG_SYNTAXHIGHLIGHTING ConfigStrings::SYNTAXHIGHLIGHTING +#define CONFIG_TEMPLATEDIR ConfigStrings::TEMPLATEDIR +#define CONFIG_TABSIZE ConfigStrings::TABSIZE +#define CONFIG_TAGFILE ConfigStrings::TAGFILE +#define CONFIG_TRANSLATORS ConfigStrings::TRANSLATORS +#define CONFIG_URL ConfigStrings::URL +#define CONFIG_VERSION ConfigStrings::VERSION +#define CONFIG_VERSIONSYM ConfigStrings::VERSIONSYM +#define CONFIG_FILEEXTENSIONS ConfigStrings::FILEEXTENSIONS +#define CONFIG_IMAGEEXTENSIONS ConfigStrings::IMAGEEXTENSIONS +#define CONFIG_QMLONLY ConfigStrings::QMLONLY +#define CONFIG_QMLTYPESPAGE ConfigStrings::QMLTYPESPAGE QT_END_NAMESPACE diff --git a/src/tools/qdoc/cppcodemarker.cpp b/src/tools/qdoc/cppcodemarker.cpp index ab58238301..a5408f7178 100644 --- a/src/tools/qdoc/cppcodemarker.cpp +++ b/src/tools/qdoc/cppcodemarker.cpp @@ -802,31 +802,6 @@ QList<Section> CppCodeMarker::sections(const InnerNode *inner, return sections; } -static const char * const typeTable[] = { - "bool", "char", "double", "float", "int", "long", "short", - "signed", "unsigned", "uint", "ulong", "ushort", "uchar", "void", - "qlonglong", "qulonglong", - "qint", "qint8", "qint16", "qint32", "qint64", - "quint", "quint8", "quint16", "quint32", "quint64", - "qreal", "cond", 0 -}; - -static const char * const keywordTable[] = { - "and", "and_eq", "asm", "auto", "bitand", "bitor", "break", - "case", "catch", "class", "compl", "const", "const_cast", - "continue", "default", "delete", "do", "dynamic_cast", "else", - "enum", "explicit", "export", "extern", "false", "for", "friend", - "goto", "if", "include", "inline", "monitor", "mutable", "namespace", - "new", "not", "not_eq", "operator", "or", "or_eq", "private", "protected", - "public", "register", "reinterpret_cast", "return", "sizeof", - "static", "static_cast", "struct", "switch", "template", "this", - "throw", "true", "try", "typedef", "typeid", "typename", "union", - "using", "virtual", "volatile", "wchar_t", "while", "xor", - "xor_eq", "synchronized", - // Qt specific - "signals", "slots", "emit", 0 -}; - /* @char @class @@ -844,25 +819,51 @@ QString CppCodeMarker::addMarkUp(const QString &in, const Node * /* relative */, const Location & /* location */) { + static QSet<QString> types; + static QSet<QString> keywords; + + if (types.isEmpty()) { + // initialize statics + Q_ASSERT(keywords.isEmpty()); + static const QString typeTable[] = { + QLatin1String("bool"), QLatin1String("char"), QLatin1String("double"), QLatin1String("float"), QLatin1String("int"), QLatin1String("long"), QLatin1String("short"), + QLatin1String("signed"), QLatin1String("unsigned"), QLatin1String("uint"), QLatin1String("ulong"), QLatin1String("ushort"), QLatin1String("uchar"), QLatin1String("void"), + QLatin1String("qlonglong"), QLatin1String("qulonglong"), + QLatin1String("qint"), QLatin1String("qint8"), QLatin1String("qint16"), QLatin1String("qint32"), QLatin1String("qint64"), + QLatin1String("quint"), QLatin1String("quint8"), QLatin1String("quint16"), QLatin1String("quint32"), QLatin1String("quint64"), + QLatin1String("qreal"), QLatin1String("cond") + }; + + static const QString keywordTable[] = { + QLatin1String("and"), QLatin1String("and_eq"), QLatin1String("asm"), QLatin1String("auto"), QLatin1String("bitand"), QLatin1String("bitor"), QLatin1String("break"), + QLatin1String("case"), QLatin1String("catch"), QLatin1String("class"), QLatin1String("compl"), QLatin1String("const"), QLatin1String("const_cast"), + QLatin1String("continue"), QLatin1String("default"), QLatin1String("delete"), QLatin1String("do"), QLatin1String("dynamic_cast"), QLatin1String("else"), + QLatin1String("enum"), QLatin1String("explicit"), QLatin1String("export"), QLatin1String("extern"), QLatin1String("false"), QLatin1String("for"), QLatin1String("friend"), + QLatin1String("goto"), QLatin1String("if"), QLatin1String("include"), QLatin1String("inline"), QLatin1String("monitor"), QLatin1String("mutable"), QLatin1String("namespace"), + QLatin1String("new"), QLatin1String("not"), QLatin1String("not_eq"), QLatin1String("operator"), QLatin1String("or"), QLatin1String("or_eq"), QLatin1String("private"), QLatin1String("protected"), + QLatin1String("public"), QLatin1String("register"), QLatin1String("reinterpret_cast"), QLatin1String("return"), QLatin1String("sizeof"), + QLatin1String("static"), QLatin1String("static_cast"), QLatin1String("struct"), QLatin1String("switch"), QLatin1String("template"), QLatin1String("this"), + QLatin1String("throw"), QLatin1String("true"), QLatin1String("try"), QLatin1String("typedef"), QLatin1String("typeid"), QLatin1String("typename"), QLatin1String("union"), + QLatin1String("using"), QLatin1String("virtual"), QLatin1String("volatile"), QLatin1String("wchar_t"), QLatin1String("while"), QLatin1String("xor"), + QLatin1String("xor_eq"), QLatin1String("synchronized"), + // Qt specific + QLatin1String("signals"), QLatin1String("slots"), QLatin1String("emit") + }; + + types.reserve(sizeof(typeTable) / sizeof(QString)); + for (int j = sizeof(typeTable) / sizeof(QString) - 1; j; --j) + types.insert(typeTable[j]); + + keywords.reserve(sizeof(keywordTable) / sizeof(QString)); + for (int j = sizeof(keywordTable) / sizeof(QString) - 1; j; --j) + keywords.insert(keywordTable[j]); + } #define readChar() \ ch = (i < (int)code.length()) ? code[i++].cell() : EOF QString code = in; - - QMap<QString, int> types; - QMap<QString, int> keywords; - int j = 0; - while (typeTable[j] != 0) { - types.insert(QString(typeTable[j]), 0); - j++; - } - j = 0; - while (keywordTable[j] != 0) { - keywords.insert(QString(keywordTable[j]), 0); - j++; - } - - QString out; + QStringList out; + QString text; int braceDepth = 0; int parenDepth = 0; int i = 0; @@ -871,6 +872,7 @@ QString CppCodeMarker::addMarkUp(const QString &in, QChar ch; QRegExp classRegExp("Qt?(?:[A-Z3]+[a-z][A-Za-z]*|t)"); QRegExp functionRegExp("q([A-Z][a-z]+)+"); + QRegExp findFunctionRegExp(QStringLiteral("^\\s*\\(")); readChar(); @@ -887,18 +889,18 @@ QString CppCodeMarker::addMarkUp(const QString &in, } while (ch.isLetterOrNumber() || ch == '_'); if (classRegExp.exactMatch(ident)) { - tag = QLatin1String("type"); + tag = QStringLiteral("type"); } else if (functionRegExp.exactMatch(ident)) { - tag = QLatin1String("func"); + tag = QStringLiteral("func"); target = true; } else if (types.contains(ident)) { - tag = QLatin1String("type"); + tag = QStringLiteral("type"); } else if (keywords.contains(ident)) { - tag = QLatin1String("keyword"); + tag = QStringLiteral("keyword"); } else if (braceDepth == 0 && parenDepth == 0) { if (QString(code.unicode() + i - 1, code.length() - (i - 1)) - .indexOf(QRegExp(QLatin1String("^\\s*\\("))) == 0) - tag = QLatin1String("func"); + .indexOf(findFunctionRegExp) == 0) + tag = QStringLiteral("func"); target = true; } } else if (ch.isDigit()) { @@ -906,7 +908,7 @@ QString CppCodeMarker::addMarkUp(const QString &in, finish = i; readChar(); } while (ch.isLetterOrNumber() || ch == '.'); - tag = QLatin1String("number"); + tag = QStringLiteral("number"); } else { switch (ch.unicode()) { case '+': @@ -928,7 +930,7 @@ QString CppCodeMarker::addMarkUp(const QString &in, case '~': finish = i; readChar(); - tag = QLatin1String("op"); + tag = QStringLiteral("op"); break; case '"': finish = i; @@ -941,7 +943,7 @@ QString CppCodeMarker::addMarkUp(const QString &in, } finish = i; readChar(); - tag = QLatin1String("string"); + tag = QStringLiteral("string"); break; case '#': finish = i; @@ -952,7 +954,7 @@ QString CppCodeMarker::addMarkUp(const QString &in, finish = i; readChar(); } - tag = QLatin1String("preprocessor"); + tag = QStringLiteral("preprocessor"); break; case '\'': finish = i; @@ -965,7 +967,7 @@ QString CppCodeMarker::addMarkUp(const QString &in, } finish = i; readChar(); - tag = QLatin1String("char"); + tag = QStringLiteral("char"); break; case '(': finish = i; @@ -983,7 +985,7 @@ QString CppCodeMarker::addMarkUp(const QString &in, if (ch == ':') { finish = i; readChar(); - tag = QLatin1String("op"); + tag = QStringLiteral("op"); } break; case '/': @@ -994,7 +996,7 @@ QString CppCodeMarker::addMarkUp(const QString &in, finish = i; readChar(); } while (ch != EOF && ch != '\n'); - tag = QLatin1String("comment"); + tag = QStringLiteral("comment"); } else if (ch == '*') { bool metAster = false; bool metAsterSlash = false; @@ -1015,9 +1017,9 @@ QString CppCodeMarker::addMarkUp(const QString &in, finish = i; readChar(); } - tag = QLatin1String("comment"); + tag = QStringLiteral("comment"); } else { - tag = QLatin1String("op"); + tag = QStringLiteral("op"); } break; case '{': @@ -1036,28 +1038,27 @@ QString CppCodeMarker::addMarkUp(const QString &in, } } - QString text; text = code.mid(start, finish - start); start = finish; if (!tag.isEmpty()) { - out += QLatin1String("<@") + tag; + out << QStringLiteral("<@") << tag; if (target) - out += QLatin1String(" target=\"") + text + QLatin1String("()\""); - out += QLatin1Char('>'); + out << QStringLiteral(" target=\"") << text << QStringLiteral("()\""); + out << QStringLiteral(">"); } - out += protect(text); + out << protect(text); if (!tag.isEmpty()) - out += QLatin1String("</@") + tag + QLatin1Char('>'); + out << QStringLiteral("</@") << tag << QStringLiteral(">"); } if (start < code.length()) { - out += protect(code.mid(start)); + out << protect(code.mid(start)); } - return out; + return out.join(QString()); } /*! diff --git a/src/tools/qdoc/ditaxmlgenerator.cpp b/src/tools/qdoc/ditaxmlgenerator.cpp index 46fb6e27e6..275fc9ecae 100644 --- a/src/tools/qdoc/ditaxmlgenerator.cpp +++ b/src/tools/qdoc/ditaxmlgenerator.cpp @@ -502,7 +502,7 @@ DitaXmlGenerator::~DitaXmlGenerator() void DitaXmlGenerator::initializeGenerator(const Config &config) { Generator::initializeGenerator(config); - obsoleteLinks = config.getBool(QLatin1String(CONFIG_OBSOLETELINKS)); + obsoleteLinks = config.getBool(CONFIG_OBSOLETELINKS); setImageFileExtensions(QStringList() << "png" << "jpg" << "jpeg" << "gif"); style = config.getString(DitaXmlGenerator::format() + diff --git a/src/tools/qdoc/generator.cpp b/src/tools/qdoc/generator.cpp index cfea6235d3..0d4e563836 100644 --- a/src/tools/qdoc/generator.cpp +++ b/src/tools/qdoc/generator.cpp @@ -1643,7 +1643,7 @@ void Generator::initialize(const Config &config) } else outputPrefixes[QLatin1String("QML")] = QLatin1String("qml-"); - noLinkErrors_ = config.getBool(QLatin1String(CONFIG_NOLINKERRORS)); + noLinkErrors_ = config.getBool(CONFIG_NOLINKERRORS); } /*! diff --git a/src/tools/qdoc/htmlgenerator.cpp b/src/tools/qdoc/htmlgenerator.cpp index 52af5d60b9..1c28ede976 100644 --- a/src/tools/qdoc/htmlgenerator.cpp +++ b/src/tools/qdoc/htmlgenerator.cpp @@ -136,7 +136,7 @@ void HtmlGenerator::initializeGenerator(const Config &config) }; Generator::initializeGenerator(config); - obsoleteLinks = config.getBool(QLatin1String(CONFIG_OBSOLETELINKS)); + obsoleteLinks = config.getBool(CONFIG_OBSOLETELINKS); setImageFileExtensions(QStringList() << "png" << "jpg" << "jpeg" << "gif"); int i = 0; while (defaults[i].key) { diff --git a/src/tools/qdoc/main.cpp b/src/tools/qdoc/main.cpp index 26aa0a7dc2..dd72be7f6e 100644 --- a/src/tools/qdoc/main.cpp +++ b/src/tools/qdoc/main.cpp @@ -78,16 +78,16 @@ QT_BEGIN_NAMESPACE And those are all the default values for configuration variables. */ static const struct { - const char *key; - const char *value; + const QString key; + const QString value; } defaults[] = { - { CONFIG_CODEINDENT, "4" }, - { CONFIG_FALSEHOODS, "0" }, - { CONFIG_FILEEXTENSIONS, "*.cpp *.h *.qdoc *.qml"}, - { CONFIG_LANGUAGE, "Cpp" }, - { CONFIG_OUTPUTFORMATS, "HTML" }, - { CONFIG_TABSIZE, "8" }, - { 0, 0 } + { CONFIG_CODEINDENT, QLatin1String("4") }, + { CONFIG_FALSEHOODS, QLatin1String("0") }, + { CONFIG_FILEEXTENSIONS, QLatin1String("*.cpp *.h *.qdoc *.qml") }, + { CONFIG_LANGUAGE, QLatin1String("Cpp") }, + { CONFIG_OUTPUTFORMATS, QLatin1String("HTML") }, + { CONFIG_TABSIZE, QLatin1String("8") }, + { QString(), QString() } }; bool creationTimeBefore(const QFileInfo &fi1, const QFileInfo &fi2) @@ -269,7 +269,7 @@ static void processQdocconfFile(const QString &fileName) */ Config config(QCoreApplication::translate("QDoc", "qdoc")); int i = 0; - while (defaults[i].key) { + while (!defaults[i].key.isEmpty()) { config.setStringList(defaults[i].key, QStringList() << defaults[i].value); ++i; } diff --git a/src/widgets/dialogs/qwizard.cpp b/src/widgets/dialogs/qwizard.cpp index 3f214809b4..dba3e8a97d 100644 --- a/src/widgets/dialogs/qwizard.cpp +++ b/src/widgets/dialogs/qwizard.cpp @@ -2437,7 +2437,7 @@ QWizardPage *QWizard::currentPage() const By default, this property has a value of -1, indicating that no page is currently shown. - \sa currentIdChanged(), currentPage() + \sa currentPage() */ int QWizard::currentId() const { diff --git a/src/widgets/kernel/qdesktopwidget.qdoc b/src/widgets/kernel/qdesktopwidget.qdoc index 789a812afb..e8bda3c805 100644 --- a/src/widgets/kernel/qdesktopwidget.qdoc +++ b/src/widgets/kernel/qdesktopwidget.qdoc @@ -239,8 +239,6 @@ \brief the number of screens currently available on the system. \since 4.6 - - \sa screenCountChanged() */ /*! diff --git a/src/widgets/kernel/qwidget.cpp b/src/widgets/kernel/qwidget.cpp index 76c4cbcb97..02d95d2fa5 100644 --- a/src/widgets/kernel/qwidget.cpp +++ b/src/widgets/kernel/qwidget.cpp @@ -5519,7 +5519,7 @@ void QWidget::unsetLocale() On some desktop platforms (including Windows and Unix), the application name (from QGuiApplication::applicationDisplayName) is added at the end of the window title, if set. This is done by the QPA plugin, so it is shown to the - user, but isn't part of the \l windowTitle string. + user, but isn't part of the windowTitle string. \sa windowIcon, windowIconText, windowModified, windowFilePath */ diff --git a/src/widgets/styles/qproxystyle.cpp b/src/widgets/styles/qproxystyle.cpp index b63e820bb9..eeed1a532b 100644 --- a/src/widgets/styles/qproxystyle.cpp +++ b/src/widgets/styles/qproxystyle.cpp @@ -109,7 +109,7 @@ void QProxyStylePrivate::ensureBaseStyle() const /*! Constructs a QProxyStyle object for overriding behavior in the - specified base \a style, or in the current \l{QApplication::style} + specified base \a style, or in the current \l{QApplication::style()} {application style} if base \a style is not specified. Ownership of \a style is transferred to QProxyStyle. @@ -128,7 +128,7 @@ QProxyStyle::QProxyStyle(QStyle *style) : /*! Constructs a QProxyStyle object for overriding behavior in the base style specified by style \a key, or in the current - \l{QApplication::style}{application style} if the specified + \l{QApplication::style()}{application style} if the specified style \a key is unrecognized. \sa QStyleFactory::create() diff --git a/src/widgets/widgets/qwidgetlinecontrol.cpp b/src/widgets/widgets/qwidgetlinecontrol.cpp index d10001a305..27048c1440 100644 --- a/src/widgets/widgets/qwidgetlinecontrol.cpp +++ b/src/widgets/widgets/qwidgetlinecontrol.cpp @@ -1773,6 +1773,14 @@ void QWidgetLineControl::processKeyEvent(QKeyEvent* event) cursorWordBackward(true); del(); } + } else if (event == QKeySequence::DeleteCompleteLine) { + if (!isReadOnly()) { + setSelection(0, text().size()); +#ifndef QT_NO_CLIPBOARD + copy(); +#endif + del(); + } } #endif // QT_NO_SHORTCUT else { @@ -1810,20 +1818,6 @@ void QWidgetLineControl::processKeyEvent(QKeyEvent* event) complete(event->key()); break; #endif - case Qt::Key_E: - if (m_keyboardScheme == QPlatformTheme::X11KeyboardScheme) - end(0); - break; - - case Qt::Key_U: - if (m_keyboardScheme == QPlatformTheme::X11KeyboardScheme && !isReadOnly()) { - setSelection(0, text().size()); -#ifndef QT_NO_CLIPBOARD - copy(); -#endif - del(); - } - break; default: if (!handled) unknown = true; |