diff --git a/src/core/classsymbol.cpp b/src/core/classsymbol.cpp index 86c68c39..5105d36d 100644 --- a/src/core/classsymbol.cpp +++ b/src/core/classsymbol.cpp @@ -17,7 +17,6 @@ namespace Core { /*! * \qmltype ClassSymbol * \brief Represents a class in the current file - * \inqmlmodule Knut * \ingroup CodeDocument * \todo */ diff --git a/src/core/codedocument.cpp b/src/core/codedocument.cpp index 997f23d8..8baa3655 100644 --- a/src/core/codedocument.cpp +++ b/src/core/codedocument.cpp @@ -38,7 +38,6 @@ namespace Core { /*! * \qmltype CodeDocument * \brief Base document object for any code that Knut can parse. - * \inqmlmodule Knut * \ingroup CodeDocument/@first * \inherits TextDocument * diff --git a/src/core/cppdocument.cpp b/src/core/cppdocument.cpp index 23bef169..97ea2a14 100644 --- a/src/core/cppdocument.cpp +++ b/src/core/cppdocument.cpp @@ -182,7 +182,6 @@ namespace Core { /*! * \qmltype CppDocument * \brief Document object for a C++ file (source or header) - * \inqmlmodule Knut * \ingroup CppDocument/@first * \inherits CodeDocument */ diff --git a/src/core/dataexchange.cpp b/src/core/dataexchange.cpp index ce41a00a..a924acb9 100644 --- a/src/core/dataexchange.cpp +++ b/src/core/dataexchange.cpp @@ -18,7 +18,6 @@ namespace Core { /*! * \qmltype DataExchangeEntry * \brief Refers to a single entry within the `DoDataExchange` - * \inqmlmodule Knut * \ingroup CppDocument * \sa DataExchange * @@ -102,7 +101,6 @@ static QList queryDDVCalls(const QueryMatch &ddxFunction) /*! * \qmltype DataExchange * \brief DataExchange entries in a MFC C++ document. - * \inqmlmodule Knut * \ingroup CppDocument * * The `DataExchange` object represents the data contained in the MFC `DoDataExchange` method. diff --git a/src/core/dir.cpp b/src/core/dir.cpp index c92b7e11..506b1fce 100644 --- a/src/core/dir.cpp +++ b/src/core/dir.cpp @@ -18,7 +18,6 @@ namespace Core { /*! * \qmltype Dir * \brief Singleton with methods to handle directories. - * \inqmlmodule Knut * \ingroup Utilities * * The `Dir` singleton implements most of the static methods from `QDir`, check [QDir](https://doc.qt.io/qt-6/qdir.html) diff --git a/src/core/document.cpp b/src/core/document.cpp index 64b2c5bb..902ae18d 100644 --- a/src/core/document.cpp +++ b/src/core/document.cpp @@ -23,7 +23,6 @@ namespace Core { /*! * \qmltype Document * \brief Base class for all documents - * \inqmlmodule Knut * * The `Document` class is the base class for all documents. * A document is a file loaded by Knut and that can be used in script (either to get data or to edit). diff --git a/src/core/file.cpp b/src/core/file.cpp index 11dd79ef..8c0fa93a 100644 --- a/src/core/file.cpp +++ b/src/core/file.cpp @@ -19,7 +19,6 @@ namespace Core { /*! * \qmltype File * \brief Singleton with methods to handle files. - * \inqmlmodule Knut * \ingroup Utilities * * The `File` singleton implements most of the static methods from `QFile`, check diff --git a/src/core/fileinfo.cpp b/src/core/fileinfo.cpp index c4fe1e2e..936e382f 100644 --- a/src/core/fileinfo.cpp +++ b/src/core/fileinfo.cpp @@ -18,7 +18,6 @@ namespace Core { /*! * \qmltype FileInfo * \brief Singleton with methods to handle file information. - * \inqmlmodule Knut * \ingroup Utilities * * The `FileInfo` singleton implements most of the static methods from `QFileInfo`, check diff --git a/src/core/functionsymbol.cpp b/src/core/functionsymbol.cpp index d7a550de..730cff28 100644 --- a/src/core/functionsymbol.cpp +++ b/src/core/functionsymbol.cpp @@ -19,7 +19,6 @@ namespace Core { /*! * \qmltype FunctionArgument * \brief Represents an argument to be passed to the function - * \inqmlmodule Knut * \ingroup CodeDocument * \todo * \sa FunctionSymbol @@ -37,7 +36,6 @@ namespace Core { /*! * \qmltype FunctionSymbol * \brief Represents a function or a method in the current file - * \inqmlmodule Knut * \ingroup CodeDocument * \todo */ diff --git a/src/core/mark.cpp b/src/core/mark.cpp index 7e2b6b65..d02c30e2 100644 --- a/src/core/mark.cpp +++ b/src/core/mark.cpp @@ -22,7 +22,6 @@ namespace Core { /*! * \qmltype Mark * \brief Keeps track of a position in a text document. - * \inqmlmodule Knut * \ingroup TextDocument * \sa TextDocument * diff --git a/src/core/message.cpp b/src/core/message.cpp index a68886bf..c76866ed 100644 --- a/src/core/message.cpp +++ b/src/core/message.cpp @@ -18,7 +18,6 @@ namespace Core { /*! * \qmltype Message * \brief Singleton with methods to display different messages to the user. - * \inqmlmodule Knut * \ingroup Utilities * * The `message` property in QML can be used to display different messages to the user, via logs. diff --git a/src/core/messagemap.cpp b/src/core/messagemap.cpp index 0962459d..4a0df375 100644 --- a/src/core/messagemap.cpp +++ b/src/core/messagemap.cpp @@ -20,7 +20,6 @@ namespace Core { /*! * \qmltype MessageMapEntry * \brief Refers to a single entry within the `MessageMap` - * \inqmlmodule Knut * \ingroup CppDocument * \sa MessageMap * @@ -71,7 +70,6 @@ MessageMapEntry fromMessage(const QueryMatch &match, const RangeMark &range) /*! * \qmltype MessageMap * \brief Message map in a MFC C++ document - * \inqmlmodule Knut * \ingroup CppDocument * * The `MessageMap` object represents the data contained in the MFC MessageMap. diff --git a/src/core/project.cpp b/src/core/project.cpp index 492bd78e..f6fecd56 100644 --- a/src/core/project.cpp +++ b/src/core/project.cpp @@ -38,7 +38,6 @@ namespace Core { /*! * \qmltype Project * \brief Singleton for handling the current project. - * \inqmlmodule Knut * The `Project` object is not meant to open multiple projects, but only open one. */ diff --git a/src/core/qdirvaluetype.cpp b/src/core/qdirvaluetype.cpp index 987e1672..5d3eeaa8 100644 --- a/src/core/qdirvaluetype.cpp +++ b/src/core/qdirvaluetype.cpp @@ -15,7 +15,6 @@ namespace Core { /*! * \qmltype QDirValueType * \brief Wrapper around the `QDir` class. - * \inqmlmodule Knut * \ingroup Utilities/@last * \sa Dir * diff --git a/src/core/qfileinfovaluetype.cpp b/src/core/qfileinfovaluetype.cpp index e720b54c..82c6f290 100644 --- a/src/core/qfileinfovaluetype.cpp +++ b/src/core/qfileinfovaluetype.cpp @@ -15,7 +15,6 @@ namespace Core { /*! * \qmltype QFileInfoValueType * \brief Wrapper around the `QFileInfo` class. - * \inqmlmodule Knut * \ingroup Utilities/@last * \sa FileInfo * diff --git a/src/core/qttsdocument.cpp b/src/core/qttsdocument.cpp index 98f30f41..adff5d3c 100644 --- a/src/core/qttsdocument.cpp +++ b/src/core/qttsdocument.cpp @@ -22,7 +22,6 @@ namespace Core { /*! * \qmltype QtTsDocument * \brief Provides access to the content of a Ts file (Qt linguist). - * \inqmlmodule Knut * \ingroup QtTsDocument/@first */ @@ -288,7 +287,6 @@ QList QtTsDocument::messages() const /*! * \qmltype QtTsMessage * \brief Provides access to message. - * \inqmlmodule Knut * \ingroup QtTsDocument * \sa QtTsDocument */ diff --git a/src/core/qtuidocument.cpp b/src/core/qtuidocument.cpp index adfd8401..97d1bb2d 100644 --- a/src/core/qtuidocument.cpp +++ b/src/core/qtuidocument.cpp @@ -23,7 +23,6 @@ namespace Core { /*! * \qmltype QtUiDocument * \brief Provides access to the content of a Ui file (Qt designer file). - * \inqmlmodule Knut * \ingroup QtUiDocument/@first */ @@ -171,7 +170,6 @@ Utils::QtUiWriter *QtUiDocument::uiWriter() /*! * \qmltype QtUiWidget * \brief Provides access to widget attributes in the ui files. - * \inqmlmodule Knut * \ingroup QtUiDocument * \sa QtUiDocument */ diff --git a/src/core/querymatch.cpp b/src/core/querymatch.cpp index 6c01b5c2..382aa229 100644 --- a/src/core/querymatch.cpp +++ b/src/core/querymatch.cpp @@ -23,7 +23,6 @@ namespace Core { /*! * \qmltype QueryCapture * \brief Defines a capture made by a query. - * \inqmlmodule Knut * \ingroup CodeDocument * \sa QueryMatch */ @@ -45,7 +44,6 @@ QString QueryCapture::toString() const /*! * \qmltype QueryMatch * \brief Contains all captures for a query match. - * \inqmlmodule Knut * \ingroup CodeDocument * \sa CodeDocument::query * diff --git a/src/core/rangemark.cpp b/src/core/rangemark.cpp index 7f068eea..21056fbd 100644 --- a/src/core/rangemark.cpp +++ b/src/core/rangemark.cpp @@ -21,7 +21,6 @@ namespace Core { /*! * \qmltype RangeMark * \brief Keeps track of a range within a text document. - * \inqmlmodule Knut * \ingroup TextDocument * \sa TextDocument * diff --git a/src/core/rcdocument.cpp b/src/core/rcdocument.cpp index bafeeb9f..7ae62b30 100644 --- a/src/core/rcdocument.cpp +++ b/src/core/rcdocument.cpp @@ -24,7 +24,6 @@ namespace Core { /*! * \qmltype RcDocument * \brief Provides access to the content of a RC file (MFC resource file). - * \inqmlmodule Knut * \ingroup RcDocument/@first */ diff --git a/src/core/scriptdialogitem.cpp b/src/core/scriptdialogitem.cpp index 69a4e0b7..6ffbb57e 100644 --- a/src/core/scriptdialogitem.cpp +++ b/src/core/scriptdialogitem.cpp @@ -39,7 +39,6 @@ namespace Core { /*! * \qmltype ScriptDialog * \brief QML Item for writing visual scripts. - * \inqmlmodule Knut * \ingroup Items * * The `ScriptDialog` allows creating a script dialog based on a ui file. It requires creating a ui file with the same diff --git a/src/core/scriptitem.cpp b/src/core/scriptitem.cpp index b01350bf..c88c8903 100644 --- a/src/core/scriptitem.cpp +++ b/src/core/scriptitem.cpp @@ -17,7 +17,6 @@ namespace Core { /*! * \qmltype Script * \brief Script object for writing non visual scripts. - * \inqmlmodule Knut * \ingroup Items * * The `Script` is the base class for all creatable items in QML. It is needed as a `QtObject` diff --git a/src/core/settings.cpp b/src/core/settings.cpp index ba012550..ef12560b 100644 --- a/src/core/settings.cpp +++ b/src/core/settings.cpp @@ -50,7 +50,6 @@ static constexpr char SettingsName[] = "knut.json"; /*! * \qmltype Settings * \brief Singleton for accessing and editing persistent settings. - * \inqmlmodule Knut * \ingroup Utilities * * The settings are stored in a json file, and could be: diff --git a/src/core/symbol.cpp b/src/core/symbol.cpp index da9af4f9..29dcc6c8 100644 --- a/src/core/symbol.cpp +++ b/src/core/symbol.cpp @@ -24,7 +24,6 @@ namespace Core { /*! * \qmltype Symbol * \brief Represent a symbol in the current file - * \inqmlmodule Knut * \ingroup CodeDocument */ diff --git a/src/core/textdocument.cpp b/src/core/textdocument.cpp index 58f8f532..ec3ad4da 100644 --- a/src/core/textdocument.cpp +++ b/src/core/textdocument.cpp @@ -66,7 +66,6 @@ matchInBlock(const QTextBlock &block, const QRegularExpression &expr, int offset /*! * \qmltype TextDocument * \brief Document object for text files. - * \inqmlmodule Knut * \ingroup TextDocument/@first * \inherits Document */ diff --git a/src/core/typedsymbol.cpp b/src/core/typedsymbol.cpp index d0e7abd1..aeff1d51 100644 --- a/src/core/typedsymbol.cpp +++ b/src/core/typedsymbol.cpp @@ -7,7 +7,6 @@ namespace Core { /*! * \qmltype TypedSymbol * \brief Represents a symbol with a type - * \inqmlmodule Knut * \ingroup CodeDocument * * This symbol has a type associated with it, like a variable or a member of a class. diff --git a/src/core/userdialog.cpp b/src/core/userdialog.cpp index 3d987b08..b19a29e7 100644 --- a/src/core/userdialog.cpp +++ b/src/core/userdialog.cpp @@ -22,7 +22,6 @@ namespace Core { /*! * \qmltype UserDialog * \brief Singleton with methods to display common dialog to the user. - * \inqmlmodule Knut * \ingroup Utilities * * The `UserDialog` singleton provides methods to display common dialog that could be used in diff --git a/src/core/utils.cpp b/src/core/utils.cpp index f9094463..f409d0eb 100644 --- a/src/core/utils.cpp +++ b/src/core/utils.cpp @@ -25,7 +25,6 @@ namespace Core { /*! * \qmltype Utils * \brief Singleton with utility methods. - * \inqmlmodule Knut * \ingroup Utilities * * The `Utils` singleton implements some utility methods useful for scripts. diff --git a/src/rccore/data.cpp b/src/rccore/data.cpp index f5759f5c..432e9149 100644 --- a/src/rccore/data.cpp +++ b/src/rccore/data.cpp @@ -16,7 +16,6 @@ namespace RcCore { /*! * \qmltype Asset * \brief Description of a RC file asset. - * \inqmlmodule Knut * \ingroup RcDocument * \sa RcFile */ @@ -37,7 +36,6 @@ namespace RcCore { /*! * \qmltype ToolBarItem * \brief Description of a RC file toolbar item. - * \inqmlmodule Knut * \ingroup RcDocument * \sa RcFile */ @@ -53,7 +51,6 @@ namespace RcCore { /*! * \qmltype ToolBar * \brief Description of a RC file toolbar. - * \inqmlmodule Knut * \ingroup RcDocument * \sa RcFile */ @@ -77,7 +74,6 @@ namespace RcCore { /*! * \qmltype Widget * \brief Description of a RC file widget. - * \inqmlmodule Knut * \ingroup RcDocument * \sa RcFile */ @@ -109,7 +105,6 @@ namespace RcCore { /*! * \qmltype MenuItem * \brief Description of a RC file menu item. - * \inqmlmodule Knut * \ingroup RcDocument * \sa RcFile */ @@ -141,7 +136,6 @@ namespace RcCore { /*! * \qmltype Menu * \brief Description of a RC file menu. - * \inqmlmodule Knut * \ingroup RcDocument * \sa RcFile */ @@ -161,7 +155,6 @@ namespace RcCore { /*! * \qmltype Shortcut * \brief Description of a RC file shortcut. - * \inqmlmodule Knut * \ingroup RcDocument * \sa RcFile */ @@ -177,7 +170,6 @@ namespace RcCore { /*! * \qmltype Action * \brief Description of a RC file action. - * \inqmlmodule Knut * \ingroup RcDocument * \sa RcFile */ @@ -217,7 +209,6 @@ namespace RcCore { /*! * \qmltype String * \brief Description of a RC file string. - * \inqmlmodule Knut * \ingroup RcDocument * \sa RcFile */ diff --git a/src/rccore/ribbon.cpp b/src/rccore/ribbon.cpp index eda5bbbf..ebea4469 100644 --- a/src/rccore/ribbon.cpp +++ b/src/rccore/ribbon.cpp @@ -17,7 +17,6 @@ namespace RcCore { /*! * \qmltype RibbonElement * \brief An item in the ribbon (button, separator...). - * \inqmlmodule Knut * \ingroup RcDocument * \sa Ribbon */ @@ -57,7 +56,6 @@ namespace RcCore { /*! * \qmltype RibbonPanel * \brief An panel (group of elements) in the ribbon. - * \inqmlmodule Knut * \ingroup RcDocument * \sa Ribbon */ @@ -77,7 +75,6 @@ namespace RcCore { /*! * \qmltype RibbonCategory * \brief A tab (made of panels) in the ribbon. - * \inqmlmodule Knut * \ingroup RcDocument * \sa Ribbon */ @@ -105,7 +102,6 @@ namespace RcCore { /*! * \qmltype RibbonContext * \brief A context (tabs with a title) in the ribbon. - * \inqmlmodule Knut * \ingroup RcDocument * \sa Ribbon */ @@ -125,7 +121,6 @@ namespace RcCore { /*! * \qmltype RibbonMenu * \brief A menu showing when clicking on the left/top icon in the ribbon. - * \inqmlmodule Knut * \ingroup RcDocument * \sa Ribbon */ @@ -153,7 +148,6 @@ namespace RcCore { /*! * \qmltype Ribbon * \brief The ribbon description (not everything is read yet). - * \inqmlmodule Knut * \ingroup RcDocument * \sa RcFile * diff --git a/tools/cpp2doc/sourceparser.cpp b/tools/cpp2doc/sourceparser.cpp index 3fa69389..de667ca0 100644 --- a/tools/cpp2doc/sourceparser.cpp +++ b/tools/cpp2doc/sourceparser.cpp @@ -103,6 +103,10 @@ Data::TypeBlock SourceParser::parseType(QTextStream &stream, QString line) parseBlock(line, currentType); } + if (currentType.qmlModule.isEmpty()) { + currentType.qmlModule = "Knut"; + } + return currentType; }