author | drw <drw> | 2004-03-02 23:29:43 (UTC) |
---|---|---|
committer | drw <drw> | 2004-03-02 23:29:43 (UTC) |
commit | 7588efaff9fcf2079b5f2a4429862bfa4fb7281d (patch) (unidiff) | |
tree | 97ce2d5a5c1d84867312ce89f76512aa92396e46 /noncore/tools/formatter | |
parent | 7cd53bb0080e8156914a3fd5f0666b47a8619df1 (diff) | |
download | opie-7588efaff9fcf2079b5f2a4429862bfa4fb7281d.zip opie-7588efaff9fcf2079b5f2a4429862bfa4fb7281d.tar.gz opie-7588efaff9fcf2079b5f2a4429862bfa4fb7281d.tar.bz2 |
Formatter: libopie -> libopie2
-rw-r--r-- | noncore/tools/formatter/config.in | 2 | ||||
-rw-r--r-- | noncore/tools/formatter/formatter.pro | 2 | ||||
-rw-r--r-- | noncore/tools/formatter/main.cpp | 3 | ||||
-rw-r--r-- | noncore/tools/formatter/opie-formatter.control | 2 |
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 | |||
@@ -1,9 +1,9 @@ | |||
1 | CONFIG += qt warn_on release quick-app | 1 | CONFIG += qt warn_on release quick-app |
2 | HEADERS = formatter.h inputDialog.h output.h | 2 | HEADERS = formatter.h inputDialog.h output.h |
3 | SOURCES = formatter.cpp inputDialog.cpp output.cpp main.cpp | 3 | SOURCES = formatter.cpp inputDialog.cpp output.cpp main.cpp |
4 | TARGET = formatter | 4 | TARGET = formatter |
5 | INCLUDEPATH += $(OPIEDIR)/include | 5 | INCLUDEPATH += $(OPIEDIR)/include |
6 | DEPENDPATH += $(OPIEDIR)/include | 6 | DEPENDPATH += $(OPIEDIR)/include |
7 | LIBS += -lqpe | 7 | LIBS += -lqpe -lopiecore2 |
8 | 8 | ||
9 | include ( $(OPIEDIR)/include.pro ) | 9 | include ( $(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 | |||
@@ -1,19 +1,18 @@ | |||
1 | 1 | ||
2 | /*************************************************************************** | 2 | /*************************************************************************** |
3 | main.cpp - description | 3 | main.cpp - description |
4 | ------------------- | 4 | ------------------- |
5 | begin : March 10, 2002 | 5 | begin : March 10, 2002 |
6 | copyright : (C) 2002 by llornkcor | 6 | copyright : (C) 2002 by llornkcor |
7 | email : ljp@llornkcor.com | 7 | email : ljp@llornkcor.com |
8 | * This program is free software; you can redistribute it and/or modify * | 8 | * This program is free software; you can redistribute it and/or modify * |
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 | ||
19 | OPIE_EXPORT_APP( OApplicationFactory<FormatterApp> ) | 18 | OPIE_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 | |||
@@ -1,9 +1,9 @@ | |||
1 | Package: opie-formatter | 1 | Package: opie-formatter |
2 | Files: plugins/application/libformatter.so* bin/formatter pics/formatter/devices.png apps/Settings/formatter.desktop | 2 | Files: plugins/application/libformatter.so* bin/formatter pics/formatter/devices.png apps/Settings/formatter.desktop |
3 | Priority: optional | 3 | Priority: optional |
4 | Section: opie/settings | 4 | Section: opie/settings |
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 |
8 | Description: The filesystem formatting and mountpoint app for the Opie environment. | 8 | Description: The filesystem formatting and mountpoint app for the Opie environment. |
9 | Version: $QPE_VERSION$EXTRAVERSION | 9 | Version: $QPE_VERSION$EXTRAVERSION |