summaryrefslogtreecommitdiffstats
path: root/chalk/ui
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-08-10 06:08:18 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-08-10 06:08:18 +0000
commitb6edfe41c9395f2e20784cbf0e630af6426950a3 (patch)
tree56ed9b871d4296e6c15949c24e16420be1b28697 /chalk/ui
parentef39e8e4178a8f98cf5f154916ba0f03e4855206 (diff)
downloadkoffice-b6edfe41c9395f2e20784cbf0e630af6426950a3.tar.gz
koffice-b6edfe41c9395f2e20784cbf0e630af6426950a3.zip
rename the following methods:
tqfind find tqreplace replace tqcontains contains git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/koffice@1246075 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'chalk/ui')
-rw-r--r--chalk/ui/kis_cmb_composite.cc2
-rw-r--r--chalk/ui/kis_cmb_idlist.cc2
-rw-r--r--chalk/ui/kis_dlg_image_properties.cc2
-rw-r--r--chalk/ui/kis_dlg_preferences.cc2
-rw-r--r--chalk/ui/kis_filter_manager.cc24
-rw-r--r--chalk/ui/kis_filters_listview.cc2
-rw-r--r--chalk/ui/kis_gradient_slider_widget.cc12
-rw-r--r--chalk/ui/kis_layerbox.cc10
-rw-r--r--chalk/ui/kis_paintop_box.cc6
-rw-r--r--chalk/ui/kis_part_layer.cc2
-rw-r--r--chalk/ui/kis_resource_mediator.cc2
-rw-r--r--chalk/ui/kis_resourceserver.cc2
-rw-r--r--chalk/ui/kis_tool_freehand.cc4
-rw-r--r--chalk/ui/kis_tool_paint.cc2
-rw-r--r--chalk/ui/kis_view.cc4
-rw-r--r--chalk/ui/kobirdeyepanel.cpp14
-rw-r--r--chalk/ui/layerlist.cpp10
-rw-r--r--chalk/ui/layerlist.h2
-rw-r--r--chalk/ui/squeezedcombobox.cpp2
-rw-r--r--chalk/ui/squeezedcombobox.h2
20 files changed, 54 insertions, 54 deletions
diff --git a/chalk/ui/kis_cmb_composite.cc b/chalk/ui/kis_cmb_composite.cc
index 54c4b643..754e69da 100644
--- a/chalk/ui/kis_cmb_composite.cc
+++ b/chalk/ui/kis_cmb_composite.cc
@@ -55,7 +55,7 @@ KisCompositeOp KisCmbComposite::currentItem() const
void KisCmbComposite::setCurrentItem(const KisCompositeOp& op)
{
- if (m_list.tqfind(op) != m_list.end()) {
+ if (m_list.find(op) != m_list.end()) {
super::setCurrentText(op.id().name());
}
}
diff --git a/chalk/ui/kis_cmb_idlist.cc b/chalk/ui/kis_cmb_idlist.cc
index bdd6f09b..0936350e 100644
--- a/chalk/ui/kis_cmb_idlist.cc
+++ b/chalk/ui/kis_cmb_idlist.cc
@@ -57,7 +57,7 @@ KisID KisCmbIDList::currentItem() const
void KisCmbIDList::setCurrent(const KisID id)
{
- if (m_list.tqfind(id) != m_list.end())
+ if (m_list.find(id) != m_list.end())
super::setCurrentText(id.name());
else {
m_list.push_back(id);
diff --git a/chalk/ui/kis_dlg_image_properties.cc b/chalk/ui/kis_dlg_image_properties.cc
index 72c26ec5..29d221a0 100644
--- a/chalk/ui/kis_dlg_image_properties.cc
+++ b/chalk/ui/kis_dlg_image_properties.cc
@@ -72,7 +72,7 @@ KisDlgImageProperties::KisDlgImageProperties(KisImageSP image, TQWidget *tqparen
//m_page->cmbColorSpaces->hide();
//m_page->lblColorSpaces->setText(image->colorSpace()->id().name());
KisIDList colorSpaces = KisMetaRegistry::instance()->csRegistry()->listKeys();
- KisIDList::iterator i = colorSpaces.tqfind(KisID("WET",""));
+ KisIDList::iterator i = colorSpaces.find(KisID("WET",""));
if (i != colorSpaces.end()) {
colorSpaces.remove(i);
}
diff --git a/chalk/ui/kis_dlg_preferences.cc b/chalk/ui/kis_dlg_preferences.cc
index 9f82c0d7..941e033e 100644
--- a/chalk/ui/kis_dlg_preferences.cc
+++ b/chalk/ui/kis_dlg_preferences.cc
@@ -130,7 +130,7 @@ ColorSettingsTab::ColorSettingsTab(TQWidget *tqparent, const char *name )
refillMonitorProfiles(KisID("RGBA", ""));
refillPrintProfiles(KisID(cfg.printerColorSpace(), ""));
- if(m_page->cmbMonitorProfile->tqcontains(cfg.monitorProfile()))
+ if(m_page->cmbMonitorProfile->contains(cfg.monitorProfile()))
m_page->cmbMonitorProfile->setCurrentText(cfg.monitorProfile());
if(m_page->cmbPrintProfile->contains(cfg.printerProfile()))
m_page->cmbPrintProfile->setCurrentText(cfg.printerProfile());
diff --git a/chalk/ui/kis_filter_manager.cc b/chalk/ui/kis_filter_manager.cc
index a5b145da..e8bf5ba8 100644
--- a/chalk/ui/kis_filter_manager.cc
+++ b/chalk/ui/kis_filter_manager.cc
@@ -95,57 +95,57 @@ void KisFilterManager::setup(KActionCollection * ac)
if (!f) break;
TQString s = f->menuCategory();
- if (s == "adjust" && !m_filterActionMenus.tqfind("adjust")) {
+ if (s == "adjust" && !m_filterActionMenus.find("adjust")) {
am = new KActionMenu(i18n("Adjust"), ac, "adjust_filters");
m_filterActionMenus.insert("adjust", am);
}
- else if (s == "artistic" && !m_filterActionMenus.tqfind("artistic")) {
+ else if (s == "artistic" && !m_filterActionMenus.find("artistic")) {
am = new KActionMenu(i18n("Artistic"), ac, "artistic_filters");
m_filterActionMenus.insert("artistic", am);
}
- else if (s == "blur" && !m_filterActionMenus.tqfind("blur")) {
+ else if (s == "blur" && !m_filterActionMenus.find("blur")) {
am = new KActionMenu(i18n("Blur"), ac, "blur_filters");
m_filterActionMenus.insert("blur", am);
}
- else if (s == "colors" && !m_filterActionMenus.tqfind("colors")) {
+ else if (s == "colors" && !m_filterActionMenus.find("colors")) {
am = new KActionMenu(i18n("Colors"), ac, "color_filters");
m_filterActionMenus.insert("colors", am);
}
- else if (s == "decor" && !m_filterActionMenus.tqfind("decor")) {
+ else if (s == "decor" && !m_filterActionMenus.find("decor")) {
am = new KActionMenu(i18n("Decor"), ac, "decor_filters");
m_filterActionMenus.insert("decor", am);
}
- else if (s == "edge" && !m_filterActionMenus.tqfind("edge")) {
+ else if (s == "edge" && !m_filterActionMenus.find("edge")) {
am = new KActionMenu(i18n("Edge Detection"), ac, "edge_filters");
m_filterActionMenus.insert("edge", am);
}
- else if (s == "emboss" && !m_filterActionMenus.tqfind("emboss")) {
+ else if (s == "emboss" && !m_filterActionMenus.find("emboss")) {
am = new KActionMenu(i18n("Emboss"), ac, "emboss_filters");
m_filterActionMenus.insert("emboss", am);
}
- else if (s == "enhance" && !m_filterActionMenus.tqfind("enhance")) {
+ else if (s == "enhance" && !m_filterActionMenus.find("enhance")) {
am = new KActionMenu(i18n("Enhance"), ac, "enhance_filters");
m_filterActionMenus.insert("enhance", am);
}
- else if (s == "map" && !m_filterActionMenus.tqfind("map")) {
+ else if (s == "map" && !m_filterActionMenus.find("map")) {
am = new KActionMenu(i18n("Map"), ac, "map_filters");
m_filterActionMenus.insert("map", am);
}
- else if (s == "nonphotorealistic" && !m_filterActionMenus.tqfind("nonphotorealistic")) {
+ else if (s == "nonphotorealistic" && !m_filterActionMenus.find("nonphotorealistic")) {
am = new KActionMenu(i18n("Non-photorealistic"), ac, "nonphotorealistic_filters");
m_filterActionMenus.insert("nonphotorealistic", am);
}
- else if (s == "other" && !m_filterActionMenus.tqfind("other")) {
+ else if (s == "other" && !m_filterActionMenus.find("other")) {
other = new KActionMenu(i18n("Other"), ac, "misc_filters");
m_filterActionMenus.insert("other", other);
}
@@ -171,7 +171,7 @@ void KisFilterManager::setup(KActionCollection * ac)
TQString("chalk_filter_%1").tqarg((*it) . id()).ascii());
// Add action to the right submenu
- KActionMenu * m = m_filterActionMenus.tqfind( f->menuCategory() );
+ KActionMenu * m = m_filterActionMenus.find( f->menuCategory() );
if (m) {
m->insert(a);
}
diff --git a/chalk/ui/kis_filters_listview.cc b/chalk/ui/kis_filters_listview.cc
index 788a787d..163c88a4 100644
--- a/chalk/ui/kis_filters_listview.cc
+++ b/chalk/ui/kis_filters_listview.cc
@@ -173,7 +173,7 @@ void KisFiltersListView::setLayer(KisLayerSP layer) {
void KisFiltersListView::setCurrentFilter(KisID filter)
{
- setCurrentItem(tqfindItem(filter.name()));
+ setCurrentItem(findItem(filter.name()));
}
void KisFiltersListView::buildPreview()
diff --git a/chalk/ui/kis_gradient_slider_widget.cc b/chalk/ui/kis_gradient_slider_widget.cc
index 3777a214..0547bdb5 100644
--- a/chalk/ui/kis_gradient_slider_widget.cc
+++ b/chalk/ui/kis_gradient_slider_widget.cc
@@ -132,20 +132,20 @@ void KisGradientSliderWidget::mousePressEvent( TQMouseEvent * e )
// Change the activation order of the handles to avoid deadlocks
if( t > 0.5 )
{
- if( leftHandle.tqcontains( e->pos() ) )
+ if( leftHandle.contains( e->pos() ) )
m_drag = LEFT_DRAG;
- else if( middleHandle.tqcontains( e->pos() ) )
+ else if( middleHandle.contains( e->pos() ) )
m_drag = MIDDLE_DRAG;
- else if( rightHandle.tqcontains( e->pos() ) )
+ else if( rightHandle.contains( e->pos() ) )
m_drag = RIGHT_DRAG;
}
else
{
- if( rightHandle.tqcontains( e->pos() ) )
+ if( rightHandle.contains( e->pos() ) )
m_drag = RIGHT_DRAG;
- else if( middleHandle.tqcontains( e->pos() ) )
+ else if( middleHandle.contains( e->pos() ) )
m_drag = MIDDLE_DRAG;
- else if( leftHandle.tqcontains( e->pos() ) )
+ else if( leftHandle.contains( e->pos() ) )
m_drag = LEFT_DRAG;
}
diff --git a/chalk/ui/kis_layerbox.cc b/chalk/ui/kis_layerbox.cc
index e257e2b0..cfdc6acd 100644
--- a/chalk/ui/kis_layerbox.cc
+++ b/chalk/ui/kis_layerbox.cc
@@ -499,7 +499,7 @@ void KisLayerBox::slotAddMenuActivated(int type)
void KisLayerBox::slotRmClicked()
{
TQValueList<int> l = list()->selectedLayerIDs();
- if (l.count() < 2 && list()->activeLayer() && !l.tqcontains(list()->activeLayer()->id()))
+ if (l.count() < 2 && list()->activeLayer() && !l.contains(list()->activeLayer()->id()))
{
l.clear();
l.append(list()->activeLayer()->id());
@@ -515,7 +515,7 @@ void KisLayerBox::slotRmClicked()
void KisLayerBox::slotRaiseClicked()
{
TQValueList<int> l = list()->selectedLayerIDs();
- if (l.count() < 2 && list()->activeLayer() && !l.tqcontains(list()->activeLayer()->id()))
+ if (l.count() < 2 && list()->activeLayer() && !l.contains(list()->activeLayer()->id()))
{
l.clear();
l.append(list()->activeLayer()->id());
@@ -542,7 +542,7 @@ void KisLayerBox::slotRaiseClicked()
void KisLayerBox::slotLowerClicked()
{
TQValueList<LayerItem*> l = list()->selectedLayers();
- if (l.count() < 2 && list()->activeLayer() && !l.tqcontains(list()->activeLayer()))
+ if (l.count() < 2 && list()->activeLayer() && !l.contains(list()->activeLayer()))
{
l.clear();
l.append(list()->activeLayer());
@@ -594,7 +594,7 @@ TQPixmap KisLayerBox::loadPixmap(const TQString& filename, const KIconLoader&
TQPixmap pixmap = il.loadIcon(filename, KIcon::NoGroup, size);
if (pixmap.isNull())
- KMessageBox::error(0, i18n("Cannot tqfind %1").tqarg(filename),
+ KMessageBox::error(0, i18n("Cannot find %1").tqarg(filename),
i18n("Canvas"));
return pixmap;
@@ -612,7 +612,7 @@ void KisLayerBox::markModified(KisLayer* layer)
layer = layer->tqparent();
}
for (int i = v.count() - 1; i >= 0; --i)
- if (!m_modified.tqcontains(v[i]))
+ if (!m_modified.contains(v[i]))
m_modified.append(v[i]);
}
diff --git a/chalk/ui/kis_paintop_box.cc b/chalk/ui/kis_paintop_box.cc
index 9f8ac9de..ad4dbabb 100644
--- a/chalk/ui/kis_paintop_box.cc
+++ b/chalk/ui/kis_paintop_box.cc
@@ -126,7 +126,7 @@ void KisPaintopBox::colorSpaceChanged(KisColorSpace *cs)
}
}
- int index = m_displayedOps->tqfindIndex(currentPaintop());
+ int index = m_displayedOps->findIndex(currentPaintop());
if (index == -1) {
// Must change the paintop as the current one is not supported
@@ -162,7 +162,7 @@ void KisPaintopBox::slotInputDeviceChanged(const KisInputDevice & inputDevice)
paintop = (*it).second;
}
- int index = m_displayedOps->tqfindIndex(paintop);
+ int index = m_displayedOps->findIndex(paintop);
if (index == -1) {
// Must change the paintop as the current one is not supported
@@ -238,7 +238,7 @@ const KisPaintOpSettings *KisPaintopBox::paintopSettings(const KisID & paintop,
settingsArray = (*it).second;
}
- const int index = m_paintops->tqfindIndex(paintop);
+ const int index = m_paintops->findIndex(paintop);
if (index >= 0 && index < (int)settingsArray.count())
return settingsArray[index];
else
diff --git a/chalk/ui/kis_part_layer.cc b/chalk/ui/kis_part_layer.cc
index 459770d1..ace29965 100644
--- a/chalk/ui/kis_part_layer.cc
+++ b/chalk/ui/kis_part_layer.cc
@@ -129,7 +129,7 @@ void KisPartLayerImpl::paintSelection(TQImage &img, TQ_INT32 x, TQ_INT32 y, TQ_I
for (int y2 = y; y2 < h + y; ++y2) {
for (int x2 = x; x2 < w + x; ++x2) {
- if (!rect.tqcontains(x2, y2)) {
+ if (!rect.contains(x2, y2)) {
TQ_UINT8 g = (*(j + 0) + *(j + 1 ) + *(j + 2 )) / 9;
*(j+0) = 165+g;
*(j+1) = 128+g;
diff --git a/chalk/ui/kis_resource_mediator.cc b/chalk/ui/kis_resource_mediator.cc
index 204a1033..d4993807 100644
--- a/chalk/ui/kis_resource_mediator.cc
+++ b/chalk/ui/kis_resource_mediator.cc
@@ -64,7 +64,7 @@ KisResource *KisResourceMediator::currentResource() const
KisIconItem *KisResourceMediator::itemFor(KisResource *r) const
{
- if(m_items.tqcontains(r))
+ if(m_items.contains(r))
{
return m_items[r];
}
diff --git a/chalk/ui/kis_resourceserver.cc b/chalk/ui/kis_resourceserver.cc
index d464e1bc..e7593ceb 100644
--- a/chalk/ui/kis_resourceserver.cc
+++ b/chalk/ui/kis_resourceserver.cc
@@ -64,7 +64,7 @@ void KisResourceServerBase::loadResources(TQStringList filenames)
// XXX: Don't load resources with the same filename. Actually, we should look inside
// the resource to find out whether they are really the same, but for now this
// will prevent the same brush etc. showing up twice.
- if (uniqueFiles.empty() || uniqueFiles.tqfind(fname) == uniqueFiles.end()) {
+ if (uniqueFiles.empty() || uniqueFiles.find(fname) == uniqueFiles.end()) {
uniqueFiles.append(fname);
KisResource *resource;
resource = createResource(front);
diff --git a/chalk/ui/kis_tool_freehand.cc b/chalk/ui/kis_tool_freehand.cc
index 5885c433..bbe575d1 100644
--- a/chalk/ui/kis_tool_freehand.cc
+++ b/chalk/ui/kis_tool_freehand.cc
@@ -87,7 +87,7 @@ void KisToolFreehand::buttonPress(KisButtonPressEvent *e)
// People complain that they can't start brush strokes outside of the image boundaries.
// This makes sense, especially when combined with BUG:132759, so commenting out the
// next line makes sense.
- //if (!m_currentImage->bounds().tqcontains(e->pos().floorTQPoint())) return;
+ //if (!m_currentImage->bounds().contains(e->pos().floorTQPoint())) return;
initPaint(e);
paintAt(e->pos(), e->pressure(), e->xTilt(), e->yTilt());
@@ -309,7 +309,7 @@ void KisToolFreehand::paintOutline(const KisPoint& point) {
KisCanvasController *controller = m_subject->canvasController();
- if (currentImage() && !currentImage()->bounds().tqcontains(point.floorTQPoint())) {
+ if (currentImage() && !currentImage()->bounds().contains(point.floorTQPoint())) {
if (m_paintedOutline) {
controller->kiscanvas()->update();
m_paintedOutline = false;
diff --git a/chalk/ui/kis_tool_paint.cc b/chalk/ui/kis_tool_paint.cc
index d8d19f36..aa1bf7a7 100644
--- a/chalk/ui/kis_tool_paint.cc
+++ b/chalk/ui/kis_tool_paint.cc
@@ -244,7 +244,7 @@ void KisToolPaint::updateCompositeOpComboBox()
KisCompositeOpList compositeOps = device->colorSpace()->userVisiblecompositeOps();
m_cmbComposite->setCompositeOpList(compositeOps);
- if (compositeOps.tqfind(m_compositeOp) == compositeOps.end()) {
+ if (compositeOps.find(m_compositeOp) == compositeOps.end()) {
m_compositeOp = COMPOSITE_OVER;
}
m_cmbComposite->setCurrentItem(m_compositeOp);
diff --git a/chalk/ui/kis_view.cc b/chalk/ui/kis_view.cc
index e3500f97..0b288da5 100644
--- a/chalk/ui/kis_view.cc
+++ b/chalk/ui/kis_view.cc
@@ -2281,7 +2281,7 @@ void KisView::canvasGotButtonPressEvent(KisButtonPressEvent *e)
// m_currentGuide = 0;
//
// if ((e->state() & ~TQt::ShiftButton) == Qt::NoButton) {
-// KisGuideSP gd = mgr->tqfind(static_cast<TQ_INT32>(pt.x() / zoom()), static_cast<TQ_INT32>(pt.y() / zoom()), TQMAX(2.0, 2.0 / zoom()));
+// KisGuideSP gd = mgr->find(static_cast<TQ_INT32>(pt.x() / zoom()), static_cast<TQ_INT32>(pt.y() / zoom()), TQMAX(2.0, 2.0 / zoom()));
//
// if (gd) {
// m_currentGuide = gd;
@@ -3544,7 +3544,7 @@ bool KisView::eventFilter(TQObject *o, TQEvent *e)
mgr = img->guides();
if (e->type() == TQEvent::MouseMove && (me->state() & Qt::LeftButton)) {
- bool flag = tqgeometry().tqcontains(pt);
+ bool flag = tqgeometry().contains(pt);
KisGuideSP gd;
if (m_currentGuide == 0 && flag) {
diff --git a/chalk/ui/kobirdeyepanel.cpp b/chalk/ui/kobirdeyepanel.cpp
index 0cd835b1..34dd043f 100644
--- a/chalk/ui/kobirdeyepanel.cpp
+++ b/chalk/ui/kobirdeyepanel.cpp
@@ -362,23 +362,23 @@ KoBirdEyePanel::enumDragHandle KoBirdEyePanel::dragHandleAt(TQPoint p)
TQRect top = TQRect(m_visibleAreaInThumbnail.left()-1, m_visibleAreaInThumbnail.top()-1, m_visibleAreaInThumbnail.width()+2, 3);
TQRect bottom = TQRect(m_visibleAreaInThumbnail.left()-1, m_visibleAreaInThumbnail.bottom()-1, m_visibleAreaInThumbnail.width()+2, 3);
- if (left.tqcontains(p)) {
+ if (left.contains(p)) {
return DragHandleLeft;
}
- if (right.tqcontains(p)) {
+ if (right.contains(p)) {
return DragHandleRight;
}
- if (top.tqcontains(p)) {
+ if (top.contains(p)) {
return DragHandleTop;
}
- if (bottom.tqcontains(p)) {
+ if (bottom.contains(p)) {
return DragHandleBottom;
}
- if (m_visibleAreaInThumbnail.tqcontains(p)) {
+ if (m_visibleAreaInThumbnail.contains(p)) {
return DragHandleCentre;
}
@@ -403,7 +403,7 @@ void KoBirdEyePanel::handleMouseMove(TQPoint p)
break;
default:
case DragHandleNone:
- if (TQT_TQRECT_OBJECT(m_thumbnail.rect()).tqcontains(p)) {
+ if (TQT_TQRECT_OBJECT(m_thumbnail.rect()).contains(p)) {
cursor = TQt::PointingHandCursor;
} else {
cursor = TQt::arrowCursor;
@@ -462,7 +462,7 @@ void KoBirdEyePanel::handleMousePress(TQPoint p)
enumDragHandle dragHandle = dragHandleAt(p);
if (dragHandle == DragHandleNone) {
- if (TQT_TQRECT_OBJECT(m_thumbnail.rect()).tqcontains(p)) {
+ if (TQT_TQRECT_OBJECT(m_thumbnail.rect()).contains(p)) {
// Snap visible area centre to p and begin a centre drag.
diff --git a/chalk/ui/layerlist.cpp b/chalk/ui/layerlist.cpp
index 059d4e35..6f7cb4e2 100644
--- a/chalk/ui/layerlist.cpp
+++ b/chalk/ui/layerlist.cpp
@@ -681,7 +681,7 @@ void LayerList::contentsMouseDoubleClickEvent( TQMouseEvent *e )
super::contentsMouseDoubleClickEvent( e );
if( LayerItem *layer = static_cast<LayerItem*>( itemAt( contentsToViewport( e->pos() ) ) ) )
{
- if( !layer->iconsRect().tqcontains( layer->mapFromListView( e->pos() ) ) )
+ if( !layer->iconsRect().contains( layer->mapFromListView( e->pos() ) ) )
{
emit requestLayerProperties( layer );
emit requestLayerProperties( layer->id() );
@@ -867,7 +867,7 @@ void LayerItem::init()
LayerItem::~LayerItem()
{
- if (listView() && (listView()->activeLayer() == this || tqcontains(listView()->activeLayer())))
+ if (listView() && (listView()->activeLayer() == this || contains(listView()->activeLayer())))
listView()->setActiveLayer( static_cast<LayerItem*>( 0 ) );
delete d;
}
@@ -885,7 +885,7 @@ bool LayerItem::isFolder() const
return d->isFolder;
}
-bool LayerItem::tqcontains(const LayerItem *item)
+bool LayerItem::contains(const LayerItem *item)
{
TQListViewItemIterator it(this);
@@ -1180,7 +1180,7 @@ bool LayerItem::mousePressEvent( TQMouseEvent *e )
const TQRect ir = iconsRect(), tr = textRect();
- if( ir.tqcontains( e->pos() ) )
+ if( ir.contains( e->pos() ) )
{
const int iconWidth = iconSize().width();
int x = e->pos().x() - ir.left();
@@ -1201,7 +1201,7 @@ bool LayerItem::mousePressEvent( TQMouseEvent *e )
return true;
}
- else if( tr.tqcontains( e->pos() ) && isSelected() && !listView()->renameLineEdit()->isVisible() )
+ else if( tr.contains( e->pos() ) && isSelected() && !listView()->renameLineEdit()->isVisible() )
{
listView()->rename( this, 0 );
TQRect r( listView()->contentsToViewport( mapToListView( tr.topLeft() ) ), tr.size() );
diff --git a/chalk/ui/layerlist.h b/chalk/ui/layerlist.h
index 58c2a4bb..5c75b6b7 100644
--- a/chalk/ui/layerlist.h
+++ b/chalk/ui/layerlist.h
@@ -178,7 +178,7 @@ public:
// Returns true if this item is the given item or the tree rooted at
// this item contains the given item.
- bool tqcontains(const LayerItem *item);
+ bool contains(const LayerItem *item);
int id() const;
diff --git a/chalk/ui/squeezedcombobox.cpp b/chalk/ui/squeezedcombobox.cpp
index 96929450..1c58f1dd 100644
--- a/chalk/ui/squeezedcombobox.cpp
+++ b/chalk/ui/squeezedcombobox.cpp
@@ -76,7 +76,7 @@ SqueezedComboBox::~SqueezedComboBox()
delete m_timer;
}
-bool SqueezedComboBox::tqcontains( const TQString& _text ) const
+bool SqueezedComboBox::contains( const TQString& _text ) const
{
if ( _text.isEmpty() )
return false;
diff --git a/chalk/ui/squeezedcombobox.h b/chalk/ui/squeezedcombobox.h
index 66758335..0ca7bb41 100644
--- a/chalk/ui/squeezedcombobox.h
+++ b/chalk/ui/squeezedcombobox.h
@@ -97,7 +97,7 @@ public:
*/
virtual ~SqueezedComboBox();
- bool tqcontains(const TQString & text) const;
+ bool contains(const TQString & text) const;
/**
* This inserts a item to the list. See TQComboBox::insertItem()