summaryrefslogtreecommitdiff
authordrw <drw>2004-02-23 18:27:31 (UTC)
committer drw <drw>2004-02-23 18:27:31 (UTC)
commitbce2a9995fa423f9fc796b46c548e47a45c9d247 (patch) (side-by-side diff)
treed6af972e78fa2ca9721172a14ce2d83bae35c2bd
parent398c7d54acfc203ec90644d6c63e5b200391e906 (diff)
downloadopie-bce2a9995fa423f9fc796b46c548e47a45c9d247.zip
opie-bce2a9995fa423f9fc796b46c548e47a45c9d247.tar.gz
opie-bce2a9995fa423f9fc796b46c548e47a45c9d247.tar.bz2
AdvancedFM: libopie->libopie2
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--noncore/apps/advancedfm/advancedfm.cpp6
-rw-r--r--noncore/apps/advancedfm/advancedfm.h8
-rw-r--r--noncore/apps/advancedfm/advancedfm.pro2
-rw-r--r--noncore/apps/advancedfm/advancedfmData.cpp2
-rw-r--r--noncore/apps/advancedfm/advancedfmMenu.cpp3
-rw-r--r--noncore/apps/advancedfm/config.in2
-rw-r--r--noncore/apps/advancedfm/main.cpp8
-rw-r--r--noncore/apps/advancedfm/opie-advancedfm.control2
-rw-r--r--noncore/apps/advancedfm/output.cpp2
-rw-r--r--noncore/apps/advancedfm/output.h2
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 @@
#define DEVELOPERS_VERSION
#include "advancedfm.h"
-
-// #include <opie/ofileselector.h>
-// #include <opie/ofiledialog.h>
-
-#include <opie/osplitter.h>
-
#include <qpe/filemanager.h>
#include <qpe/qcopenvelope_qws.h>
#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 @@
#define QTOPIA_INTERNAL_FSLP // to get access to fileproperties
#define QT_QWS_OPIE
-//#include <opie/otabwidget.h>
-#include <opie/oprocess.h>
+#include <opie2/oprocess.h>
+#include <opie2/osplitter.h>
#include <qpe/ir.h>
#include <qpe/qcopenvelope_qws.h>
@@ -30,7 +30,8 @@
#include <qtimer.h>
#include <qpixmap.h>
-class OSplitter;
+using Opie::OSplitter;
+
class QVBoxLayout;
class QHBoxLayout;
class QGridLayout;
@@ -40,7 +41,6 @@ class QListviewItem;
class QLabel;
class QProgressBar;
class QSpinBox;
-class QTabWidget;
class QWidget;
class QPopupMenu;
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
TARGET = advancedfm
INCLUDEPATH += $(OPIEDIR)/include
DEPENDPATH += $(OPIEDIR)/include
-LIBS += -lqpe -lopie
+LIBS += -lqpe -lopiecore2 -lopieui2
TRANSLATIONS = ../../../i18n/de/advancedfm.ts \
../../../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 @@
***************************************************************************/
#include "advancedfm.h"
-#include <opie/osplitter.h>
#include <qpe/storage.h>
-
#include <qpe/qpeapplication.h>
#include <qpe/resource.h>
#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 @@
#include "output.h"
#include "filePermissions.h"
-#include <opie/otabwidget.h>
-#include <opie/oprocess.h>
-
#include <qpe/lnkproperties.h>
#include <qpe/qpeapplication.h>
#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 @@
config ADVANCEDFM
boolean "opie-advancedfm (advanced file manager)"
default "y"
- depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
+ 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 @@
* the Free Software Foundation; either version 2 of the License, or *
* (at your option) any later version. *
***************************************************************************/
-#include <qpe/qpeapplication.h>
-
-
#include "advancedfm.h"
#ifdef NOQUICKLAUNCH
+
+#include <qpe/qpeapplication.h>
+
int main(int argc, char *argv[])
{
QPEApplication a(argc, argv);
@@ -26,7 +26,7 @@ int main(int argc, char *argv[])
return a.exec();
}
#else
-#include <opie/oapplicationfactory.h>
+#include <opie2/oapplicationfactory.h>
OPIE_EXPORT_APP( OApplicationFactory<AdvancedFm> )
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
Section: opie/applications
Maintainer: L.J. Potter <lpotter@trolltech.com>
Architecture: arm
-Depends: task-opie-minimal
+Depends: task-opie-minimal, libopiecore2, libopieui2
Description: Advanced File Manager
The advanced file manager for the Opie environment.
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 @@
****************************************************************************/
#include "output.h"
-#include <opie/oprocess.h>
-
#include <qpe/qpeapplication.h>
#include <qpe/applnk.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
@@ -16,7 +16,7 @@
#include <qlineedit.h>
#include <qwhatsthis.h>
-#include <opie/oprocess.h>
+#include <opie2/oprocess.h>
class QVBoxLayout;
class QHBoxLayout;