From 255b65585bec03c1f74ba0448aad6e5e1e303761 Mon Sep 17 00:00:00 2001 From: tpearson Date: Sat, 9 Jul 2011 02:23:29 +0000 Subject: [PATCH] Remove the tq in front of these incorrectly TQt4-converted methods/data members: tqrepaint[...] tqinvalidate[...] tqparent[...] tqmask[...] tqlayout[...] tqalignment[...] git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/ksystemlog@1240522 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- ksystemlog/src/detailDialogBase.ui | 2 +- ksystemlog/src/logLineTree.cpp | 12 ++++++------ ksystemlog/src/logLineTree.h | 2 +- ksystemlog/src/loggerDialogBase.ui | 2 +- ksystemlog/src/parentLogLine.cpp | 4 ++-- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/ksystemlog/src/detailDialogBase.ui b/ksystemlog/src/detailDialogBase.ui index 6f07024..1a0b82b 100644 --- a/ksystemlog/src/detailDialogBase.ui +++ b/ksystemlog/src/detailDialogBase.ui @@ -189,7 +189,7 @@ message - + ktextedit.h kpushbutton.h diff --git a/ksystemlog/src/logLineTree.cpp b/ksystemlog/src/logLineTree.cpp index ed5b859..f74f406 100644 --- a/ksystemlog/src/logLineTree.cpp +++ b/ksystemlog/src/logLineTree.cpp @@ -78,7 +78,7 @@ LogLine* LogLineTree::synchronizeAddedLines(View* view) { LogLine* line=it.current(); - kdDebug() << "Inserting " << tqparents.count() << " tqparent log item" << endl; + kdDebug() << "Inserting " << parents.count() << " tqparent log item" << endl; int i=0; while (line!=NULL) { @@ -101,7 +101,7 @@ LogLine* LogLineTree::synchronizeAddedLines(View* view) { kdDebug() << "Adding tqparent items to the tree..." << endl; //We first add the new tqparent items - TQPtrListIterator it(tqparents); + TQPtrListIterator it(parents); LogLine* line=it.current(); @@ -129,7 +129,7 @@ bool LogLineTree::remove(LogLine* line) { ParentLogLine* tqparent=(ParentLogLine*) line; if (tqparent->hasChildren()==false) { - tqparents.remove(tqparent); + parents.remove(tqparent); return(LogLineList::remove(line)); } @@ -147,7 +147,7 @@ bool LogLineTree::remove(LogLine* line) { //Remove tqparent if it does not have longer tqchildren if (tqparent->hasChildren()==false) { - tqparents.remove(tqparent); + parents.remove(tqparent); LogLineList::remove(tqparent); } @@ -163,7 +163,7 @@ bool LogLineTree::remove(LogLine* line) { void LogLineTree::insert(LogLine* line) { - TQPtrListIterator it(tqparents); + TQPtrListIterator it(parents); ParentLogLine* tqparent=it.current(); bool insertion=false; @@ -199,7 +199,7 @@ void LogLineTree::insert(LogLine* line) { //Insert this tqparent by the classical way LogLineList::insert(newParent); - tqparents.append(newParent); + parents.append(newParent); ChildLogLine* newChild=new ChildLogLine(date, time, line->getItemList(), line->getOriginalFile(), line->getLogLevel(), line->getType()); newParent->addChild(newChild); diff --git a/ksystemlog/src/logLineTree.h b/ksystemlog/src/logLineTree.h index 824de36..fe59ecf 100644 --- a/ksystemlog/src/logLineTree.h +++ b/ksystemlog/src/logLineTree.h @@ -49,7 +49,7 @@ class LogLineTree : public LogLineList { virtual void insert(LogLine* line); protected: - TQPtrList tqparents; + TQPtrList parents; groupByType groupBy; int groupByColumn; diff --git a/ksystemlog/src/loggerDialogBase.ui b/ksystemlog/src/loggerDialogBase.ui index 4e58dd2..da04751 100644 --- a/ksystemlog/src/loggerDialogBase.ui +++ b/ksystemlog/src/loggerDialogBase.ui @@ -439,7 +439,7 @@ buttonCancel loggerManual - + klineedit.h kurlrequester.h diff --git a/ksystemlog/src/parentLogLine.cpp b/ksystemlog/src/parentLogLine.cpp index 5eab0cb..5976173 100644 --- a/ksystemlog/src/parentLogLine.cpp +++ b/ksystemlog/src/parentLogLine.cpp @@ -75,10 +75,10 @@ bool ParentLogLine::isChild(LogLine* child) { } //Group by Hour else if (groupBy==GROUP_BY_HOUR) { - TQTime tqparentTime=getTime().time(); + TQTime parentTime=getTime().time(); TQTime childTime=child->getTime().time(); - if (getTime().date()==child->getTime().date() && tqparentTime.hour()==childTime.hour()) + if (getTime().date()==child->getTime().date() && parentTime.hour()==childTime.hour()) return(true); else return(false);