rename the following methods:

tqparent parent
tqmask mask


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/kio-locate@1246260 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
v3.5.13-sru
tpearson 14 years ago
parent cdd96d0eac
commit 9ade1fd58c

@ -843,9 +843,9 @@ void LocateProtocol::helpRequest()
///////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////
// SEARCH STRUCTURES // SEARCH STRUCTURES
LocateDirectory::LocateDirectory(LocateDirectory *tqparent, const TQString& path) LocateDirectory::LocateDirectory(LocateDirectory *parent, const TQString& path)
{ {
m_parent = tqparent; m_parent = parent;
m_path = path; m_path = path;
m_childs.setAutoDelete(true); m_childs.setAutoDelete(true);
m_itemsCount = 0; m_itemsCount = 0;
@ -929,20 +929,20 @@ void LocateDirectory::prepareListing(const LocateProtocol* protocol, int skip)
m_fullCount = countMatchingItems(protocol, newSkip); m_fullCount = countMatchingItems(protocol, newSkip);
// Collapse if directory part matches. // Collapse if directory part matches.
LocateDirectory* tqparent = m_parent; LocateDirectory* parent = m_parent;
if (tqparent == NULL) { if (parent == NULL) {
tqparent = this; parent = this;
} }
if (n > skip && protocol->getRegExp().isMatching(m_path.mid(skip))) { if (n > skip && protocol->getRegExp().isMatching(m_path.mid(skip))) {
// Directory part matches. // Directory part matches.
m_childs.clear(); m_childs.clear();
m_items.clear(); m_items.clear();
m_itemsCount = 0; m_itemsCount = 0;
tqparent->m_items += LocateItem(m_path, m_fullCount); parent->m_items += LocateItem(m_path, m_fullCount);
++tqparent->m_itemsCount; ++parent->m_itemsCount;
if (m_fullCount != 0) { if (m_fullCount != 0) {
tqparent->m_items += LocateItem(m_path, 0); parent->m_items += LocateItem(m_path, 0);
++tqparent->m_itemsCount; ++parent->m_itemsCount;
} }
} }
@ -958,7 +958,7 @@ void LocateDirectory::prepareListing(const LocateProtocol* protocol, int skip)
++m_itemsCount; ++m_itemsCount;
} }
} else { } else {
// Propagate items to tqparent. // Propagate items to parent.
// (only root LocateDirectory runs listItems) // (only root LocateDirectory runs listItems)
if (m_parent != NULL) { if (m_parent != NULL) {
m_parent->m_items += m_items; m_parent->m_items += m_items;

@ -251,7 +251,7 @@ class LocateItem
class LocateDirectory class LocateDirectory
{ {
public: public:
LocateDirectory(LocateDirectory *tqparent, const TQString& path); LocateDirectory(LocateDirectory *parent, const TQString& path);
LocateDirectory *addPath(const TQString& path); LocateDirectory *addPath(const TQString& path);
void prepareListing(const LocateProtocol* protocol, int skip); void prepareListing(const LocateProtocol* protocol, int skip);

@ -31,8 +31,8 @@
#include "locater.h" #include "locater.h"
Locater::Locater(TQObject *tqparent, const char *name) Locater::Locater(TQObject *parent, const char *name)
: TQObject(tqparent, name), m_process(TQTextCodec::codecForLocale()) : TQObject(parent, name), m_process(TQTextCodec::codecForLocale())
{ {
DEBUGSTR << "Locater::Locater" << endl; DEBUGSTR << "Locater::Locater" << endl;

@ -52,7 +52,7 @@ class Locater : public TQObject
/** /**
* Constructor * Constructor
*/ */
Locater(TQObject *tqparent = 0, const char *name = 0); Locater(TQObject *parent = 0, const char *name = 0);
virtual ~Locater(); virtual ~Locater();

Loading…
Cancel
Save