diff options
Diffstat (limited to 'examples')
24 files changed, 80 insertions, 80 deletions
diff --git a/examples/assistant/remotecontrol/remotecontrol.cpp b/examples/assistant/remotecontrol/remotecontrol.cpp index 772ea7540..1e7222c7f 100644 --- a/examples/assistant/remotecontrol/remotecontrol.cpp +++ b/examples/assistant/remotecontrol/remotecontrol.cpp @@ -112,7 +112,7 @@ void RemoteControl::on_launchButton_clicked() if (!ui.startUrlLineEdit->text().isEmpty()) sendCommand(QLatin1String("SetSource ") + ui.startUrlLineEdit->text()); - + ui.launchButton->setEnabled(false); ui.startUrlLineEdit->setEnabled(false); ui.actionGroupBox->setEnabled(true); diff --git a/examples/assistant/remotecontrol/remotecontrol.h b/examples/assistant/remotecontrol/remotecontrol.h index 4f40db201..b2ebc3abb 100644 --- a/examples/assistant/remotecontrol/remotecontrol.h +++ b/examples/assistant/remotecontrol/remotecontrol.h @@ -55,11 +55,11 @@ class RemoteControl : public QMainWindow public: RemoteControl(QWidget *parent = 0, Qt::WindowFlags flags = 0); ~RemoteControl(); - + private: Ui::RemoteControlClass ui; QProcess *process; - + private slots: void on_launchButton_clicked(); void on_actionQuit_triggered(); diff --git a/examples/assistant/simpletextviewer/assistant.cpp b/examples/assistant/simpletextviewer/assistant.cpp index c3740d647..163856015 100644 --- a/examples/assistant/simpletextviewer/assistant.cpp +++ b/examples/assistant/simpletextviewer/assistant.cpp @@ -71,7 +71,7 @@ void Assistant::showDocumentation(const QString &page) QByteArray ba("SetSource "); ba.append("qthelp://org.qt-project.examples.simpletextviewer/doc/"); - + proc->write(ba + page.toLocal8Bit() + '\n'); } //! [1] @@ -87,7 +87,7 @@ bool Assistant::startAssistant() #if !defined(Q_OS_MAC) app += QLatin1String("assistant"); #else - app += QLatin1String("Assistant.app/Contents/MacOS/Assistant"); + app += QLatin1String("Assistant.app/Contents/MacOS/Assistant"); #endif QStringList args; @@ -102,7 +102,7 @@ bool Assistant::startAssistant() QMessageBox::critical(0, QObject::tr("Simple Text Viewer"), QObject::tr("Unable to launch Qt Assistant (%1)").arg(app)); return false; - } + } } return true; } diff --git a/examples/assistant/simpletextviewer/assistant.h b/examples/assistant/simpletextviewer/assistant.h index eb9e0c228..8a24294a7 100644 --- a/examples/assistant/simpletextviewer/assistant.h +++ b/examples/assistant/simpletextviewer/assistant.h @@ -53,7 +53,7 @@ public: Assistant(); ~Assistant(); void showDocumentation(const QString &file); - + private: bool startAssistant(); QProcess *proc; diff --git a/examples/assistant/simpletextviewer/documentation/browse.html b/examples/assistant/simpletextviewer/documentation/browse.html index 987abf31f..47e09f56f 100644 --- a/examples/assistant/simpletextviewer/documentation/browse.html +++ b/examples/assistant/simpletextviewer/documentation/browse.html @@ -1,16 +1,16 @@ <html> <head> - <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"> - <title>Browse</title> + <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"> + <title>Browse</title> </head> <body style="font-size:12pt;font-family:helvetica"> - + <p><center><h2>Browse</h2></center></p> - + <p> The file dialog let you browse the current file system to specify the directory in which the file you want to open - resides. + resides. Note that only the specified directory will be searched, any subdirectories will simply be ignored. </p> diff --git a/examples/assistant/simpletextviewer/documentation/filedialog.html b/examples/assistant/simpletextviewer/documentation/filedialog.html index afa65ed57..6ebf40364 100644 --- a/examples/assistant/simpletextviewer/documentation/filedialog.html +++ b/examples/assistant/simpletextviewer/documentation/filedialog.html @@ -1,17 +1,17 @@ <html> <head> - <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"> - <title>File Dialog</title> + <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"> + <title>File Dialog</title> </head> <body style="font-size:12pt;font-family:helvetica"> - <p><center><h2>File Dialog</h2></center></p> + <p><center><h2>File Dialog</h2></center></p> <p> In the file dialog you can name a particular file name, or search for files using wildcard matching, i.e. specify a file name containing wildcards. In addition you must specify - the directory in which the file you search for resides. + the directory in which the file you search for resides. </p> <br /> @@ -39,7 +39,7 @@ <br /> <br /> <p> - See also: <a href="browse.html">Browse</a>, <a href="wildcardmatching.html">Wildcard Matching</a>, + See also: <a href="browse.html">Browse</a>, <a href="wildcardmatching.html">Wildcard Matching</a>, <a href="findfile.html">Find File</a> </p> </body> diff --git a/examples/assistant/simpletextviewer/documentation/findfile.html b/examples/assistant/simpletextviewer/documentation/findfile.html index 32e014718..dad66ab31 100644 --- a/examples/assistant/simpletextviewer/documentation/findfile.html +++ b/examples/assistant/simpletextviewer/documentation/findfile.html @@ -1,11 +1,11 @@ <html> <head> - <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"> - <title>Find File</title> + <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"> + <title>Find File</title> </head> <body style="font-size:12pt;font-family:helvetica"> - <p><center><h2>Find File</h2></center></p> + <p><center><h2>Find File</h2></center></p> <p> To open and view a file in the Simple Text Viewer, select the diff --git a/examples/assistant/simpletextviewer/documentation/index.html b/examples/assistant/simpletextviewer/documentation/index.html index 5a7b1d5fa..569ff531d 100644 --- a/examples/assistant/simpletextviewer/documentation/index.html +++ b/examples/assistant/simpletextviewer/documentation/index.html @@ -1,15 +1,15 @@ <html> <head> - <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"> - <title>Manual</title> + <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"> + <title>Manual</title> </head> <body style="font-size:12pt;font-family:helvetica"> - <p><center><h2>Simple Text Viewer</h2></center></p> + <p><center><h2>Simple Text Viewer</h2></center></p> - <p> + <p> The Simple Text Viewer enables the user to select and view - existing files. + existing files. </p> <p><center> @@ -25,15 +25,15 @@ the existing file system to find the relevant directory. </p> - <ul> - <li><a href="findfile.html">Find File</a></li> + <ul> + <li><a href="findfile.html">Find File</a></li> <ul> <li><a href="filedialog.html">File Dialog</a></li> <li><a href="wildcardmatching.html">WildCard Matching</a></li> <li><a href="browse.html">Browse</a></li> </ul> - <li><a href="openfile.html">Open File</a></li> - </ul> + <li><a href="openfile.html">Open File</a></li> + </ul> </body> </html> diff --git a/examples/assistant/simpletextviewer/documentation/intro.html b/examples/assistant/simpletextviewer/documentation/intro.html index 2e2aa40de..958619b9b 100644 --- a/examples/assistant/simpletextviewer/documentation/intro.html +++ b/examples/assistant/simpletextviewer/documentation/intro.html @@ -1,15 +1,15 @@ <html> <head> - <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"> - <title>Manual</title> + <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"> + <title>Manual</title> </head> <body style="font-size:12pt;font-family:helvetica"> - <p><center><h2>Simple Text Viewer</h2></center></p> + <p><center><h2>Simple Text Viewer</h2></center></p> - <p> + <p> The Simple Text Viewer enables the user to select and view - existing files. + existing files. </p> <p><center> diff --git a/examples/assistant/simpletextviewer/documentation/openfile.html b/examples/assistant/simpletextviewer/documentation/openfile.html index e172de95e..a68b1c18e 100644 --- a/examples/assistant/simpletextviewer/documentation/openfile.html +++ b/examples/assistant/simpletextviewer/documentation/openfile.html @@ -1,11 +1,11 @@ <html> <head> - <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"> - <title>Open File</title> + <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"> + <title>Open File</title> </head> <body style="font-size:12pt;font-family:helvetica"> - <p><center><h2>Open File</h2></center></p> + <p><center><h2>Open File</h2></center></p> <p> Once the file you want to view appears in the dialog's diff --git a/examples/assistant/simpletextviewer/documentation/wildcardmatching.html b/examples/assistant/simpletextviewer/documentation/wildcardmatching.html index eb1839a06..a6d8a74aa 100644 --- a/examples/assistant/simpletextviewer/documentation/wildcardmatching.html +++ b/examples/assistant/simpletextviewer/documentation/wildcardmatching.html @@ -1,16 +1,16 @@ <html> <head> - <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"> - <title>Wildcard Matching</title> + <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"> + <title>Wildcard Matching</title> </head> <body style="font-size:12pt;font-family:helvetica"> - <p><center><h2>Wildcard Matching</h2></center></p> + <p><center><h2>Wildcard Matching</h2></center></p> <p> Most command shells such as bash or cmd.exe support "file globbing", the ability to identify a group of files by using - wildcards. + wildcards. <br /> <br /> @@ -23,20 +23,20 @@ <br /> <br /> <p> - Wildcard matching provides four features: - </p> + Wildcard matching provides four features: + </p> - <ul> - <li>Any character represents itself apart from those - mentioned below. Thus 'c' matches the character 'c'. + <ul> + <li>Any character represents itself apart from those + mentioned below. Thus 'c' matches the character 'c'. </li> - <li>The '?' character matches any single character.</li> - <li>The '*' matches zero or more of any characters.</li> - <li>Sets of characters can be represented in square brackets. - Within the character class, like outside, backslash + <li>The '?' character matches any single character.</li> + <li>The '*' matches zero or more of any characters.</li> + <li>Sets of characters can be represented in square brackets. + Within the character class, like outside, backslash has no special meaning. - </li> - </ul> + </li> + </ul> <p> For example we could identify HTML files with diff --git a/examples/assistant/simpletextviewer/findfiledialog.cpp b/examples/assistant/simpletextviewer/findfiledialog.cpp index d07cd6232..a1c96607b 100644 --- a/examples/assistant/simpletextviewer/findfiledialog.cpp +++ b/examples/assistant/simpletextviewer/findfiledialog.cpp @@ -91,7 +91,7 @@ void FindFileDialog::browse() //! [2] void FindFileDialog::help() { - currentAssistant->showDocumentation("filedialog.html"); + currentAssistant->showDocumentation("filedialog.html"); } //! [2] diff --git a/examples/assistant/simpletextviewer/mainwindow.cpp b/examples/assistant/simpletextviewer/mainwindow.cpp index bc1700173..b23594012 100644 --- a/examples/assistant/simpletextviewer/mainwindow.cpp +++ b/examples/assistant/simpletextviewer/mainwindow.cpp @@ -87,7 +87,7 @@ void MainWindow::about() //! [3] void MainWindow::showDocumentation() { - assistant->showDocumentation("index.html"); + assistant->showDocumentation("index.html"); } //! [3] diff --git a/examples/designer/containerextension/containerextension.pro b/examples/designer/containerextension/containerextension.pro index 5bd5f7c08..b3e05d7f8 100644 --- a/examples/designer/containerextension/containerextension.pro +++ b/examples/designer/containerextension/containerextension.pro @@ -24,14 +24,14 @@ QT += widgets designer #! [2] HEADERS += multipagewidget.h \ - multipagewidgetplugin.h \ + multipagewidgetplugin.h \ multipagewidgetcontainerextension.h \ - multipagewidgetextensionfactory.h + multipagewidgetextensionfactory.h SOURCES += multipagewidget.cpp \ multipagewidgetplugin.cpp \ multipagewidgetcontainerextension.cpp \ - multipagewidgetextensionfactory.cpp + multipagewidgetextensionfactory.cpp OTHER_FILES += multipagewidget.json #! [2] diff --git a/examples/designer/containerextension/multipagewidget.h b/examples/designer/containerextension/multipagewidget.h index e110e73c5..a05e3ba51 100644 --- a/examples/designer/containerextension/multipagewidget.h +++ b/examples/designer/containerextension/multipagewidget.h @@ -65,8 +65,8 @@ public: int currentIndex() const; QWidget *widget(int index); QString pageTitle() const; - -public slots: + +public slots: void addPage(QWidget *page); void insertPage(int index, QWidget *page); void removePage(int index); diff --git a/examples/designer/designer.pro b/examples/designer/designer.pro index 5b81ce2bc..38987f8da 100644 --- a/examples/designer/designer.pro +++ b/examples/designer/designer.pro @@ -10,7 +10,7 @@ SUBDIRS = calculatorform # the sun cc compiler has a problem with the include lines for the form.prf solaris-cc*:SUBDIRS -= calculatorbuilder \ - worldtimeclockbuilder + worldtimeclockbuilder qtNomakeTools( \ containerextension \ diff --git a/examples/help/contextsensitivehelp/helpbrowser.cpp b/examples/help/contextsensitivehelp/helpbrowser.cpp index cbf9b21d6..a5e4292f0 100644 --- a/examples/help/contextsensitivehelp/helpbrowser.cpp +++ b/examples/help/contextsensitivehelp/helpbrowser.cpp @@ -71,9 +71,9 @@ QVariant HelpBrowser::loadResource(int type, const QUrl &name) QByteArray ba; if (type < 4 && m_helpEngine) { QUrl url(name); - if (name.isRelative()) + if (name.isRelative()) url = source().resolved(url); - ba = m_helpEngine->fileData(url); + ba = m_helpEngine->fileData(url); } return ba; } diff --git a/examples/help/contextsensitivehelp/main.cpp b/examples/help/contextsensitivehelp/main.cpp index d58d2884e..7fad8a427 100644 --- a/examples/help/contextsensitivehelp/main.cpp +++ b/examples/help/contextsensitivehelp/main.cpp @@ -44,7 +44,7 @@ int main(int argc, char *argv[]) { - QApplication a(argc, argv); + QApplication a(argc, argv); WateringConfigDialog dia; return dia.exec(); } diff --git a/examples/help/contextsensitivehelp/wateringconfigdialog.h b/examples/help/contextsensitivehelp/wateringconfigdialog.h index 638c795bf..7a9f4a2e1 100644 --- a/examples/help/contextsensitivehelp/wateringconfigdialog.h +++ b/examples/help/contextsensitivehelp/wateringconfigdialog.h @@ -52,7 +52,7 @@ public: private slots: void focusChanged(QWidget *old, QWidget *now); - + private: Ui::WateringConfigDialog m_ui; QMap<QWidget*, QString> m_widgetInfo; diff --git a/examples/uitools/multipleinheritance/multipleinheritance.pro b/examples/uitools/multipleinheritance/multipleinheritance.pro index 06f29b3e7..1baace29c 100644 --- a/examples/uitools/multipleinheritance/multipleinheritance.pro +++ b/examples/uitools/multipleinheritance/multipleinheritance.pro @@ -1,6 +1,6 @@ #! [0] SOURCES = calculatorform.cpp main.cpp -HEADERS = calculatorform.h +HEADERS = calculatorform.h FORMS = calculatorform.ui #! [0] diff --git a/examples/uitools/textfinder/forms/input.txt b/examples/uitools/textfinder/forms/input.txt index 29dfe5d6c..96e8c3047 100644 --- a/examples/uitools/textfinder/forms/input.txt +++ b/examples/uitools/textfinder/forms/input.txt @@ -1,9 +1,9 @@ -These forms are processed at run-time to produce dynamically-generated user interfaces. -In order to generate a form at run-time, a resource file containing a UI file is needed. -Applications that use the form handling classes need to be configured to be built against -the QtUiTools module. This is done by including the following declaration in a qmake project -file to ensure that the application is compiled and linked appropriately. A form loader object, -provided by the QUiLoader class, is used to construct the user interface. This user interface -can be retrieved from any QIODevice; for example, a QFile object can be used to obtain a form -stored in a project's resources. The QUiLoader::load() function takes the user interface +These forms are processed at run-time to produce dynamically-generated user interfaces. +In order to generate a form at run-time, a resource file containing a UI file is needed. +Applications that use the form handling classes need to be configured to be built against +the QtUiTools module. This is done by including the following declaration in a qmake project +file to ensure that the application is compiled and linked appropriately. A form loader object, +provided by the QUiLoader class, is used to construct the user interface. This user interface +can be retrieved from any QIODevice; for example, a QFile object can be used to obtain a form +stored in a project's resources. The QUiLoader::load() function takes the user interface description contained in the file and constructs the form widget.
\ No newline at end of file diff --git a/examples/uitools/textfinder/textfinder.cpp b/examples/uitools/textfinder/textfinder.cpp index ee6dce89c..d32280215 100644 --- a/examples/uitools/textfinder/textfinder.cpp +++ b/examples/uitools/textfinder/textfinder.cpp @@ -120,9 +120,9 @@ void TextFinder::on_findButton_clicked() "The search field is empty. Please enter a word and click Find."); } else { - QTextCursor highlightCursor(document); + QTextCursor highlightCursor(document); QTextCursor cursor(document); - + cursor.beginEditBlock(); //! [6] @@ -149,7 +149,7 @@ void TextFinder::on_findButton_clicked() if (found == false) { QMessageBox::information(this, tr("Word Not Found"), "Sorry, the word cannot be found."); - } + } } } //! [8] //! [9] diff --git a/examples/uitools/textfinder/textfinder.h b/examples/uitools/textfinder/textfinder.h index 374f24540..1a7fd0c68 100644 --- a/examples/uitools/textfinder/textfinder.h +++ b/examples/uitools/textfinder/textfinder.h @@ -59,7 +59,7 @@ public: private slots: void on_findButton_clicked(); - + private: QWidget* loadUiFile(); void loadTextFile(); diff --git a/examples/uitools/textfinder/textfinder.pro b/examples/uitools/textfinder/textfinder.pro index 0e6421f6c..667711dda 100644 --- a/examples/uitools/textfinder/textfinder.pro +++ b/examples/uitools/textfinder/textfinder.pro @@ -1,6 +1,6 @@ -HEADERS = textfinder.h -RESOURCES = textfinder.qrc -SOURCES = textfinder.cpp main.cpp +HEADERS = textfinder.h +RESOURCES = textfinder.qrc +SOURCES = textfinder.cpp main.cpp target.path = $$[QT_INSTALL_EXAMPLES]/uitools/textfinder INSTALLS += target |