|
@@ -72,16 +72,17 @@ void ctkCompleterPrivate::init()
|
|
QStringList ctkCompleterPrivate::splitPath(const QString& s)
|
|
QStringList ctkCompleterPrivate::splitPath(const QString& s)
|
|
{
|
|
{
|
|
Q_Q(ctkCompleter);
|
|
Q_Q(ctkCompleter);
|
|
|
|
+ QStringList paths;
|
|
switch(q->modelFiltering())
|
|
switch(q->modelFiltering())
|
|
{
|
|
{
|
|
default:
|
|
default:
|
|
case ctkCompleter::FilterStartsWith:
|
|
case ctkCompleter::FilterStartsWith:
|
|
- return q->QCompleter::splitPath(s);
|
|
|
|
|
|
+ paths = q->QCompleter::splitPath(s);
|
|
break;
|
|
break;
|
|
case ctkCompleter::FilterContains:
|
|
case ctkCompleter::FilterContains:
|
|
this->updateSortFilterProxyModel();
|
|
this->updateSortFilterProxyModel();
|
|
this->SortFilterProxyModel->setFilterWildcard(s);
|
|
this->SortFilterProxyModel->setFilterWildcard(s);
|
|
- return QStringList();
|
|
|
|
|
|
+ paths = QStringList();
|
|
break;
|
|
break;
|
|
case ctkCompleter::FilterWordStartsWith:
|
|
case ctkCompleter::FilterWordStartsWith:
|
|
{
|
|
{
|
|
@@ -89,10 +90,11 @@ QStringList ctkCompleterPrivate::splitPath(const QString& s)
|
|
QRegExp regexp = QRegExp(QRegExp::escape(s));
|
|
QRegExp regexp = QRegExp(QRegExp::escape(s));
|
|
regexp.setCaseSensitivity(q->caseSensitivity());
|
|
regexp.setCaseSensitivity(q->caseSensitivity());
|
|
this->SortFilterProxyModel->setFilterRegExp(regexp);
|
|
this->SortFilterProxyModel->setFilterRegExp(regexp);
|
|
- return QStringList();
|
|
|
|
|
|
+ paths = QStringList();
|
|
break;
|
|
break;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
+ return paths;
|
|
}
|
|
}
|
|
|
|
|
|
// -------------------------------------------------------------------------
|
|
// -------------------------------------------------------------------------
|