summaryrefslogtreecommitdiff
authordrw <drw>2004-03-02 23:29:43 (UTC)
committer drw <drw>2004-03-02 23:29:43 (UTC)
commit7588efaff9fcf2079b5f2a4429862bfa4fb7281d (patch) (side-by-side diff)
tree97ce2d5a5c1d84867312ce89f76512aa92396e46
parent7cd53bb0080e8156914a3fd5f0666b47a8619df1 (diff)
downloadopie-7588efaff9fcf2079b5f2a4429862bfa4fb7281d.zip
opie-7588efaff9fcf2079b5f2a4429862bfa4fb7281d.tar.gz
opie-7588efaff9fcf2079b5f2a4429862bfa4fb7281d.tar.bz2
Formatter: libopie -> libopie2
Diffstat (more/less context) (show 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 @@
config FORMATTER
boolean "opie-formatter (filesystem formatting and mount app)"
default "y"
- depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
+ 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 @@
CONFIG += qt warn_on release quick-app
HEADERS = formatter.h inputDialog.h output.h
SOURCES = formatter.cpp inputDialog.cpp output.cpp main.cpp
TARGET = formatter
INCLUDEPATH += $(OPIEDIR)/include
DEPENDPATH += $(OPIEDIR)/include
-LIBS += -lqpe
+LIBS += -lqpe -lopiecore2
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 @@
/***************************************************************************
main.cpp - description
-------------------
begin : March 10, 2002
copyright : (C) 2002 by llornkcor
email : ljp@llornkcor.com
* This program is free software; you can redistribute it and/or modify *
* it under the terms of the GNU General Public License as published by *
* the Free Software Foundation; either version 2 of the License, or *
* (at your option) any later version. *
***************************************************************************/
-#include <qpe/qpeapplication.h>
#include "formatter.h"
-#include <opie/oapplicationfactory.h>
+#include <opie2/oapplicationfactory.h>
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 @@
Package: opie-formatter
Files: plugins/application/libformatter.so* bin/formatter pics/formatter/devices.png apps/Settings/formatter.desktop
Priority: optional
Section: opie/settings
Maintainer: L.J. Potter <lpotter@trolltech.com>
Architecture: arm
-Depends: task-opie-minimal
+Depends: task-opie-minimal, libopiecore2
Description: The filesystem formatting and mountpoint app for the Opie environment.
Version: $QPE_VERSION$EXTRAVERSION