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 /noncore | |
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 | |||
@@ -14,8 +14,2 @@ | |||
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> |
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 | |||
@@ -16,4 +16,4 @@ | |||
16 | 16 | ||
17 | //#include <opie/otabwidget.h> | 17 | #include <opie2/oprocess.h> |
18 | #include <opie/oprocess.h> | 18 | #include <opie2/osplitter.h> |
19 | 19 | ||
@@ -32,3 +32,4 @@ | |||
32 | 32 | ||
33 | class OSplitter; | 33 | using Opie::OSplitter; |
34 | |||
34 | class QVBoxLayout; | 35 | class QVBoxLayout; |
@@ -42,3 +43,2 @@ class QProgressBar; | |||
42 | class QSpinBox; | 43 | class QSpinBox; |
43 | class QTabWidget; | ||
44 | class QWidget; | 44 | class QWidget; |
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 | |||
@@ -8,3 +8,3 @@ INCLUDEPATH += $(OPIEDIR)/include | |||
8 | DEPENDPATH += $(OPIEDIR)/include | 8 | DEPENDPATH += $(OPIEDIR)/include |
9 | LIBS += -lqpe -lopie | 9 | LIBS += -lqpe -lopiecore2 -lopieui2 |
10 | 10 | ||
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 | |||
@@ -13,5 +13,3 @@ | |||
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> |
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 | |||
@@ -15,5 +15,2 @@ | |||
15 | 15 | ||
16 | #include <opie/otabwidget.h> | ||
17 | #include <opie/oprocess.h> | ||
18 | |||
19 | #include <qpe/lnkproperties.h> | 16 | #include <qpe/lnkproperties.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 | |||
@@ -3,2 +3,2 @@ | |||
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 | |||
@@ -12,5 +12,2 @@ | |||
12 | ***************************************************************************/ | 12 | ***************************************************************************/ |
13 | #include <qpe/qpeapplication.h> | ||
14 | |||
15 | |||
16 | 13 | ||
@@ -19,2 +16,5 @@ | |||
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[]) |
@@ -28,3 +28,3 @@ int main(int argc, char *argv[]) | |||
28 | #else | 28 | #else |
29 | #include <opie/oapplicationfactory.h> | 29 | #include <opie2/oapplicationfactory.h> |
30 | 30 | ||
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 | |||
@@ -6,3 +6,3 @@ 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 |
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 | |||
@@ -7,4 +7,2 @@ | |||
7 | 7 | ||
8 | #include <opie/oprocess.h> | ||
9 | |||
10 | #include <qpe/qpeapplication.h> | 8 | #include <qpe/qpeapplication.h> |
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 | |||
@@ -18,3 +18,3 @@ | |||
18 | 18 | ||
19 | #include <opie/oprocess.h> | 19 | #include <opie2/oprocess.h> |
20 | 20 | ||