SVN_SILENT: replaced "criterions" by "criteria"

svn path=/trunk/KDE/kdebase/apps/; revision=1053448

diff --git a/src/search/dolphin_searchsettings.kcfg b/src/search/dolphin_searchsettings.kcfg
index 27e8ca04452195685eb9b68cbd0a19777462aeff..792a9e24721cdb11b8e98d213819cb99b0050265 100644 (file)
--- a/src/search/dolphin_searchsettings.kcfg
+++ b/src/search/dolphin_searchsettings.kcfg
@@ -11,7 +11,7 @@
             <label>What</label>
             <default>All</default>
         </entry>
-        <entry name="Criterions" type="String">
+        <entry name="Criteria" type="String">
             <label>Criteria</label>
             <default></default>
         </entry>

diff --git a/src/search/dolphinsearchoptionsconfigurator.cpp b/src/search/dolphinsearchoptionsconfigurator.cpp
index c1ebd571c7d617755e9cb11855b5a4ee7fc0235a..150a71210c43a628ae8531f9c972271dcf00a92d 100644 (file)
--- a/src/search/dolphinsearchoptionsconfigurator.cpp
+++ b/src/search/dolphinsearchoptionsconfigurator.cpp
@@ -86,7 +86,7 @@ DolphinSearchOptionsConfigurator::DolphinSearchOptionsConfigurator(QWidget* pare
     m_searchButton(0),
     m_saveButton(0),
     m_vBoxLayout(0),
-    m_criterions(),
+    m_criteria(),
     m_customSearchQuery()
 {
     m_vBoxLayout = new QVBoxLayout(this);
@@ -162,15 +162,15 @@ DolphinSearchOptionsConfigurator::~DolphinSearchOptionsConfigurator()
     const int whatIndex = m_whatBox->currentIndex();
     SearchSettings::setWhat(g_whatItems[whatIndex].settingsName);
 
-    QString criterionsString;
-    foreach(const SearchCriterionSelector* criterion, m_criterions) {
-        if (!criterionsString.isEmpty()) {
-            criterionsString += ',';
+    QString criteriaString;
+    foreach(const SearchCriterionSelector* criterion, m_criteria) {
+        if (!criteriaString.isEmpty()) {
+            criteriaString += ',';
         }
         const int index = static_cast<int>(criterion->type());
-        criterionsString += g_criterionItems[index].settingsName;
+        criteriaString += g_criterionItems[index].settingsName;
     }
-    SearchSettings::setCriterions(criterionsString);
+    SearchSettings::setCriteria(criteriaString);
 
     SearchSettings::self()->writeConfig();
 }
@@ -178,7 +178,7 @@ DolphinSearchOptionsConfigurator::~DolphinSearchOptionsConfigurator()
 KUrl DolphinSearchOptionsConfigurator::nepomukUrl() const
 {
     Nepomuk::Query::AndTerm andTerm;
-    foreach (const SearchCriterionSelector* criterion, m_criterions) {
+    foreach (const SearchCriterionSelector* criterion, m_criteria) {
         const Nepomuk::Query::Term term = criterion->queryTerm();
         andTerm.addSubTerm(term);
     }
@@ -230,9 +230,9 @@ void DolphinSearchOptionsConfigurator::showEvent(QShowEvent* event)
             }
         }
 
-        const QString criterions = SearchSettings::criterions();
-        QStringList criterionsList = criterions.split(',');
-        foreach (const QString& criterionName, criterionsList) {
+        const QString criteria = SearchSettings::criteria();
+        QStringList criteriaList = criteria.split(',');
+        foreach (const QString& criterionName, criteriaList) {
             for (unsigned int i = 0; i < sizeof(g_criterionItems) / sizeof(CriterionItem); ++i) {
                 if (g_criterionItems[i].settingsName == criterionName) {
                     const SearchCriterionSelector::Type type = g_criterionItems[i].type;
@@ -266,8 +266,8 @@ void DolphinSearchOptionsConfigurator::removeCriterion()
     Q_ASSERT(criterion != 0);
     m_vBoxLayout->removeWidget(criterion);
 
-    const int index = m_criterions.indexOf(criterion);
-    m_criterions.removeAt(index);
+    const int index = m_criteria.indexOf(criterion);
+    m_criteria.removeAt(index);
 
     criterion->deleteLater();
 
@@ -316,7 +316,7 @@ void DolphinSearchOptionsConfigurator::addCriterion(SearchCriterionSelector* cri
     m_vBoxLayout->insertWidget(index, criterion);
     updateSelectorButton();
 
-    m_criterions.append(criterion);
+    m_criteria.append(criterion);
 }
 
 bool DolphinSearchOptionsConfigurator::hasSearchParameters() const

diff --git a/src/search/dolphinsearchoptionsconfigurator.h b/src/search/dolphinsearchoptionsconfigurator.h
index ee7867933c5d5f037dfafc78cd9cd245ec77ce99..338f4cd3f2737fca871fdc01e416581f8c054f7c 100644 (file)
--- a/src/search/dolphinsearchoptionsconfigurator.h
+++ b/src/search/dolphinsearchoptionsconfigurator.h
@@ -100,7 +100,7 @@ private:
     QPushButton* m_searchButton;
     QPushButton* m_saveButton;
     QVBoxLayout* m_vBoxLayout;
-    QList<SearchCriterionSelector*> m_criterions;
+    QList<SearchCriterionSelector*> m_criteria;
     QString m_customSearchQuery;
 };