QT GUI: fix small problems in newly native qt4 term expander

This commit is contained in:
Jean-Francois Dockes 2010-01-30 17:47:35 +01:00
parent 603dd8132e
commit 35dcfcaf94
2 changed files with 8 additions and 5 deletions

View File

@ -210,11 +210,11 @@ void SpellW::doExpand()
suggsLV->setItem(0, 0, new QTableWidgetItem(tr("No expansion found"))); suggsLV->setItem(0, 0, new QTableWidgetItem(tr("No expansion found")));
#endif #endif
} else { } else {
int row = 0;
#if (QT_VERSION < 0x040000) #if (QT_VERSION < 0x040000)
for (list<Rcl::TermMatchEntry>::reverse_iterator it = entries.rbegin(); for (list<Rcl::TermMatchEntry>::reverse_iterator it = entries.rbegin();
it != entries.rend(); it++) { it != entries.rend(); it++) {
#else #else
int row = 0;
for (list<Rcl::TermMatchEntry>::iterator it = entries.begin(); for (list<Rcl::TermMatchEntry>::iterator it = entries.begin();
it != entries.end(); it++) { it != entries.end(); it++) {
#endif #endif
@ -247,15 +247,21 @@ void SpellW::wordChanged(const QString &text)
{ {
if (text.isEmpty()) { if (text.isEmpty()) {
expandPB->setEnabled(false); expandPB->setEnabled(false);
suggsLV->clear(); #if (QT_VERSION < 0x040000)
suggsLV->clear();
#else
suggsLV->setRowCount(0);
#endif
} else { } else {
expandPB->setEnabled(true); expandPB->setEnabled(true);
} }
} }
#if (QT_VERSION < 0x040000) #if (QT_VERSION < 0x040000)
void SpellW::textDoubleClicked(int, int){}
void SpellW::textDoubleClicked() void SpellW::textDoubleClicked()
#else #else
void SpellW::textDoubleClicked() {}
void SpellW::textDoubleClicked(int row, int) void SpellW::textDoubleClicked(int row, int)
#endif #endif
{ {

View File

@ -53,11 +53,8 @@ public:
public slots: public slots:
virtual void doExpand(); virtual void doExpand();
virtual void wordChanged(const QString&); virtual void wordChanged(const QString&);
#if (QT_VERSION < 0x040000)
virtual void textDoubleClicked(); virtual void textDoubleClicked();
#else
virtual void textDoubleClicked(int, int); virtual void textDoubleClicked(int, int);
#endif
virtual void modeSet(int); virtual void modeSet(int);
signals: signals: