author | cniehaus <cniehaus> | 2003-01-03 22:31:19 (UTC) |
---|---|---|
committer | cniehaus <cniehaus> | 2003-01-03 22:31:19 (UTC) |
commit | da1889933ccd03ef948fef7debda0b7e13f12add (patch) (unidiff) | |
tree | 98df5c800d091800f1264dcbd601b951b0522a96 /noncore/apps | |
parent | 5c6c68a2297762fe69ac6d1bd62fd0e09afeccb3 (diff) | |
download | opie-da1889933ccd03ef948fef7debda0b7e13f12add.zip opie-da1889933ccd03ef948fef7debda0b7e13f12add.tar.gz opie-da1889933ccd03ef948fef7debda0b7e13f12add.tar.bz2 |
minifixes to avoid clashes with tille
-rw-r--r-- | noncore/apps/odict/dingwidget.cpp | 8 | ||||
-rw-r--r-- | noncore/apps/odict/odict.cpp | 9 | ||||
-rw-r--r-- | noncore/apps/odict/odict.h | 2 |
3 files changed, 16 insertions, 3 deletions
diff --git a/noncore/apps/odict/dingwidget.cpp b/noncore/apps/odict/dingwidget.cpp index 6e3179f..61ddbbf 100644 --- a/noncore/apps/odict/dingwidget.cpp +++ b/noncore/apps/odict/dingwidget.cpp | |||
@@ -74,6 +74,9 @@ void DingWidget::parseInfo( QStringList &lines, QString &top, QString &bottom ) | |||
74 | right = current.right( current.length() - current.find(reg_div) - 1 ); | 74 | right = current.right( current.length() - current.find(reg_div) - 1 ); |
75 | if ( left.contains( reg_word ) ){ | 75 | if ( left.contains( reg_word ) ) |
76 | { | ||
76 | left.replace( queryword, substitute ); | 77 | left.replace( queryword, substitute ); |
77 | toplist.append( left + " -> " + right); | 78 | toplist.append( left + " -> " + right); |
78 | }else{ | 79 | } |
80 | else | ||
81 | { | ||
79 | right.replace( reg_word, substitute ); | 82 | right.replace( reg_word, substitute ); |
@@ -81,3 +84,2 @@ void DingWidget::parseInfo( QStringList &lines, QString &top, QString &bottom ) | |||
81 | } | 84 | } |
82 | // .replace( reg_word, substitute ); | ||
83 | } | 85 | } |
diff --git a/noncore/apps/odict/odict.cpp b/noncore/apps/odict/odict.cpp index 166f6b9..7de9169 100644 --- a/noncore/apps/odict/odict.cpp +++ b/noncore/apps/odict/odict.cpp | |||
@@ -34,2 +34,3 @@ | |||
34 | #include <qtextbrowser.h> | 34 | #include <qtextbrowser.h> |
35 | #include <qcombobox.h> | ||
35 | 36 | ||
@@ -47,2 +48,3 @@ ODict::ODict() : QMainWindow() | |||
47 | query_le = new QLineEdit( hbox ); | 48 | query_le = new QLineEdit( hbox ); |
49 | query_co = new QComboBox( hbox ); | ||
48 | ok_button = new QPushButton( tr( "&Ok" ), hbox ); | 50 | ok_button = new QPushButton( tr( "&Ok" ), hbox ); |
@@ -64,2 +66,9 @@ void ODict::loadConfig() | |||
64 | completewords = cfg.readEntry( "completewords" ).toInt(); | 66 | completewords = cfg.readEntry( "completewords" ).toInt(); |
67 | |||
68 | QStringList groupListCfg = cfg.groupList().grep( "Method_" ); | ||
69 | for ( QStringList::Iterator it = groupListCfg.begin() ; it != groupListCfg.end() ; ++it ) | ||
70 | { | ||
71 | cfg.setGroup( *it ); | ||
72 | query_co->insertItem( cfg.readEntry( "Name" ) ); | ||
73 | } | ||
65 | } | 74 | } |
diff --git a/noncore/apps/odict/odict.h b/noncore/apps/odict/odict.h index ef0822d..7c1f32f 100644 --- a/noncore/apps/odict/odict.h +++ b/noncore/apps/odict/odict.h | |||
@@ -22,2 +22,3 @@ class DingWidget; | |||
22 | class QTextBrowser; | 22 | class QTextBrowser; |
23 | class QComboBox; | ||
23 | 24 | ||
@@ -38,2 +39,3 @@ class ODict : public QMainWindow | |||
38 | QLineEdit *query_le; | 39 | QLineEdit *query_le; |
40 | QComboBox *query_co; | ||
39 | QPushButton *ok_button; | 41 | QPushButton *ok_button; |