summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorIvan Tkachenko <me@ratijas.tk>2021-10-23 23:04:56 +0300
committerIvan Tkachenko <me@ratijas.tk>2021-12-08 02:28:34 +0300
commite65c29fffc2232ff038c5e79c9b15e16adaaed81 (patch)
tree75d24e082241e13b5de160f9e7270af23d0480f5 /src
parentcb00db5a7e644d381ec58f7b715e0312c57f282a (diff)
Doc: Reword, fix typos and some formatting
Change-Id: I0929f7653cb07665842d0aa7bf18dc80471febdc Reviewed-by: Kai Koehne <kai.koehne@qt.io>
Diffstat (limited to 'src')
-rw-r--r--src/corelib/global/qlogging.cpp13
-rw-r--r--src/corelib/itemmodels/qabstractitemmodel.cpp2
2 files changed, 8 insertions, 7 deletions
diff --git a/src/corelib/global/qlogging.cpp b/src/corelib/global/qlogging.cpp
index e562fed336..f2d4a50a2c 100644
--- a/src/corelib/global/qlogging.cpp
+++ b/src/corelib/global/qlogging.cpp
@@ -422,8 +422,8 @@ void QMessageLogger::info(const char *msg, ...) const
\snippet code/qlogging/qlogging.cpp 2
- A function which this signature is generated by Q_DECLARE_LOGGING_CATEGORY,
- Q_LOGGING_CATEGORY.
+ The \c Q_DECLARE_LOGGING_CATEGORY macro generates a function declaration
+ with this signature, and \c Q_LOGGING_CATEGORY generates its definition.
\since 5.3
*/
@@ -1946,9 +1946,10 @@ void qErrnoWarning(int code, const char *msg, ...)
compilation. If you implement your own message handler, you get total
control of these messages.
- The default message handler prints the message to the standard
- output under X11 or to the debugger under Windows. If it is a
- fatal message, the application aborts immediately.
+ The default message handler prints the message to the standard output
+ under X11 or to the debugger under Windows. If it is a fatal message, the
+ application aborts immediately after handling that message. Custom
+ message handlers should not attempt to exit an application on their own.
Only one message handler can be defined, since this is usually
done on an application-wide basis to control debug output.
@@ -2015,7 +2016,7 @@ void qErrnoWarning(int code, const char *msg, ...)
Example:
\snippet code/src_corelib_global_qlogging.cpp 0
- The default \a pattern is "%{if-category}%{category}: %{endif}%{message}".
+ The default \a pattern is \c{%{if-category}%{category}: %{endif}%{message}}.
The \a pattern can also be changed at runtime by setting the QT_MESSAGE_PATTERN
environment variable; if both \l qSetMessagePattern() is called and QT_MESSAGE_PATTERN is
diff --git a/src/corelib/itemmodels/qabstractitemmodel.cpp b/src/corelib/itemmodels/qabstractitemmodel.cpp
index 02ffd0e085..b28597468f 100644
--- a/src/corelib/itemmodels/qabstractitemmodel.cpp
+++ b/src/corelib/itemmodels/qabstractitemmodel.cpp
@@ -2086,7 +2086,7 @@ bool QAbstractItemModel::clearItemData(const QModelIndex &index)
by the \a index.
\note If you do not have a value to return, return an \b invalid
- QVariant instead of returning 0.
+ (default-constructed) QVariant.
\sa Qt::ItemDataRole, setData(), headerData()
*/