summaryrefslogtreecommitdiff
authordrw <drw>2004-02-23 19:06:26 (UTC)
committer drw <drw>2004-02-23 19:06:26 (UTC)
commit34339c8c6d356dfad6380778fd84a3fba6967303 (patch) (unidiff)
tree10ffe98a17d43f603a253069198239a3c4cca782
parent7206bf5ae8a9940a9c30a9dc3dd3cb663e64874b (diff)
downloadopie-34339c8c6d356dfad6380778fd84a3fba6967303.zip
opie-34339c8c6d356dfad6380778fd84a3fba6967303.tar.gz
opie-34339c8c6d356dfad6380778fd84a3fba6967303.tar.bz2
ODict: libopie->libopie2
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/apps/odict/config.in2
-rw-r--r--noncore/apps/odict/main.cpp4
-rw-r--r--noncore/apps/odict/odict.pro4
-rw-r--r--noncore/apps/odict/opie-odict.control2
-rw-r--r--noncore/apps/odict/searchmethoddlg.cpp7
-rw-r--r--noncore/apps/odict/searchmethoddlg.h8
6 files changed, 12 insertions, 15 deletions
diff --git a/noncore/apps/odict/config.in b/noncore/apps/odict/config.in
index 0ec2c89..c1f5eb4 100644
--- a/noncore/apps/odict/config.in
+++ b/noncore/apps/odict/config.in
@@ -1,4 +1,4 @@
1 config ODICT 1 config ODICT
2 boolean "opie-odict (electronic dictionary)" 2 boolean "opie-odict (electronic dictionary)"
3 default "n" 3 default "n"
4 depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE 4 depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE && LIBOPIE2UI
diff --git a/noncore/apps/odict/main.cpp b/noncore/apps/odict/main.cpp
index 0642022..d5b08d3 100644
--- a/noncore/apps/odict/main.cpp
+++ b/noncore/apps/odict/main.cpp
@@ -13,12 +13,12 @@
13 * the Free Software Foundation; either version 2 of the License, or * 13 * the Free Software Foundation; either version 2 of the License, or *
14 * ( at your option ) any later version. * 14 * ( at your option ) any later version. *
15 * * 15 * *
16 **************************************************************************/ 16 **************************************************************************/
17 17
18 18
19#include <qpe/qpeapplication.h> 19#include <opie2/oapplicationfactory.h>
20#include <opie/oapplicationfactory.h> 20
21#include "odict.h" 21#include "odict.h"
22 22
23 23
24OPIE_EXPORT_APP( OApplicationFactory<ODict> ) 24OPIE_EXPORT_APP( OApplicationFactory<ODict> )
diff --git a/noncore/apps/odict/odict.pro b/noncore/apps/odict/odict.pro
index 32e0ecc..7480cd7 100644
--- a/noncore/apps/odict/odict.pro
+++ b/noncore/apps/odict/odict.pro
@@ -1,17 +1,17 @@
1 CONFIG = qt warn_on release quick-app 1 CONFIG = qt warn_on release quick-app
2 HEADERS = odict.h \ 2 HEADERS = odict.h \
3 searchmethoddlg.h \ 3 searchmethoddlg.h \
4 configdlg.h \ 4 configdlg.h \
5 dingwidget.h 5 dingwidget.h
6 6
7 SOURCES = main.cpp \ 7 SOURCES = main.cpp \
8 odict.cpp \ 8 odict.cpp \
9 searchmethoddlg.cpp \ 9 searchmethoddlg.cpp \
10 configdlg.cpp \ 10 configdlg.cpp \
11 dingwidget.cpp 11 dingwidget.cpp
12INCLUDEPATH += $(OPIEDIR)/include 12INCLUDEPATH += $(OPIEDIR)/include
13DEPENDPATH += $(OPIEDIR)/include 13DEPENDPATH += $(OPIEDIR)/include
14 LIBS += -lqpe -lstdc++ -lopie 14 LIBS += -lqpe -lstdc++ -lopiecore2 -lopieui2
15 TARGET = odict 15 TARGET = odict
16 16
17include ( $(OPIEDIR)/include.pro ) 17include ( $(OPIEDIR)/include.pro )
diff --git a/noncore/apps/odict/opie-odict.control b/noncore/apps/odict/opie-odict.control
index b5cf931..bd4101b 100644
--- a/noncore/apps/odict/opie-odict.control
+++ b/noncore/apps/odict/opie-odict.control
@@ -1,10 +1,10 @@
1Package: opie-odict 1Package: opie-odict
2Files: plugins/application/libodict.so* bin/odict apps/Applications/odict.desktop pics/odict/odict.png 2Files: plugins/application/libodict.so* bin/odict apps/Applications/odict.desktop pics/odict/odict.png
3Priority: optional 3Priority: optional
4Section: opie/applications 4Section: opie/applications
5Maintainer: Carsten Niehaus <cniehaus@handhelds.org> 5Maintainer: Carsten Niehaus <cniehaus@handhelds.org>
6Architecture: arm 6Architecture: arm
7Depends: task-opie-minimal 7Depends: task-opie-minimal, libopiecore2, libopieui2
8Description: Dictionary look-up program 8Description: Dictionary look-up program
9 Look up words :) 9 Look up words :)
10Version: $QPE_VERSION$EXTRAVERSION 10Version: $QPE_VERSION$EXTRAVERSION
diff --git a/noncore/apps/odict/searchmethoddlg.cpp b/noncore/apps/odict/searchmethoddlg.cpp
index 8ed7152..abe2966 100644
--- a/noncore/apps/odict/searchmethoddlg.cpp
+++ b/noncore/apps/odict/searchmethoddlg.cpp
@@ -13,12 +13,15 @@
13 * the Free Software Foundation; either version 2 of the License, or * 13 * the Free Software Foundation; either version 2 of the License, or *
14 * ( at your option ) any later version. * 14 * ( at your option ) any later version. *
15 * * 15 * *
16 **************************************************************************/ 16 **************************************************************************/
17#include "searchmethoddlg.h" 17#include "searchmethoddlg.h"
18 18
19#include <opie2/ofileselector.h>
20#include <opie2/ofiledialog.h>
21
19#include <qpe/config.h> 22#include <qpe/config.h>
20#include <qpe/qpeapplication.h> 23#include <qpe/qpeapplication.h>
21 24
22#include <qdialog.h> 25#include <qdialog.h>
23#include <qlayout.h> 26#include <qlayout.h>
24#include <qhbox.h> 27#include <qhbox.h>
@@ -26,14 +29,14 @@
26#include <qlabel.h> 29#include <qlabel.h>
27#include <qpushbutton.h> 30#include <qpushbutton.h>
28#include <qstring.h> 31#include <qstring.h>
29#include <qlineedit.h> 32#include <qlineedit.h>
30#include <qdir.h> 33#include <qdir.h>
31 34
32#include <opie/ofileselector.h> 35using Opie::OFileDialog;
33#include <opie/ofiledialog.h> 36using Opie::OFileSelector;
34 37
35SearchMethodDlg::SearchMethodDlg(QWidget *parent, const char *name, bool modal, QString itemname) : QDialog(parent, name, modal) 38SearchMethodDlg::SearchMethodDlg(QWidget *parent, const char *name, bool modal, QString itemname) : QDialog(parent, name, modal)
36{ 39{
37 40
38 QVBoxLayout *vbox_layout = new QVBoxLayout( this, 4,4,"vbox_layout" ); 41 QVBoxLayout *vbox_layout = new QVBoxLayout( this, 4,4,"vbox_layout" );
39 QVBox *vbox = new QVBox( this ); 42 QVBox *vbox = new QVBox( this );
diff --git a/noncore/apps/odict/searchmethoddlg.h b/noncore/apps/odict/searchmethoddlg.h
index 706bbc1..ee9513b 100644
--- a/noncore/apps/odict/searchmethoddlg.h
+++ b/noncore/apps/odict/searchmethoddlg.h
@@ -4,26 +4,20 @@
4 * it under the terms of the GNU General Public License as published by * 4 * it under the terms of the GNU General Public License as published by *
5 * the Free Software Foundation; either version 2 of the License, or * 5 * the Free Software Foundation; either version 2 of the License, or *
6 * ( at your option ) any later version. * 6 * ( at your option ) any later version. *
7 * * 7 * *
8 **************************************************************************/ 8 **************************************************************************/
9 9
10class QWidget;
11class QLineEdit; 10class QLineEdit;
12class OTabWidget;
13class QListView;
14class QPushButton;
15class QLabel;
16class QString;
17 11
18#include <qdialog.h> 12#include <qdialog.h>
19 13
20class SearchMethodDlg : public QDialog 14class SearchMethodDlg : public QDialog
21{ 15{
22 Q_OBJECT 16 Q_OBJECT
23 17
24 public: 18 public:
25 SearchMethodDlg(QWidget *parent, const char *name, bool modal=FALSE, QString itemname=0 ); 19 SearchMethodDlg(QWidget *parent, const char *name, bool modal=FALSE, QString itemname=0 );
26 20
27 QString itemName; 21 QString itemName;
28 QLineEdit *nameLE; 22 QLineEdit *nameLE;
29 QLineEdit *lang1, *lang2, *trenner; 23 QLineEdit *lang1, *lang2, *trenner;