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
v3.5.13-sru
tpearson 13 years ago
parent 7eadc95d6f
commit 497ab12472

@ -141,8 +141,8 @@ uint FlowLayout::count(){
} }
bool FlowLayout::moveItem(const TQLayoutItem* which, const TQLayoutItem* relate, DIRECTION direction){ bool FlowLayout::moveItem(const TQLayoutItem* which, const TQLayoutItem* relate, DIRECTION direction){
int newPos = mLayoutItems.tqfindRef(relate); int newPos = mLayoutItems.findRef(relate);
int oldPos = mLayoutItems.tqfindRef(which); int oldPos = mLayoutItems.findRef(which);
// check whether the widget is already at a correct position // check whether the widget is already at a correct position
if(oldPos+1 == newPos && direction == ABOVE || oldPos-1 == newPos && direction == BELOW) if(oldPos+1 == newPos && direction == ABOVE || oldPos-1 == newPos && direction == BELOW)

@ -332,7 +332,7 @@ void Kima::mousePressEvent(TQMouseEvent* inEvent ){
TQLayoutIterator it = mLayout->iterator(); TQLayoutIterator it = mLayout->iterator();
while(it.current()){ while(it.current()){
TQWidget * c = it.current()->widget(); 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 mDraggedSourceItem = it.current(); // remenber the clicked source
c->setCursor(TQt::SizeAllCursor); // set drag cursor c->setCursor(TQt::SizeAllCursor); // set drag cursor
mDragFactor = (c->rect().height()/2.0) / (double)c->mapFromGlobal(inEvent->globalPos()).y(); 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(); TQLayoutIterator it = mLayout->iterator();
while(it.current()){ while(it.current()){
TQWidget * c = it.current()->widget(); 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) if(it.current() == mDraggedSourceItem)
break; break;
// we are over a source-widget. // we are over a source-widget.
@ -377,7 +377,7 @@ void Kima::mouseMoveEvent( TQMouseEvent* inEvent ) {
++it; ++it;
} }
// outside kima? // 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); mDraggedSourceItem->widget()->setCursor(TQt::ForbiddenCursor);
else else
mDraggedSourceItem->widget()->setCursor(TQt::SizeAllCursor); mDraggedSourceItem->widget()->setCursor(TQt::SizeAllCursor);
@ -414,7 +414,7 @@ void Kima::registerSource(Source* source) {
} }
void Kima::maybeTip(const TQPoint& inPos){ void Kima::maybeTip(const TQPoint& inPos){
if(!TQT_TQRECT_OBJECT(rect()).tqcontains(inPos)) if(!TQT_TQRECT_OBJECT(rect()).contains(inPos))
return; return;
TQString text = "<b>" + i18n("Sources:") + "</b><br><table border=\"0\" cellpadding=\"0\" cellspacing=\"0\">"; TQString text = "<b>" + i18n("Sources:") + "</b><br><table border=\"0\" cellpadding=\"0\" cellspacing=\"0\">";

@ -82,9 +82,9 @@ std::list<Source*>NVidiaThermalSrc::createInstances(TQWidget* inParent){
while(proc.readln(ln) != -1) while(proc.readln(ln) != -1)
pout+= ln + '\n'; pout+= ln + '\n';
if(pout.tqcontains("Attribute 'GPUCoreTemp'")) if(pout.contains("Attribute 'GPUCoreTemp'"))
list.push_back(new NVidiaThermalSrc(inParent, "GPUCoreTemp", "NVidiaCore")); 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")); list.push_back(new NVidiaThermalSrc(inParent, "GPUAmbientTemp", "NVidiaAmbient"));
#else #else
int evt_base = 0, err_base = 0, temp; int evt_base = 0, err_base = 0, temp;

Loading…
Cancel
Save