From 48d4a26399959121f33d2bc3bfe51c7827b654fc Mon Sep 17 00:00:00 2001 From: tpearson Date: Tue, 14 Jun 2011 16:45:05 +0000 Subject: TQt4 port kdevelop This enables compilation under both Qt3 and Qt4 git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdevelop@1236710 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- lib/widgets/propeditor/propertylist.cpp | 36 ++++++++++++++++----------------- 1 file changed, 18 insertions(+), 18 deletions(-) (limited to 'lib/widgets/propeditor/propertylist.cpp') diff --git a/lib/widgets/propeditor/propertylist.cpp b/lib/widgets/propeditor/propertylist.cpp index 491c2ebb..20feeb43 100644 --- a/lib/widgets/propeditor/propertylist.cpp +++ b/lib/widgets/propeditor/propertylist.cpp @@ -41,7 +41,7 @@ PropertyList::~PropertyList() MultiProperty *PropertyList::operator[](const TQString &name) { - if (m_list.contains(name)) + if (m_list.tqcontains(name)) return m_list[name]; else return new MultiProperty(this); @@ -49,7 +49,7 @@ MultiProperty *PropertyList::operator[](const TQString &name) MultiProperty *PropertyList::property( const TQString &name ) { - if (m_list.contains(name)) + if (m_list.tqcontains(name)) return m_list[name]; else return new MultiProperty(this); @@ -60,7 +60,7 @@ void PropertyList::addProperty(Property *property) if (property == 0) return; MultiProperty *mp = 0; - if ( m_list.contains(property->name()) ) + if ( m_list.tqcontains(property->name()) ) { mp = m_list[property->name()]; mp->addProperty(property); @@ -79,7 +79,7 @@ void PropertyList::addProperty(const TQString &group, Property *property) return; MultiProperty *mp = 0; - if (m_list.contains(property->name())) + if (m_list.tqcontains(property->name())) { mp = m_list[property->name()]; mp->addProperty(property); @@ -119,7 +119,7 @@ void PropertyList::removeProperty(Property *property) void PropertyList::removeProperty(const TQString &name) { - if (m_list.contains(name)) + if (m_list.tqcontains(name)) { TQString group = m_groupOfProperty[m_list[name]]; removeFromGroup(m_list[name]); @@ -146,7 +146,7 @@ void PropertyList::removeProperty(const TQString &name) } } -const TQValueList > >& PropertyList::propertiesOfGroup() const +const TQValueList > >& PropertyList::propertiesOfGroup() const { return m_propertiesOfGroup; } @@ -162,11 +162,11 @@ void PropertyList::addToGroup(const TQString &group, MultiProperty *property) return; //do not add same property to the group twice - if (m_groupOfProperty.contains(property) && (m_groupOfProperty[property] == group)) + if (m_groupOfProperty.tqcontains(property) && (m_groupOfProperty[property] == group)) return; - QPair > *groupPair = 0; - for(TQValueList > >::iterator it = m_propertiesOfGroup.begin(); + TQPair > *groupPair = 0; + for(TQValueList > >::iterator it = m_propertiesOfGroup.begin(); it != m_propertiesOfGroup.end(); ++it) { if ((*it).first == group) @@ -177,7 +177,7 @@ void PropertyList::addToGroup(const TQString &group, MultiProperty *property) } if (groupPair == 0) { - groupPair = new QPair >(); + groupPair = new TQPair >(); groupPair->first = group; groupPair->second.append(property->name()); m_propertiesOfGroup.append(*groupPair); @@ -185,7 +185,7 @@ void PropertyList::addToGroup(const TQString &group, MultiProperty *property) return; } //check if group already contains property with the same name - if (!groupPair->second.contains(property->name())) + if (!groupPair->second.tqcontains(property->name())) groupPair->second.append(property->name()); m_groupOfProperty[property] = group; @@ -196,7 +196,7 @@ void PropertyList::removeFromGroup(MultiProperty *property) TQString group = m_groupOfProperty[property]; // qWarning("removeFromGroup group=%s", group.ascii()); - for(TQValueList > >::iterator it = m_propertiesOfGroup.begin(); + for(TQValueList > >::iterator it = m_propertiesOfGroup.begin(); it != m_propertiesOfGroup.end(); ++it) { // qWarning("removeFromGroup checking %s", (*it).first.ascii()); @@ -217,16 +217,16 @@ void PropertyList::clear( ) removeProperty(it.key()); } -bool PropertyList::contains( const TQString & name ) +bool PropertyList::tqcontains( const TQString & name ) { - if (m_list.contains(name)) + if (m_list.tqcontains(name)) return true; return false; } TQPtrList PropertyList::properties(const TQString &name) { - if (m_list.contains(name)) + if (m_list.tqcontains(name)) return m_list[name]->list; return TQPtrList(); } @@ -309,9 +309,9 @@ void PropertyBuffer::intersect(const PropertyList *list) for (TQMap::iterator it = m_list.begin(); it != m_list.end(); ++it) { // qWarning("intersect:: for mp = %s", it.data()->name().ascii()); - if (list->m_list.contains(it.key())) + if (list->m_list.tqcontains(it.key())) { -/* qWarning("intersect:: list contains %s", it.key().ascii()); +/* qWarning("intersect:: list tqcontains %s", it.key().ascii()); if ( (*(it.data()) == *(list->m_list[it.key()]))) qWarning("intersect:: equal properties"); else @@ -334,7 +334,7 @@ void PropertyBuffer::intersectedValueChanged(Property *property) { // qWarning("PropertyBuffer::intersectedValueChanged"); TQString propertyName = property->name(); - if (!contains(propertyName)) + if (!tqcontains(propertyName)) return; MultiProperty mp(property); -- cgit v1.2.1