diff options
Diffstat (limited to 'src/corelib/doc')
14 files changed, 28 insertions, 28 deletions
diff --git a/src/corelib/doc/snippets/code/src_corelib_global_qglobal.cpp b/src/corelib/doc/snippets/code/src_corelib_global_qglobal.cpp index 7d7d71ac50..59f05592be 100644 --- a/src/corelib/doc/snippets/code/src_corelib_global_qglobal.cpp +++ b/src/corelib/doc/snippets/code/src_corelib_global_qglobal.cpp @@ -501,7 +501,7 @@ namespace QT_NAMESPACE { //! [43] class MyClass : public QObject { - + private: Q_DISABLE_COPY(MyClass) }; @@ -511,7 +511,7 @@ class MyClass : public QObject //! [44] class MyClass : public QObject { - + private: MyClass(const MyClass &); MyClass &operator=(const MyClass &); diff --git a/src/corelib/doc/snippets/code/src_corelib_thread_qwaitcondition_unix.cpp b/src/corelib/doc/snippets/code/src_corelib_thread_qwaitcondition_unix.cpp index de1a7cea19..92a6e77866 100644 --- a/src/corelib/doc/snippets/code/src_corelib_thread_qwaitcondition_unix.cpp +++ b/src/corelib/doc/snippets/code/src_corelib_thread_qwaitcondition_unix.cpp @@ -84,6 +84,6 @@ forever { mutex.lock(); } keyPressed.wakeAll(); - mutex.unlock(); + mutex.unlock(); } //! [3] diff --git a/src/corelib/doc/snippets/code/src_corelib_tools_qbytearray.cpp b/src/corelib/doc/snippets/code/src_corelib_tools_qbytearray.cpp index 7e221cfaab..4f8c4c095e 100644 --- a/src/corelib/doc/snippets/code/src_corelib_tools_qbytearray.cpp +++ b/src/corelib/doc/snippets/code/src_corelib_tools_qbytearray.cpp @@ -405,7 +405,7 @@ QString tmp = "test"; QByteArray text = tmp.toLocal8Bit(); char *data = new char[text.size()] strcpy(data, text.data()); -delete [] data; +delete [] data; //! [46] //! [47] diff --git a/src/corelib/doc/snippets/fileinfo/main.cpp b/src/corelib/doc/snippets/fileinfo/main.cpp index 57d7e32cb5..50acdb2550 100644 --- a/src/corelib/doc/snippets/fileinfo/main.cpp +++ b/src/corelib/doc/snippets/fileinfo/main.cpp @@ -54,12 +54,12 @@ int main(int argc, char *argv[]) QFileInfo fileInfo1("~/examples/191697/."); QFileInfo fileInfo2("~/examples/191697/.."); QFileInfo fileInfo3("~/examples/191697/main.cpp"); -//! [0] -//! [1] +//! [0] +//! [1] QFileInfo fileInfo4("."); QFileInfo fileInfo5(".."); QFileInfo fileInfo6("main.cpp"); -//! [1] +//! [1] qDebug() << fileInfo1.fileName(); qDebug() << fileInfo2.fileName(); diff --git a/src/corelib/doc/snippets/qstring/main.cpp b/src/corelib/doc/snippets/qstring/main.cpp index 6ee3088138..bf45a31c29 100644 --- a/src/corelib/doc/snippets/qstring/main.cpp +++ b/src/corelib/doc/snippets/qstring/main.cpp @@ -552,7 +552,7 @@ void Widget::replaceFunction() //! [86] QString equis = "xxxxxx"; equis.replace("xx", "x"); - // equis == "xxx" + // equis == "xxx" //! [86] //! [87] diff --git a/src/corelib/doc/snippets/sharedemployee/employee.h b/src/corelib/doc/snippets/sharedemployee/employee.h index 8025015a2e..2df1f71c51 100644 --- a/src/corelib/doc/snippets/sharedemployee/employee.h +++ b/src/corelib/doc/snippets/sharedemployee/employee.h @@ -69,11 +69,11 @@ class Employee setName(name); } //! [2] //! [7] - Employee(const Employee &other) - : d (other.d) - { - } -//! [7] + Employee(const Employee &other) + : d (other.d) + { + } +//! [7] //! [3] void setId(int id) { d->id = id; } //! [3] //! [4] diff --git a/src/corelib/doc/snippets/signalmapper/filereader.cpp b/src/corelib/doc/snippets/signalmapper/filereader.cpp index 42660b9551..cb83ea9362 100644 --- a/src/corelib/doc/snippets/signalmapper/filereader.cpp +++ b/src/corelib/doc/snippets/signalmapper/filereader.cpp @@ -73,7 +73,7 @@ FileReader::FileReader(QWidget *parent) /* //! [2] //slower due to signature normalization at runtime - + connect(signalMapper, SIGNAL(mapped(const QString &)), this, SLOT(readFile(const QString &))); //! [2] @@ -93,7 +93,7 @@ FileReader::FileReader(QWidget *parent) void FileReader::readFile(const QString &filename) { QFile file(filename); - + if (!file.open(QIODevice::ReadOnly)) { QMessageBox::information(this, tr("Unable to open file"), file.errorString()); diff --git a/src/corelib/doc/snippets/statemachine/eventtest.cpp b/src/corelib/doc/snippets/statemachine/eventtest.cpp index c83e92ab77..7454344680 100644 --- a/src/corelib/doc/snippets/statemachine/eventtest.cpp +++ b/src/corelib/doc/snippets/statemachine/eventtest.cpp @@ -55,11 +55,11 @@ protected: if (wrappedEvent->type() == QEvent::KeyPress) { QKeyEvent *keyEvent = static_cast<QKeyEvent *>(wrappedEvent); // Do your event test - } + } } return false; } -//![0] +//![0] void onTransition(QEvent *event) { diff --git a/src/corelib/doc/snippets/statemachine/main4.cpp b/src/corelib/doc/snippets/statemachine/main4.cpp index f1ecabd535..19b40a10b4 100644 --- a/src/corelib/doc/snippets/statemachine/main4.cpp +++ b/src/corelib/doc/snippets/statemachine/main4.cpp @@ -69,7 +69,7 @@ protected: StringEvent *se = static_cast<StringEvent*>(e); return (m_value == se->value); } - + virtual void onTransition(QEvent *) {} private: diff --git a/src/corelib/doc/snippets/streaming/main.cpp b/src/corelib/doc/snippets/streaming/main.cpp index 66808a5a6b..673df075ee 100644 --- a/src/corelib/doc/snippets/streaming/main.cpp +++ b/src/corelib/doc/snippets/streaming/main.cpp @@ -85,12 +85,12 @@ int main(int argc, char *argv[]) QByteArray byteArray; QDataStream stream(&byteArray, QIODevice::WriteOnly); stream << m; - + // display qDebug() << m.id << m.releaseDate << m.title; Movie m2; - + int id2; QString title2; QDate date2; diff --git a/src/corelib/doc/snippets/timers/timers.cpp b/src/corelib/doc/snippets/timers/timers.cpp index 4d74e7cc27..8257bf57a7 100644 --- a/src/corelib/doc/snippets/timers/timers.cpp +++ b/src/corelib/doc/snippets/timers/timers.cpp @@ -74,5 +74,5 @@ Foo::Foo() int main() { - + } diff --git a/src/corelib/doc/src/objectmodel/object.qdoc b/src/corelib/doc/src/objectmodel/object.qdoc index 1d33c14d0f..89a781da39 100644 --- a/src/corelib/doc/src/objectmodel/object.qdoc +++ b/src/corelib/doc/src/objectmodel/object.qdoc @@ -71,7 +71,7 @@ \section1 Important Classes These classes form the basis of the Qt Object Model. - + \annotatedlist objectmodel \target Identity vs Value @@ -108,7 +108,7 @@ at runtime that are not declared in the C++ class. If we copy a Qt Object, should the copy include the properties that were added to the original? - + \endlist For these reasons, Qt Objects should be treated as identities, not diff --git a/src/corelib/doc/src/objectmodel/properties.qdoc b/src/corelib/doc/src/objectmodel/properties.qdoc index 37f54621a1..721b98c0f7 100644 --- a/src/corelib/doc/src/objectmodel/properties.qdoc +++ b/src/corelib/doc/src/objectmodel/properties.qdoc @@ -62,7 +62,7 @@ A property behaves like a class data member, but it has additional features accessible through the \l {Meta-Object System}. - \list + \list \li A \c READ accessor function is required if no \c MEMBER variable was specified. It is for reading the property value. Ideally, a const function @@ -130,7 +130,7 @@ gets and sets a widget's \c USER property. \li The presence of the \c CONSTANT attibute indicates that the property - value is constant. For a given object instance, the READ method of a + value is constant. For a given object instance, the READ method of a constant property must return the same value every time it is called. This constant value may be different for different instances of the object. A constant property cannot have a WRITE method or a NOTIFY signal. @@ -272,7 +272,7 @@ Q_DECLARE_METATYPE() macro so that their values can be stored in QVariant objects. This makes them suitable for use with both static properties declared using the Q_PROPERTY() macro in class - definitions and dynamic properties created at run-time. + definitions and dynamic properties created at run-time. \sa Q_DECLARE_METATYPE(), QMetaType, QVariant diff --git a/src/corelib/doc/src/objectmodel/signalsandslots.qdoc b/src/corelib/doc/src/objectmodel/signalsandslots.qdoc index d897c4b9a7..4e285f2966 100644 --- a/src/corelib/doc/src/objectmodel/signalsandslots.qdoc +++ b/src/corelib/doc/src/objectmodel/signalsandslots.qdoc @@ -365,7 +365,7 @@ arguments can have default values. Consider QObject::destroyed(): \code - void destroyed(QObject* = 0); + void destroyed(QObject* = 0); \endcode When a QObject is deleted, it emits this QObject::destroyed() @@ -434,7 +434,7 @@ handle each signal differently. Suppose you have three push buttons that determine which file you - will open: "Tax File", "Accounts File", or "Report File". + will open: "Tax File", "Accounts File", or "Report File". In order to open the correct file, you use QSignalMapper::setMapping() to map all the clicked() signals to a QSignalMapper object. Then you connect |