diff --git a/custom_widgets/yacreader_search_line_edit.cpp b/custom_widgets/yacreader_search_line_edit.cpp index ceea99e6..d9b66b6e 100644 --- a/custom_widgets/yacreader_search_line_edit.cpp +++ b/custom_widgets/yacreader_search_line_edit.cpp @@ -70,6 +70,15 @@ YACReaderSearchLineEdit::YACReaderSearchLineEdit(QWidget *parent) connect(this,SIGNAL(textChanged(QString)),this,SLOT(processText(QString))); } +//modifiers are not returned +const QString YACReaderSearchLineEdit::text() +{ + QString text = QLineEdit::text(); + + QRegExp regExp("\\[.*\\]"); + return text.remove(regExp).trimmed(); +} + void YACReaderSearchLineEdit::resizeEvent(QResizeEvent *) { #ifdef Q_OS_MAC @@ -108,11 +117,10 @@ void YACReaderSearchLineEdit::processText(const QString &text) QString modifier = regExp.cap(1); QString searchText = regExp.cap(2).trimmed(); - QLOG_INFO() << "modifier : " << modifier << "text : " << searchText; - int indexOfModifier = modifiers.indexOf(modifier); if(indexOfModifier != -1) { + QLOG_INFO() << "modifier : " << modifier << "text : " << searchText; emit filterChanged(static_cast(indexOfModifier+1), searchText); //TODO, do not use on indexOF } else diff --git a/custom_widgets/yacreader_search_line_edit.h b/custom_widgets/yacreader_search_line_edit.h index ed100f60..6d08a72d 100644 --- a/custom_widgets/yacreader_search_line_edit.h +++ b/custom_widgets/yacreader_search_line_edit.h @@ -15,6 +15,7 @@ class YACReaderSearchLineEdit : public QLineEdit public: YACReaderSearchLineEdit(QWidget *parent = 0); + const QString text(); protected: void resizeEvent(QResizeEvent *);