diff options
author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-08-10 06:08:18 +0000 |
---|---|---|
committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-08-10 06:08:18 +0000 |
commit | 330c33ab6f97b279737bf9527c9add7bb1475450 (patch) | |
tree | 85cb998d3077ae295d65944ebb4d0189fc660ead /lib/widgets/propeditor | |
parent | 093de0db4fea89b3f94a2359c6981f353d035eb7 (diff) | |
download | tdevelop-330c33ab6f97b279737bf9527c9add7bb1475450.tar.gz tdevelop-330c33ab6f97b279737bf9527c9add7bb1475450.zip |
rename the following methods:
tqfind find
tqreplace replace
tqcontains contains
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdevelop@1246075 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'lib/widgets/propeditor')
-rw-r--r-- | lib/widgets/propeditor/Mainpage.dox | 2 | ||||
-rw-r--r-- | lib/widgets/propeditor/pcombobox.cpp | 2 | ||||
-rw-r--r-- | lib/widgets/propeditor/propertyeditor.cpp | 6 | ||||
-rw-r--r-- | lib/widgets/propeditor/propertylist.cpp | 26 | ||||
-rw-r--r-- | lib/widgets/propeditor/propertylist.h | 2 | ||||
-rw-r--r-- | lib/widgets/propeditor/propertymachinefactory.cpp | 2 | ||||
-rw-r--r-- | lib/widgets/propeditor/qeditlistbox.cpp | 4 |
7 files changed, 22 insertions, 22 deletions
diff --git a/lib/widgets/propeditor/Mainpage.dox b/lib/widgets/propeditor/Mainpage.dox index 1f98b4ac..6bc81be0 100644 --- a/lib/widgets/propeditor/Mainpage.dox +++ b/lib/widgets/propeditor/Mainpage.dox @@ -56,7 +56,7 @@ called @ref PropertyLib::PropertyMachineFactory. Static function @ref PropertyLi can be used to obtain the reference to the factory instance. Factory creates and returns so-called @ref PropertyLib::Machine for each registered property type (either predefined or user defined). -@ref PropertyLib::Machine tqcontains @ref PropertyLib::PropertyWidget and a list of "detailed" machines. +@ref PropertyLib::Machine contains @ref PropertyLib::PropertyWidget and a list of "detailed" machines. Usually only property widget is necessary for a property but there are complex properties like "Font" for example. We would like to see separate editors for font family, size, etc. and a button to choose all of these in the dialog. diff --git a/lib/widgets/propeditor/pcombobox.cpp b/lib/widgets/propeditor/pcombobox.cpp index 18cad9b6..7732866c 100644 --- a/lib/widgets/propeditor/pcombobox.cpp +++ b/lib/widgets/propeditor/pcombobox.cpp @@ -58,7 +58,7 @@ void PComboBox::fillBox() TQVariant PComboBox::value() const { - TQMap<TQString, TQVariant>::const_iterator it = m_valueList.tqfind(m_edit->currentText()); + TQMap<TQString, TQVariant>::const_iterator it = m_valueList.find(m_edit->currentText()); if (it == m_valueList.end()) return TQVariant(""); return TQVariant(it.data()); diff --git a/lib/widgets/propeditor/propertyeditor.cpp b/lib/widgets/propeditor/propertyeditor.cpp index b51ff4fc..c7e5523c 100644 --- a/lib/widgets/propeditor/propertyeditor.cpp +++ b/lib/widgets/propeditor/propertyeditor.cpp @@ -263,7 +263,7 @@ void PropertyEditor::addChildProperties(PropertyItem *tqparent) { MultiProperty *prop = tqparent->property(); //force machine creation to get detailed properties appended to current multiproperty - if ( !m_registeredForType.tqcontains(prop->name()) + if ( !m_registeredForType.contains(prop->name()) && (PropertyMachineFactory::getInstance()->hasDetailedEditors(prop->type())) ) { //FIXME: find better solution @@ -328,10 +328,10 @@ void PropertyEditor::propertyChanged(MultiProperty *property, const TQVariant &v emit changed(); -/* if (m_list->tqcontains(name)) +/* if (m_list->contains(name)) { (*m_list)[name]->setValue(value, false); -// else if (m_detailedList->tqcontains(*/ +// else if (m_detailedList->contains(*/ } void PropertyEditor::hideEditor() diff --git a/lib/widgets/propeditor/propertylist.cpp b/lib/widgets/propeditor/propertylist.cpp index 20feeb43..b831e6d2 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.tqcontains(name)) + if (m_list.contains(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.tqcontains(name)) + if (m_list.contains(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.tqcontains(property->name()) ) + if ( m_list.contains(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.tqcontains(property->name())) + if (m_list.contains(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.tqcontains(name)) + if (m_list.contains(name)) { TQString group = m_groupOfProperty[m_list[name]]; removeFromGroup(m_list[name]); @@ -162,7 +162,7 @@ void PropertyList::addToGroup(const TQString &group, MultiProperty *property) return; //do not add same property to the group twice - if (m_groupOfProperty.tqcontains(property) && (m_groupOfProperty[property] == group)) + if (m_groupOfProperty.contains(property) && (m_groupOfProperty[property] == group)) return; TQPair<TQString, TQValueList<TQString> > *groupPair = 0; @@ -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.tqcontains(property->name())) + if (!groupPair->second.contains(property->name())) groupPair->second.append(property->name()); m_groupOfProperty[property] = group; @@ -217,16 +217,16 @@ void PropertyList::clear( ) removeProperty(it.key()); } -bool PropertyList::tqcontains( const TQString & name ) +bool PropertyList::contains( const TQString & name ) { - if (m_list.tqcontains(name)) + if (m_list.contains(name)) return true; return false; } TQPtrList<Property> PropertyList::properties(const TQString &name) { - if (m_list.tqcontains(name)) + if (m_list.contains(name)) return m_list[name]->list; return TQPtrList<Property>(); } @@ -309,9 +309,9 @@ void PropertyBuffer::intersect(const PropertyList *list) for (TQMap<TQString, MultiProperty*>::iterator it = m_list.begin(); it != m_list.end(); ++it) { // qWarning("intersect:: for mp = %s", it.data()->name().ascii()); - if (list->m_list.tqcontains(it.key())) + if (list->m_list.contains(it.key())) { -/* qWarning("intersect:: list tqcontains %s", it.key().ascii()); +/* qWarning("intersect:: list contains %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 (!tqcontains(propertyName)) + if (!contains(propertyName)) return; MultiProperty mp(property); diff --git a/lib/widgets/propeditor/propertylist.h b/lib/widgets/propeditor/propertylist.h index c549048b..94baf50d 100644 --- a/lib/widgets/propeditor/propertylist.h +++ b/lib/widgets/propeditor/propertylist.h @@ -118,7 +118,7 @@ public: /**Clears the list of properties.*/ virtual void clear(); /**Returns true if the list of properties contains property with given name.*/ - virtual bool tqcontains(const TQString &name); + virtual bool contains(const TQString &name); /**The list of properties with given name.*/ TQPtrList<Property> properties(const TQString &name); diff --git a/lib/widgets/propeditor/propertymachinefactory.cpp b/lib/widgets/propeditor/propertymachinefactory.cpp index cccc3a37..e8390e18 100644 --- a/lib/widgets/propeditor/propertymachinefactory.cpp +++ b/lib/widgets/propeditor/propertymachinefactory.cpp @@ -76,7 +76,7 @@ Machine *PropertyMachineFactory::machineForProperty(MultiProperty *property) TQString propertyName = property->name(); TQMap<TQString, TQVariant> valueList = property->valueList(); - if (m_registeredForType.tqcontains(propertyName)) + if (m_registeredForType.contains(propertyName)) return (*m_registeredForType[propertyName])(); switch (type) diff --git a/lib/widgets/propeditor/qeditlistbox.cpp b/lib/widgets/propeditor/qeditlistbox.cpp index 565786f0..0c3119da 100644 --- a/lib/widgets/propeditor/qeditlistbox.cpp +++ b/lib/widgets/propeditor/qeditlistbox.cpp @@ -185,7 +185,7 @@ void QEditListBox::typedSomething(const TQString& text) else { StringComparisonMode mode = (StringComparisonMode) (ExactMatch | CaseSensitive ); - bool enable = (m_listBox->tqfindItem( text, mode ) == 0L); + bool enable = (m_listBox->findItem( text, mode ) == 0L); servNewButton->setEnabled( enable ); } } @@ -256,7 +256,7 @@ void QEditListBox::addItem() else { StringComparisonMode mode = (StringComparisonMode) (ExactMatch | CaseSensitive ); - alreadyInList =(m_listBox->tqfindItem(currentTextLE, mode) != 0); + alreadyInList =(m_listBox->findItem(currentTextLE, mode) != 0); } } |