diff options
Diffstat (limited to 'doc/src')
27 files changed, 50 insertions, 50 deletions
diff --git a/doc/src/examples/application.qdoc b/doc/src/examples/application.qdoc index 9e03bc490d..e4fceecdf5 100644 --- a/doc/src/examples/application.qdoc +++ b/doc/src/examples/application.qdoc @@ -166,7 +166,7 @@ the string for translation. It is a good habit to call \l{QObject::tr()}{tr()} on all user-visible strings, in case you later decide to translate your application to other languages. - The \l{Internationalization with Qt} overview convers + The \l{Internationalization with Qt} overview covers \l{QObject::tr()}{tr()} in more detail. \snippet examples/mainwindows/application/mainwindow.cpp 15 diff --git a/doc/src/examples/completer.qdoc b/doc/src/examples/completer.qdoc index 408de6b5cd..d4a4e6d1d9 100644 --- a/doc/src/examples/completer.qdoc +++ b/doc/src/examples/completer.qdoc @@ -149,7 +149,7 @@ \snippet examples/tools/completer/mainwindow.cpp 5 - The mouse cursor is then overriden with Qt::WaitCursor before we fill + The mouse cursor is then overridden with Qt::WaitCursor before we fill a QStringList object, \c words, with the contents of \c file. Once this is done, we restore the mouse cursor. diff --git a/doc/src/examples/customsortfiltermodel.qdoc b/doc/src/examples/customsortfiltermodel.qdoc index e145e82b5b..8c402ac972 100644 --- a/doc/src/examples/customsortfiltermodel.qdoc +++ b/doc/src/examples/customsortfiltermodel.qdoc @@ -91,7 +91,7 @@ {QSortFilterProxyModel::filterAcceptsRow()}{filterAcceptsRow()} function to only accept rows with valid dates, and QSortFilterProxyModel::lessThan() to be able to sort the senders - by their email adresses. Finally, we implement a \c dateInRange() + by their email addresses. Finally, we implement a \c dateInRange() convenience function that we will use to determine if a date is valid. @@ -112,21 +112,21 @@ \snippet examples/itemviews/customsortfiltermodel/mysortfilterproxymodel.cpp 4 - We want to sort the senders by their email adresses. The \l + We want to sort the senders by their email addresses. The \l {QSortFilterProxyModel::}{lessThan()} function is used as the < operator when sorting. The default implementation handles a collection of types including QDateTime and String, but in order - to be able to sort the senders by their email adresses we must - first identify the adress within the given string: + to be able to sort the senders by their email addresses we must + first identify the address within the given string: \snippet examples/itemviews/customsortfiltermodel/mysortfilterproxymodel.cpp 6 - We use QRegExp to define a pattern for the adresses we are looking + We use QRegExp to define a pattern for the addresses we are looking for. The QRegExp::indexIn() function attempts to find a match in the given string and returns the position of the first match, or -1 if there was no match. If the given string contains the pattern, we use QRegExp's \l {QRegExp::cap()}{cap()} function to - retrieve the actual adress. The \l {QRegExp::cap()}{cap()} + retrieve the actual address. The \l {QRegExp::cap()}{cap()} function returns the text captured by the \e nth subexpression. The entire match has index 0 and the parenthesized subexpressions have indexes starting from 1 (excluding diff --git a/doc/src/examples/dbscreen.qdoc b/doc/src/examples/dbscreen.qdoc index 7f6bb18f98..793b5fc28c 100644 --- a/doc/src/examples/dbscreen.qdoc +++ b/doc/src/examples/dbscreen.qdoc @@ -156,7 +156,7 @@ \section1 Step 3: Creating the Driver Plugin - Qt provides a high level API for writing Qt extentions. One of the plugin + Qt provides a high level API for writing Qt extensions. One of the plugin base classes provided is QScreenDriverPlugin, which we use in this example to create our screen driver plugin. diff --git a/doc/src/examples/dragdroprobot.qdoc b/doc/src/examples/dragdroprobot.qdoc index 84d8af42b6..c68f6cc999 100644 --- a/doc/src/examples/dragdroprobot.qdoc +++ b/doc/src/examples/dragdroprobot.qdoc @@ -196,7 +196,7 @@ \snippet examples/graphicsview/dragdroprobot/robot.cpp 10 - The constuctor starts by setting the flag + The constructor starts by setting the flag \l{QGraphicsItem::ItemHasNoContents}{ItemHasNoContents}, which is a minor optimization for items that have no visual appearance. diff --git a/doc/src/examples/drilldown.qdoc b/doc/src/examples/drilldown.qdoc index 1903df6d5b..13c4117f25 100644 --- a/doc/src/examples/drilldown.qdoc +++ b/doc/src/examples/drilldown.qdoc @@ -438,7 +438,7 @@ The animation is implemented using the QTimeLine class together with the event handlers and the private \c setFrame() slot: The image item will expand when the mouse cursor hovers over it, - returning back to its orignal size when the cursor leaves its + returning back to its original size when the cursor leaves its borders. Finally, we store the location ID that this particular record is diff --git a/doc/src/examples/elasticnodes.qdoc b/doc/src/examples/elasticnodes.qdoc index e5399b143b..7b4563172b 100644 --- a/doc/src/examples/elasticnodes.qdoc +++ b/doc/src/examples/elasticnodes.qdoc @@ -152,7 +152,7 @@ \snippet examples/graphicsview/elasticnodes/node.cpp 5 In theory, the sum of pushing and pulling forces should stabilize to - precisely 0. In practise, however, they never do. To circumvent errors in + precisely 0. In practice, however, they never do. To circumvent errors in numerical precision, we simply force the sum of forces to be 0 when they are less than 0.1. @@ -282,7 +282,7 @@ If the length of the vector is less than 20 (i.e., if two nodes overlap), then we fix the source and destination pointer at the center of the source - node. In practise this case is very hard to reproduce manually, as the + node. In practice this case is very hard to reproduce manually, as the forces between the two nodes is then at its maximum. It's important to notice that we call diff --git a/doc/src/examples/extension.qdoc b/doc/src/examples/extension.qdoc index 41fddbbbc2..a2c3590be8 100644 --- a/doc/src/examples/extension.qdoc +++ b/doc/src/examples/extension.qdoc @@ -120,8 +120,8 @@ \snippet examples/dialogs/extension/finddialog.cpp 4 Before we create the main layout, we create several child layouts - for the widgets: First we allign the QLabel ans its buddy, the - QLineEdit, using a QHBoxLayout. Then we vertically allign the + for the widgets: First we align the QLabel and its buddy, the + QLineEdit, using a QHBoxLayout. Then we vertically align the QLabel and QLineEdit with the check boxes associated with the simple search, using a QVBoxLayout. We also create a QVBoxLayout for the buttons. In the end we lay out the two latter layouts and diff --git a/doc/src/examples/findfiles.qdoc b/doc/src/examples/findfiles.qdoc index 026d61fc56..4c03aac640 100644 --- a/doc/src/examples/findfiles.qdoc +++ b/doc/src/examples/findfiles.qdoc @@ -41,7 +41,7 @@ With the Find Files application the user can search for files in a specified directory, matching a specified file name (using wild - cards if appropiate) and containing a specified text. + cards if appropriate) and containing a specified text. The user is provided with a \gui Browse option, and the result of the search is displayed in a table with the names of the files diff --git a/doc/src/examples/imageviewer.qdoc b/doc/src/examples/imageviewer.qdoc index 49b3111c22..be47c7dd87 100644 --- a/doc/src/examples/imageviewer.qdoc +++ b/doc/src/examples/imageviewer.qdoc @@ -164,7 +164,7 @@ In release mode, the macro simply disappear. The mode can be set in the application's \c .pro file. One way to do so is to add an - option to \gui qmake when building the appliction: + option to \gui qmake when building the application: \snippet doc/src/snippets/code/doc_src_examples_imageviewer.qdoc 2 @@ -270,7 +270,7 @@ actions providing the application features. We assign a short-cut key to each action and connect them to the - appropiate slots. We only enable the \c openAct and \c exitAxt at + appropriate slots. We only enable the \c openAct and \c exitAct at the time of creation, the others are updated once an image has been loaded into the application. In addition we make the \c fitToWindowAct \l {QAction::checkable}{checkable}. diff --git a/doc/src/examples/licensewizard.qdoc b/doc/src/examples/licensewizard.qdoc index a58e029973..1e11732db3 100644 --- a/doc/src/examples/licensewizard.qdoc +++ b/doc/src/examples/licensewizard.qdoc @@ -108,7 +108,7 @@ \dots \snippet examples/dialogs/licensewizard/licensewizard.cpp 13 - In \c showHelp(), we display help texts that are appropiate for + In \c showHelp(), we display help texts that are appropriate for the current page. If the user clicks \gui Help twice for the same page, we say, "Sorry, I already gave what help I could. Maybe you should try asking a human?" diff --git a/doc/src/examples/mandelbrot.qdoc b/doc/src/examples/mandelbrot.qdoc index eb53e95b90..c4a6a49bf1 100644 --- a/doc/src/examples/mandelbrot.qdoc +++ b/doc/src/examples/mandelbrot.qdoc @@ -210,7 +210,7 @@ \l{QImage}s. It is called from the constructor to initialize the \c colormap array with pleasing colors. - \section1 MandelbrotWidget Class Defintion + \section1 MandelbrotWidget Class Definition The \c MandelbrotWidget class uses \c RenderThread to draw the Mandelbrot set on screen. Here's the class definition: diff --git a/doc/src/examples/orderform.qdoc b/doc/src/examples/orderform.qdoc index ea93d865f4..7ab56da7fe 100644 --- a/doc/src/examples/orderform.qdoc +++ b/doc/src/examples/orderform.qdoc @@ -306,7 +306,7 @@ \row \o block \o \c{I want to receive...} \row - \o block \o \c{I do not want to recieve...} + \o block \o \c{I do not want to receive...} \row \o block \o \c{X} \endtable diff --git a/doc/src/examples/padnavigator.qdoc b/doc/src/examples/padnavigator.qdoc index 591d3d0e63..6838e0a49f 100644 --- a/doc/src/examples/padnavigator.qdoc +++ b/doc/src/examples/padnavigator.qdoc @@ -51,7 +51,7 @@ \section1 RoundRectItem Class Definition - The \c RoundRectItem class is used by itself to diplay the icons on the + The \c RoundRectItem class is used by itself to display the icons on the pad, and as a base class for \c FlippablePad, the class for the pad itself. The role of the class is to paint a round rectangle of a specified size and gradient color, and optionally to paint a pixmap icon on top. To support \c @@ -108,7 +108,7 @@ \l{QGraphicsItem::ItemCoordinateCache}{ItemCoordinateCache}. This mode causes the item's rendering to be cached into an off-screen pixmap that remains persistent as we move and transform the item. This mode is ideal - for this example, and works particularily well with OpenGL and OpenGL ES. + for this example, and works particularly well with OpenGL and OpenGL ES. \snippet examples/graphicsview/padnavigator/roundrectitem.cpp 1 @@ -131,7 +131,7 @@ We then draw the "foreground" round rectangle itself. The fill depends on the \c fill property; if true, we will with a plain QPalette::Window color. - We get the corrent brush from QApplication::palette(). We assign a single + We get the current brush from QApplication::palette(). We assign a single unit wide pen for the stroke, assign the brush, and then draw the rectangle. @@ -359,7 +359,7 @@ RoundRectItem that is slightly larger than the icons on the pad. We create it as an immediate child of the \c FlippablePad, so the selection item is a sibling to all the icons. By giving it a - \l{QGraphicsItem::zValue()}{Z-value} of 0.5 we ensure it will slide beteen + \l{QGraphicsItem::zValue()}{Z-value} of 0.5 we ensure it will slide between the pad and its icons. What follows now is a series of animation initializations. diff --git a/doc/src/examples/painterpaths.qdoc b/doc/src/examples/painterpaths.qdoc index 2f740b8dc3..acf9772de9 100644 --- a/doc/src/examples/painterpaths.qdoc +++ b/doc/src/examples/painterpaths.qdoc @@ -192,7 +192,7 @@ new subpath, and construct three sides of a square using the QPainterPath::lineTo() function. - Now, when we call the QPainterPath::closeSubpath() fucntion the + Now, when we call the QPainterPath::closeSubpath() function the last side is created. Remember that the QPainterPath::closeSubpath() function draws a line to the beginning of the \e current subpath, i.e the square. @@ -286,7 +286,7 @@ Finally, we initialize the \c RenderArea widgets by calling the \c fillRuleChanged(), \c fillGradientChanged() and \c - penColorChanged() slots, and we set the inital pen width and + penColorChanged() slots, and we set the initial pen width and window title. \snippet examples/painting/painterpaths/window.cpp 19 @@ -396,7 +396,7 @@ painter path is rendered in the right size, i.e that it grows with the \c RenderArea widget when the application is resized. When we constructed the various painter paths, they were all rnedered - within a square with a 100 pixel width wich is equivalent to \c + within a square with a 100 pixel width which is equivalent to \c RenderArea::sizeHint(). The QPainter::scale() function scales the coordinate system by the \c RenderArea widget's \e current width and height divided by 100. diff --git a/doc/src/examples/screenshot.qdoc b/doc/src/examples/screenshot.qdoc index bc87fdb012..190b175389 100644 --- a/doc/src/examples/screenshot.qdoc +++ b/doc/src/examples/screenshot.qdoc @@ -99,7 +99,7 @@ We create the applications's buttons and the group box containing the application's options, and put it all into a main - layout. Finally we take the initial screenshot, and set the inital + layout. Finally we take the initial screenshot, and set the initial delay and the window title, before we resize the widget to a suitable size. diff --git a/doc/src/examples/scribble.qdoc b/doc/src/examples/scribble.qdoc index da9b0b6bb9..b09f570c51 100644 --- a/doc/src/examples/scribble.qdoc +++ b/doc/src/examples/scribble.qdoc @@ -358,7 +358,7 @@ \snippet examples/widgets/scribble/mainwindow.cpp 14 In the \c createAction() function we create the actions - representing the menu entries and connect them to the appropiate + representing the menu entries and connect them to the appropriate slots. In particular we create the actions found in the \gui {Save As} sub-menu. We use QImageWriter::supportedImageFormats() to get a list of the supported formats (as a QList<QByteArray>). diff --git a/doc/src/examples/sliders.qdoc b/doc/src/examples/sliders.qdoc index 7e47dcc4d6..721acaefbe 100644 --- a/doc/src/examples/sliders.qdoc +++ b/doc/src/examples/sliders.qdoc @@ -195,7 +195,7 @@ \snippet examples/widgets/sliders/slidersgroup.cpp 0 - First we create the slider-like widgets with the appropiate + First we create the slider-like widgets with the appropriate properties. In particular we set the focus policy for each widget. Qt::FocusPolicy is an enum type that defines the various policies a widget can have with respect to acquiring keyboard diff --git a/doc/src/examples/tablet.qdoc b/doc/src/examples/tablet.qdoc index 8639ab6b81..ce4ab2a1f0 100644 --- a/doc/src/examples/tablet.qdoc +++ b/doc/src/examples/tablet.qdoc @@ -318,7 +318,7 @@ \snippet examples/widgets/tablet/tabletcanvas.cpp 11 - We finally check wether the pointer is the stylus or the eraser. + We finally check whether the pointer is the stylus or the eraser. If it is the eraser, we set the color to the background color of the pixmap an let the pressure decide the pen width, else we set the colors we have set up previously in the function. diff --git a/doc/src/examples/tooltips.qdoc b/doc/src/examples/tooltips.qdoc index 9786c40264..2b39bf9c5f 100644 --- a/doc/src/examples/tooltips.qdoc +++ b/doc/src/examples/tooltips.qdoc @@ -112,7 +112,7 @@ \snippet examples/widgets/tooltips/sortingbox.cpp 1 - To be able to show the appropiate tooltips while the user is + To be able to show the appropriate tooltips while the user is moving the cursor around, we need to enable mouse tracking for the widget. @@ -208,7 +208,7 @@ The QPainter::setBrush() function sets the current brush used by the painter. When the provided argument is a QColor, the function - calls the appropiate QBrush constructor which creates a brush with + calls the appropriate QBrush constructor which creates a brush with the specified color and Qt::SolidPattern style. The QPainter::drawPath() function draws the given path using the current pen for outline and the current brush for filling. @@ -340,14 +340,14 @@ to appear at a random position, and we use the \c randomItemPosition() function to calculate such a position. We make sure that the item appears within the visible area of the - \c SortingBox widget, using the widget's current width and heigth + \c SortingBox widget, using the widget's current width and height when calculating the random coordinates. \snippet examples/widgets/tooltips/sortingbox.cpp 25 As with \c initialItemPosition(), the \c initialItemColor() function is called from the constructor. The purposes of both - functions are purely cosmetic: We want to control the inital + functions are purely cosmetic: We want to control the initial position and color of the three first items. \snippet examples/widgets/tooltips/sortingbox.cpp 26 diff --git a/doc/src/examples/transformations.qdoc b/doc/src/examples/transformations.qdoc index 2d9f9f770e..74c1a8450a 100644 --- a/doc/src/examples/transformations.qdoc +++ b/doc/src/examples/transformations.qdoc @@ -124,7 +124,7 @@ In the constructor we pass the parent parameter on to the base class, and customize the font that we will use to render the - coordinates. The QWidget::font() funtion returns the font + coordinates. The QWidget::font() function returns the font currently set for the widget. As long as no special font has been set, or after QWidget::setFont() is called, this is either a special font for the widget class, the parent's font or (if this @@ -163,7 +163,7 @@ \snippet examples/painting/transformations/renderarea.cpp 5 - The \c paintEvent() event handler recieves the \c RenderArea + The \c paintEvent() event handler receives the \c RenderArea widget's paint events. A paint event is a request to repaint all or part of the widget. It can happen as a result of QWidget::repaint() or QWidget::update(), or because the widget was diff --git a/doc/src/sql/sql-programming/sql-driver.qdoc b/doc/src/sql/sql-programming/sql-driver.qdoc index 40c7c6a23c..3fc685b5bc 100644 --- a/doc/src/sql/sql-programming/sql-driver.qdoc +++ b/doc/src/sql/sql-programming/sql-driver.qdoc @@ -86,7 +86,7 @@ \snippet doc/src/snippets/code/doc_src_sql-driver.qdoc 0 - The \c configure script cannot detect the neccessary libraries + The \c configure script cannot detect the necessary libraries and include files if they are not in the standard paths, so it may be necessary to specify these paths using the \c -I and \c -L command-line options. For example, if your MySQL include files @@ -303,7 +303,7 @@ \bold{Note:} If you are using the Oracle Instant Client package, you will need to set LD_LIBRARY_PATH when building the OCI SQL plugin - and when running an applicaiton that uses the OCI SQL plugin. You can + and when running an application that uses the OCI SQL plugin. You can avoid this requirement by setting and RPATH and listing all of the libraries to link to. Here is an example: \snippet doc/src/snippets/code/doc_src_sql-driver.qdoc 32 @@ -409,7 +409,7 @@ QODBC plugin with such drivers it has to be compiled with the Q_ODBC_VERSION_2 defined. - For the Oracle 9 ODBC driver (Windows), it is neccessary to check + For the Oracle 9 ODBC driver (Windows), it is necessary to check "SQL_WCHAR support" in the ODBC driver manager otherwise Oracle will convert all Unicode strings to local 8-bit. @@ -661,7 +661,7 @@ follow SQLite patch releases. Patch releases are therefore both backward and forward compatible. - To force SQLite to use a specific file format, it is neccessary to build and + To force SQLite to use a specific file format, it is necessary to build and ship your own database plugin with your own SQLite library as illustrated above. Some versions of SQLite can be forced to write a specific file format by setting the \c{SQLITE_DEFAULT_FILE_FORMAT} define when building SQLite. @@ -734,7 +734,7 @@ \snippet doc/src/snippets/code/doc_src_sql-driver.qdoc 29 - If you are using Firebird, the Firebird library has to be set explicitely: + If you are using Firebird, the Firebird library has to be set explicitly: \snippet doc/src/snippets/code/doc_src_sql-driver.qdoc 30 diff --git a/doc/src/sql/sql-programming/sql-programming.qdoc b/doc/src/sql/sql-programming/sql-programming.qdoc index 55f97484bb..0be443c89e 100644 --- a/doc/src/sql/sql-programming/sql-programming.qdoc +++ b/doc/src/sql/sql-programming/sql-programming.qdoc @@ -234,7 +234,7 @@ QSqlQuery::previous(), QSqlQuery::first(), QSqlQuery::last(), and QSqlQuery::seek(). The current row index is returned by QSqlQuery::at(), and the total number of rows in the result set - is avaliable as QSqlQuery::size() for databases that support it. + is available as QSqlQuery::size() for databases that support it. To determine whether a database driver supports a given feature, use QSqlDriver::hasFeature(). In the following example, we call diff --git a/doc/src/widgets/modelview.qdoc b/doc/src/widgets/modelview.qdoc index 9cbba47b60..5ac15b9f39 100644 --- a/doc/src/widgets/modelview.qdoc +++ b/doc/src/widgets/modelview.qdoc @@ -56,7 +56,7 @@ \list \o The difference between standard and model/view widgets - \o Adapters betweeen forms and models + \o Adapters between forms and models \o Developing a simple model/view application \o Predefined models \o Intermediate topics such as: @@ -475,7 +475,7 @@ The selection model (as shown above) can be retrieved, but it can also be set with \l{QAbstractItemView}{QAbstractItemView::setSelectionModel}. This - is how it's possible to have 3 view classes with synchronised selections + is how it's possible to have 3 view classes with synchronized selections because only one instance of a selection model is used. To share a selection model between 3 views use \l{QAbstractItemView::}{selectionModel()} and assign the result to the second and third view class with diff --git a/doc/src/widgets/widgets-and-layouts/gallery.qdoc b/doc/src/widgets/widgets-and-layouts/gallery.qdoc index eb27ec97db..865321d4ad 100644 --- a/doc/src/widgets/widgets-and-layouts/gallery.qdoc +++ b/doc/src/widgets/widgets-and-layouts/gallery.qdoc @@ -31,7 +31,7 @@ \brief Qt widgets shown in different styles on various platforms. Qt's support for widget styles and themes enables your application to fit in - with the native desktop enviroment. Below, you can find links to the various + with the native desktop environment. Below, you can find links to the various widget styles that are supplied with Qt 4. \table diff --git a/doc/src/widgets/widgets-and-layouts/layout.qdoc b/doc/src/widgets/widgets-and-layouts/layout.qdoc index 3db58c21f9..394d537293 100644 --- a/doc/src/widgets/widgets-and-layouts/layout.qdoc +++ b/doc/src/widgets/widgets-and-layouts/layout.qdoc @@ -192,12 +192,12 @@ \o Any widgets that are allocated less space than their minimum size (or minimum size hint if no minimum size is specified) are allocated this minimum size they require. (Widgets don't have to - have a minimum size or minimum size hint in which case the strech + have a minimum size or minimum size hint in which case the stretch factor is their determining factor.) \o Any widgets that are allocated more space than their maximum size are allocated the maximum size space they require. (Widgets do not - have to have a maximum size in which case the strech factor is + have to have a maximum size in which case the stretch factor is their determining factor.) \endlist diff --git a/doc/src/widgets/widgets-and-layouts/stylesheet.qdoc b/doc/src/widgets/widgets-and-layouts/stylesheet.qdoc index 80376b40a1..8375587ce8 100644 --- a/doc/src/widgets/widgets-and-layouts/stylesheet.qdoc +++ b/doc/src/widgets/widgets-and-layouts/stylesheet.qdoc @@ -3542,7 +3542,7 @@ \section2 Customizing QCheckBox - Styling of a QCheckBox is almost indentical to styling a QRadioButton. The + Styling of a QCheckBox is almost identical to styling a QRadioButton. The main difference is that a tristate QCheckBox has an indeterminate state. \snippet doc/src/snippets/code/doc_src_stylesheet.qdoc 108 |