Revert "Rename a number of old tq methods that are no longer tq specific"

This reverts commit 83323aca3c.
pull/1/head
Timothy Pearson 13 years ago
parent 83323aca3c
commit bd1037abe7

@ -347,7 +347,7 @@ void LocateProtocol::get(const KURL& url)
if (m_locater.binaryExists()) { if (m_locater.binaryExists()) {
error(KIO::ERR_IS_DIRECTORY, TQString()); error(KIO::ERR_IS_DIRECTORY, TQString());
} else { } else {
TQString html = i18n("<h1>\"%1\" could not be started.</h1><p>Please note that kio-locate can't be used on its own. You need an additional program for doing searches. Typically this is the command line tool <i>locate</i> that can be found in many distributions by default. You can check if the correct tool is used by looking at the <a href=\"locater:config\">setting</a> \"Locate Binary\".<p>Besides the mentioned tool <i>locate</i>, kio-locate can use any tool that uses the same syntax. In particular, it was reported to work with <i>slocate</i> and <i>rlocate</i>.").arg(m_locater.binary()); TQString html = i18n("<h1>\"%1\" could not be started.</h1><p>Please note that kio-locate can't be used on its own. You need an additional program for doing searches. Typically this is the command line tool <i>locate</i> that can be found in many distributions by default. You can check if the correct tool is used by looking at the <a href=\"locater:config\">setting</a> \"Locate Binary\".<p>Besides the mentioned tool <i>locate</i>, kio-locate can use any tool that uses the same syntax. In particular, it was reported to work with <i>slocate</i> and <i>rlocate</i>.").tqarg(m_locater.binary());
outputHtml(html); outputHtml(html);
} }
} else if (isConfigRequest()) { } else if (isConfigRequest()) {
@ -512,7 +512,7 @@ void LocateProtocol::searchRequest()
m_locateRegExp = LocateRegExp(convertWildcardsToRegExp(m_locatePattern), !isCaseSensitive(m_locatePattern)); m_locateRegExp = LocateRegExp(convertWildcardsToRegExp(m_locatePattern), !isCaseSensitive(m_locatePattern));
// Now perform the search... // Now perform the search...
infoMessage(i18n("Locating %1 ...").arg(display)); infoMessage(i18n("Locating %1 ...").tqarg(display));
bool started = m_locater.locate(m_locatePattern, !isCaseSensitive(m_locatePattern), regexp); bool started = m_locater.locate(m_locatePattern, !isCaseSensitive(m_locatePattern), regexp);
@ -725,7 +725,7 @@ TQString LocateProtocol::pathToDisplay(const TQString& path, int subItems)
display = display.mid(m_locateDirectory.length()); display = display.mid(m_locateDirectory.length());
} }
if (subItems > 0) { if (subItems > 0) {
// Can't use m_collapsedDisplay.arg(subItems).arg(display); here // Can't use m_collapsedDisplay.tqarg(subItems).tqarg(display); here
// because user might forget to type %1 or %2, or type it twice. // because user might forget to type %1 or %2, or type it twice.
// In both cases the result of arg() is undefined. // In both cases the result of arg() is undefined.
TQString output = m_config.m_collapsedDisplay, temp; TQString output = m_config.m_collapsedDisplay, temp;

@ -68,7 +68,7 @@
</widget> </widget>
<widget class="TQLayoutWidget"> <widget class="TQLayoutWidget">
<property name="name"> <property name="name">
<cstring>layout11</cstring> <cstring>tqlayout11</cstring>
</property> </property>
<hbox> <hbox>
<property name="name"> <property name="name">
@ -81,7 +81,7 @@
<property name="text"> <property name="text">
<string>Locate &amp;binary:</string> <string>Locate &amp;binary:</string>
</property> </property>
<property name="alignment"> <property name="tqalignment">
<set>AlignVCenter</set> <set>AlignVCenter</set>
</property> </property>
<property name="buddy" stdset="0"> <property name="buddy" stdset="0">
@ -98,7 +98,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="sizeHint"> <property name="tqsizeHint">
<size> <size>
<width>81</width> <width>81</width>
<height>20</height> <height>20</height>
@ -117,7 +117,7 @@
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="minimumSize"> <property name="tqminimumSize">
<size> <size>
<width>200</width> <width>200</width>
<height>0</height> <height>0</height>
@ -136,7 +136,7 @@
</widget> </widget>
<widget class="TQLayoutWidget"> <widget class="TQLayoutWidget">
<property name="name"> <property name="name">
<cstring>layout12</cstring> <cstring>tqlayout12</cstring>
</property> </property>
<hbox> <hbox>
<property name="name"> <property name="name">
@ -163,7 +163,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="sizeHint"> <property name="tqsizeHint">
<size> <size>
<width>51</width> <width>51</width>
<height>20</height> <height>20</height>
@ -182,7 +182,7 @@
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="minimumSize"> <property name="tqminimumSize">
<size> <size>
<width>200</width> <width>200</width>
<height>0</height> <height>0</height>

@ -32,7 +32,7 @@
</property> </property>
<widget class="TQLayoutWidget"> <widget class="TQLayoutWidget">
<property name="name"> <property name="name">
<cstring>layout10</cstring> <cstring>tqlayout10</cstring>
</property> </property>
<hbox> <hbox>
<property name="name"> <property name="name">
@ -59,7 +59,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="sizeHint"> <property name="tqsizeHint">
<size> <size>
<width>284</width> <width>284</width>
<height>20</height> <height>20</height>
@ -85,7 +85,7 @@
<property name="name"> <property name="name">
<cstring>kcfg_caseSensitivity</cstring> <cstring>kcfg_caseSensitivity</cstring>
</property> </property>
<property name="minimumSize"> <property name="tqminimumSize">
<size> <size>
<width>150</width> <width>150</width>
<height>0</height> <height>0</height>
@ -120,7 +120,7 @@
</property> </property>
<widget class="TQLayoutWidget"> <widget class="TQLayoutWidget">
<property name="name"> <property name="name">
<cstring>layout6</cstring> <cstring>tqlayout6</cstring>
</property> </property>
<hbox> <hbox>
<property name="name"> <property name="name">
@ -141,7 +141,7 @@
<property name="text"> <property name="text">
<string>&amp;Collapse a directory with more hits:</string> <string>&amp;Collapse a directory with more hits:</string>
</property> </property>
<property name="alignment"> <property name="tqalignment">
<set>AlignVCenter</set> <set>AlignVCenter</set>
</property> </property>
<property name="buddy" stdset="0"> <property name="buddy" stdset="0">
@ -158,7 +158,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="sizeHint"> <property name="tqsizeHint">
<size> <size>
<width>141</width> <width>141</width>
<height>20</height> <height>20</height>
@ -177,7 +177,7 @@
</widget> </widget>
<widget class="TQLayoutWidget"> <widget class="TQLayoutWidget">
<property name="name"> <property name="name">
<cstring>layout4</cstring> <cstring>tqlayout4</cstring>
</property> </property>
<hbox> <hbox>
<property name="name"> <property name="name">
@ -198,7 +198,7 @@
<property name="text"> <property name="text">
<string>Text of a collapsed &amp;directory:</string> <string>Text of a collapsed &amp;directory:</string>
</property> </property>
<property name="alignment"> <property name="tqalignment">
<set>AlignVCenter</set> <set>AlignVCenter</set>
</property> </property>
<property name="buddy" stdset="0"> <property name="buddy" stdset="0">
@ -215,7 +215,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="sizeHint"> <property name="tqsizeHint">
<size> <size>
<width>100</width> <width>100</width>
<height>20</height> <height>20</height>
@ -234,7 +234,7 @@
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="minimumSize"> <property name="tqminimumSize">
<size> <size>
<width>200</width> <width>200</width>
<height>0</height> <height>0</height>
@ -253,7 +253,7 @@
</widget> </widget>
<widget class="TQLayoutWidget"> <widget class="TQLayoutWidget">
<property name="name"> <property name="name">
<cstring>layout3</cstring> <cstring>tqlayout3</cstring>
</property> </property>
<hbox> <hbox>
<property name="name"> <property name="name">
@ -280,7 +280,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="sizeHint"> <property name="tqsizeHint">
<size> <size>
<width>161</width> <width>161</width>
<height>20</height> <height>20</height>
@ -347,7 +347,7 @@
<property name="name"> <property name="name">
<cstring>kcfg_collapsedIcon</cstring> <cstring>kcfg_collapsedIcon</cstring>
</property> </property>
<property name="minimumSize"> <property name="tqminimumSize">
<size> <size>
<width>150</width> <width>150</width>
<height>0</height> <height>0</height>

@ -23,7 +23,7 @@
* (at your option) any later version. * * (at your option) any later version. *
***************************************************************************/ ***************************************************************************/
#include <textcodec.h> #include <tqtextcodec.h>
#include <kdebug.h> #include <kdebug.h>
#include <kstandarddirs.h> #include <kstandarddirs.h>

Loading…
Cancel
Save