From 497ab12472bb04a18ec409bbe643334329559864 Mon Sep 17 00:00:00 2001 From: tpearson Date: Wed, 10 Aug 2011 06:08:18 +0000 Subject: [PATCH] rename the following methods: tqfind find tqreplace replace tqcontains contains git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/kima@1246075 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- src/flowlayout.cpp | 4 ++-- src/kima.cpp | 8 ++++---- src/sources/nvidiathermalsrc.cpp | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/flowlayout.cpp b/src/flowlayout.cpp index fb7223c..ae37828 100644 --- a/src/flowlayout.cpp +++ b/src/flowlayout.cpp @@ -141,8 +141,8 @@ uint FlowLayout::count(){ } bool FlowLayout::moveItem(const TQLayoutItem* which, const TQLayoutItem* relate, DIRECTION direction){ - int newPos = mLayoutItems.tqfindRef(relate); - int oldPos = mLayoutItems.tqfindRef(which); + int newPos = mLayoutItems.findRef(relate); + int oldPos = mLayoutItems.findRef(which); // check whether the widget is already at a correct position if(oldPos+1 == newPos && direction == ABOVE || oldPos-1 == newPos && direction == BELOW) diff --git a/src/kima.cpp b/src/kima.cpp index 0e3f54c..eb30f5d 100644 --- a/src/kima.cpp +++ b/src/kima.cpp @@ -332,7 +332,7 @@ void Kima::mousePressEvent(TQMouseEvent* inEvent ){ TQLayoutIterator it = mLayout->iterator(); while(it.current()){ TQWidget * c = it.current()->widget(); - if(TQT_TQRECT_OBJECT(c->rect()).tqcontains(c->mapFromGlobal(inEvent->globalPos()))){ + if(TQT_TQRECT_OBJECT(c->rect()).contains(c->mapFromGlobal(inEvent->globalPos()))){ mDraggedSourceItem = it.current(); // remenber the clicked source c->setCursor(TQt::SizeAllCursor); // set drag cursor mDragFactor = (c->rect().height()/2.0) / (double)c->mapFromGlobal(inEvent->globalPos()).y(); @@ -358,7 +358,7 @@ void Kima::mouseMoveEvent( TQMouseEvent* inEvent ) { TQLayoutIterator it = mLayout->iterator(); while(it.current()){ TQWidget * c = it.current()->widget(); - if(TQT_TQRECT_OBJECT(c->rect()).tqcontains(c->mapFromGlobal(inEvent->globalPos()))){ + if(TQT_TQRECT_OBJECT(c->rect()).contains(c->mapFromGlobal(inEvent->globalPos()))){ if(it.current() == mDraggedSourceItem) break; // we are over a source-widget. @@ -377,7 +377,7 @@ void Kima::mouseMoveEvent( TQMouseEvent* inEvent ) { ++it; } // outside kima? - if(!TQT_TQRECT_OBJECT(rect()).tqcontains(mapToParent(inEvent->pos()))) + if(!TQT_TQRECT_OBJECT(rect()).contains(mapToParent(inEvent->pos()))) mDraggedSourceItem->widget()->setCursor(TQt::ForbiddenCursor); else mDraggedSourceItem->widget()->setCursor(TQt::SizeAllCursor); @@ -414,7 +414,7 @@ void Kima::registerSource(Source* source) { } void Kima::maybeTip(const TQPoint& inPos){ - if(!TQT_TQRECT_OBJECT(rect()).tqcontains(inPos)) + if(!TQT_TQRECT_OBJECT(rect()).contains(inPos)) return; TQString text = "" + i18n("Sources:") + "
"; diff --git a/src/sources/nvidiathermalsrc.cpp b/src/sources/nvidiathermalsrc.cpp index 34fec06..351a728 100644 --- a/src/sources/nvidiathermalsrc.cpp +++ b/src/sources/nvidiathermalsrc.cpp @@ -82,9 +82,9 @@ std::listNVidiaThermalSrc::createInstances(TQWidget* inParent){ while(proc.readln(ln) != -1) pout+= ln + '\n'; - if(pout.tqcontains("Attribute 'GPUCoreTemp'")) + if(pout.contains("Attribute 'GPUCoreTemp'")) list.push_back(new NVidiaThermalSrc(inParent, "GPUCoreTemp", "NVidiaCore")); - if(pout.tqcontains("Attribute 'GPUAmbientTemp'")) + if(pout.contains("Attribute 'GPUAmbientTemp'")) list.push_back(new NVidiaThermalSrc(inParent, "GPUAmbientTemp", "NVidiaAmbient")); #else int evt_base = 0, err_base = 0, temp;