| -rw-r--r-- | noncore/apps/odict/config.in | 2 | ||||
| -rw-r--r-- | noncore/apps/odict/main.cpp | 4 | ||||
| -rw-r--r-- | noncore/apps/odict/odict.pro | 2 | ||||
| -rw-r--r-- | noncore/apps/odict/opie-odict.control | 2 | ||||
| -rw-r--r-- | noncore/apps/odict/searchmethoddlg.cpp | 7 | ||||
| -rw-r--r-- | noncore/apps/odict/searchmethoddlg.h | 6 |
6 files changed, 10 insertions, 13 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 @@ config ODICT boolean "opie-odict (electronic dictionary)" default "n" - depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE + 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 @@ -3,22 +3,22 @@ begin : December 2002 copyright : ( C ) 2002, 2003 by Carsten Niehaus email : cniehaus@handhelds.org **************************************************************************/ /*************************************************************************** * * * 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 <opie/oapplicationfactory.h> +#include <opie2/oapplicationfactory.h> + #include "odict.h" OPIE_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 @@ CONFIG = qt warn_on release quick-app HEADERS = odict.h \ searchmethoddlg.h \ configdlg.h \ dingwidget.h SOURCES = main.cpp \ odict.cpp \ searchmethoddlg.cpp \ configdlg.cpp \ dingwidget.cpp INCLUDEPATH += $(OPIEDIR)/include DEPENDPATH += $(OPIEDIR)/include -LIBS += -lqpe -lstdc++ -lopie +LIBS += -lqpe -lstdc++ -lopiecore2 -lopieui2 TARGET = odict include ( $(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 @@ Package: opie-odict Files: plugins/application/libodict.so* bin/odict apps/Applications/odict.desktop pics/odict/odict.png Priority: optional Section: opie/applications Maintainer: Carsten Niehaus <cniehaus@handhelds.org> Architecture: arm -Depends: task-opie-minimal +Depends: task-opie-minimal, libopiecore2, libopieui2 Description: Dictionary look-up program Look up words :) Version: $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 @@ -3,47 +3,50 @@ begin : December 2002 copyright : ( C ) 2002, 2003 by Carsten Niehaus email : cniehaus@handhelds.org **************************************************************************/ /*************************************************************************** * * * 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 "searchmethoddlg.h" +#include <opie2/ofileselector.h> +#include <opie2/ofiledialog.h> + #include <qpe/config.h> #include <qpe/qpeapplication.h> #include <qdialog.h> #include <qlayout.h> #include <qhbox.h> #include <qvbox.h> #include <qlabel.h> #include <qpushbutton.h> #include <qstring.h> #include <qlineedit.h> #include <qdir.h> -#include <opie/ofileselector.h> -#include <opie/ofiledialog.h> +using Opie::OFileDialog; +using Opie::OFileSelector; SearchMethodDlg::SearchMethodDlg(QWidget *parent, const char *name, bool modal, QString itemname) : QDialog(parent, name, modal) { QVBoxLayout *vbox_layout = new QVBoxLayout( this, 4,4,"vbox_layout" ); QVBox *vbox = new QVBox( this ); QHBox *hbox1 = new QHBox( vbox ); QLabel *nameLabel = new QLabel( tr( "Name:" ) , hbox1 ); nameLE = new QLineEdit( hbox1 ); QLabel *dictLabel = new QLabel( tr( "Dictionary file" ), vbox ); QHBox *hbox2 = new QHBox( vbox ); dictFileLE = new QLineEdit( hbox2 ); QPushButton *browseButton = new QPushButton( tr( "Browse" ) , hbox2 ); connect( browseButton, SIGNAL( clicked() ), this, SLOT( slotBrowse() ) ); 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 @@ -1,32 +1,26 @@ /*************************************************************************** * * * 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. * * * **************************************************************************/ -class QWidget; class QLineEdit; -class OTabWidget; -class QListView; -class QPushButton; -class QLabel; -class QString; #include <qdialog.h> class SearchMethodDlg : public QDialog { Q_OBJECT public: SearchMethodDlg(QWidget *parent, const char *name, bool modal=FALSE, QString itemname=0 ); QString itemName; QLineEdit *nameLE; QLineEdit *lang1, *lang2, *trenner; void saveItem(); private: |