summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/kio_locate.cpp20
-rw-r--r--src/kio_locate.h2
-rw-r--r--src/locater.cpp4
-rw-r--r--src/locater.h2
4 files changed, 14 insertions, 14 deletions
diff --git a/src/kio_locate.cpp b/src/kio_locate.cpp
index ee9e791..d213ded 100644
--- a/src/kio_locate.cpp
+++ b/src/kio_locate.cpp
@@ -843,9 +843,9 @@ void LocateProtocol::helpRequest()
/////////////////////////////////////////////////////////////////////
// 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_childs.setAutoDelete(true);
m_itemsCount = 0;
@@ -929,20 +929,20 @@ void LocateDirectory::prepareListing(const LocateProtocol* protocol, int skip)
m_fullCount = countMatchingItems(protocol, newSkip);
// Collapse if directory part matches.
- LocateDirectory* tqparent = m_parent;
- if (tqparent == NULL) {
- tqparent = this;
+ LocateDirectory* parent = m_parent;
+ if (parent == NULL) {
+ parent = this;
}
if (n > skip && protocol->getRegExp().isMatching(m_path.mid(skip))) {
// Directory part matches.
m_childs.clear();
m_items.clear();
m_itemsCount = 0;
- tqparent->m_items += LocateItem(m_path, m_fullCount);
- ++tqparent->m_itemsCount;
+ parent->m_items += LocateItem(m_path, m_fullCount);
+ ++parent->m_itemsCount;
if (m_fullCount != 0) {
- tqparent->m_items += LocateItem(m_path, 0);
- ++tqparent->m_itemsCount;
+ parent->m_items += LocateItem(m_path, 0);
+ ++parent->m_itemsCount;
}
}
@@ -958,7 +958,7 @@ void LocateDirectory::prepareListing(const LocateProtocol* protocol, int skip)
++m_itemsCount;
}
} else {
- // Propagate items to tqparent.
+ // Propagate items to parent.
// (only root LocateDirectory runs listItems)
if (m_parent != NULL) {
m_parent->m_items += m_items;
diff --git a/src/kio_locate.h b/src/kio_locate.h
index f944c5c..007f689 100644
--- a/src/kio_locate.h
+++ b/src/kio_locate.h
@@ -251,7 +251,7 @@ class LocateItem
class LocateDirectory
{
public:
- LocateDirectory(LocateDirectory *tqparent, const TQString& path);
+ LocateDirectory(LocateDirectory *parent, const TQString& path);
LocateDirectory *addPath(const TQString& path);
void prepareListing(const LocateProtocol* protocol, int skip);
diff --git a/src/locater.cpp b/src/locater.cpp
index f221a6e..120ec99 100644
--- a/src/locater.cpp
+++ b/src/locater.cpp
@@ -31,8 +31,8 @@
#include "locater.h"
-Locater::Locater(TQObject *tqparent, const char *name)
- : TQObject(tqparent, name), m_process(TQTextCodec::codecForLocale())
+Locater::Locater(TQObject *parent, const char *name)
+ : TQObject(parent, name), m_process(TQTextCodec::codecForLocale())
{
DEBUGSTR << "Locater::Locater" << endl;
diff --git a/src/locater.h b/src/locater.h
index 7674838..47640d5 100644
--- a/src/locater.h
+++ b/src/locater.h
@@ -52,7 +52,7 @@ class Locater : public TQObject
/**
* Constructor
*/
- Locater(TQObject *tqparent = 0, const char *name = 0);
+ Locater(TQObject *parent = 0, const char *name = 0);
virtual ~Locater();