diff options
Diffstat (limited to 'src/corelib/doc/snippets/code')
10 files changed, 59 insertions, 45 deletions
diff --git a/src/corelib/doc/snippets/code/doc_src_containers.cpp b/src/corelib/doc/snippets/code/doc_src_containers.cpp index 84935580c9..2eedfffedf 100644 --- a/src/corelib/doc/snippets/code/doc_src_containers.cpp +++ b/src/corelib/doc/snippets/code/doc_src_containers.cpp @@ -70,7 +70,7 @@ list << "A" << "B" << "C" << "D"; QListIterator<QString> i(list); while (i.hasNext()) - qDebug() << i.next(); + QString s = i.next(); //! [1] @@ -78,7 +78,7 @@ while (i.hasNext()) QListIterator<QString> i(list); i.toBack(); while (i.hasPrevious()) - qDebug() << i.previous(); + QString s = i.previous(); //! [2] @@ -217,8 +217,10 @@ foreach (str, list) QLinkedList<QString> list; ... QLinkedListIterator<QString> i(list); -while (i.hasNext()) - qDebug() << i.next(); +while (i.hasNext()) { + QString s = i.next(); + qDebug() << s; +} //! [16] diff --git a/src/corelib/doc/snippets/code/doc_src_qiterator.cpp b/src/corelib/doc/snippets/code/doc_src_qiterator.cpp index c7a312b00e..1a3ef98ba1 100644 --- a/src/corelib/doc/snippets/code/doc_src_qiterator.cpp +++ b/src/corelib/doc/snippets/code/doc_src_qiterator.cpp @@ -53,7 +53,7 @@ QList<float> list; ... QListIterator<float> i(list); while (i.hasNext()) - qDebug() << i.next(); + float f = i.next(); //! [0] @@ -61,7 +61,7 @@ while (i.hasNext()) QListIterator<float> i(list); i.toBack(); while (i.hasPrevious()) - qDebug() << i.previous(); + float f = i.previous(); //! [1] @@ -70,7 +70,7 @@ QLinkedList<float> list; ... QLinkedListIterator<float> i(list); while (i.hasNext()) - qDebug() << i.next(); + float f = i.next(); //! [2] @@ -78,7 +78,7 @@ while (i.hasNext()) QLinkedListIterator<float> i(list); i.toBack(); while (i.hasPrevious()) - qDebug() << i.previous(); + float f = i.previous(); //! [3] @@ -87,7 +87,7 @@ QVector<float> vector; ... QVectorIterator<float> i(vector); while (i.hasNext()) - qDebug() << i.next(); + float f = i.next(); //! [4] @@ -95,7 +95,7 @@ while (i.hasNext()) QVectorIterator<float> i(vector); i.toBack(); while (i.hasPrevious()) - qDebug() << i.previous(); + float f = i.previous(); //! [5] @@ -104,7 +104,7 @@ QSet<QString> set; ... QSetIterator<QString> i(set); while (i.hasNext()) - qDebug() << i.next(); + float f = i.next(); //! [6] @@ -112,7 +112,7 @@ while (i.hasNext()) QSetIterator<QString> i(set); i.toBack(); while (i.hasPrevious()) - qDebug() << i.previous(); + QString s = i.previous(); //! [7] @@ -121,7 +121,7 @@ QList<float> list; ... QMutableListIterator<float> i(list); while (i.hasNext()) - qDebug() << i.next(); + float f = i.next(); //! [8] @@ -129,7 +129,7 @@ while (i.hasNext()) QMutableListIterator<float> i(list); i.toBack(); while (i.hasPrevious()) - qDebug() << i.previous(); + float f = i.previous(); //! [9] @@ -151,7 +151,7 @@ QLinkedList<float> list; ... QMutableLinkedListIterator<float> i(list); while (i.hasNext()) - qDebug() << i.next(); + float f = i.next(); //! [11] @@ -159,7 +159,7 @@ while (i.hasNext()) QMutableLinkedListIterator<float> i(list); i.toBack(); while (i.hasPrevious()) - qDebug() << i.previous(); + float f = i.previous(); //! [12] @@ -181,7 +181,7 @@ QVector<float> vector; ... QMutableVectorIterator<float> i(vector); while (i.hasNext()) - qDebug() << i.next(); + float f = i.next(); //! [14] @@ -189,7 +189,7 @@ while (i.hasNext()) QMutableVectorIterator<float> i(vector); i.toBack(); while (i.hasPrevious()) - qDebug() << i.previous(); + float f = i.previous(); //! [15] @@ -211,7 +211,7 @@ QSet<float> set; ... QMutableSetIterator<float> i(set); while (i.hasNext()) - qDebug() << i.next(); + float f = i.next(); //! [17] @@ -219,7 +219,7 @@ while (i.hasNext()) QMutableSetIterator<float> i(set); i.toBack(); while (i.hasPrevious()) - qDebug() << i.previous(); + float f = i.previous(); //! [18] diff --git a/src/corelib/doc/snippets/code/doc_src_qset.cpp b/src/corelib/doc/snippets/code/doc_src_qset.cpp index 100661e00a..cb35de487c 100644 --- a/src/corelib/doc/snippets/code/doc_src_qset.cpp +++ b/src/corelib/doc/snippets/code/doc_src_qset.cpp @@ -73,8 +73,10 @@ if (!set.contains("ninety-nine")) //! [4] QSetIterator<QWidget *> i(set); -while (i.hasNext()) - qDebug() << i.next(); +while (i.hasNext()) { + QWidget *w = i.next(); + qDebug() << w; +} //! [4] diff --git a/src/corelib/doc/snippets/code/src_corelib_global_qrandom.cpp b/src/corelib/doc/snippets/code/src_corelib_global_qrandom.cpp index 0dc47f2370..35bf49c186 100644 --- a/src/corelib/doc/snippets/code/src_corelib_global_qrandom.cpp +++ b/src/corelib/doc/snippets/code/src_corelib_global_qrandom.cpp @@ -127,5 +127,5 @@ //! [15] //! [16] - qint64 value = QRandomGenerator64::generate() & std::numeric_limits<qint64>::max(); + qint64 value = QRandomGenerator64::global()->generate() & std::numeric_limits<qint64>::max(); //! [16] diff --git a/src/corelib/doc/snippets/code/src_corelib_io_qdir.cpp b/src/corelib/doc/snippets/code/src_corelib_io_qdir.cpp index 4e5e25a64a..4d79a618b7 100644 --- a/src/corelib/doc/snippets/code/src_corelib_io_qdir.cpp +++ b/src/corelib/doc/snippets/code/src_corelib_io_qdir.cpp @@ -54,7 +54,7 @@ void wrapInFunction() //! [0] QDir("/home/user/Documents") -QDir("C:/Documents and Settings") +QDir("C:/Users") //! [0] @@ -154,7 +154,7 @@ if (d1 != d2) //! [12] -C:/Documents and Settings/Username +C:/Users/Username //! [12] @@ -182,4 +182,17 @@ namespace MyNamespace Q_CLEANUP_RESOURCE(myapp); //! [15] +//! [16] +QString absolute = "/local/bin"; +QString relative = "local/bin"; +QFileInfo absFile(absolute); +QFileInfo relFile(relative); + +QDir::setCurrent(QDir::rootPath()); +// absFile and relFile now point to the same file + +QDir::setCurrent("/tmp"); +// absFile now points to "/local/bin", +// while relFile points to "/tmp/local/bin" +//! [16] } diff --git a/src/corelib/doc/snippets/code/src_corelib_io_qdiriterator.cpp b/src/corelib/doc/snippets/code/src_corelib_io_qdiriterator.cpp index 56cf9ed699..39fb629b94 100644 --- a/src/corelib/doc/snippets/code/src_corelib_io_qdiriterator.cpp +++ b/src/corelib/doc/snippets/code/src_corelib_io_qdiriterator.cpp @@ -51,8 +51,8 @@ //! [0] QDirIterator it("/etc", QDirIterator::Subdirectories); while (it.hasNext()) { - qDebug() << it.next(); - + QString dir = it.next(); + qDebug() << dir; // /etc/. // /etc/.. // /etc/X11 diff --git a/src/corelib/doc/snippets/code/src_corelib_io_qfileinfo.cpp b/src/corelib/doc/snippets/code/src_corelib_io_qfileinfo.cpp index 036625370e..a6e73a3e6c 100644 --- a/src/corelib/doc/snippets/code/src_corelib_io_qfileinfo.cpp +++ b/src/corelib/doc/snippets/code/src_corelib_io_qfileinfo.cpp @@ -74,10 +74,10 @@ info2.size(); // returns 56201 //! [1] #ifdef Q_OS_WIN -QFileInfo info1("C:\\Documents and Settings\\Bob\\untabify.lnk"); +QFileInfo info1("C:\\Users\\Bob\\untabify.lnk"); info1.isSymLink(); // returns true -info1.absoluteFilePath(); // returns "C:/Documents and Settings/Bob/untabify.lnk" -info1.size(); // returns 743 +info1.absoluteFilePath(); // returns "C:/Users/Bob/untabify.lnk" +info1.size(); // returns 63942 info1.symLinkTarget(); // returns "C:/Pretty++/untabify" QFileInfo info2(info1.symLinkTarget()); @@ -90,19 +90,16 @@ info2.size(); // returns 63942 //! [2] -QString absolute = "/local/bin"; -QString relative = "local/bin"; -QFileInfo absFile(absolute); -QFileInfo relFile(relative); +QFileInfo info("/usr/bin/env"); -QDir::setCurrent(QDir::rootPath()); -// absFile and relFile now point to the same file +QString path = info.absolutePath(); // path = /usr/bin +QString base = info.baseName(); // base = env -QDir::setCurrent("/tmp"); -// absFile now points to "/local/bin", -// while relFile points to "/tmp/local/bin" -//! [2] +info.setFile("/etc/hosts"); +path = info.absolutePath(); // path = /etc +base = info.baseName(); // base = hosts +//! [2] //! [3] QFileInfo fi("/tmp/archive.tar.gz"); diff --git a/src/corelib/doc/snippets/code/src_corelib_thread_qfuture.cpp b/src/corelib/doc/snippets/code/src_corelib_thread_qfuture.cpp index dfa9b670e7..3e0ad18010 100644 --- a/src/corelib/doc/snippets/code/src_corelib_thread_qfuture.cpp +++ b/src/corelib/doc/snippets/code/src_corelib_thread_qfuture.cpp @@ -62,7 +62,7 @@ QFuture<QString> future; ... QFutureIterator<QString> i(future); while (i.hasNext()) - qDebug() << i.next(); + QString s = i.next(); //! [1] @@ -70,5 +70,5 @@ while (i.hasNext()) QFutureIterator<QString> i(future); i.toBack(); while (i.hasPrevious()) - qDebug() << i.previous(); + QString s = i.previous(); //! [2] diff --git a/src/corelib/doc/snippets/code/src_corelib_tools_qlistdata.cpp b/src/corelib/doc/snippets/code/src_corelib_tools_qlistdata.cpp index 78875c19e2..418cbe5ec3 100644 --- a/src/corelib/doc/snippets/code/src_corelib_tools_qlistdata.cpp +++ b/src/corelib/doc/snippets/code/src_corelib_tools_qlistdata.cpp @@ -228,7 +228,7 @@ qDeleteAll(list.constBegin(), list.constEnd()); QVector<double> vect; vect << 20.0 << 30.0 << 40.0 << 50.0; -QList<double> list = QVector<T>::fromVector(vect); +QList<double> list = QList<double>::fromVector(vect); // list: [20.0, 30.0, 40.0, 50.0] //! [21] diff --git a/src/corelib/doc/snippets/code/src_corelib_tools_qvector.cpp b/src/corelib/doc/snippets/code/src_corelib_tools_qvector.cpp index a05233049f..4595dfb2af 100644 --- a/src/corelib/doc/snippets/code/src_corelib_tools_qvector.cpp +++ b/src/corelib/doc/snippets/code/src_corelib_tools_qvector.cpp @@ -171,10 +171,10 @@ vector.lastIndexOf("X"); // returns -1 //! [14] -QVector<double> vect; +QVector<QString> vect; vect << "red" << "green" << "blue" << "black"; -QList<double> list = vect.toList(); +QList<QString> list = vect.toList(); // list: ["red", "green", "blue", "black"] //! [14] |