summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorhjk <qtc-committer@nokia.com>2009-03-24 17:35:59 +0100
committerhjk <qtc-committer@nokia.com>2009-03-24 17:35:59 +0100
commita4bb415f58fdcc5d2bbacc4a430e68e56423726d (patch)
tree6fd8a343b5924f1bc3d04dea12d06a0398850d2e
parent32495f55bc0faf3148a70f5828988fa2799383ac (diff)
downloadqt-creator-a4bb415f58fdcc5d2bbacc4a430e68e56423726d.tar.gz
update textfinder example
-rw-r--r--doc/example/textfinder/textfinder.cpp23
-rw-r--r--doc/example/textfinder/textfinder.h16
-rw-r--r--doc/qtcreator.qdoc2
3 files changed, 15 insertions, 26 deletions
diff --git a/doc/example/textfinder/textfinder.cpp b/doc/example/textfinder/textfinder.cpp
index b399d17d23..28cfc597b6 100644
--- a/doc/example/textfinder/textfinder.cpp
+++ b/doc/example/textfinder/textfinder.cpp
@@ -33,16 +33,16 @@
#include <QtCore/QTextStream>
#include <QtGui/QMessageBox>
-TextFinder::TextFinder(QWidget *parent, Qt::WFlags flags)
- : QWidget(parent, flags)
+TextFinder::TextFinder(QWidget *parent)
+ : QWidget(parent), ui(new Ui::TextFinder)
{
- ui.setupUi(this);
+ ui->setupUi(this);
loadTextFile();
- isFirstTime = true;
}
TextFinder::~TextFinder()
{
+ delete ui;
}
void TextFinder::loadTextFile()
@@ -54,20 +54,13 @@ void TextFinder::loadTextFile()
QString line = in.readAll();
inputFile.close();
- ui.textEdit->setPlainText(line);
- QTextCursor cursor = ui.textEdit->textCursor();
+ ui->textEdit->setPlainText(line);
+ QTextCursor cursor = ui->textEdit->textCursor();
cursor.movePosition(QTextCursor::Start, QTextCursor::MoveAnchor, 1);
}
void TextFinder::on_findButton_clicked()
{
- QString searchString = ui.lineEdit->text();
- QTextDocument *document = ui.textEdit->document();
-
- bool found = false;
-
- ui.textEdit->find(searchString, QTextDocument::FindWholeWords);
- QTextCursor cursor = ui.textEdit->textCursor();
- if (!cursor.isNull())
- found = true;
+ QString searchString = ui->lineEdit->text();
+ ui->textEdit->find(searchString, QTextDocument::FindWholeWords);
}
diff --git a/doc/example/textfinder/textfinder.h b/doc/example/textfinder/textfinder.h
index 19e34224da..89dad69136 100644
--- a/doc/example/textfinder/textfinder.h
+++ b/doc/example/textfinder/textfinder.h
@@ -34,29 +34,25 @@
#include <QtGui/QWidget>
-class QPushButton;
-class QTextEdit;
-class QLineEdit;
+namespace Ui
+{
+ class TextFinder;
+}
class TextFinder : public QWidget
{
Q_OBJECT
public:
- TextFinder(QWidget *parent = 0, Qt::WFlags flags = 0);
+ TextFinder(QWidget *parent = 0);
~TextFinder();
private slots:
void on_findButton_clicked();
private:
- Ui::Form ui;
+ Ui::TextFinder *ui;
void loadTextFile();
-
- QPushButton *ui_findButton;
- QTextEdit *ui_textEdit;
- QLineEdit *ui_lineEdit;
- bool isFirstTime;
};
#endif // TEXTFINDER_H
diff --git a/doc/qtcreator.qdoc b/doc/qtcreator.qdoc
index 09d8c570c7..37d93730f3 100644
--- a/doc/qtcreator.qdoc
+++ b/doc/qtcreator.qdoc
@@ -608,7 +608,7 @@
this line of code:
\code
- QMetaObject::connectSlotsByName(Form);
+ QMetaObject::connectSlotsByName(TextFinderClass);
\endcode
in the uic generated \c{ui_textfinder.h} file.