summaryrefslogtreecommitdiff
authordrw <drw>2004-03-02 23:29:43 (UTC)
committer drw <drw>2004-03-02 23:29:43 (UTC)
commit7588efaff9fcf2079b5f2a4429862bfa4fb7281d (patch) (unidiff)
tree97ce2d5a5c1d84867312ce89f76512aa92396e46
parent7cd53bb0080e8156914a3fd5f0666b47a8619df1 (diff)
downloadopie-7588efaff9fcf2079b5f2a4429862bfa4fb7281d.zip
opie-7588efaff9fcf2079b5f2a4429862bfa4fb7281d.tar.gz
opie-7588efaff9fcf2079b5f2a4429862bfa4fb7281d.tar.bz2
Formatter: libopie -> libopie2
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/tools/formatter/config.in2
-rw-r--r--noncore/tools/formatter/formatter.pro2
-rw-r--r--noncore/tools/formatter/main.cpp3
-rw-r--r--noncore/tools/formatter/opie-formatter.control2
4 files changed, 4 insertions, 5 deletions
diff --git a/noncore/tools/formatter/config.in b/noncore/tools/formatter/config.in
index 0748213..5758180 100644
--- a/noncore/tools/formatter/config.in
+++ b/noncore/tools/formatter/config.in
@@ -1,4 +1,4 @@
1 config FORMATTER 1 config FORMATTER
2 boolean "opie-formatter (filesystem formatting and mount app)" 2 boolean "opie-formatter (filesystem formatting and mount app)"
3 default "y" 3 default "y"
4 depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE 4 depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE
diff --git a/noncore/tools/formatter/formatter.pro b/noncore/tools/formatter/formatter.pro
index 6450954..daedad9 100644
--- a/noncore/tools/formatter/formatter.pro
+++ b/noncore/tools/formatter/formatter.pro
@@ -3,7 +3,7 @@ HEADERS = formatter.h inputDialog.h output.h
3SOURCES = formatter.cpp inputDialog.cpp output.cpp main.cpp 3SOURCES = formatter.cpp inputDialog.cpp output.cpp main.cpp
4TARGET = formatter 4TARGET = formatter
5INCLUDEPATH += $(OPIEDIR)/include 5INCLUDEPATH += $(OPIEDIR)/include
6DEPENDPATH += $(OPIEDIR)/include 6DEPENDPATH += $(OPIEDIR)/include
7LIBS += -lqpe 7LIBS += -lqpe -lopiecore2
8 8
9include ( $(OPIEDIR)/include.pro ) 9include ( $(OPIEDIR)/include.pro )
diff --git a/noncore/tools/formatter/main.cpp b/noncore/tools/formatter/main.cpp
index 6228e55..bdd4a2c 100644
--- a/noncore/tools/formatter/main.cpp
+++ b/noncore/tools/formatter/main.cpp
@@ -9,11 +9,10 @@
9 * it under the terms of the GNU General Public License as published by * 9 * it under the terms of the GNU General Public License as published by *
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 13
15#include "formatter.h" 14#include "formatter.h"
16 15
17#include <opie/oapplicationfactory.h> 16#include <opie2/oapplicationfactory.h>
18 17
19OPIE_EXPORT_APP( OApplicationFactory<FormatterApp> ) 18OPIE_EXPORT_APP( OApplicationFactory<FormatterApp> )
diff --git a/noncore/tools/formatter/opie-formatter.control b/noncore/tools/formatter/opie-formatter.control
index 11fe57a..19ba7c8 100644
--- a/noncore/tools/formatter/opie-formatter.control
+++ b/noncore/tools/formatter/opie-formatter.control
@@ -3,7 +3,7 @@ Files: plugins/application/libformatter.so* bin/formatter pics/formatter/devices
3Priority: optional 3Priority: optional
4Section: opie/settings 4Section: opie/settings
5Maintainer: L.J. Potter <lpotter@trolltech.com> 5Maintainer: L.J. Potter <lpotter@trolltech.com>
6Architecture: arm 6Architecture: arm
7Depends: task-opie-minimal 7Depends: task-opie-minimal, libopiecore2
8Description: The filesystem formatting and mountpoint app for the Opie environment. 8Description: The filesystem formatting and mountpoint app for the Opie environment.
9Version: $QPE_VERSION$EXTRAVERSION 9Version: $QPE_VERSION$EXTRAVERSION