| -rw-r--r-- | noncore/apps/odict/dingwidget.cpp | 4 | ||||
| -rw-r--r-- | noncore/apps/odict/dingwidget.h | 13 | ||||
| -rw-r--r-- | noncore/apps/odict/odict.cpp | 4 |
3 files changed, 9 insertions, 12 deletions
diff --git a/noncore/apps/odict/dingwidget.cpp b/noncore/apps/odict/dingwidget.cpp index b69a803..6154d68 100644 --- a/noncore/apps/odict/dingwidget.cpp +++ b/noncore/apps/odict/dingwidget.cpp @@ -21,48 +21,48 @@ #include <qhbox.h> #include <qlabel.h> #include <qpushbutton.h> #include <qlineedit.h> #include <qmainwindow.h> #include <qstring.h> #include <qtextstream.h> #include <qstringlist.h> #include <qregexp.h> #include <qtextbrowser.h> #include <stdlib.h> // for getenv -DingWidget::DingWidget(QWidget *parent, QString word, QTextBrowser *browser_top, QTextBrowser *browser_bottom, QString activated_name) : QWidget(parent) +DingWidget::DingWidget(QString word, QTextBrowser *browser_top, QTextBrowser *browser_bottom, QString activated_name) { methodname = activated_name; queryword = word; trenner = QString::null; loadValues(); QString opie_dir = getenv("OPIEDIR"); QFile file( opie_dir+"/noncore/apps/odict/eng_ita.dic" ); QStringList lines; if( file.open( IO_ReadOnly ) ) { QTextStream stream( &file ); while ( !stream.eof() ) { lines.append( stream.readLine() ); } file.close(); } lines = lines.grep( queryword ); QString top, bottom; - //parseInfo( lines, top , bottom ); + parseInfo( lines, top , bottom ); browser_top->setText( top ); browser_bottom->setText( bottom ); } void DingWidget::loadValues() { Config cfg( "odict" ); cfg.setGroup( "Method_"+methodname ); trenner = cfg.readEntry( "Seperator" ); } void DingWidget::parseInfo( QStringList &lines, QString &top, QString &bottom ) diff --git a/noncore/apps/odict/dingwidget.h b/noncore/apps/odict/dingwidget.h index 66379fe..1cedb4e 100644 --- a/noncore/apps/odict/dingwidget.h +++ b/noncore/apps/odict/dingwidget.h @@ -1,31 +1,28 @@ /*************************************************************************** * * * 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 <qwidget.h> - class QString; class QTextBrowser; -class QString; class QStringList; -class DingWidget : public QWidget +#include <qstring.h> + +class DingWidget { - Q_OBJECT - public: - DingWidget(QWidget *parent = 0, QString word = 0, QTextBrowser* = 0, QTextBrowser* =0, QString activated_name=0); + DingWidget(QString word = 0, QTextBrowser* = 0, QTextBrowser* =0, QString activated_name=0); private: - QString search_word; + QString search_word; void parseInfo( QStringList& , QString&, QString& ); QString queryword; void loadValues(); QString methodname; QString trenner; }; diff --git a/noncore/apps/odict/odict.cpp b/noncore/apps/odict/odict.cpp index e2d1d7b..1fbdb85 100644 --- a/noncore/apps/odict/odict.cpp +++ b/noncore/apps/odict/odict.cpp @@ -88,31 +88,31 @@ void ODict::saveConfig() } void ODict::slotDisplayAbout() { QMessageBox::about( this, tr( "About ODict" ), tr( "OPIE-Dictionary ODict \n (c) 2002, 2003 Carsten Niehaus \n cniehaus@handhelds.org \n Version 20030103" ) ); } void ODict::slotStartQuery() { QString querystring = query_le->text(); qDebug("opening dict >%s< for >%s<", activated_name.latin1(),querystring.latin1()); if (querystring.isEmpty()){ - qWarning("emphty querysting"); + qWarning("empty querysting"); return; } if (!activated_name || activated_name.isEmpty()) QMessageBox::warning(this,tr("No Dictionary"),tr("Please choose a dictonary") ); else - DingWidget *ding = new DingWidget( vbox , querystring , browser_top, browser_bottom, activated_name); + DingWidget *ding = new DingWidget( querystring , browser_top, browser_bottom, activated_name ); } void ODict::slotSetErrorcount( int count ) { errorTol = count; } void ODict::slotSettings() { ConfigDlg dlg( this, "Config" , true); if ( dlg.exec() == QDialog::Accepted ) |