From 7e3a5fd664b02a537b7f5dcd73840c5c7a437519 Mon Sep 17 00:00:00 2001 From: Nico Vertriest Date: Thu, 19 Feb 2015 16:14:27 +0100 Subject: Doc: corrections to solve autolink issues Task-number: QTBUG-43810 Change-Id: Ide165158a226beb731e9d300df57b142cf456d5d Reviewed-by: Martin Smith --- examples/activeqt/comapp/doc/src/comapp.qdoc | 4 ++-- examples/activeqt/hierarchy/doc/src/hierarchy.qdoc | 4 ++-- src/activeqt/container/qaxbase.cpp | 2 +- src/activeqt/container/qaxscript.cpp | 4 ++-- src/activeqt/control/qaxfactory.cpp | 8 ++++---- src/activeqt/doc/activeqt.qdocconf | 2 +- src/activeqt/doc/src/examples/dotnet.qdoc | 2 +- src/activeqt/doc/src/qtaxserver.qdoc | 2 +- 8 files changed, 14 insertions(+), 14 deletions(-) diff --git a/examples/activeqt/comapp/doc/src/comapp.qdoc b/examples/activeqt/comapp/doc/src/comapp.qdoc index 69b27b6..ea8e22a 100644 --- a/examples/activeqt/comapp/doc/src/comapp.qdoc +++ b/examples/activeqt/comapp/doc/src/comapp.qdoc @@ -73,8 +73,8 @@ name (accessible through the \c id property) is set to \c "From QAxFactory" to indicate that this COM object has been created by COM. Note that there is no destructor that would delete the QTabWidget - this is instead done in the - \c quit() slot, before calling QApplication::quit() through a single-shot-timer, - which is necessary ensure that the COM call to the slot is complete. + \c quit() slot, before calling \l {QApplication::}{quit()} through a single-shot-timer, + which is necessary to ensure that the COM call to the slot is complete. \snippet activeqt/comapp/main.cpp 6 The classes are exported from the server using the QAxFactory macros. Only diff --git a/examples/activeqt/hierarchy/doc/src/hierarchy.qdoc b/examples/activeqt/hierarchy/doc/src/hierarchy.qdoc index 93450f3..bc22b80 100644 --- a/examples/activeqt/hierarchy/doc/src/hierarchy.qdoc +++ b/examples/activeqt/hierarchy/doc/src/hierarchy.qdoc @@ -47,7 +47,7 @@ this class. \snippet activeqt/hierarchy/objects.cpp 0 - The constructor of QParentWidget creates a vertical box layout. + The constructor of \c QParentWidget creates a vertical box layout. New child widgets are automatically added to the layout. \snippet activeqt/hierarchy/objects.cpp 1 @@ -69,7 +69,7 @@ \snippet activeqt/hierarchy/objects.cpp 3 \snippet activeqt/hierarchy/objects.cpp 4 - The implementation of the QSubWidget class is self-explanatory. + The implementation of the \c QSubWidget class is self-explanatory. \snippet activeqt/hierarchy/main.cpp 0 The classes are then exported using a QAxFactory. \c QParentWidget is diff --git a/src/activeqt/container/qaxbase.cpp b/src/activeqt/container/qaxbase.cpp index c313a42..3181578 100644 --- a/src/activeqt/container/qaxbase.cpp +++ b/src/activeqt/container/qaxbase.cpp @@ -706,7 +706,7 @@ QByteArray QAxEventSink::findProperty(DISPID dispID) Properties exposed by the object's IDispatch implementation can be read and written through the property system provided by the - Qt Object Model (both subclasses are QObjects, so you can use + Qt Object Model (both subclasses are \l{QObject}s, so you can use QObject::setProperty() and QObject::property()). Properties with multiple parameters are not supported. diff --git a/src/activeqt/container/qaxscript.cpp b/src/activeqt/container/qaxscript.cpp index c56474d..7e4bb6a 100644 --- a/src/activeqt/container/qaxscript.cpp +++ b/src/activeqt/container/qaxscript.cpp @@ -696,7 +696,7 @@ QAxScript::~QAxScript() heuristically. If \a code contains the string \c {End Sub} it will be interpreted as VBScript, otherwise as JScript. Additional scripting languages can be registered using - QAxScript::registerEngine(). + QAxScriptManager::registerEngine(). This function can only be called once for each QAxScript object, which is done automatically when using QAxScriptManager::load(). @@ -875,7 +875,7 @@ QAxBase *QAxScript::findObject(const QString &name) /*! \fn void QAxScript::stateChanged(int state); This signal is emitted when a script engine changes state. - \a state can be any value in the QAxScriptEngineState enumeration. + \a state can be any value in the \c QAxScriptEngine::State enumeration. */ /*! diff --git a/src/activeqt/control/qaxfactory.cpp b/src/activeqt/control/qaxfactory.cpp index b510f18..4ab315c 100644 --- a/src/activeqt/control/qaxfactory.cpp +++ b/src/activeqt/control/qaxfactory.cpp @@ -366,7 +366,7 @@ extern wchar_t qAxModuleFilename[MAX_PATH]; Returns the directory that contains the server binary. For out-of-process servers this is the same as - QApplication::applicationDirPath(). For in-process servers + \l {QCoreApplication::applicationDirPath()}. For in-process servers that function returns the directory that contains the hosting application. */ @@ -379,7 +379,7 @@ QString QAxFactory::serverDirPath() Returns the file path of the server binary. For out-of-process servers this is the same as - QApplication::applicationFilePath(). For in-process servers + \l {QCoreApplication::applicationFilePath()}. For in-process servers that function returns the file path of the hosting application. */ QString QAxFactory::serverFilePath() @@ -547,8 +547,8 @@ bool QAxFactory::registerActiveObject(QObject *object) \a IDTypeLib, and if the server is an executable server then it will have the application id \a IDApp. - This macro needs to be used together with the QAXCLASS(), QAXTYPE() - and QAXFACTORY_END() macros. + This macro needs to be used together with the \l {QAxFactory::}{QAXCLASS()}, \c {QAxFactory::}{QAXTYPE()} + and \c {QAxFactory::}{QAXFACTORY_END()} macros. \snippet src_activeqt_control_qaxfactory.cpp 9 */ diff --git a/src/activeqt/doc/activeqt.qdocconf b/src/activeqt/doc/activeqt.qdocconf index 3f9afcf..10a340c 100644 --- a/src/activeqt/doc/activeqt.qdocconf +++ b/src/activeqt/doc/activeqt.qdocconf @@ -31,7 +31,7 @@ qhp.ActiveQt.subprojects.qaxserverclasses.sortPages = true tagfile = ../../../doc/activeqt/activeqt.tags -depends += qtcore qtdesigner qtdoc qtopengl qtscript qtwidgets +depends += qtcore qtdesigner qtdoc qtopengl qtscript qtwidgets qtgui headerdirs += .. diff --git a/src/activeqt/doc/src/examples/dotnet.qdoc b/src/activeqt/doc/src/examples/dotnet.qdoc index a52834d..76b5be0 100644 --- a/src/activeqt/doc/src/examples/dotnet.qdoc +++ b/src/activeqt/doc/src/examples/dotnet.qdoc @@ -222,7 +222,7 @@ the Qt objects we want to use in our form. Right-click on the empty space, and select "Customize". This opens a dialog that has two tabs, "COM Components" and ".NET Framework Components". We used - ActiveQt to wrap QWidgets into COM objects, so we select the "COM + ActiveQt to wrap \l {QWidget}s into COM objects, so we select the "COM Components" page, and look for the classes we want to use, e.g. "QPushButton" and "QAxWidget2". diff --git a/src/activeqt/doc/src/qtaxserver.qdoc b/src/activeqt/doc/src/qtaxserver.qdoc index 79acf5d..32d10b8 100644 --- a/src/activeqt/doc/src/qtaxserver.qdoc +++ b/src/activeqt/doc/src/qtaxserver.qdoc @@ -267,7 +267,7 @@ the default factory through the QAXFACTORY_DEFAULT() macro. If you cannot provide a standard constructor you must implement a QAxFactory custom factory and call the constructor you have in - your implementation of QAxFactory::create. + your implementation of \l {QAxFactory::createObject}. \endfootnote \snippet doc_src_qaxserver.cpp 6 -- cgit v1.2.3