author | kergoth <kergoth> | 2002-06-07 18:53:14 (UTC) |
---|---|---|
committer | kergoth <kergoth> | 2002-06-07 18:53:14 (UTC) |
commit | 640d964cfdc7467f6cacb513087cd3acda2c04f0 (patch) (unidiff) | |
tree | 9a784686c1795f8b1f81eb344598f3b549d43467 /library/finddialog.cpp | |
parent | dfb9c76738bb68e235114c5ad43dbd26a59b98ab (diff) | |
download | opie-640d964cfdc7467f6cacb513087cd3acda2c04f0.zip opie-640d964cfdc7467f6cacb513087cd3acda2c04f0.tar.gz opie-640d964cfdc7467f6cacb513087cd3acda2c04f0.tar.bz2 |
Backing out unintentional merge from TT branch.
-rw-r--r-- | library/finddialog.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/library/finddialog.cpp b/library/finddialog.cpp index 7a9367b..904e952 100644 --- a/library/finddialog.cpp +++ b/library/finddialog.cpp | |||
@@ -1,68 +1,72 @@ | |||
1 | /********************************************************************** | 1 | /********************************************************************** |
2 | ** Copyright (C) 2001 Trolltech AS. All rights reserved. | 2 | ** Copyright (C) 2001 Trolltech AS. All rights reserved. |
3 | ** | 3 | ** |
4 | ** This file is part of Qtopia Environment. | 4 | ** This file is part of Qtopia Environment. |
5 | ** | 5 | ** |
6 | ** This file may be distributed and/or modified under the terms of the | 6 | ** This file may be distributed and/or modified under the terms of the |
7 | ** GNU General Public License version 2 as published by the Free Software | 7 | ** GNU General Public License version 2 as published by the Free Software |
8 | ** Foundation and appearing in the file LICENSE.GPL included in the | 8 | ** Foundation and appearing in the file LICENSE.GPL included in the |
9 | ** packaging of this file. | 9 | ** packaging of this file. |
10 | ** | 10 | ** |
11 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE | 11 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE |
12 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. | 12 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. |
13 | ** | 13 | ** |
14 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. | 14 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. |
15 | ** | 15 | ** |
16 | ** Contact info@trolltech.com if any conditions of this licensing are | 16 | ** Contact info@trolltech.com if any conditions of this licensing are |
17 | ** not clear to you. | 17 | ** not clear to you. |
18 | ** | 18 | ** |
19 | **********************************************************************/ | 19 | **********************************************************************/ |
20 | 20 | ||
21 | // WARNING: Do *NOT* define this yourself. The SL5xxx from SHARP does NOT | ||
22 | // have this class. | ||
23 | #define QTOPIA_INTERNAL_FD | ||
24 | |||
21 | #include "finddialog.h" | 25 | #include "finddialog.h" |
22 | #include "findwidget_p.h" | 26 | #include "findwidget_p.h" |
23 | 27 | ||
24 | #include <qlayout.h> | 28 | #include <qlayout.h> |
25 | #include <qpushbutton.h> | 29 | #include <qpushbutton.h> |
26 | 30 | ||
27 | FindDialog::FindDialog( const QString &appName, QWidget *parent, | 31 | FindDialog::FindDialog( const QString &appName, QWidget *parent, |
28 | const char *name, bool modal ) | 32 | const char *name, bool modal ) |
29 | : QDialog( parent, name, modal ) | 33 | : QDialog( parent, name, modal ) |
30 | { | 34 | { |
31 | QVBoxLayout *vb; | 35 | QVBoxLayout *vb; |
32 | vb = new QVBoxLayout( this ); | 36 | vb = new QVBoxLayout( this ); |
33 | fw = new FindWidget( appName, this, "Find Widget" ); | 37 | fw = new FindWidget( appName, this, "Find Widget" ); |
34 | vb->addWidget( fw ); | 38 | vb->addWidget( fw ); |
35 | QObject::connect( fw, SIGNAL(signalFindClicked(const QString&, | 39 | QObject::connect( fw, SIGNAL(signalFindClicked(const QString&, |
36 | bool,bool,int)), | 40 | bool,bool,int)), |
37 | this, SIGNAL(signalFindClicked(const QString&, | 41 | this, SIGNAL(signalFindClicked(const QString&, |
38 | bool,bool,int)) ); | 42 | bool,bool,int)) ); |
39 | QObject::connect( fw, SIGNAL(signalFindClicked(const QString&,const QDate&, | 43 | QObject::connect( fw, SIGNAL(signalFindClicked(const QString&,const QDate&, |
40 | bool,bool,int)), | 44 | bool,bool,int)), |
41 | this, SIGNAL(signalFindClicked(const QString&, | 45 | this, SIGNAL(signalFindClicked(const QString&, |
42 | const QDate&,bool,bool,int)) ); | 46 | const QDate&,bool,bool,int)) ); |
43 | d = 0; | 47 | d = 0; |
44 | } | 48 | } |
45 | 49 | ||
46 | FindDialog::~FindDialog() | 50 | FindDialog::~FindDialog() |
47 | { | 51 | { |
48 | } | 52 | } |
49 | 53 | ||
50 | QString FindDialog::findText() const | 54 | QString FindDialog::findText() const |
51 | { | 55 | { |
52 | return fw->findText(); | 56 | return fw->findText(); |
53 | } | 57 | } |
54 | 58 | ||
55 | void FindDialog::setUseDate( bool show ) | 59 | void FindDialog::setUseDate( bool show ) |
56 | { | 60 | { |
57 | fw->setUseDate( show ); | 61 | fw->setUseDate( show ); |
58 | } | 62 | } |
59 | 63 | ||
60 | void FindDialog::setDate( const QDate &dt ) | 64 | void FindDialog::setDate( const QDate &dt ) |
61 | { | 65 | { |
62 | fw->setDate( dt ); | 66 | fw->setDate( dt ); |
63 | } | 67 | } |
64 | 68 | ||
65 | void FindDialog::slotNotFound() | 69 | void FindDialog::slotNotFound() |
66 | { | 70 | { |
67 | fw->slotNotFound(); | 71 | fw->slotNotFound(); |
68 | } | 72 | } |