summaryrefslogtreecommitdiffstats
path: root/kcontrol/ebrowsing/plugins/ikws
diff options
context:
space:
mode:
Diffstat (limited to 'kcontrol/ebrowsing/plugins/ikws')
-rw-r--r--kcontrol/ebrowsing/plugins/ikws/ikwsopts_ui.ui8
-rw-r--r--kcontrol/ebrowsing/plugins/ikws/kuriikwsfiltereng.cpp38
-rw-r--r--kcontrol/ebrowsing/plugins/ikws/searchprovider.desktop2
-rw-r--r--kcontrol/ebrowsing/plugins/ikws/searchproviderdlg_ui.ui4
-rw-r--r--kcontrol/ebrowsing/plugins/ikws/searchproviders/mamma.desktop2
-rw-r--r--kcontrol/ebrowsing/plugins/ikws/searchproviders/nl-telephone.desktop2
6 files changed, 28 insertions, 28 deletions
diff --git a/kcontrol/ebrowsing/plugins/ikws/ikwsopts_ui.ui b/kcontrol/ebrowsing/plugins/ikws/ikwsopts_ui.ui
index 302bdf21b..fdeeb27ca 100644
--- a/kcontrol/ebrowsing/plugins/ikws/ikwsopts_ui.ui
+++ b/kcontrol/ebrowsing/plugins/ikws/ikwsopts_ui.ui
@@ -4,7 +4,7 @@
<property name="name">
<cstring>FilterOptionsUI</cstring>
</property>
- <property name="tqgeometry">
+ <property name="geometry">
<rect>
<x>0</x>
<y>0</y>
@@ -34,7 +34,7 @@ Enable shortcuts that allow you to quickly search for information on the web. Fo
</widget>
<widget class="QLayoutWidget">
<property name="name">
- <cstring>tqlayout10</cstring>
+ <cstring>layout10</cstring>
</property>
<grid>
<property name="name">
@@ -161,7 +161,7 @@ Select the search engine to use for input boxes that provide automatic lookup se
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>21</width>
<height>170</height>
@@ -254,5 +254,5 @@ Select the search engine to use for input boxes that provide automatic lookup se
<tabstop>cmbDefaultEngine</tabstop>
<tabstop>cmbDelimiter</tabstop>
</tabstops>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
</UI>
diff --git a/kcontrol/ebrowsing/plugins/ikws/kuriikwsfiltereng.cpp b/kcontrol/ebrowsing/plugins/ikws/kuriikwsfiltereng.cpp
index 3f96f90e2..9f3a245fc 100644
--- a/kcontrol/ebrowsing/plugins/ikws/kuriikwsfiltereng.cpp
+++ b/kcontrol/ebrowsing/plugins/ikws/kuriikwsfiltereng.cpp
@@ -149,11 +149,11 @@ TQStringList KURISearchFilterEngine::modifySubstitutionMap(SubstMap& map,
TQString s = userquery.mid (pos, qsexpr.matchedLength());
while ((i = s.find(" ")) != -1)
{
- s = s.tqreplace (i, 1, "%20");
+ s = s.replace (i, 1, "%20");
n++;
}
start = pos + qsexpr.matchedLength() + 2*n; // Move after last quote
- userquery = userquery.tqreplace (pos, qsexpr.matchedLength(), s);
+ userquery = userquery.replace (pos, qsexpr.matchedLength(), s);
}
}
@@ -164,10 +164,10 @@ TQStringList KURISearchFilterEngine::modifySubstitutionMap(SubstMap& map,
{
int i = 0;
while ((i = userquery.find("%20")) != -1)
- userquery = userquery.tqreplace(i, 3, " ");
+ userquery = userquery.replace(i, 3, " ");
for ( TQStringList::Iterator it = l.begin(); it != l.end(); ++it )
- *it = (*it).tqreplace("%20", " ");
+ *it = (*it).replace("%20", " ");
}
PIDDBG << "Generating substitution map:\n";
@@ -188,10 +188,10 @@ TQStringList KURISearchFilterEngine::modifySubstitutionMap(SubstMap& map,
// Back-substitute quoted strings (%20 -> " "):
while ((j = v.find("%20")) != -1)
- v = v.tqreplace(j, 3, " ");
+ v = v.replace(j, 3, " ");
// Insert partial queries (referenced by \1 ... \n) to map:
- map.tqreplace(TQString::number(i), v);
+ map.replace(TQString::number(i), v);
PDVAR (" map['" + nr + "']", map[nr]);
// Insert named references (referenced by \name) to map:
@@ -202,8 +202,8 @@ TQStringList KURISearchFilterEngine::modifySubstitutionMap(SubstMap& map,
TQString k = v.left(pos);
// Back-substitute references contained in references (e.g. '\refname' substitutes to 'thisquery=\0')
- while ((j = s.find("%5C")) != -1) s = s.tqreplace(j, 3, "\\");
- map.tqreplace(k, s);
+ while ((j = s.find("%5C")) != -1) s = s.replace(j, 3, "\\");
+ map.replace(k, s);
PDVAR (" map['" + k + "']", map[k]);
}
}
@@ -228,15 +228,15 @@ TQString KURISearchFilterEngine::substituteQuery(const TQString& url, SubstMap &
TQStringList ql = modifySubstitutionMap (map, userquery);
int count = ql.count();
- // Check, if old style '\1' is found and tqreplace it with \{@} (compatibility mode):
+ // Check, if old style '\1' is found and replace it with \{@} (compatibility mode):
{
int pos = -1;
if ((pos = newurl.find("\\1")) >= 0)
{
PIDDBG << "WARNING: Using compatibility mode for newurl='" << newurl
- << "'. Please tqreplace old style '\\1' with new style '\\{0}' "
+ << "'. Please replace old style '\\1' with new style '\\{0}' "
"in the query definition.\n";
- newurl = newurl.tqreplace(pos, 2, "\\{@}");
+ newurl = newurl.replace(pos, 2, "\\{@}");
}
}
@@ -307,7 +307,7 @@ TQString KURISearchFilterEngine::substituteQuery(const TQString& url, SubstMap &
v = encodeString(s, encodingMib);
PDVAR (" default", s);
}
- else if (map.tqcontains(rlitem))
+ else if (map.contains(rlitem))
{
// Use value from substitution map:
found = true;
@@ -341,7 +341,7 @@ TQString KURISearchFilterEngine::substituteQuery(const TQString& url, SubstMap &
// Encode '+', otherwise it would be interpreted as space in the resulting url:
int vpos = 0;
while ((vpos = v.find('+')) != -1)
- v = v.tqreplace (vpos, 1, "%2B");
+ v = v.replace (vpos, 1, "%2B");
}
else if (rlitem == "@")
@@ -353,7 +353,7 @@ TQString KURISearchFilterEngine::substituteQuery(const TQString& url, SubstMap &
i++;
}
- newurl = newurl.tqreplace(pos, reflist.matchedLength(), v);
+ newurl = newurl.replace(pos, reflist.matchedLength(), v);
}
// Special handling for \{@};
@@ -371,7 +371,7 @@ TQString KURISearchFilterEngine::substituteQuery(const TQString& url, SubstMap &
// Substitute \{@} with list of unmatched query strings
int vpos = 0;
while ((vpos = newurl.find("\\@")) != -1)
- newurl = newurl.tqreplace (vpos, 2, v);
+ newurl = newurl.replace (vpos, 2, v);
}
}
@@ -395,7 +395,7 @@ TQString KURISearchFilterEngine::formatResult( const TQString& url,
bool /* isMalformed */,
SubstMap& map ) const
{
- // Return nothing if userquery is empty and it tqcontains
+ // Return nothing if userquery is empty and it contains
// substitution strings...
if (query.isEmpty() && url.find(TQRegExp(TQRegExp::escape("\\{"))) > 0)
return TQString::null;
@@ -427,13 +427,13 @@ TQString KURISearchFilterEngine::formatResult( const TQString& url,
PDVAR ("query definition", url);
// Add charset indicator for the query to substitution map:
- map.tqreplace("ikw_charset", cseta);
+ map.replace("ikw_charset", cseta);
// Add charset indicator for the fallback query to substitution map:
TQString csetb = cset2;
if (csetb.isEmpty())
csetb = "iso-8859-1";
- map.tqreplace("wsc_charset", csetb);
+ map.replace("wsc_charset", csetb);
TQString newurl = substituteQuery (url, map, userquery, csetacodec->mibEnum());
@@ -446,7 +446,7 @@ void KURISearchFilterEngine::loadConfig()
{
// Migrate from the old format, this block should remain until
// we can assume "every" user has upgraded to a KDE version that
- // tqcontains the sycoca based search provider configuration (malte).
+ // contains the sycoca based search provider configuration (malte).
// TODO: Remove in KDE 4 !!! This has been here a sufficient amount of time...
{
KSimpleConfig oldConfig(kapp->dirs()->saveLocation("config") + TQString(name()) + "rc");
diff --git a/kcontrol/ebrowsing/plugins/ikws/searchprovider.desktop b/kcontrol/ebrowsing/plugins/ikws/searchprovider.desktop
index b9c60f2aa..35bb3242a 100644
--- a/kcontrol/ebrowsing/plugins/ikws/searchprovider.desktop
+++ b/kcontrol/ebrowsing/plugins/ikws/searchprovider.desktop
@@ -13,7 +13,7 @@ Comment[ca]=Motor de recerca
Comment[cs]=Vyhledávací stroj
Comment[csb]=Szëkôrz
Comment[cy]=Peiriant Chwilio
-Comment[da]=Søgetqmaskine
+Comment[da]=Søgemaskine
Comment[de]=Suchmaschine
Comment[el]=Μηχανή αναζήτησης
Comment[eo]=Serĉilo
diff --git a/kcontrol/ebrowsing/plugins/ikws/searchproviderdlg_ui.ui b/kcontrol/ebrowsing/plugins/ikws/searchproviderdlg_ui.ui
index ab28f7e30..1a507c0ff 100644
--- a/kcontrol/ebrowsing/plugins/ikws/searchproviderdlg_ui.ui
+++ b/kcontrol/ebrowsing/plugins/ikws/searchproviderdlg_ui.ui
@@ -4,7 +4,7 @@
<property name="name">
<cstring>SearchProviderDlgUI</cstring>
</property>
- <property name="tqgeometry">
+ <property name="geometry">
<rect>
<x>0</x>
<y>0</y>
@@ -127,7 +127,7 @@ Recommended is \{@}, since it removes all query variables (name=value) from the
<tabstop>leShortcut</tabstop>
<tabstop>cbCharset</tabstop>
</tabstops>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>klineedit.h</includehint>
<includehint>klineedit.h</includehint>
diff --git a/kcontrol/ebrowsing/plugins/ikws/searchproviders/mamma.desktop b/kcontrol/ebrowsing/plugins/ikws/searchproviders/mamma.desktop
index cdc3590f1..2e104f15b 100644
--- a/kcontrol/ebrowsing/plugins/ikws/searchproviders/mamma.desktop
+++ b/kcontrol/ebrowsing/plugins/ikws/searchproviders/mamma.desktop
@@ -11,7 +11,7 @@ Name[ca]=Mamma - La mare de tots els motors de recerca
Name[cs]=Mamma
Name[csb]=Mamma - mëmka wszëstczich szëkôrzów
Name[cy]=Mamma - Mam holl Beiriannau Chwilio
-Name[da]=Mamma - moderen til alle søgetqmaskiner
+Name[da]=Mamma - moderen til alle søgemaskiner
Name[de]=Mamma - Die Mutter aller Suchmaschinen
Name[el]=Mamma - Η μητέρα όλων των μηχανών αναζήτησης
Name[eo]=Mamma - Patrino de ĉiuj retserĉiloj
diff --git a/kcontrol/ebrowsing/plugins/ikws/searchproviders/nl-telephone.desktop b/kcontrol/ebrowsing/plugins/ikws/searchproviders/nl-telephone.desktop
index 761a20954..7abbad0e1 100644
--- a/kcontrol/ebrowsing/plugins/ikws/searchproviders/nl-telephone.desktop
+++ b/kcontrol/ebrowsing/plugins/ikws/searchproviders/nl-telephone.desktop
@@ -26,7 +26,7 @@ Name[he]=חיפוש ספר של ספר טלפונים
Name[hi]=टेलिफोनबुक खोज प्रदायक
Name[hr]=Davatelj usluge pretraživanja imenika
Name[hu]=Telefonkönyv (NL)
-Name[is]=Leitarvél fyrir sítqmaskrár
+Name[is]=Leitarvél fyrir símaskrár
Name[it]=Motore di ricerca Elencotelefonico
Name[ja]=Telephonebook 検索プロバイダ
Name[km]=អ្នក​ផ្ដល់​សេវា​ស្វែងរក​សៀវភៅ​លេខ​ទូរស័ព្ទ