summaryrefslogtreecommitdiff
authorcniehaus <cniehaus>2003-01-04 12:57:25 (UTC)
committer cniehaus <cniehaus>2003-01-04 12:57:25 (UTC)
commit69f08fb67ec7e92c4b3c573d6a1ce374aaa97cee (patch) (unidiff)
treedba2a9fd1bcb38841227bda4b29fa625fc02169e
parent969924a9d896b70141758b734d898b4423dac357 (diff)
downloadopie-69f08fb67ec7e92c4b3c573d6a1ce374aaa97cee.zip
opie-69f08fb67ec7e92c4b3c573d6a1ce374aaa97cee.tar.gz
opie-69f08fb67ec7e92c4b3c573d6a1ce374aaa97cee.tar.bz2
- qWarning("emphty querysting");
+ qWarning("empty querysting"); - DingWidget *ding = new DingWidget( vbox , querystring , browser_top, browser_bottom, activated_name); + DingWidget *ding = new DingWidget( querystring , browser_top, browser_bottom, activated_name ); That with some more changes even works
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/apps/odict/dingwidget.cpp4
-rw-r--r--noncore/apps/odict/dingwidget.h13
-rw-r--r--noncore/apps/odict/odict.cpp4
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
@@ -27,13 +27,13 @@
27#include <qtextstream.h> 27#include <qtextstream.h>
28#include <qstringlist.h> 28#include <qstringlist.h>
29#include <qregexp.h> 29#include <qregexp.h>
30#include <qtextbrowser.h> 30#include <qtextbrowser.h>
31#include <stdlib.h> // for getenv 31#include <stdlib.h> // for getenv
32 32
33DingWidget::DingWidget(QWidget *parent, QString word, QTextBrowser *browser_top, QTextBrowser *browser_bottom, QString activated_name) : QWidget(parent) 33DingWidget::DingWidget(QString word, QTextBrowser *browser_top, QTextBrowser *browser_bottom, QString activated_name)
34{ 34{
35 methodname = activated_name; 35 methodname = activated_name;
36 queryword = word; 36 queryword = word;
37 trenner = QString::null; 37 trenner = QString::null;
38 loadValues(); 38 loadValues();
39 QString opie_dir = getenv("OPIEDIR"); 39 QString opie_dir = getenv("OPIEDIR");
@@ -50,13 +50,13 @@ DingWidget::DingWidget(QWidget *parent, QString word, QTextBrowser *browser_top,
50 file.close(); 50 file.close();
51 } 51 }
52 52
53 lines = lines.grep( queryword ); 53 lines = lines.grep( queryword );
54 54
55 QString top, bottom; 55 QString top, bottom;
56 //parseInfo( lines, top , bottom ); 56 parseInfo( lines, top , bottom );
57 browser_top->setText( top ); 57 browser_top->setText( top );
58 browser_bottom->setText( bottom ); 58 browser_bottom->setText( bottom );
59} 59}
60 60
61void DingWidget::loadValues() 61void DingWidget::loadValues()
62{ 62{
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
@@ -4,28 +4,25 @@
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
10#include <qwidget.h>
11
12class QString; 10class QString;
13class QTextBrowser; 11class QTextBrowser;
14class QString;
15class QStringList; 12class QStringList;
16 13
17class DingWidget : public QWidget 14#include <qstring.h>
15
16class DingWidget
18{ 17{
19 Q_OBJECT
20
21 public: 18 public:
22 DingWidget(QWidget *parent = 0, QString word = 0, QTextBrowser* = 0, QTextBrowser* =0, QString activated_name=0); 19 DingWidget(QString word = 0, QTextBrowser* = 0, QTextBrowser* =0, QString activated_name=0);
23 20
24 private: 21 private:
25 QString search_word; 22 QString search_word;
26 void parseInfo( QStringList& , QString&, QString& ); 23 void parseInfo( QStringList& , QString&, QString& );
27 QString queryword; 24 QString queryword;
28 void loadValues(); 25 void loadValues();
29 QString methodname; 26 QString methodname;
30 QString trenner; 27 QString trenner;
31}; 28};
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
@@ -94,19 +94,19 @@ void ODict::slotDisplayAbout()
94 94
95void ODict::slotStartQuery() 95void ODict::slotStartQuery()
96{ 96{
97 QString querystring = query_le->text(); 97 QString querystring = query_le->text();
98 qDebug("opening dict >%s< for >%s<", activated_name.latin1(),querystring.latin1()); 98 qDebug("opening dict >%s< for >%s<", activated_name.latin1(),querystring.latin1());
99 if (querystring.isEmpty()){ 99 if (querystring.isEmpty()){
100 qWarning("emphty querysting"); 100 qWarning("empty querysting");
101 return; 101 return;
102 } 102 }
103 if (!activated_name || activated_name.isEmpty()) 103 if (!activated_name || activated_name.isEmpty())
104 QMessageBox::warning(this,tr("No Dictionary"),tr("Please choose a dictonary") ); 104 QMessageBox::warning(this,tr("No Dictionary"),tr("Please choose a dictonary") );
105 else 105 else
106 DingWidget *ding = new DingWidget( vbox , querystring , browser_top, browser_bottom, activated_name); 106 DingWidget *ding = new DingWidget( querystring , browser_top, browser_bottom, activated_name );
107} 107}
108 108
109 109
110void ODict::slotSetErrorcount( int count ) 110void ODict::slotSetErrorcount( int count )
111{ 111{
112 errorTol = count; 112 errorTol = count;