author | zecke <zecke> | 2005-04-16 22:02:12 (UTC) |
---|---|---|
committer | zecke <zecke> | 2005-04-16 22:02:12 (UTC) |
commit | 206784bc9919dca87a71de9b998ff0ece08bd8ca (patch) (unidiff) | |
tree | b45acd807cdb073e6a9c0d07862f72b395c865a9 | |
parent | f2b8a146b411a99c43050ab902f641ee406e3bab (diff) | |
download | opie-206784bc9919dca87a71de9b998ff0ece08bd8ca.zip opie-206784bc9919dca87a71de9b998ff0ece08bd8ca.tar.gz opie-206784bc9919dca87a71de9b998ff0ece08bd8ca.tar.bz2 |
Opie X11:
Do not take the local qpeapplication.h but the Opie/X11 version
-rw-r--r-- | library/config.cpp | 2 | ||||
-rw-r--r-- | library/qpedialog.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/library/config.cpp b/library/config.cpp index 72bd4d2..73ddeb5 100644 --- a/library/config.cpp +++ b/library/config.cpp | |||
@@ -15,49 +15,49 @@ | |||
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 | #include <qdir.h> | 21 | #include <qdir.h> |
22 | #include <qmessagebox.h> | 22 | #include <qmessagebox.h> |
23 | #if QT_VERSION <= 230 && defined(QT_NO_CODECS) | 23 | #if QT_VERSION <= 230 && defined(QT_NO_CODECS) |
24 | #include <qtextcodec.h> | 24 | #include <qtextcodec.h> |
25 | #endif | 25 | #endif |
26 | #include <qtextstream.h> | 26 | #include <qtextstream.h> |
27 | 27 | ||
28 | #include <sys/stat.h> | 28 | #include <sys/stat.h> |
29 | #include <sys/types.h> | 29 | #include <sys/types.h> |
30 | #include <sys/time.h> | 30 | #include <sys/time.h> |
31 | #include <fcntl.h> | 31 | #include <fcntl.h> |
32 | #include <stdlib.h> | 32 | #include <stdlib.h> |
33 | #include <time.h> | 33 | #include <time.h> |
34 | #include <unistd.h> | 34 | #include <unistd.h> |
35 | 35 | ||
36 | #define QTOPIA_INTERNAL_LANGLIST | 36 | #define QTOPIA_INTERNAL_LANGLIST |
37 | #include "config.h" | 37 | #include "config.h" |
38 | #include "global.h" | 38 | #include "global.h" |
39 | #include "qpeapplication.h" | 39 | #include <qtopia/qpeapplication.h> |
40 | 40 | ||
41 | 41 | ||
42 | /* | 42 | /* |
43 | * Internal Class | 43 | * Internal Class |
44 | */ | 44 | */ |
45 | class ConfigPrivate { | 45 | class ConfigPrivate { |
46 | public: | 46 | public: |
47 | ConfigPrivate() : multilang(FALSE) {} | 47 | ConfigPrivate() : multilang(FALSE) {} |
48 | ConfigPrivate(const ConfigPrivate& o) : | 48 | ConfigPrivate(const ConfigPrivate& o) : |
49 | trfile(o.trfile), | 49 | trfile(o.trfile), |
50 | trcontext(o.trcontext), | 50 | trcontext(o.trcontext), |
51 | multilang(o.multilang) | 51 | multilang(o.multilang) |
52 | {} | 52 | {} |
53 | ConfigPrivate& operator=(const ConfigPrivate& o) | 53 | ConfigPrivate& operator=(const ConfigPrivate& o) |
54 | { | 54 | { |
55 | trfile = o.trfile; | 55 | trfile = o.trfile; |
56 | trcontext = o.trcontext; | 56 | trcontext = o.trcontext; |
57 | multilang = o.multilang; | 57 | multilang = o.multilang; |
58 | return *this; | 58 | return *this; |
59 | } | 59 | } |
60 | 60 | ||
61 | QString trfile; | 61 | QString trfile; |
62 | QCString trcontext; | 62 | QCString trcontext; |
63 | bool multilang; | 63 | bool multilang; |
diff --git a/library/qpedialog.cpp b/library/qpedialog.cpp index f52171f..8da0ca6 100644 --- a/library/qpedialog.cpp +++ b/library/qpedialog.cpp | |||
@@ -1,49 +1,49 @@ | |||
1 | /********************************************************************** | 1 | /********************************************************************** |
2 | ** Copyright (C) 2000-2002 Trolltech AS. All rights reserved. | 2 | ** Copyright (C) 2000-2002 Trolltech AS. All rights reserved. |
3 | ** | 3 | ** |
4 | ** This file is part of the Qtopia Environment. | 4 | ** This file is part of the 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 | #include "qpedialog.h" | 21 | #include "qpedialog.h" |
22 | 22 | ||
23 | #include <qdialog.h> | 23 | #include <qdialog.h> |
24 | 24 | ||
25 | #include <qpeapplication.h> | 25 | #include <qtopia/qpeapplication.h> |
26 | 26 | ||
27 | 27 | ||
28 | // Allow access to nornally protected accept and reject functions | 28 | // Allow access to nornally protected accept and reject functions |
29 | class HackedPrivateQDialog : public QDialog{ | 29 | class HackedPrivateQDialog : public QDialog{ |
30 | public: | 30 | public: |
31 | void accept() { QDialog::accept();} | 31 | void accept() { QDialog::accept();} |
32 | void reject() { QDialog::reject();} | 32 | void reject() { QDialog::reject();} |
33 | }; | 33 | }; |
34 | 34 | ||
35 | 35 | ||
36 | /** | 36 | /** |
37 | * \brief This is the only c'tor. | 37 | * \brief This is the only c'tor. |
38 | * | 38 | * |
39 | * The parent of this Listener is the Dialog you pass. This means once | 39 | * The parent of this Listener is the Dialog you pass. This means once |
40 | * the dialog is deleted this listener will be deleted too. | 40 | * the dialog is deleted this listener will be deleted too. |
41 | * This Listener listens on QPEApplication::appMessage signal and implements | 41 | * This Listener listens on QPEApplication::appMessage signal and implements |
42 | * accept() and reject(). | 42 | * accept() and reject(). |
43 | * | 43 | * |
44 | * \code | 44 | * \code |
45 | *QDialog *dialog = new YourDialog(); | 45 | *QDialog *dialog = new YourDialog(); |
46 | (void)new QPEDialogListener(dialog); | 46 | (void)new QPEDialogListener(dialog); |
47 | if( QPEApplication::execDialog(dialog) == QDialog::Accept ){ | 47 | if( QPEApplication::execDialog(dialog) == QDialog::Accept ){ |
48 | // do some stuff | 48 | // do some stuff |
49 | } | 49 | } |