author | zecke <zecke> | 2004-03-14 17:56:46 (UTC) |
---|---|---|
committer | zecke <zecke> | 2004-03-14 17:56:46 (UTC) |
commit | 98bbe5561e8e1a862e19a3d0a0d49ed90ef15b54 (patch) (unidiff) | |
tree | 8a440150cc5f66ac5dfce1062b436d9878517779 | |
parent | d69b11f67e3118f86d068c38c422984d754e13cc (diff) | |
download | opie-98bbe5561e8e1a862e19a3d0a0d49ed90ef15b54.zip opie-98bbe5561e8e1a862e19a3d0a0d49ed90ef15b54.tar.gz opie-98bbe5561e8e1a862e19a3d0a0d49ed90ef15b54.tar.bz2 |
ODP and only ODP
-rw-r--r-- | core/apps/embeddedkonsole/konsole.cpp | 1 | ||||
-rw-r--r-- | core/apps/embeddedkonsole/main.cpp | 1 | ||||
-rw-r--r-- | core/apps/helpbrowser/main.cpp | 1 | ||||
-rw-r--r-- | core/apps/qcop/config.in | 4 | ||||
-rw-r--r-- | core/apps/textedit/main.cpp | 1 | ||||
-rw-r--r-- | core/apps/textedit/textedit.cpp | 4 | ||||
-rw-r--r-- | core/apps/textedit/textedit.h | 2 |
7 files changed, 8 insertions, 6 deletions
diff --git a/core/apps/embeddedkonsole/konsole.cpp b/core/apps/embeddedkonsole/konsole.cpp index 281835e..c5df47f 100644 --- a/core/apps/embeddedkonsole/konsole.cpp +++ b/core/apps/embeddedkonsole/konsole.cpp | |||
@@ -36,32 +36,33 @@ | |||
36 | #include <qmenubar.h> | 36 | #include <qmenubar.h> |
37 | #include <qtabbar.h> | 37 | #include <qtabbar.h> |
38 | #include <qpe/config.h> | 38 | #include <qpe/config.h> |
39 | #include <qfontdatabase.h> | 39 | #include <qfontdatabase.h> |
40 | #include <qfile.h> | 40 | #include <qfile.h> |
41 | #include <qspinbox.h> | 41 | #include <qspinbox.h> |
42 | #include <qlayout.h> | 42 | #include <qlayout.h> |
43 | 43 | ||
44 | #include <sys/wait.h> | 44 | #include <sys/wait.h> |
45 | #include <stdio.h> | 45 | #include <stdio.h> |
46 | #include <stdlib.h> | 46 | #include <stdlib.h> |
47 | #include <assert.h> | 47 | #include <assert.h> |
48 | 48 | ||
49 | #include "konsole.h" | 49 | #include "konsole.h" |
50 | #include "commandeditdialog.h" | 50 | #include "commandeditdialog.h" |
51 | 51 | ||
52 | using namespace Opie; | ||
52 | class EKNumTabBar : public QTabBar | 53 | class EKNumTabBar : public QTabBar |
53 | { | 54 | { |
54 | public: | 55 | public: |
55 | EKNumTabBar(QWidget *parent = 0, const char *name = 0) : | 56 | EKNumTabBar(QWidget *parent = 0, const char *name = 0) : |
56 | QTabBar(parent, name) | 57 | QTabBar(parent, name) |
57 | {} | 58 | {} |
58 | 59 | ||
59 | // QList<QTab> *getTabList() { return(tabList()); } | 60 | // QList<QTab> *getTabList() { return(tabList()); } |
60 | 61 | ||
61 | void numberTabs() | 62 | void numberTabs() |
62 | { | 63 | { |
63 | // Yes, it really is this messy. QTabWidget needs functions | 64 | // Yes, it really is this messy. QTabWidget needs functions |
64 | // that provide acces to tabs in a sequential way. | 65 | // that provide acces to tabs in a sequential way. |
65 | int m=INT_MIN; | 66 | int m=INT_MIN; |
66 | for (int i=0; i<count(); i++) | 67 | for (int i=0; i<count(); i++) |
67 | { | 68 | { |
diff --git a/core/apps/embeddedkonsole/main.cpp b/core/apps/embeddedkonsole/main.cpp index fe30b7e..b456ce2 100644 --- a/core/apps/embeddedkonsole/main.cpp +++ b/core/apps/embeddedkonsole/main.cpp | |||
@@ -12,18 +12,19 @@ | |||
12 | /* kvt, which is copyright (c) 1996 by Matthias Ettrich <ettrich@kde.org> */ | 12 | /* kvt, which is copyright (c) 1996 by Matthias Ettrich <ettrich@kde.org> */ |
13 | /* */ | 13 | /* */ |
14 | /* ---------------------------------------------------------------------- */ | 14 | /* ---------------------------------------------------------------------- */ |
15 | /* */ | 15 | /* */ |
16 | /* Ported Konsole to Qt/Embedded */ | 16 | /* Ported Konsole to Qt/Embedded */ |
17 | /* */ | 17 | /* */ |
18 | /* Copyright (C) 2000 by John Ryland <jryland@trolltech.com> */ | 18 | /* Copyright (C) 2000 by John Ryland <jryland@trolltech.com> */ |
19 | /* */ | 19 | /* */ |
20 | /* -------------------------------------------------------------------------- */ | 20 | /* -------------------------------------------------------------------------- */ |
21 | 21 | ||
22 | #include "konsole.h" | 22 | #include "konsole.h" |
23 | 23 | ||
24 | #include <opie2/oapplicationfactory.h> | 24 | #include <opie2/oapplicationfactory.h> |
25 | 25 | ||
26 | 26 | ||
27 | /* --| main |------------------------------------------------------ */ | 27 | /* --| main |------------------------------------------------------ */ |
28 | using namespace Opie::Core; | ||
28 | OPIE_EXPORT_APP( OApplicationFactory<Konsole> ) | 29 | OPIE_EXPORT_APP( OApplicationFactory<Konsole> ) |
29 | 30 | ||
diff --git a/core/apps/helpbrowser/main.cpp b/core/apps/helpbrowser/main.cpp index c726cd3..66241ae 100644 --- a/core/apps/helpbrowser/main.cpp +++ b/core/apps/helpbrowser/main.cpp | |||
@@ -9,17 +9,18 @@ | |||
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 "helpbrowser.h" | 21 | #include "helpbrowser.h" |
22 | 22 | ||
23 | #include <opie2/oapplicationfactory.h> | 23 | #include <opie2/oapplicationfactory.h> |
24 | 24 | ||
25 | using namespace Opie::Core; | ||
25 | OPIE_EXPORT_APP( OApplicationFactory<HelpBrowser> ) | 26 | OPIE_EXPORT_APP( OApplicationFactory<HelpBrowser> ) |
diff --git a/core/apps/qcop/config.in b/core/apps/qcop/config.in index 2bd1a73..f99ff03 100644 --- a/core/apps/qcop/config.in +++ b/core/apps/qcop/config.in | |||
@@ -1,4 +1,4 @@ | |||
1 | config QCOP | 1 | config QCOP |
2 | boolean "opie-qcop (inter-application communication daemon)" | 2 | boolean "opie-qcop (inter-application communication client)" |
3 | default "y" | 3 | default "y" |
4 | depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE | 4 | depends ( LIBQPE || LIBQPE-X11 ) |
diff --git a/core/apps/textedit/main.cpp b/core/apps/textedit/main.cpp index 9aee47b..d05d6d6 100644 --- a/core/apps/textedit/main.cpp +++ b/core/apps/textedit/main.cpp | |||
@@ -9,17 +9,18 @@ | |||
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 "textedit.h" | 21 | #include "textedit.h" |
22 | 22 | ||
23 | #include <opie2/oapplicationfactory.h> | 23 | #include <opie2/oapplicationfactory.h> |
24 | 24 | ||
25 | using namespace Opie::Core; | ||
25 | OPIE_EXPORT_APP( OApplicationFactory<TextEdit> ) | 26 | OPIE_EXPORT_APP( OApplicationFactory<TextEdit> ) |
diff --git a/core/apps/textedit/textedit.cpp b/core/apps/textedit/textedit.cpp index b54da34..5bb65a9 100644 --- a/core/apps/textedit/textedit.cpp +++ b/core/apps/textedit/textedit.cpp | |||
@@ -24,35 +24,33 @@ | |||
24 | #include <qpe/qpeapplication.h> | 24 | #include <qpe/qpeapplication.h> |
25 | #include <qmenubar.h> | 25 | #include <qmenubar.h> |
26 | #include <qtoolbar.h> | 26 | #include <qtoolbar.h> |
27 | 27 | ||
28 | #include <qtextstream.h> | 28 | #include <qtextstream.h> |
29 | #include <qclipboard.h> | 29 | #include <qclipboard.h> |
30 | #include <qaction.h> | 30 | #include <qaction.h> |
31 | #include <qlineedit.h> | 31 | #include <qlineedit.h> |
32 | #include <qmessagebox.h> | 32 | #include <qmessagebox.h> |
33 | #include <qlayout.h> | 33 | #include <qlayout.h> |
34 | #include <qtimer.h> | 34 | #include <qtimer.h> |
35 | #include <qdir.h> | 35 | #include <qdir.h> |
36 | #include <unistd.h> | 36 | #include <unistd.h> |
37 | #include <sys/stat.h> | 37 | #include <sys/stat.h> |
38 | #include <stdlib.h> //getenv | 38 | #include <stdlib.h> //getenv |
39 | 39 | ||
40 | using Opie::OFileDialog; | 40 | using namespace Opie::Ui; |
41 | using Opie::OFileSelector; | ||
42 | using Opie::OFontSelector; | ||
43 | 41 | ||
44 | #if QT_VERSION < 300 | 42 | #if QT_VERSION < 300 |
45 | 43 | ||
46 | class QpeEditor : public QMultiLineEdit | 44 | class QpeEditor : public QMultiLineEdit |
47 | { | 45 | { |
48 | 46 | ||
49 | public: | 47 | public: |
50 | QpeEditor( QWidget *parent, const char * name = 0 ) | 48 | QpeEditor( QWidget *parent, const char * name = 0 ) |
51 | : QMultiLineEdit( parent, name ) { | 49 | : QMultiLineEdit( parent, name ) { |
52 | clearTableFlags(); | 50 | clearTableFlags(); |
53 | setTableFlags( Tbl_vScrollBar | Tbl_autoHScrollBar ); | 51 | setTableFlags( Tbl_vScrollBar | Tbl_autoHScrollBar ); |
54 | } | 52 | } |
55 | 53 | ||
56 | void find( const QString &txt, bool caseSensitive, | 54 | void find( const QString &txt, bool caseSensitive, |
57 | bool backwards ); | 55 | bool backwards ); |
58 | protected: | 56 | protected: |
diff --git a/core/apps/textedit/textedit.h b/core/apps/textedit/textedit.h index 34f3617..6cc693f 100644 --- a/core/apps/textedit/textedit.h +++ b/core/apps/textedit/textedit.h | |||
@@ -17,33 +17,33 @@ | |||
17 | ** not clear to you. | 17 | ** not clear to you. |
18 | ** | 18 | ** |
19 | **********************************************************************/ | 19 | **********************************************************************/ |
20 | // additions made by L.J. Potter Sun 02-17-2002 22:27:46 | 20 | // additions made by L.J. Potter Sun 02-17-2002 22:27:46 |
21 | 21 | ||
22 | #ifndef TEXTEDIT_H | 22 | #ifndef TEXTEDIT_H |
23 | #define TEXTEDIT_H | 23 | #define TEXTEDIT_H |
24 | 24 | ||
25 | #define QTEXTEDIT_OPEN_API | 25 | #define QTEXTEDIT_OPEN_API |
26 | 26 | ||
27 | //#include "fileBrowser.h" | 27 | //#include "fileBrowser.h" |
28 | //#include "fileSaver.h" | 28 | //#include "fileSaver.h" |
29 | 29 | ||
30 | #include <qpe/filemanager.h> | 30 | #include <qpe/filemanager.h> |
31 | #include <qpe/qcopenvelope_qws.h> | 31 | #include <qpe/qcopenvelope_qws.h> |
32 | 32 | ||
33 | //#include <opie/ofileselector.h> | 33 | //#include <opie2/ofileselector.h> |
34 | 34 | ||
35 | #include <qmainwindow.h> | 35 | #include <qmainwindow.h> |
36 | #include <qmultilineedit.h> | 36 | #include <qmultilineedit.h> |
37 | #include <qlist.h> | 37 | #include <qlist.h> |
38 | #include <qmap.h> | 38 | #include <qmap.h> |
39 | 39 | ||
40 | class QAction; | 40 | class QAction; |
41 | class QWidgetStack; | 41 | class QWidgetStack; |
42 | class QToolButton; | 42 | class QToolButton; |
43 | class QPopupMenu; | 43 | class QPopupMenu; |
44 | class QToolBar; | 44 | class QToolBar; |
45 | class QLineEdit; | 45 | class QLineEdit; |
46 | class QAction; | 46 | class QAction; |
47 | class FileSelector; | 47 | class FileSelector; |
48 | class QpeEditor; | 48 | class QpeEditor; |
49 | class QPopupMenu; | 49 | class QPopupMenu; |