diff --git a/krusader/Filter/filtersettings.h b/krusader/Filter/filtersettings.h --- a/krusader/Filter/filtersettings.h +++ b/krusader/Filter/filtersettings.h @@ -98,7 +98,6 @@ bool followLinks; QList searchIn; QList dontSearchIn; - bool remoteContentSearch; QString contentEncoding; QString containsText; bool containsTextCase; diff --git a/krusader/Filter/filtersettings.cpp b/krusader/Filter/filtersettings.cpp --- a/krusader/Filter/filtersettings.cpp +++ b/krusader/Filter/filtersettings.cpp @@ -93,7 +93,6 @@ searchInArchives(false), recursive(false), followLinks(false), - remoteContentSearch(false), containsTextCase(false), containsWholeWord(false), containsRegExp(false), @@ -120,7 +119,6 @@ COPY(followLinks); COPY(searchIn); COPY(dontSearchIn); - COPY(remoteContentSearch); COPY(contentEncoding); COPY(containsText); COPY(containsTextCase); @@ -161,7 +159,6 @@ LOAD("FollowLinks", followLinks); searchIn = KrServices::toUrlList(cfg.readEntry("SearchIn", QStringList())); dontSearchIn = KrServices::toUrlList(cfg.readEntry("DontSearchIn", QStringList())); - LOAD("RemoteContentSearch", remoteContentSearch); LOAD("ContentEncoding", contentEncoding); LOAD("ContainsText", containsText); LOAD("ContainsTextCase", containsTextCase); @@ -214,7 +211,6 @@ cfg.writeEntry("FollowLinks", followLinks); cfg.writeEntry("SearchIn", KrServices::toStringList(searchIn)); cfg.writeEntry("DontSearchIn", KrServices::toStringList(dontSearchIn)); - cfg.writeEntry("RemoteContentSearch", remoteContentSearch); cfg.writeEntry("ContentEncoding", contentEncoding); cfg.writeEntry("ContainsText", containsText); cfg.writeEntry("ContainsTextCase", containsTextCase); @@ -285,7 +281,6 @@ query.setContent(containsText, containsTextCase, containsWholeWord, - remoteContentSearch, charset, containsRegExp); } diff --git a/krusader/Filter/filtertabs.h b/krusader/Filter/filtertabs.h --- a/krusader/Filter/filtertabs.h +++ b/krusader/Filter/filtertabs.h @@ -45,7 +45,6 @@ public: enum { - HasRemoteContentSearch = 0x0800, HasProfileHandler = 0x1000, HasRecurseOptions = 0x2000, HasSearchIn = 0x4000, diff --git a/krusader/Filter/generalfilter.h b/krusader/Filter/generalfilter.h --- a/krusader/Filter/generalfilter.h +++ b/krusader/Filter/generalfilter.h @@ -83,7 +83,6 @@ public: KComboBox* contentEncoding; QCheckBox* searchForCase; - QCheckBox* remoteContentSearch; QCheckBox* containsTextCase; QCheckBox* containsWholeWord; QCheckBox* searchInDirs; diff --git a/krusader/Filter/generalfilter.cpp b/krusader/Filter/generalfilter.cpp --- a/krusader/Filter/generalfilter.cpp +++ b/krusader/Filter/generalfilter.cpp @@ -326,16 +326,6 @@ QSpacerItem* recurseSpacer = new QSpacerItem(20, 20, QSizePolicy::Expanding, QSizePolicy::Minimum); recurseLayout->addItem(recurseSpacer); - remoteContentSearch = new QCheckBox(containsGroup); - QSizePolicy remoteContentSearchPolicy(QSizePolicy::Preferred, QSizePolicy::Fixed); - remoteContentSearchPolicy.setHeightForWidth(remoteContentSearch->sizePolicy().hasHeightForWidth()); - remoteContentSearch->setSizePolicy(remoteContentSearchPolicy); - remoteContentSearch->setText(i18n("Remote co&ntent search")); - remoteContentSearch->setChecked(false); - recurseLayout->addWidget(remoteContentSearch); - if (!(properties & FilterTabs::HasRemoteContentSearch)) - remoteContentSearch->hide(); - if (properties & FilterTabs::HasRecurseOptions) { // Options for recursive searching searchInDirs = new QCheckBox(this); @@ -505,8 +495,6 @@ contentEncoding->setEnabled(global); containsTextCase->setEnabled(global); containsRegExp->setEnabled(global); - if (properties & FilterTabs::HasRemoteContentSearch) - remoteContentSearch->setEnabled(global); if (properties & FilterTabs::HasRecurseOptions) searchInArchives->setEnabled(global && !remoteOnly); containsLabel->setEnabled(global); @@ -545,8 +533,6 @@ s.containsTextCase = containsTextCase->isChecked(); s.containsWholeWord = containsWholeWord->isChecked(); s.containsRegExp = containsRegExp->isChecked(); - s.remoteContentSearch = (properties & FilterTabs::HasRemoteContentSearch) ? - remoteContentSearch->isChecked() : false; } if (contentEncoding->currentIndex() != 0) @@ -585,7 +571,6 @@ containsTextCase->setChecked(s.containsTextCase); containsWholeWord->setChecked(s.containsWholeWord); containsRegExp->setChecked(s.containsRegExp); - remoteContentSearch->setChecked(s.remoteContentSearch); setComboBoxValue(contentEncoding, KCharsets::charsets()->descriptionForEncoding(s.contentEncoding)); diff --git a/krusader/KViewer/lister.cpp b/krusader/KViewer/lister.cpp --- a/krusader/KViewer/lister.cpp +++ b/krusader/KViewer/lister.cpp @@ -1554,7 +1554,7 @@ _searchHexQuery.push_back((char) c); } } else { - _searchQuery.setContent(_searchLineEdit->text(), caseSensitive, matchWholeWord, false, _textArea->codec()->name(), regExp); + _searchQuery.setContent(_searchLineEdit->text(), caseSensitive, matchWholeWord, _textArea->codec()->name(), regExp); } _searchIsForward = forward; _searchHexadecimal = hex; diff --git a/krusader/Search/krsearchdialog.h b/krusader/Search/krsearchdialog.h --- a/krusader/Search/krsearchdialog.h +++ b/krusader/Search/krsearchdialog.h @@ -116,7 +116,6 @@ static QString lastSearchText; static int lastSearchType; static bool lastSearchForCase; - static bool lastRemoteContentSearch; static bool lastContainsWholeWord; static bool lastContainsWithCase; static bool lastSearchInSubDirs; diff --git a/krusader/Search/krsearchdialog.cpp b/krusader/Search/krsearchdialog.cpp --- a/krusader/Search/krsearchdialog.cpp +++ b/krusader/Search/krsearchdialog.cpp @@ -130,7 +130,6 @@ QString KrSearchDialog::lastSearchText = "*"; int KrSearchDialog::lastSearchType = 0; bool KrSearchDialog::lastSearchForCase = false; -bool KrSearchDialog::lastRemoteContentSearch = false; bool KrSearchDialog::lastContainsWholeWord = false; bool KrSearchDialog::lastContainsWithCase = true; bool KrSearchDialog::lastSearchInSubDirs = true; @@ -193,7 +192,7 @@ searcherTabs = new QTabWidget(this); - filterTabs = FilterTabs::addTo(searcherTabs, FilterTabs::Default | FilterTabs::HasRemoteContentSearch); + filterTabs = FilterTabs::addTo(searcherTabs, FilterTabs::Default); generalFilter = (GeneralFilter *)filterTabs->get("GeneralFilter"); QWidget* resultTab = new QWidget(searcherTabs); @@ -308,7 +307,6 @@ generalFilter->searchFor->lineEdit()->selectAll(); generalFilter->ofType->setCurrentIndex(lastSearchType); generalFilter->searchForCase->setChecked(lastSearchForCase); - generalFilter->remoteContentSearch->setChecked(lastRemoteContentSearch); generalFilter->containsWholeWord->setChecked(lastContainsWholeWord); generalFilter->containsTextCase->setChecked(lastContainsWithCase); generalFilter->containsRegExp->setChecked(lastContainsRegExp); @@ -355,7 +353,6 @@ lastSearchText = generalFilter->searchFor->currentText(); lastSearchType = generalFilter->ofType->currentIndex(); lastSearchForCase = generalFilter->searchForCase->isChecked(); - lastRemoteContentSearch = generalFilter->remoteContentSearch->isChecked(); lastContainsWholeWord = generalFilter->containsWholeWord->isChecked(); lastContainsWithCase = generalFilter->containsTextCase->isChecked(); lastContainsRegExp = generalFilter->containsRegExp->isChecked(); diff --git a/krusader/VFS/krquery.h b/krusader/VFS/krquery.h --- a/krusader/VFS/krquery.h +++ b/krusader/VFS/krquery.h @@ -90,7 +90,7 @@ }; // sets the content part of the query - void setContent(const QString &content, bool cs = true, bool wholeWord = false, bool remoteSearch = false, QString encoding = QString(), bool regExp = false); + void setContent(const QString &content, bool cs = true, bool wholeWord = false, QString encoding = QString(), bool regExp = false); const QString content() { return contain; } @@ -199,7 +199,6 @@ bool containCaseSensetive; bool containWholeWord; bool containRegExp; - bool containOnRemote; KIO::filesize_t minSize; KIO::filesize_t maxSize; diff --git a/krusader/VFS/krquery.cpp b/krusader/VFS/krquery.cpp --- a/krusader/VFS/krquery.cpp +++ b/krusader/VFS/krquery.cpp @@ -51,7 +51,7 @@ // set the defaults KRQuery::KRQuery(): QObject(), matchesCaseSensitive(true), bNull(true), contain(QString()), containCaseSensetive(true), - containWholeWord(false), containRegExp(false), containOnRemote(false), + containWholeWord(false), containRegExp(false), minSize(0), maxSize(0), newerThen(0), olderThen(0), owner(QString()), group(QString()), perm(QString()), type(QString()), inArchive(false), recurse(true), @@ -68,7 +68,7 @@ // set the defaults KRQuery::KRQuery(const QString &name, bool matchCase) : QObject(), bNull(true), contain(QString()), containCaseSensetive(true), - containWholeWord(false), containRegExp(false), containOnRemote(false), + containWholeWord(false), containRegExp(false), minSize(0), maxSize(0), newerThen(0), olderThen(0), owner(QString()), group(QString()), perm(QString()), type(QString()), inArchive(false), recurse(true), @@ -108,7 +108,6 @@ containCaseSensetive = old.containCaseSensetive; containWholeWord = old.containWholeWord; containRegExp = old.containRegExp; - containOnRemote = old.containOnRemote; minSize = old.minSize; maxSize = old.maxSize; newerThen = old.newerThen; @@ -151,7 +150,6 @@ LOAD("ContainCaseSensetive", containCaseSensetive); LOAD("ContainWholeWord", containWholeWord); LOAD("ContainRegExp", containRegExp); - LOAD("ContainOnRemote", containOnRemote); LOAD("MinSize", minSize); LOAD("MaxSize", maxSize); newerThen = QDateTime::fromString(cfg.readEntry("NewerThan", QDateTime::fromTime_t(newerThen).toString())).toTime_t(); @@ -197,7 +195,6 @@ cfg.writeEntry("ContainCaseSensetive", containCaseSensetive); cfg.writeEntry("ContainWholeWord", containWholeWord); cfg.writeEntry("ContainRegExp", containRegExp); - cfg.writeEntry("ContainOnRemote", containOnRemote); cfg.writeEntry("MinSize", minSize); cfg.writeEntry("MaxSize", maxSize); cfg.writeEntry("NewerThan", QDateTime::fromTime_t(newerThen).toString()); @@ -321,19 +318,16 @@ fileName = vf->vfile_getName(); timer.start(); + // search locally if (vf->vfile_getUrl().isLocalFile()) { - if (!containsContent(vf->vfile_getUrl().path())) return false; - } else { - if (containOnRemote) { - if (processEventsConnected == 0) - return false; - else if (containsContent(vf->vfile_getUrl())) - return true; - else - return false; - } else - return false; + return containsContent(vf->vfile_getUrl().path()); + } + + // search remotely + if (processEventsConnected == 0) { + return false; } + return containsContent(vf->vfile_getUrl()); } return true; @@ -656,14 +650,13 @@ } } -void KRQuery::setContent(const QString &content, bool cs, bool wholeWord, bool remoteSearch, QString encoding, bool regExp) +void KRQuery::setContent(const QString &content, bool cs, bool wholeWord, QString encoding, bool regExp) { bNull = false; contain = content; containCaseSensetive = cs; containWholeWord = wholeWord; containRegExp = regExp; - containOnRemote = remoteSearch; if (encoding.isEmpty()) codec = QTextCodec::codecForLocale();