summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--doc/src/examples/dirview.qdoc2
-rw-r--r--src/corelib/io/qtextstream.cpp5
-rw-r--r--src/gui/itemviews/qlistwidget.cpp8
-rw-r--r--src/gui/itemviews/qtreeview.cpp2
-rw-r--r--src/gui/widgets/qtextedit.cpp2
5 files changed, 7 insertions, 12 deletions
diff --git a/doc/src/examples/dirview.qdoc b/doc/src/examples/dirview.qdoc
index d81dea4..c8d9c7f 100644
--- a/doc/src/examples/dirview.qdoc
+++ b/doc/src/examples/dirview.qdoc
@@ -30,7 +30,7 @@
\title Dir View Example
\brief The Dir View example shows a tree view onto the local filing system. It uses the
- QDirModel class to provide supply file and directory information.
+ QDirModel class to provide file and directory information.
\image dirview-example.png
*/
diff --git a/src/corelib/io/qtextstream.cpp b/src/corelib/io/qtextstream.cpp
index 194e987..adef0b0 100644
--- a/src/corelib/io/qtextstream.cpp
+++ b/src/corelib/io/qtextstream.cpp
@@ -66,11 +66,6 @@ static const int QTEXTSTREAM_BUFFERSIZE = 16384;
\snippet doc/src/snippets/code/src_corelib_io_qtextstream.cpp 1
- Note that you cannot use QTextStream::atEnd(), which returns true when you
- have reached the end of the data stream, with stdin. The reason for this is
- that as long as stdin doesn't give any input to the QTextStream, \c atEnd()
- will return true even if the stdin is open and waiting for more characters.
-
Besides using QTextStream's constructors, you can also set the
device or string QTextStream operates on by calling setDevice() or
setString(). You can seek to a position by calling seek(), and
diff --git a/src/gui/itemviews/qlistwidget.cpp b/src/gui/itemviews/qlistwidget.cpp
index 28e6e80..180b8e9 100644
--- a/src/gui/itemviews/qlistwidget.cpp
+++ b/src/gui/itemviews/qlistwidget.cpp
@@ -1166,10 +1166,10 @@ void QListWidgetPrivate::_q_dataChanged(const QModelIndex &topLeft,
\snippet doc/src/snippets/qlistwidget-using/mainwindow.cpp 1
- If you need to insert a new item into the list at a particular position, it
- is more required to construct the item without a parent widget and use the
- insertItem() function to place it within the list. The list widget will
- take ownership of the item.
+ If you need to insert a new item into the list at a particular position,
+ then it should be constructed without a parent widget. The insertItem()
+ function should then be used to place it within the list. The list widget
+ will take ownership of the item.
\snippet doc/src/snippets/qlistwidget-using/mainwindow.cpp 6
\snippet doc/src/snippets/qlistwidget-using/mainwindow.cpp 7
diff --git a/src/gui/itemviews/qtreeview.cpp b/src/gui/itemviews/qtreeview.cpp
index 927721a..813787f 100644
--- a/src/gui/itemviews/qtreeview.cpp
+++ b/src/gui/itemviews/qtreeview.cpp
@@ -83,7 +83,7 @@ QT_BEGIN_NAMESPACE
It is simple to construct a tree view displaying data from a
model. In the following example, the contents of a directory are
- supplied by a QDirModel and displayed as a tree:
+ supplied by a QFileSystemModel and displayed as a tree:
\snippet doc/src/snippets/shareddirmodel/main.cpp 3
\snippet doc/src/snippets/shareddirmodel/main.cpp 6
diff --git a/src/gui/widgets/qtextedit.cpp b/src/gui/widgets/qtextedit.cpp
index 6e97fc1..453b38b 100644
--- a/src/gui/widgets/qtextedit.cpp
+++ b/src/gui/widgets/qtextedit.cpp
@@ -406,7 +406,7 @@ void QTextEditPrivate::_q_ensureVisible(const QRectF &_rect)
within the text.
If you want to limit the total number of paragraphs in a QTextEdit,
- as it is for example open useful in a log viewer, then you can use
+ as for example it is often useful in a log viewer, then you can use
QTextDocument's maximumBlockCount property for that.
\section2 Read-only Key Bindings