author | drw <drw> | 2004-02-23 18:27:31 (UTC) |
---|---|---|
committer | drw <drw> | 2004-02-23 18:27:31 (UTC) |
commit | bce2a9995fa423f9fc796b46c548e47a45c9d247 (patch) (unidiff) | |
tree | d6af972e78fa2ca9721172a14ce2d83bae35c2bd | |
parent | 398c7d54acfc203ec90644d6c63e5b200391e906 (diff) | |
download | opie-bce2a9995fa423f9fc796b46c548e47a45c9d247.zip opie-bce2a9995fa423f9fc796b46c548e47a45c9d247.tar.gz opie-bce2a9995fa423f9fc796b46c548e47a45c9d247.tar.bz2 |
AdvancedFM: libopie->libopie2
-rw-r--r-- | noncore/apps/advancedfm/advancedfm.cpp | 6 | ||||
-rw-r--r-- | noncore/apps/advancedfm/advancedfm.h | 8 | ||||
-rw-r--r-- | noncore/apps/advancedfm/advancedfm.pro | 2 | ||||
-rw-r--r-- | noncore/apps/advancedfm/advancedfmData.cpp | 2 | ||||
-rw-r--r-- | noncore/apps/advancedfm/advancedfmMenu.cpp | 3 | ||||
-rw-r--r-- | noncore/apps/advancedfm/config.in | 2 | ||||
-rw-r--r-- | noncore/apps/advancedfm/main.cpp | 8 | ||||
-rw-r--r-- | noncore/apps/advancedfm/opie-advancedfm.control | 2 | ||||
-rw-r--r-- | noncore/apps/advancedfm/output.cpp | 2 | ||||
-rw-r--r-- | noncore/apps/advancedfm/output.h | 2 |
10 files changed, 12 insertions, 25 deletions
diff --git a/noncore/apps/advancedfm/advancedfm.cpp b/noncore/apps/advancedfm/advancedfm.cpp index 9c13e53..5148172 100644 --- a/noncore/apps/advancedfm/advancedfm.cpp +++ b/noncore/apps/advancedfm/advancedfm.cpp | |||
@@ -12,12 +12,6 @@ | |||
12 | #define DEVELOPERS_VERSION | 12 | #define DEVELOPERS_VERSION |
13 | #include "advancedfm.h" | 13 | #include "advancedfm.h" |
14 | 14 | ||
15 | |||
16 | // #include <opie/ofileselector.h> | ||
17 | // #include <opie/ofiledialog.h> | ||
18 | |||
19 | #include <opie/osplitter.h> | ||
20 | |||
21 | #include <qpe/filemanager.h> | 15 | #include <qpe/filemanager.h> |
22 | #include <qpe/qcopenvelope_qws.h> | 16 | #include <qpe/qcopenvelope_qws.h> |
23 | #include <qpe/qpeapplication.h> | 17 | #include <qpe/qpeapplication.h> |
diff --git a/noncore/apps/advancedfm/advancedfm.h b/noncore/apps/advancedfm/advancedfm.h index bfefa77..547fa7c 100644 --- a/noncore/apps/advancedfm/advancedfm.h +++ b/noncore/apps/advancedfm/advancedfm.h | |||
@@ -14,8 +14,8 @@ | |||
14 | #define QTOPIA_INTERNAL_FSLP // to get access to fileproperties | 14 | #define QTOPIA_INTERNAL_FSLP // to get access to fileproperties |
15 | #define QT_QWS_OPIE | 15 | #define QT_QWS_OPIE |
16 | 16 | ||
17 | //#include <opie/otabwidget.h> | 17 | #include <opie2/oprocess.h> |
18 | #include <opie/oprocess.h> | 18 | #include <opie2/osplitter.h> |
19 | 19 | ||
20 | #include <qpe/ir.h> | 20 | #include <qpe/ir.h> |
21 | #include <qpe/qcopenvelope_qws.h> | 21 | #include <qpe/qcopenvelope_qws.h> |
@@ -30,7 +30,8 @@ | |||
30 | #include <qtimer.h> | 30 | #include <qtimer.h> |
31 | #include <qpixmap.h> | 31 | #include <qpixmap.h> |
32 | 32 | ||
33 | class OSplitter; | 33 | using Opie::OSplitter; |
34 | |||
34 | class QVBoxLayout; | 35 | class QVBoxLayout; |
35 | class QHBoxLayout; | 36 | class QHBoxLayout; |
36 | class QGridLayout; | 37 | class QGridLayout; |
@@ -40,7 +41,6 @@ class QListviewItem; | |||
40 | class QLabel; | 41 | class QLabel; |
41 | class QProgressBar; | 42 | class QProgressBar; |
42 | class QSpinBox; | 43 | class QSpinBox; |
43 | class QTabWidget; | ||
44 | class QWidget; | 44 | class QWidget; |
45 | class QPopupMenu; | 45 | class QPopupMenu; |
46 | class QFile; | 46 | class QFile; |
diff --git a/noncore/apps/advancedfm/advancedfm.pro b/noncore/apps/advancedfm/advancedfm.pro index 70db018..ca9856b 100644 --- a/noncore/apps/advancedfm/advancedfm.pro +++ b/noncore/apps/advancedfm/advancedfm.pro | |||
@@ -6,7 +6,7 @@ SOURCES = advancedfm.cpp advancedfmData.cpp advancedfmMenu.cpp filePermissions | |||
6 | TARGET = advancedfm | 6 | TARGET = advancedfm |
7 | INCLUDEPATH += $(OPIEDIR)/include | 7 | INCLUDEPATH += $(OPIEDIR)/include |
8 | DEPENDPATH += $(OPIEDIR)/include | 8 | DEPENDPATH += $(OPIEDIR)/include |
9 | LIBS += -lqpe -lopie | 9 | LIBS += -lqpe -lopiecore2 -lopieui2 |
10 | 10 | ||
11 | TRANSLATIONS = ../../../i18n/de/advancedfm.ts \ | 11 | TRANSLATIONS = ../../../i18n/de/advancedfm.ts \ |
12 | ../../../i18n/nl/advancedfm.ts \ | 12 | ../../../i18n/nl/advancedfm.ts \ |
diff --git a/noncore/apps/advancedfm/advancedfmData.cpp b/noncore/apps/advancedfm/advancedfmData.cpp index ddaa39a..763ae34 100644 --- a/noncore/apps/advancedfm/advancedfmData.cpp +++ b/noncore/apps/advancedfm/advancedfmData.cpp | |||
@@ -11,9 +11,7 @@ | |||
11 | ***************************************************************************/ | 11 | ***************************************************************************/ |
12 | #include "advancedfm.h" | 12 | #include "advancedfm.h" |
13 | 13 | ||
14 | #include <opie/osplitter.h> | ||
15 | #include <qpe/storage.h> | 14 | #include <qpe/storage.h> |
16 | |||
17 | #include <qpe/qpeapplication.h> | 15 | #include <qpe/qpeapplication.h> |
18 | #include <qpe/resource.h> | 16 | #include <qpe/resource.h> |
19 | #include <qpe/menubutton.h> | 17 | #include <qpe/menubutton.h> |
diff --git a/noncore/apps/advancedfm/advancedfmMenu.cpp b/noncore/apps/advancedfm/advancedfmMenu.cpp index 78f9da2..18bbd43 100644 --- a/noncore/apps/advancedfm/advancedfmMenu.cpp +++ b/noncore/apps/advancedfm/advancedfmMenu.cpp | |||
@@ -13,9 +13,6 @@ | |||
13 | #include "output.h" | 13 | #include "output.h" |
14 | #include "filePermissions.h" | 14 | #include "filePermissions.h" |
15 | 15 | ||
16 | #include <opie/otabwidget.h> | ||
17 | #include <opie/oprocess.h> | ||
18 | |||
19 | #include <qpe/lnkproperties.h> | 16 | #include <qpe/lnkproperties.h> |
20 | #include <qpe/qpeapplication.h> | 17 | #include <qpe/qpeapplication.h> |
21 | #include <qpe/resource.h> | 18 | #include <qpe/resource.h> |
diff --git a/noncore/apps/advancedfm/config.in b/noncore/apps/advancedfm/config.in index 72a1f1b..0ba1487 100644 --- a/noncore/apps/advancedfm/config.in +++ b/noncore/apps/advancedfm/config.in | |||
@@ -1,4 +1,4 @@ | |||
1 | config ADVANCEDFM | 1 | config ADVANCEDFM |
2 | boolean "opie-advancedfm (advanced file manager)" | 2 | boolean "opie-advancedfm (advanced file manager)" |
3 | default "y" | 3 | default "y" |
4 | depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE | 4 | depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE && LIBOPIE2UI |
diff --git a/noncore/apps/advancedfm/main.cpp b/noncore/apps/advancedfm/main.cpp index 51e38dc..3c1a164 100644 --- a/noncore/apps/advancedfm/main.cpp +++ b/noncore/apps/advancedfm/main.cpp | |||
@@ -10,13 +10,13 @@ | |||
10 | * the Free Software Foundation; either version 2 of the License, or * | 10 | * the Free Software Foundation; either version 2 of the License, or * |
11 | * (at your option) any later version. * | 11 | * (at your option) any later version. * |
12 | ***************************************************************************/ | 12 | ***************************************************************************/ |
13 | #include <qpe/qpeapplication.h> | ||
14 | |||
15 | |||
16 | 13 | ||
17 | #include "advancedfm.h" | 14 | #include "advancedfm.h" |
18 | 15 | ||
19 | #ifdef NOQUICKLAUNCH | 16 | #ifdef NOQUICKLAUNCH |
17 | |||
18 | #include <qpe/qpeapplication.h> | ||
19 | |||
20 | int main(int argc, char *argv[]) | 20 | int main(int argc, char *argv[]) |
21 | { | 21 | { |
22 | QPEApplication a(argc, argv); | 22 | QPEApplication a(argc, argv); |
@@ -26,7 +26,7 @@ int main(int argc, char *argv[]) | |||
26 | return a.exec(); | 26 | return a.exec(); |
27 | } | 27 | } |
28 | #else | 28 | #else |
29 | #include <opie/oapplicationfactory.h> | 29 | #include <opie2/oapplicationfactory.h> |
30 | 30 | ||
31 | OPIE_EXPORT_APP( OApplicationFactory<AdvancedFm> ) | 31 | OPIE_EXPORT_APP( OApplicationFactory<AdvancedFm> ) |
32 | 32 | ||
diff --git a/noncore/apps/advancedfm/opie-advancedfm.control b/noncore/apps/advancedfm/opie-advancedfm.control index 5bab6ab..bb311c1 100644 --- a/noncore/apps/advancedfm/opie-advancedfm.control +++ b/noncore/apps/advancedfm/opie-advancedfm.control | |||
@@ -4,7 +4,7 @@ Priority: optional | |||
4 | Section: opie/applications | 4 | Section: opie/applications |
5 | Maintainer: L.J. Potter <lpotter@trolltech.com> | 5 | Maintainer: L.J. Potter <lpotter@trolltech.com> |
6 | Architecture: arm | 6 | Architecture: arm |
7 | Depends: task-opie-minimal | 7 | Depends: task-opie-minimal, libopiecore2, libopieui2 |
8 | Description: Advanced File Manager | 8 | Description: Advanced File Manager |
9 | The advanced file manager for the Opie environment. | 9 | The advanced file manager for the Opie environment. |
10 | Version: $QPE_VERSION$EXTRAVERSION | 10 | Version: $QPE_VERSION$EXTRAVERSION |
diff --git a/noncore/apps/advancedfm/output.cpp b/noncore/apps/advancedfm/output.cpp index 33abdfc..7dc2416 100644 --- a/noncore/apps/advancedfm/output.cpp +++ b/noncore/apps/advancedfm/output.cpp | |||
@@ -5,8 +5,6 @@ | |||
5 | ****************************************************************************/ | 5 | ****************************************************************************/ |
6 | #include "output.h" | 6 | #include "output.h" |
7 | 7 | ||
8 | #include <opie/oprocess.h> | ||
9 | |||
10 | #include <qpe/qpeapplication.h> | 8 | #include <qpe/qpeapplication.h> |
11 | #include <qpe/applnk.h> | 9 | #include <qpe/applnk.h> |
12 | 10 | ||
diff --git a/noncore/apps/advancedfm/output.h b/noncore/apps/advancedfm/output.h index 199a684..26c0fa0 100644 --- a/noncore/apps/advancedfm/output.h +++ b/noncore/apps/advancedfm/output.h | |||
@@ -16,7 +16,7 @@ | |||
16 | #include <qlineedit.h> | 16 | #include <qlineedit.h> |
17 | #include <qwhatsthis.h> | 17 | #include <qwhatsthis.h> |
18 | 18 | ||
19 | #include <opie/oprocess.h> | 19 | #include <opie2/oprocess.h> |
20 | 20 | ||
21 | class QVBoxLayout; | 21 | class QVBoxLayout; |
22 | class QHBoxLayout; | 22 | class QHBoxLayout; |