1 files changed, 14 insertions, 44 deletions
diff --git a/src/corelib/doc/snippets/code/src_corelib_kernel_qobject.cpp b/src/corelib/doc/snippets/code/src_corelib_kernel_qobject.cpp
index 2c5483abce..e3bbac7a3c 100644
--- a/src/corelib/doc/snippets/code/src_corelib_kernel_qobject.cpp
+++ b/src/corelib/doc/snippets/code/src_corelib_kernel_qobject.cpp
@@ -129,13 +129,6 @@ void MyObject::timerEvent(QTimerEvent *event)
 //! [8]
 
 
-//! [9]
-QList<QObject *> list = window()->queryList("QAbstractButton"));
-foreach (QObject *obj, list)
-    static_cast<QAbstractButton *>(obj)->setEnabled(false);
-//! [9]
-
-
 //! [10]
 QPushButton *button = parentWidget->findChild<QPushButton *>("button1");
 //! [10]
@@ -204,22 +197,6 @@ MyWindow::MyWindow()
 }
 
 
-//! [18]
-int n = messages.count();
-showMessage(tr("%n message(s) saved", "", n));
-//! [18]
-
-
-//! [19]
-n == 1 ? tr("%n message saved") : tr("%n messages saved")
-//! [19]
-
-
-//! [20]
-label->setText(tr("F\374r \310lise"));
-//! [20]
-
-
 //! [21]
 if (receivers(SIGNAL(valueChanged(QByteArray))) > 0) {
     QByteArray data;
@@ -383,21 +360,13 @@ public:
 //! [39]
 
 
-//! [40]
-//: This name refers to a host name.
-hostNameLabel->setText(tr("Name:"));
-
-/*: This text refers to a C++ code example. */
-QString example = tr("Example");
-//! [40]
-
 //! [41]
 QPushButton *button = parentWidget->findChild<QPushButton *>("button1", Qt::FindDirectChildrenOnly);
 //! [41]
 
 
 //! [42]
-QListWidget *list = parentWidget->findChild<QListWidget *>(QString(), Qt::FindDirectChildrenOnly);
+QListWidget *list = parentWidget->findChild<QListWidget *>(Qt::FindDirectChildrenOnly);
 //! [42]
 
 
@@ -487,18 +456,6 @@ public:
 };
 //! [52]
 
-//! [meta data]
-//: This is a comment for the translator.
-//= qtn_foo_bar
-//~ loc-layout_id foo_dialog
-//~ loc-blank False
-//~ magic-stuff This might mean something magic.
-QString text = MyMagicClass::tr("Sim sala bim.");
-//! [meta data]
-
-//! [explicit tr context]
-QString text = QScrollBar::tr("Page up");
-//! [explicit tr context]
 
 //! [53]
 {
@@ -512,3 +469,16 @@ const bool wasBlocked = someQObject->blockSignals(true);
 // no signals here
 someQObject->blockSignals(wasBlocked);
 //! [54]
+
+{
+//! [invalid-timer-id]
+    QObject *obj;
+    ...
+    int id = obj->startTimer(100ms);
+    if (id > Qt::TimerId::Invalid)
+        // The timer has been started successfully
+
+    if (id > 0) // Equivalent, albeit less readable
+        // The timer has been started successfully
+//! [invalid-timer-id]
+}