rename the following methods:

tqparent parent
tqmask mask


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/ksystemlog@1246260 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

ksystemlog/src/acpid/acpidOptions.cpp

@@ -42,8 +42,8 @@
 #include "acpidOptions.h"
 #include "ksystemlogConfig.h"
 
-AcpidOptions::AcpidOptions(TQWidget *tqparent) : 
-	TQWidget(tqparent) 
+AcpidOptions::AcpidOptions(TQWidget *parent) : 
+	TQWidget(parent) 
 	{
 	
 	TQHBoxLayout *tqlayout = new TQHBoxLayout(this);

ksystemlog/src/acpid/acpidOptions.h

@@ -41,7 +41,7 @@ class AcpidOptions : public TQWidget {
   TQ_OBJECT
 	
 	public:
-		AcpidOptions(TQWidget *tqparent = 0);
+		AcpidOptions(TQWidget *parent = 0);
 		~AcpidOptions();
 		
 		bool isValid();

ksystemlog/src/acpid/acpidReader.cpp

@@ -25,8 +25,8 @@
 
 #include "acpidReader.h"
 
-AcpidReader::AcpidReader(TQObject *tqparent, const char *name) : 
-	DefaultReader(tqparent, name)
+AcpidReader::AcpidReader(TQObject *parent, const char *name) : 
+	DefaultReader(parent, name)
 	{
 }
 

ksystemlog/src/acpid/acpidReader.h

@@ -40,7 +40,7 @@ class AcpidReader : public DefaultReader {
   TQ_OBJECT
 	
 	public:
-		AcpidReader(TQObject *tqparent = 0, const char *name = 0);
+		AcpidReader(TQObject *parent = 0, const char *name = 0);
 		
 		virtual ~AcpidReader();
 		

ksystemlog/src/apache/apacheAccessReader.cpp

@@ -24,8 +24,8 @@
 #include "parsingHelper.h"
 #include "apacheAccessReader.h"
 
-ApacheAccessReader::ApacheAccessReader(TQObject *tqparent, const char *name) :
-	DefaultReader(tqparent, name)
+ApacheAccessReader::ApacheAccessReader(TQObject *parent, const char *name) :
+	DefaultReader(parent, name)
 	{
 }
 

ksystemlog/src/apache/apacheAccessReader.h

@@ -40,7 +40,7 @@ class ApacheAccessReader : public DefaultReader {
   TQ_OBJECT
 	
 	public:
-		ApacheAccessReader(TQObject *tqparent = 0, const char *name = 0);
+		ApacheAccessReader(TQObject *parent = 0, const char *name = 0);
 		
 		virtual ~ApacheAccessReader();
 		

ksystemlog/src/apache/apacheOptions.cpp

@@ -42,8 +42,8 @@
 #include "apacheOptions.h"
 #include "ksystemlogConfig.h"
 
-ApacheOptions::ApacheOptions(TQWidget *tqparent) :
-	TQWidget(tqparent),
+ApacheOptions::ApacheOptions(TQWidget *parent) :
+	TQWidget(parent),
 	tabs(this, "tabs"),
 	apacheFileList(this, i18n("<qt><p>These files will be analyzed to display <b>Apache log</b>. This list also determines the order in which the files are read.</p></qt>")),
 	apacheAccessFileList(this, i18n("<qt><p>These files will be analyzed to display <b>Apache Access log</b>. This list also determines the order in which the files are read.</p></qt>"))

ksystemlog/src/apache/apacheOptions.h

@@ -43,7 +43,7 @@ class ApacheOptions : public TQWidget {
   TQ_OBJECT
 	
 	public:
-		ApacheOptions(TQWidget *tqparent = 0);
+		ApacheOptions(TQWidget *parent = 0);
 		~ApacheOptions();
 		
 		bool isValid();

ksystemlog/src/apache/apacheReader.cpp

@@ -25,8 +25,8 @@
 #include "parsingHelper.h"
 #include "apacheReader.h"
 
-ApacheReader::ApacheReader(TQObject *tqparent, const char *name) : 
-	DefaultReader(tqparent, name)
+ApacheReader::ApacheReader(TQObject *parent, const char *name) : 
+	DefaultReader(parent, name)
 	{
 	
 	initializeTypeLevels();

ksystemlog/src/apache/apacheReader.h

@@ -40,7 +40,7 @@ class ApacheReader : public DefaultReader {
   TQ_OBJECT
 	
 	public:
-		ApacheReader(TQObject *tqparent = 0, const char *name = 0);
+		ApacheReader(TQObject *parent = 0, const char *name = 0);
 		
 		virtual ~ApacheReader();
 		

ksystemlog/src/bootauth/bootAuthenticationOptions.cpp

@@ -42,8 +42,8 @@
 #include "ksystemlogConfig.h"
 
 
-BootAuthenticationOptions::BootAuthenticationOptions(TQWidget *tqparent) :
-	TQWidget(tqparent) 
+BootAuthenticationOptions::BootAuthenticationOptions(TQWidget *parent) :
+	TQWidget(parent) 
 	{
 	
 	TQVBoxLayout *tqlayout = new TQVBoxLayout(this);

ksystemlog/src/bootauth/bootAuthenticationOptions.h

@@ -38,7 +38,7 @@ class BootAuthenticationOptions : public TQWidget {
 	Q_OBJECT
   TQ_OBJECT
 	public:
-		BootAuthenticationOptions(TQWidget *tqparent = 0);
+		BootAuthenticationOptions(TQWidget *parent = 0);
 		
 		bool isValid();
 

ksystemlog/src/childLogLine.cpp

@@ -24,7 +24,7 @@
 
 ChildLogLine::ChildLogLine(TQDate& date, TQTime& time, TQStringList& list, TQString& file, LogLevel* level, int type) :
 	LogLine(date, time, list, file, level, type),
-	tqparent(NULL) {
+	parent(NULL) {
 	
 }
 
@@ -33,11 +33,11 @@ ChildLogLine::~ChildLogLine() {
 }
 
 void ChildLogLine::setParent(ParentLogLine* line) {
-	tqparent=line;
+	parent=line;
 }
 
 ParentLogLine* ChildLogLine::getParent() {
-	return(tqparent);
+	return(parent);
 }
 
 bool ChildLogLine::isChildLogLine() {

ksystemlog/src/childLogLine.h

@@ -48,7 +48,7 @@ class ChildLogLine : public LogLine {
 		virtual bool isChildLogLine();
 		
 	protected:
-		ParentLogLine* tqparent;
+		ParentLogLine* parent;
 
 };
 

ksystemlog/src/cron/cronOptions.cpp

@@ -42,8 +42,8 @@
 #include "cronOptions.h"
 #include "ksystemlogConfig.h"
 
-CronOptions::CronOptions(TQWidget *tqparent) : 
-	TQWidget(tqparent) 
+CronOptions::CronOptions(TQWidget *parent) : 
+	TQWidget(parent) 
 	{
 
 	TQHBoxLayout *tqlayout = new TQHBoxLayout(this);

ksystemlog/src/cron/cronOptions.h

@@ -41,7 +41,7 @@ class CronOptions : public TQWidget {
 	Q_OBJECT
   TQ_OBJECT
 	public:
-		CronOptions(TQWidget *tqparent = 0);
+		CronOptions(TQWidget *parent = 0);
 		~CronOptions();
 		
 		bool isValid();

ksystemlog/src/cron/cronReader.cpp

@@ -23,8 +23,8 @@
 #include <klocale.h>
 #include <kmessagebox.h>
 
-CronReader::CronReader(TQObject *tqparent, const char *name) : 
-	DefaultReader(tqparent, name)
+CronReader::CronReader(TQObject *parent, const char *name) : 
+	DefaultReader(parent, name)
 	{
 	
 }

ksystemlog/src/cron/cronReader.h

@@ -40,7 +40,7 @@ class CronReader : public DefaultReader {
   TQ_OBJECT
 	
 	public:
-		CronReader(TQObject *tqparent = 0, const char *name = 0);
+		CronReader(TQObject *parent = 0, const char *name = 0);
 		
 		virtual ~CronReader();
 		

ksystemlog/src/cups/cupsAccessReader.cpp

@@ -24,8 +24,8 @@
 #include "parsingHelper.h"
 #include "cupsAccessReader.h"
 
-CupsAccessReader::CupsAccessReader(TQObject *tqparent, const char *name) :
-	DefaultReader(tqparent, name)
+CupsAccessReader::CupsAccessReader(TQObject *parent, const char *name) :
+	DefaultReader(parent, name)
 	{
 }
 

ksystemlog/src/cups/cupsAccessReader.h

@@ -40,7 +40,7 @@ class CupsAccessReader : public DefaultReader {
   TQ_OBJECT
 	
 	public:
-		CupsAccessReader(TQObject *tqparent = 0, const char *name = 0);
+		CupsAccessReader(TQObject *parent = 0, const char *name = 0);
 		
 		virtual ~CupsAccessReader();
 		

ksystemlog/src/cups/cupsOptions.cpp

@@ -42,8 +42,8 @@
 #include "cupsOptions.h"
 #include "ksystemlogConfig.h"
 
-CupsOptions::CupsOptions(TQWidget *tqparent) :
-	TQWidget(tqparent),
+CupsOptions::CupsOptions(TQWidget *parent) :
+	TQWidget(parent),
 	tabs(this, "tabs"),
 	cupsFileList(this, i18n("<qt><p>These files will be analyzed to display <b>Cups log</b>. This list also determines the order in which the files are read.</p></qt>")),
 	cupsAccessFileList(this, i18n("<qt><p>These files will be analyzed to display <b>Cups Web Server log</b>. This list also determines the order in which the files are read.</p></qt>"))

ksystemlog/src/cups/cupsOptions.h

@@ -43,7 +43,7 @@ class CupsOptions : public TQWidget {
   TQ_OBJECT
 	
 	public:
-		CupsOptions(TQWidget *tqparent = 0);
+		CupsOptions(TQWidget *parent = 0);
 		~CupsOptions();
 		
 		bool isValid();

ksystemlog/src/cups/cupsReader.cpp

@@ -26,8 +26,8 @@
 
 #define DEBUG2_LOG_LEVEL_ICON "source"
 
-CupsReader::CupsReader(TQObject *tqparent, const char *name) : 
-	DefaultReader(tqparent, name)
+CupsReader::CupsReader(TQObject *parent, const char *name) : 
+	DefaultReader(parent, name)
 	{
 	
 	initializeTypeLevels();

ksystemlog/src/cups/cupsReader.h

@@ -40,7 +40,7 @@ class CupsReader : public DefaultReader {
   TQ_OBJECT
 	
 	public:
-		CupsReader(TQObject *tqparent = 0, const char *name = 0);
+		CupsReader(TQObject *parent = 0, const char *name = 0);
 		
 		virtual ~CupsReader();
 		

ksystemlog/src/daemon/daemonOptions.cpp

@@ -42,8 +42,8 @@
 #include "daemonOptions.h"
 #include "ksystemlogConfig.h"
 
-DaemonOptions::DaemonOptions(TQWidget *tqparent) : 
-	TQWidget(tqparent) 
+DaemonOptions::DaemonOptions(TQWidget *parent) : 
+	TQWidget(parent) 
 	{
 
 	TQHBoxLayout *tqlayout = new TQHBoxLayout(this);

ksystemlog/src/daemon/daemonOptions.h

@@ -39,7 +39,7 @@ class DaemonOptions : public TQWidget {
 	Q_OBJECT
   TQ_OBJECT
 	public:
-		DaemonOptions(TQWidget *tqparent = 0);
+		DaemonOptions(TQWidget *parent = 0);
 		~DaemonOptions();
 		
 		bool isValid();

ksystemlog/src/defaultReader.cpp

@@ -31,8 +31,8 @@
 #include "defaultReader.h"
 
 
-DefaultReader::DefaultReader(TQObject *tqparent, const char *name) :
-	Reader(tqparent, name),
+DefaultReader::DefaultReader(TQObject *parent, const char *name) :
+	Reader(parent, name),
 	buffers(NULL)
 	{
 	

ksystemlog/src/defaultReader.h

@@ -48,7 +48,7 @@ class DefaultReader : public Reader {
   TQ_OBJECT
 	
 	public:
-		DefaultReader(TQObject *tqparent = 0, const char *name = 0);
+		DefaultReader(TQObject *parent = 0, const char *name = 0);
 		
 		virtual ~DefaultReader();
 		

ksystemlog/src/detailDialog.cpp

@@ -36,9 +36,9 @@
 
 #include "detailDialog.h"
 
-DetailDialog::DetailDialog(View* v, TQWidget *tqparent, const char *name) :
-	//KDialogBase(tqparent, name, false, i18n("Log Line Details"), 0 /*KDialogBase::Ok*/),
-	DetailDialogBase(tqparent, name, false, 0),
+DetailDialog::DetailDialog(View* v, TQWidget *parent, const char *name) :
+	//KDialogBase(parent, name, false, i18n("Log Line Details"), 0 /*KDialogBase::Ok*/),
+	DetailDialogBase(parent, name, false, 0),
 	view(v),
 	currentLine(NULL) {
 	

ksystemlog/src/detailDialog.h

@@ -40,7 +40,7 @@ class DetailDialog : public DetailDialogBase {
   TQ_OBJECT
 	
 	public:
-		DetailDialog(View* v, TQWidget *tqparent=NULL, const char* name=NULL);
+		DetailDialog(View* v, TQWidget *parent=NULL, const char* name=NULL);
 		
 		~DetailDialog();
 		

ksystemlog/src/fileList.cpp

@@ -40,8 +40,8 @@
 #include <kmessagebox.h>
 #include <kiconloader.h>
 
-FileList::FileList(TQWidget *tqparent, TQString description) : 
-	TQWidget(tqparent) 
+FileList::FileList(TQWidget *parent, TQString description) : 
+	TQWidget(parent) 
 	{
 
 	TQHBoxLayout *tqlayout = new TQHBoxLayout(this);

ksystemlog/src/fileList.h

@@ -43,7 +43,7 @@ class FileList : public TQWidget {
   TQ_OBJECT
 	
 	public:
-		FileList(TQWidget *tqparent, TQString description);
+		FileList(TQWidget *parent, TQString description);
 		~FileList();
 
 		virtual void insertItem(TQString& item);

ksystemlog/src/findManager.cpp

@@ -16,9 +16,9 @@
 #include "ksystemlog.h"
 
 
-FindManager::FindManager(KSystemLog* tqparent, const char* name) :
-	TQObject(tqparent, name),
-	main(tqparent),
+FindManager::FindManager(KSystemLog* parent, const char* name) :
+	TQObject(parent, name),
+	main(parent),
 	findDialog(NULL),
 	findManager(NULL),
 	previousItemFound(NULL),

ksystemlog/src/findManager.h

@@ -42,7 +42,7 @@ class FindManager : public TQObject {
 		/**
 		* Default Constructor
 		*/
-		FindManager(KSystemLog* tqparent, const char* name);
+		FindManager(KSystemLog* parent, const char* name);
 		
 		virtual ~FindManager();
 	

ksystemlog/src/generalOptions.cpp

@@ -38,8 +38,8 @@
 #include "ksystemlogConfig.h"
 #include "generalOptions.h"
 
-GeneralOptions::GeneralOptions(TQWidget *tqparent) : 
-	TQWidget(tqparent) 
+GeneralOptions::GeneralOptions(TQWidget *parent) : 
+	TQWidget(parent) 
 	{
 
 	TQVBoxLayout *tqlayout = new TQVBoxLayout(this);

ksystemlog/src/generalOptions.h

@@ -36,7 +36,7 @@ class GeneralOptions : public TQWidget {
 	Q_OBJECT
   TQ_OBJECT
 	public:
-		GeneralOptions(TQWidget *tqparent = 0);
+		GeneralOptions(TQWidget *parent = 0);
 		
 		bool isValid();
 

ksystemlog/src/itemFactory.cpp

@@ -37,7 +37,7 @@
 
 LogListItem* ItemFactory::createLogListItem(TQListView* view, LogLine* line) {
 	
-	//If it is a tqparent Log Line
+	//If it is a parent Log Line
 	if (line->isParentLogLine()==true)
 		return(createParentItem(view, (ParentLogLine*)line));
 		
@@ -61,7 +61,7 @@ LogListItem* ItemFactory::createLogListItem(TQListView* view, LogLine* line) {
 
 
 LogListItem* ItemFactory::createParentItem(TQListView* view, ParentLogLine* line) {
-	//kdDebug() << "Creating a tqparent item : " << line->getLogLevel()->name << endl;
+	//kdDebug() << "Creating a parent item : " << line->getLogLevel()->name << endl;
 
 	LogListItem* item=new LogListItem(view, line);
 	
@@ -148,14 +148,14 @@ LogListItem* ItemFactory::createParentItem(TQListView* view, ParentLogLine* line
 
 LogListItem* ItemFactory::createChildItem(TQListView* /*view*/, ChildLogLine* line) {
 	
-	LogListItem* tqparent=line->getParent()->getLogListItem();
+	LogListItem* parent=line->getParent()->getLogListItem();
 	
-	if (tqparent==NULL)
+	if (parent==NULL)
 		kdDebug() << "Parent log list item NULL !!!" << endl;
 	
-	//kdDebug() << "The log level of the tqparent is " << tqparent->getLogLine()->getLogLevel()->name << endl;
+	//kdDebug() << "The log level of the parent is " << parent->getLogLine()->getLogLevel()->name << endl;
 	
-	LogListItem* item=new LogListItem(tqparent, line);
+	LogListItem* item=new LogListItem(parent, line);
 	
 	initItem(item);
 	
@@ -267,25 +267,25 @@ TQString ItemFactory::createToolTipText(LogLine* line) {
 TQString ItemFactory::createParentFormattedText(LogLine* line) {
 	TQString result;
 	
-	ParentLogLine* tqparent=(ParentLogLine*) line;
+	ParentLogLine* parent=(ParentLogLine*) line;
 	
 	//All Group By cases are showed here
-	if (tqparent->getGroupBy()==GROUP_BY_LOG_LEVEL) {
+	if (parent->getGroupBy()==GROUP_BY_LOG_LEVEL) {
 		result.append(i18n("<div align='center'><b>Group:</b> %1</div>").tqarg(line->getLogLevel()->name));
 	}
-	else if (tqparent->getGroupBy()==GROUP_BY_DAY) {
+	else if (parent->getGroupBy()==GROUP_BY_DAY) {
 		result.append(i18n("<div align='center'><b>Group:</b> %1</div>").tqarg(line->getTime().date().toString()));
 	}
-	else if (tqparent->getGroupBy()==GROUP_BY_HOUR) {
+	else if (parent->getGroupBy()==GROUP_BY_HOUR) {
 		TQString string(i18n("%1, %2 hour").tqarg(line->getTime().date().toString(), line->getTime().time().toString("h")));
 		result.append(i18n("<div align='center'><b>Group:</b> %1</div>").tqarg(string));
 	}
-	else if (tqparent->getGroupBy()==GROUP_BY_LOG_FILE) {
+	else if (parent->getGroupBy()==GROUP_BY_LOG_FILE) {
 		result.append(i18n("<div align='center'><b>Group:</b> %1</div>").tqarg(line->getOriginalFile()));
 	}
 	else {
 		TQStringList& list=line->getItemList();
-		int index=ParentLogLine::getGroupedColumnIndex(tqparent->getColumns(), tqparent->getGroupByColumn());
+		int index=ParentLogLine::getGroupedColumnIndex(parent->getColumns(), parent->getGroupByColumn());
 		if (index<0 || index>=(int) list.size())
 			result.append(i18n("<div align='center'><b>Group:</b> none</div>"));
 		else

ksystemlog/src/kernel/kernelOptions.cpp

@@ -43,8 +43,8 @@
 #include "kernelOptions.h"
 #include "ksystemlogConfig.h"
 
-KernelOptions::KernelOptions(TQWidget *tqparent) : 
-	TQWidget(tqparent) 
+KernelOptions::KernelOptions(TQWidget *parent) : 
+	TQWidget(parent) 
 	{
 	
 	TQHBoxLayout *tqlayout = new TQHBoxLayout(this);

ksystemlog/src/kernel/kernelOptions.h

@@ -40,7 +40,7 @@ class KernelOptions : public TQWidget {
 	Q_OBJECT
   TQ_OBJECT
 	public:
-		KernelOptions(TQWidget *tqparent = 0);
+		KernelOptions(TQWidget *parent = 0);
 		~KernelOptions();
 		
 		bool isValid();

ksystemlog/src/loadingDialog.cpp

@@ -22,8 +22,8 @@
 
 #include "loadingDialog.h"
 
-LoadingDialog::LoadingDialog(TQWidget* tqparent, const char* name, bool modal) :
-	KProgressDialog(tqparent, name, i18n("Loading Progress"), "", modal),
+LoadingDialog::LoadingDialog(TQWidget* parent, const char* name, bool modal) :
+	KProgressDialog(parent, name, i18n("Loading Progress"), "", modal),
 	tabCount(0),
 	currentTab(0),
 	

ksystemlog/src/loadingDialog.h

@@ -46,7 +46,7 @@ class LoadingDialog : public KProgressDialog {
   TQ_OBJECT
 	
 	public:
-		LoadingDialog(TQWidget* tqparent=0, const char* name=0, bool modal=false);
+		LoadingDialog(TQWidget* parent=0, const char* name=0, bool modal=false);
 		
 		~LoadingDialog();
 		

ksystemlog/src/logLineFilter.cpp

@@ -30,8 +30,8 @@
 
 #include "logLineFilter.h"
 
-LogLineFilter::LogLineFilter(TQWidget* tqparent, KListView* listView, const char* name) :
-	KListViewSearchLine(tqparent, listView, name) {
+LogLineFilter::LogLineFilter(TQWidget* parent, KListView* listView, const char* name) :
+	KListViewSearchLine(parent, listView, name) {
 
 	drawFilterMessage = true;
 	

ksystemlog/src/logLineFilter.h

@@ -40,7 +40,7 @@
 class LogLineFilter : public KListViewSearchLine
 {
     public:
-        LogLineFilter(TQWidget* tqparent=NULL, KListView* listView=NULL, const char* name=NULL);
+        LogLineFilter(TQWidget* parent=NULL, KListView* listView=NULL, const char* name=NULL);
 
     protected:
         virtual void drawContents( TQPainter *p );

ksystemlog/src/logLineTree.cpp

@@ -73,18 +73,18 @@ LogLine* LogLineTree::synchronizeAddedLines(View* view) {
 	 * This code wasn't able to find Parent Log Lines in the addedList object
 	 */
 	/*
-	//We first add the new tqparent items
+	//We first add the new parent items
 	TQPtrListIterator<LogLine> it(addedList);
 	
 	LogLine* line=it.current();
 	
-	kdDebug() << "Inserting " << parents.count() << " tqparent log item" << endl;
+	kdDebug() << "Inserting " << parents.count() << " parent log item" << endl;
 	
 	int i=0;
 	while (line!=NULL) {
 		if (line->isParentLogLine()==true) {
-			ParentLogLine* tqparent=(ParentLogLine*) (line);
-			tqparent->insertItem(view->getLogList());
+			ParentLogLine* parent=(ParentLogLine*) (line);
+			parent->insertItem(view->getLogList());
 			
 			addedList.remove(it.current());
 			++i;
@@ -95,18 +95,18 @@ LogLine* LogLineTree::synchronizeAddedLines(View* view) {
 		line=it.current();
 	}
 	
-	kdDebug() << "Insertion of " << i << " tqparent log items" << endl;
+	kdDebug() << "Insertion of " << i << " parent log items" << endl;
 	*/
 	
-	kdDebug() << "Adding tqparent items to the tree..." << endl;
+	kdDebug() << "Adding parent items to the tree..." << endl;
 	
-	//We first add the new tqparent items
+	//We first add the new parent items
 	TQPtrListIterator<ParentLogLine> it(parents);
 	
 	LogLine* line=it.current();
 		
 	while (line!=NULL) {
-		//Even if the tqparent has already been added, it will automatically be added once time
+		//Even if the parent has already been added, it will automatically be added once time
 		line->insertItem(view->getLogList());
 		
 		addedList.remove(it.current());
@@ -126,29 +126,29 @@ bool LogLineTree::remove(LogLine* line) {
 	 * - Only remove this line is it does not have any tqchildren left
 	 */
 	if (line->isParentLogLine()==true) {
-		ParentLogLine* tqparent=(ParentLogLine*) line;
+		ParentLogLine* parent=(ParentLogLine*) line;
 		
-		if (tqparent->hasChildren()==false) {
-			parents.remove(tqparent);
+		if (parent->hasChildren()==false) {
+			parents.remove(parent);
 			return(LogLineList::remove(line));
 		}
 
 	}
 	/**
 	 * Child log line actions : 
-	 * - First remove the dependency from the tqparent
-	 * - Remove tqparent if it does not have child left
+	 * - First remove the dependency from the parent
+	 * - Remove parent if it does not have child left
 	 * - Finally remove child
 	 */
 	else if (line->isChildLogLine()==true) {
 		ChildLogLine* child=(ChildLogLine*) line;
-		ParentLogLine* tqparent=child->getParent();
-		tqparent->removeChild(child);
+		ParentLogLine* parent=child->getParent();
+		parent->removeChild(child);
 		
-		//Remove tqparent if it does not have longer tqchildren
-		if (tqparent->hasChildren()==false) {
-			parents.remove(tqparent);
-			LogLineList::remove(tqparent);
+		//Remove parent if it does not have longer tqchildren
+		if (parent->hasChildren()==false) {
+			parents.remove(parent);
+			LogLineList::remove(parent);
 		}
 		
 		//Remove the tqchildren
@@ -164,12 +164,12 @@ bool LogLineTree::remove(LogLine* line) {
 void LogLineTree::insert(LogLine* line) {
 	
 	TQPtrListIterator<ParentLogLine> it(parents);
-	ParentLogLine* tqparent=it.current();
+	ParentLogLine* parent=it.current();
 	
 	bool insertion=false;
 	
-	while (tqparent!=NULL) {
-		insertion=tqparent->isChild(line);
+	while (parent!=NULL) {
+		insertion=parent->isChild(line);
 		if (insertion==true) {
 
 			TQDate date=line->getTime().date();
@@ -177,8 +177,8 @@ void LogLineTree::insert(LogLine* line) {
 			
 			ChildLogLine* newChild=new ChildLogLine(date, time, line->getItemList(), line->getOriginalFile(), line->getLogLevel(), line->getType());
 			
-			tqparent->addChild(newChild);
-			newChild->setParent(tqparent);
+			parent->addChild(newChild);
+			newChild->setParent(parent);
 			
 			//Insert this child by the classical way
 			LogLineList::insert(newChild);
@@ -189,14 +189,14 @@ void LogLineTree::insert(LogLine* line) {
 		}
 		
 		++it;
-		tqparent=it.current();
+		parent=it.current();
 	}
 	
 	TQDate date=line->getTime().date();
 	TQTime time=line->getTime().time();
 	
 	ParentLogLine* newParent=new ParentLogLine(date, time, line->getItemList(), line->getOriginalFile(), line->getLogLevel(), line->getType(), this->groupBy, this->groupByColumn, this->columns);
-	//Insert this tqparent by the classical way
+	//Insert this parent by the classical way
 	LogLineList::insert(newParent);
 	
 	parents.append(newParent);

ksystemlog/src/logListItem.cpp

@@ -52,8 +52,8 @@ LogListItem::LogListItem(TQListView* list, LogLine* l) :
 
 }
 
-LogListItem::LogListItem(TQListViewItem* tqparent, LogLine* l) :
-	KListViewItem(tqparent),
+LogListItem::LogListItem(TQListViewItem* parent, LogLine* l) :
+	KListViewItem(parent),
 	line(l)
 	{
 
@@ -185,7 +185,7 @@ void LogListItem::paintCell(TQPainter* p, const TQColorGroup& cg, int column, in
 	
 
 	if (line->isParentLogLine()==true && column==0) {
-		//Draw 3 gray lines around the tqparent item
+		//Draw 3 gray lines around the parent item
 		pBuf.setPen(cg.button());
 		pBuf.drawLine(0, 0, width, 0);
 		pBuf.drawLine(0, height()-1, width, height()-1);
@@ -200,7 +200,7 @@ void LogListItem::paintCell(TQPainter* p, const TQColorGroup& cg, int column, in
 	//Draw the item name in bold if it is a recent one
 	if (line->isRecent()==true && column==lv->columns()-1)
 		font.setBold(true);
-	//Draw in italic and bold if it's a tqparent item
+	//Draw in italic and bold if it's a parent item
 	else if (line->isParentLogLine()==true && column==0) {
 		font.setItalic(true);
 		font.setBold(true);
@@ -227,7 +227,7 @@ void LogListItem::paintCell(TQPainter* p, const TQColorGroup& cg, int column, in
 		text_x=1;
 	
 	
-	//If this is the first column and also a tqparent log line
+	//If this is the first column and also a parent log line
 	if (line->isParentLogLine()==true && column==0) {
 		if (KSystemLogConfig::colorizeLogLines() && ((ParentLogLine*)line)->getGroupBy()==GROUP_BY_LOG_LEVEL)
 			pBuf.setPen( isSelected() ? cg.text() : line->getLogLevel()->color);

ksystemlog/src/logListItem.h

@@ -50,7 +50,7 @@ class LogListItem : public KListViewItem {
 	public:
 		LogListItem(TQListView* list, LogLine* l);
 		
-		LogListItem(TQListViewItem* tqparent, LogLine* l);
+		LogListItem(TQListViewItem* parent, LogLine* l);
 
 		~LogListItem();
 		

ksystemlog/src/logManager.cpp

@@ -168,7 +168,7 @@ void LogManager::openingProgress(int percent) {
 	
 	//Move this signal to Loading Dialog class
 	emit GUIUpdated();
-	//((KSystemLog*)( view->tqparent()))->kapp->processEvents();
+	//((KSystemLog*)( view->parent()))->kapp->processEvents();
 }
 
 
@@ -351,7 +351,7 @@ void LogManager::initialize(LogMode* mode) {
 	connect(reader, TQT_SIGNAL(readingEnd()), this, TQT_SLOT(readingEnded()));
 
 	
-	//Inform this reader that this LogManager is now its tqparent
+	//Inform this reader that this LogManager is now its parent
 	reader->setLogManager(this);
 	
 	//Find the log files used for this kind of mode, and set them to our log manager

ksystemlog/src/loggerDialog.cpp

@@ -38,8 +38,8 @@
 
 #include "loggerDialog.h"
 
-LoggerDialog::LoggerDialog(TQWidget *tqparent, const char *name) :
-	LoggerDialogBase(tqparent, name) {
+LoggerDialog::LoggerDialog(TQWidget *parent, const char *name) :
+	LoggerDialogBase(parent, name) {
 		
 	connect(buttonOK, TQT_SIGNAL(clicked()), this, TQT_SLOT(sendMessage()));
 	

ksystemlog/src/loggerDialog.h

@@ -32,7 +32,7 @@ class LoggerDialog: public LoggerDialogBase {
 	Q_OBJECT
   TQ_OBJECT
 	public:
-		LoggerDialog(TQWidget *tqparent = 0, const char *name = 0);
+		LoggerDialog(TQWidget *parent = 0, const char *name = 0);
 	
 	protected slots:
 		void sendMessage();

ksystemlog/src/options.cpp

@@ -35,8 +35,8 @@
 #include "options.h"
 
 
-Options::Options(TQWidget* tqparent, const char *name, bool modal) :
-	KDialogBase(IconList, i18n("Configuration"), Ok|Apply|Cancel, Ok, tqparent, name, modal, true)
+Options::Options(TQWidget* parent, const char *name, bool modal) :
+	KDialogBase(IconList, i18n("Configuration"), Ok|Apply|Cancel, Ok, parent, name, modal, true)
 	{
 
 	this->setMinimumSize(480, 500);

ksystemlog/src/options.h

@@ -52,7 +52,7 @@ class Options: public KDialogBase {
   TQ_OBJECT
 	
 	public:
-		Options(TQWidget *tqparent, const char *name, bool modal);
+		Options(TQWidget *parent, const char *name, bool modal);
 	
 		~Options();
 	public slots:

ksystemlog/src/postfix/postfixOptions.cpp

@@ -43,8 +43,8 @@
 #include "postfixOptions.h"
 #include "ksystemlogConfig.h"
 
-PostfixOptions::PostfixOptions(TQWidget *tqparent) :
-	TQWidget(tqparent) 
+PostfixOptions::PostfixOptions(TQWidget *parent) :
+	TQWidget(parent) 
 	{
 
 	TQHBoxLayout *tqlayout = new TQHBoxLayout(this);

ksystemlog/src/postfix/postfixOptions.h

@@ -39,7 +39,7 @@ class PostfixOptions : public TQWidget {
 	Q_OBJECT
   TQ_OBJECT
 	public:
-		PostfixOptions(TQWidget *tqparent = 0);
+		PostfixOptions(TQWidget *parent = 0);
 		~PostfixOptions();
 		
 		bool isValid();

ksystemlog/src/reader.cpp

@@ -29,8 +29,8 @@
 #include <kmessagebox.h>
 #include <kdebug.h>
 
-Reader::Reader(TQObject *tqparent, const char *name) :
-	TQObject(tqparent, name),
+Reader::Reader(TQObject *parent, const char *name) :
+	TQObject(parent, name),
 	logManager(NULL)
 	{
 	

ksystemlog/src/reader.h

@@ -52,7 +52,7 @@ class Reader : public TQObject {
   TQ_OBJECT
 	
 	public:
-		Reader(TQObject* tqparent=NULL, const char* name=NULL);
+		Reader(TQObject* parent=NULL, const char* name=NULL);
 		
 		~Reader();
 		

ksystemlog/src/samba/sambaOptions.cpp

@@ -42,8 +42,8 @@
 #include "sambaOptions.h"
 #include "ksystemlogConfig.h"
 
-SambaOptions::SambaOptions(TQWidget *tqparent) :
-	TQWidget(tqparent)
+SambaOptions::SambaOptions(TQWidget *parent) :
+	TQWidget(parent)
 	{
 	
 	TQHBoxLayout *tqlayout = new TQHBoxLayout(this);

ksystemlog/src/samba/sambaOptions.h

@@ -41,7 +41,7 @@ class SambaOptions : public TQWidget {
 	Q_OBJECT
   TQ_OBJECT
 	public:
-		SambaOptions(TQWidget *tqparent = 0);
+		SambaOptions(TQWidget *parent = 0);
 		~SambaOptions();
 		
 		bool isValid();

ksystemlog/src/samba/sambaReader.cpp

@@ -24,8 +24,8 @@
 #include "parsingHelper.h"
 #include "sambaReader.h"
 
-SambaReader::SambaReader(TQObject *tqparent, const char *name) : 
-	DefaultReader(tqparent, name)
+SambaReader::SambaReader(TQObject *parent, const char *name) : 
+	DefaultReader(parent, name)
 	{
 	
 }

ksystemlog/src/samba/sambaReader.h

@@ -40,7 +40,7 @@ class SambaReader : public DefaultReader {
   TQ_OBJECT
 	
 	public:
-		SambaReader(TQObject *tqparent = 0, const char *name = 0);
+		SambaReader(TQObject *parent = 0, const char *name = 0);
 		
 		virtual ~SambaReader();
 		

ksystemlog/src/slotLogAction.cpp

@@ -32,7 +32,7 @@
 #endif
 
 SlotLogAction::SlotLogAction(KSystemLog* p) :
-	tqparent(p) {
+	parent(p) {
 	
 }
 
@@ -41,14 +41,14 @@ void SlotLogAction::slotLogAction(KAction::ActivationReason reason, TQt::ButtonS
 	const TQObject* sender=TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(TQObject::sender()));
 	
 	//We can call the correct method from KSystemLog, which manage the two parameters
-	tqparent->logActionClicked(sender, reason, state);
+	parent->logActionClicked(sender, reason, state);
 }
 #else
 void SlotLogAction::slotLogAction() {
 	const TQObject* sender=TQObject::sender();
 	
 	//In the other case, We can only call the method from KSystemLog, which keeps compatibility
-	tqparent->logActionClicked(sender);
+	parent->logActionClicked(sender);
 }
 #endif
 

ksystemlog/src/slotLogAction.h

@@ -33,7 +33,7 @@ class SlotLogAction : public TQObject {
   TQ_OBJECT
 	
 	public:
-		SlotLogAction(KSystemLog* tqparent);
+		SlotLogAction(KSystemLog* parent);
 		
 	public slots:
 		
@@ -43,7 +43,7 @@ class SlotLogAction : public TQObject {
 		void slotLogAction(KAction::ActivationReason reason, TQt::ButtonState state);
 	
 	private:
-		KSystemLog* tqparent;
+		KSystemLog* parent;
 };
 
 #endif

ksystemlog/src/slotLogActionCompatibility.h

@@ -32,7 +32,7 @@ class SlotLogAction : public TQObject {
   TQ_OBJECT
 	
 	public:
-		SlotLogAction(KSystemLog* tqparent);
+		SlotLogAction(KSystemLog* parent);
 		
 	public slots:
 	
@@ -43,7 +43,7 @@ class SlotLogAction : public TQObject {
 		void slotLogAction();
 	
 	private:
-		KSystemLog* tqparent;
+		KSystemLog* parent;
 };
 
 #endif

ksystemlog/src/specificFileList.cpp

@@ -40,8 +40,8 @@
 #include "specificFileList.h"
 
 
-SpecificFileList::SpecificFileList(TQWidget* tqparent, TQString description) :
-	FileList(tqparent, description)
+SpecificFileList::SpecificFileList(TQWidget* parent, TQString description) :
+	FileList(parent, description)
 	{
 
 

ksystemlog/src/specificFileList.h

@@ -35,7 +35,7 @@ class SpecificFileList : public FileList {
   TQ_OBJECT
 	
 	public:
-		SpecificFileList(TQWidget *tqparent, TQString description);
+		SpecificFileList(TQWidget *parent, TQString description);
 		~SpecificFileList();
 		
 		virtual void insertItem(TQString& item);

ksystemlog/src/system/systemOptions.cpp

@@ -42,8 +42,8 @@
 #include "systemOptions.h"
 #include "ksystemlogConfig.h"
 
-SystemOptions::SystemOptions(TQWidget *tqparent) : 
-	TQWidget(tqparent)
+SystemOptions::SystemOptions(TQWidget *parent) : 
+	TQWidget(parent)
 	{
 	
 	TQVBoxLayout* tqlayout = new TQVBoxLayout(this);

ksystemlog/src/system/systemOptions.h

@@ -42,7 +42,7 @@ class SystemOptions : public TQWidget {
 	Q_OBJECT
   TQ_OBJECT
 	public:
-		SystemOptions(TQWidget *tqparent = 0);
+		SystemOptions(TQWidget *parent = 0);
 		~SystemOptions();
 		
 		bool isValid();

ksystemlog/src/system/systemReader.cpp

@@ -23,8 +23,8 @@
 #include <klocale.h>
 #include <kmessagebox.h>
 
-SystemReader::SystemReader(TQObject *tqparent, const char *name) : 
-	DefaultReader(tqparent, name)
+SystemReader::SystemReader(TQObject *parent, const char *name) : 
+	DefaultReader(parent, name)
 	{
 }
 

ksystemlog/src/system/systemReader.h

@@ -39,7 +39,7 @@ class SystemReader : public DefaultReader {
   TQ_OBJECT
 	
 	public:
-		SystemReader(TQObject *tqparent = 0, const char *name = 0);
+		SystemReader(TQObject *parent = 0, const char *name = 0);
 		
 		virtual ~SystemReader();
 		

ksystemlog/src/view.cpp

@@ -55,9 +55,9 @@
 #include "ksystemlog.h"
 
 
-View::View(TQWidget *tqparent) :
+View::View(TQWidget *parent) :
 	DCOPObject("KSystemLogInterface"),
-	TQWidget(tqparent),
+	TQWidget(parent),
 	logManager(NULL),
 	table(NULL),
 	columns(NULL),

ksystemlog/src/view.h

@@ -71,7 +71,7 @@ class View : public TQWidget, public KSystemLogInterface {
 		/**
 		 * Default constructor
 		 */
-		View(TQWidget *tqparent);
+		View(TQWidget *parent);
 	
 		/**
 		 * Destructor

ksystemlog/src/viewToolTip.cpp

@@ -30,8 +30,8 @@
 #include "view.h"
 
 
-ViewToolTip::ViewToolTip(TQWidget *tqparent, View *view) :
-	TQToolTip(tqparent),
+ViewToolTip::ViewToolTip(TQWidget *parent, View *view) :
+	TQToolTip(parent),
 	view(view) {
 	
 }

ksystemlog/src/viewToolTip.h

@@ -30,7 +30,7 @@ class View;
 
 class ViewToolTip : public TQToolTip {
 	public:
-		ViewToolTip(TQWidget *tqparent, View* view);
+		ViewToolTip(TQWidget *parent, View* view);
 		
 		virtual ~ViewToolTip();
 	

ksystemlog/src/xorg/xorgOptions.cpp

@@ -42,8 +42,8 @@
 #include "xorgOptions.h"
 #include "ksystemlogConfig.h"
 
-XorgOptions::XorgOptions(TQWidget *tqparent) : 
-	TQWidget(tqparent) 
+XorgOptions::XorgOptions(TQWidget *parent) : 
+	TQWidget(parent) 
 	{
 	
 	TQHBoxLayout *tqlayout = new TQHBoxLayout(this);

ksystemlog/src/xorg/xorgOptions.h

@@ -41,7 +41,7 @@ class XorgOptions : public TQWidget {
   TQ_OBJECT
 	
 	public:
-		XorgOptions(TQWidget *tqparent = 0);
+		XorgOptions(TQWidget *parent = 0);
 		~XorgOptions();
 		
 		bool isValid();

ksystemlog/src/xorg/xorgReader.cpp

@@ -32,8 +32,8 @@
 #define PROBED_LOG_LEVEL_ICON "wizard"
 #define NOT_IMPLEMENTED_LOG_LEVEL_ICON "filenew"
 
-XorgReader::XorgReader(TQObject *tqparent, const char *name) : 
-	DefaultReader(tqparent, name),
+XorgReader::XorgReader(TQObject *parent, const char *name) : 
+	DefaultReader(parent, name),
 	newLineTime(),
 	newLineDate(TQDate::tqcurrentDate()),
 	lineCount(1)

ksystemlog/src/xorg/xorgReader.h

@@ -43,7 +43,7 @@ class XorgReader : public DefaultReader {
   TQ_OBJECT
 	
 	public:
-		XorgReader(TQObject *tqparent = 0, const char *name = 0);
+		XorgReader(TQObject *parent = 0, const char *name = 0);
 		
 		virtual ~XorgReader();