summaryrefslogtreecommitdiff
authordrw <drw>2004-02-23 18:31:24 (UTC)
committer drw <drw>2004-02-23 18:31:24 (UTC)
commit155281d14ac505d69ee0be82a5dbed97bc3fa9b7 (patch) (side-by-side diff)
treeb14db0369b6d045b6b6d6323790c400ff3258552
parentbce2a9995fa423f9fc796b46c548e47a45c9d247 (diff)
downloadopie-155281d14ac505d69ee0be82a5dbed97bc3fa9b7.zip
opie-155281d14ac505d69ee0be82a5dbed97bc3fa9b7.tar.gz
opie-155281d14ac505d69ee0be82a5dbed97bc3fa9b7.tar.bz2
Table Viewer: libopie->libopie2
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/apps/tableviewer/config.in2
-rw-r--r--noncore/apps/tableviewer/main.cpp4
-rw-r--r--noncore/apps/tableviewer/opie-tableviewer.control2
-rw-r--r--noncore/apps/tableviewer/tableviewer.pro2
4 files changed, 5 insertions, 5 deletions
diff --git a/noncore/apps/tableviewer/config.in b/noncore/apps/tableviewer/config.in
index 5304974..7a4f051 100644
--- a/noncore/apps/tableviewer/config.in
+++ b/noncore/apps/tableviewer/config.in
@@ -1,4 +1,4 @@
config TABLEVIEWER
boolean "opie-tableviewer (XML database browser)"
default "y"
- depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
+ depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE
diff --git a/noncore/apps/tableviewer/main.cpp b/noncore/apps/tableviewer/main.cpp
index ce39c84..80a76e0 100644
--- a/noncore/apps/tableviewer/main.cpp
+++ b/noncore/apps/tableviewer/main.cpp
@@ -1,25 +1,25 @@
/**********************************************************************
** Copyright (C) 2000 Trolltech AS. All rights reserved.
**
** This file is part of Qtopia Environment.
**
** This file may be distributed and/or modified under the terms of the
** GNU General Public License version 2 as published by the Free Software
** Foundation and appearing in the file LICENSE.GPL included in the
** packaging of this file.
**
** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
**
** See http://www.trolltech.com/gpl/ for GPL licensing information.
**
** Contact info@trolltech.com if any conditions of this licensing are
** not clear to you.
**
**********************************************************************/
#include "tableviewer.h"
-#include <qpe/qpeapplication.h>
-#include <opie/oapplicationfactory.h>
+
+#include <opie2/oapplicationfactory.h>
OPIE_EXPORT_APP( OApplicationFactory<TableViewerWindow> )
diff --git a/noncore/apps/tableviewer/opie-tableviewer.control b/noncore/apps/tableviewer/opie-tableviewer.control
index 805781e..0681e08 100644
--- a/noncore/apps/tableviewer/opie-tableviewer.control
+++ b/noncore/apps/tableviewer/opie-tableviewer.control
@@ -1,11 +1,11 @@
Package: opie-tableviewer
Files: plugins/application/libtableviewer.so* bin/tableviewer apps/Applications/tableviewer.desktop
Priority: optional
Section: opie/applications
Maintainer: Opie Team <opie@handhelds.org>
Architecture: arm
Arch: arm
-Depends: task-opie-minimal
+Depends: task-opie-minimal, libopiecore2
Description: XML database browsers
A table/database viewer for the Opie environment.
Version: $QPE_VERSION$EXTRAVERSION
diff --git a/noncore/apps/tableviewer/tableviewer.pro b/noncore/apps/tableviewer/tableviewer.pro
index 6af1655..376d768 100644
--- a/noncore/apps/tableviewer/tableviewer.pro
+++ b/noncore/apps/tableviewer/tableviewer.pro
@@ -1,38 +1,38 @@
CONFIG = qt warn_on debug quick-app
SUBDIRS = db ui
HEADERS = tableviewer.h \
xmlencodeattr.h \
ui/commonwidgets.h \
ui/tvbrowseview.h \
ui/tvlistview.h \
ui/tvfilterview.h \
ui/tveditview.h \
ui/browsekeyentry.h \
ui/filterkeyentry.h \
ui/tvkeyedit.h \
db/datacache.h \
db/common.h \
db/xmlsource.h \
db/csvsource.h
SOURCES = main.cpp \
tableviewer.cpp \
xmlencodeattr.cpp \
ui/commonwidgets.cpp \
ui/tvbrowseview.cpp \
ui/tvfilterview.cpp \
ui/browsekeyentry.cpp \
ui/filterkeyentry.cpp \
ui/tvlistview.cpp \
ui/tveditview.cpp \
ui/tvkeyedit.cpp \
db/datacache.cpp \
db/xmlsource.cpp \
db/csvsource.cpp \
db/common.cpp
INTERFACES = ui/tvkeyedit_gen.ui
TARGET = tableviewer
INCLUDEPATH += $(OPIEDIR)/include
DEPENDPATH += $(OPIEDIR)/include
-LIBS += -lqpe
+LIBS += -lqpe -lopiecore2
include ( $(OPIEDIR)/include.pro )