Changeset 561 for trunk/doc/src/examples/application.qdoc

Timestamp:

Feb 11, 2010, 11:19:06 PM (15 years ago)

Author:

Dmitry A. Kuminov

Message:

trunk: Merged in qt 4.6.1 sources.

Location:

trunk

Files:

• . (modified) (1 prop)
• doc/src/examples/application.qdoc (modified) (10 diffs)

trunk/doc/src/examples/application.qdoc

@@ -2 +2 @@
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Qt Software Information ([email protected])
+** All rights reserved.
+** Contact: Nokia Corporation ([email protected])
 **
 ** This file is part of the documentation of the Qt Toolkit.
@@ -21 +22 @@
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
-** In addition, as a special exception, Nokia gives you certain
-** additional rights. These rights are described in the Nokia Qt LGPL
-** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
-** package.
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** GNU General Public License Usage
@@ -34 +34 @@
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
-** If you are unsure which license is appropriate for your use, please
-** contact the sales department at qt-sales@nokia.com.
+** If you 
+** @nokia.com.
 ** $QT_END_LICENSE$
 **
@@ -46 +46 @@
     The Application example shows how to implement a standard GUI
     application with menus, toolbars, and a status bar. The example
-    itself is a simple text editor program built around QTextEdit.
+    itself is a simple text editor program built around QTextEdit.
 
     \image application.png Screenshot of the Application example
@@ -104 +104 @@
     \snippet examples/mainwindows/application/mainwindow.cpp 2
 
-    In the constructor, we start by creating a QTextEdit widget as a
+    In the constructor, we start by creating a QTextEdit widget as a
     child of the main window (the \c this object). Then we call
     QMainWindow::setCentralWidget() to tell that this is going to be
@@ -115 +115 @@
     readSettings() to restore the user's preferences.
 
-    We establish a signal-slot connection between the QTextEdit's
+    We establish a signal-slot connection between the QTextEdit's
     document object and our \c documentWasModified() slot. Whenever
-    the user modifies the text in the QTextEdit, we want to update
+    the user modifies the text in the QTextEdit, we want to update
     the title bar to show that the file was modified.
 
@@ -142 +142 @@
     \menu{File|New} from the menu. We call \c maybeSave() to save any
     pending changes and if the user accepts to go on, we clear the
-    QTextEdit and call the private function \c setCurrentFile() to
+    QTextEdit and call the private function \c setCurrentFile() to
     update the window title and clear the
     \l{QWidget::windowModified}{windowModified} flag.
@@ -188 +188 @@
 
     The \c documentWasModified() slot is invoked each time the text
-    in the QTextEdit changes because of user edits. We call
+    in the QTextEdit changes because of user edits. We call
     QWidget::setWindowModified() to make the title bar show that the
     file was modified. How this is done varies on each platform.
@@ -228 +228 @@
 
     The \gui{Edit|Cut} and \gui{Edit|Copy} actions must be available
-    only when the QTextEdit contains selected text. We disable them
-    by default and connect the QTextEdit::copyAvailable() signal to
+    only when the QTextEdit contains selected text. We disable them
+    by default and connect the QTextEdit::copyAvailable() signal to
     the QAction::setEnabled() slot, ensuring that the actions are
     disabled when the text editor has no selection.
@@ -290 +290 @@
     When restoring the position and size of a window, it's important
     to call QWidget::resize() before QWidget::move(). The reason why
-    is given in the \l{geometry.html}{Window Geometry} overview.
+    is given in the \l{Window Geometry} overview.
 
     \snippet examples/mainwindows/application/mainwindow.cpp 37