diff options
Diffstat (limited to 'kexi/formeditor/widgetlibrary.cpp')
| -rw-r--r-- | kexi/formeditor/widgetlibrary.cpp | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/kexi/formeditor/widgetlibrary.cpp b/kexi/formeditor/widgetlibrary.cpp index 265153e7..ac663f8b 100644 --- a/kexi/formeditor/widgetlibrary.cpp +++ b/kexi/formeditor/widgetlibrary.cpp @@ -135,13 +135,13 @@ WidgetLibrary::loadFactoryWidgets(WidgetFactory *f) continue; //this class is hidden // check if we want to inherit a widget from a different factory if (!w->m_parentFactoryName.isEmpty() && !w->m_inheritedClassName.isEmpty()) { - WidgetFactory *tqparentFactory = d->factories[w->m_parentFactoryName]; - if (!tqparentFactory) { + WidgetFactory *parentFactory = d->factories[w->m_parentFactoryName]; + if (!parentFactory) { kdWarning() << "WidgetLibrary::loadFactoryWidgets(): class '" << w->className() << "' - no such tqparent factory '" << w->m_parentFactoryName << "'" << endl; continue; } - WidgetInfo* inheritedClass = tqparentFactory->m_classesByName[ w->m_inheritedClassName ]; + WidgetInfo* inheritedClass = parentFactory->m_classesByName[ w->m_inheritedClassName ]; if (!inheritedClass) { kdWarning() << "WidgetLibrary::loadFactoryWidgets(): class '" << w->m_inheritedClassName << "' - no such class to inherit in factory '" << w->m_parentFactoryName << "'" << endl; @@ -536,18 +536,18 @@ WidgetLibrary::iconName(const TQCString &classname) } bool -WidgetLibrary::saveSpecialProperty(const TQCString &classname, const TQString &name, const TQVariant &value, TQWidget *w, TQDomElement &tqparentNode, TQDomDocument &tqparent) +WidgetLibrary::saveSpecialProperty(const TQCString &classname, const TQString &name, const TQVariant &value, TQWidget *w, TQDomElement &parentNode, TQDomDocument &tqparent) { loadFactories(); WidgetInfo *wi = d->widgets.tqfind(classname); if (!wi) return false; - if (wi->factory()->saveSpecialProperty(classname, name, value, w, tqparentNode, tqparent)) + if (wi->factory()->saveSpecialProperty(classname, name, value, w, parentNode, tqparent)) return true; //try from inherited class if (wi->inheritedClass()) - return wi->inheritedClass()->factory()->saveSpecialProperty(wi->className(), name, value, w, tqparentNode, tqparent); + return wi->inheritedClass()->factory()->saveSpecialProperty(wi->className(), name, value, w, parentNode, tqparent); return false; } @@ -649,11 +649,11 @@ TQString WidgetLibrary::propertyDescForName(WidgetInfo *winfo, const TQCString& return TQString(); //try in tqparent factory, if exists - WidgetFactory *tqparentFactory = d->factories[winfo->m_parentFactoryName]; - if (!tqparentFactory) + WidgetFactory *parentFactory = d->factories[winfo->m_parentFactoryName]; + if (!parentFactory) return TQString(); - return tqparentFactory->propertyDescForName(propertyName); + return parentFactory->propertyDescForName(propertyName); } TQString WidgetLibrary::propertyDescForValue(WidgetInfo *winfo, const TQCString& name) @@ -667,11 +667,11 @@ TQString WidgetLibrary::propertyDescForValue(WidgetInfo *winfo, const TQCString& return TQString(); //try in tqparent factory, if exists - WidgetFactory *tqparentFactory = d->factories[winfo->m_parentFactoryName]; - if (!tqparentFactory) + WidgetFactory *parentFactory = d->factories[winfo->m_parentFactoryName]; + if (!parentFactory) return TQString(); - return tqparentFactory->propertyDescForValue(name); + return parentFactory->propertyDescForValue(name); } void WidgetLibrary::setPropertyOptions( WidgetPropertySet& buf, const WidgetInfo& winfo, TQWidget* w ) @@ -681,10 +681,10 @@ void WidgetLibrary::setPropertyOptions( WidgetPropertySet& buf, const WidgetInfo winfo.factory()->setPropertyOptions(buf, winfo, w); if (winfo.m_parentFactoryName.isEmpty()) return; - WidgetFactory *tqparentFactory = d->factories[winfo.m_parentFactoryName]; - if (!tqparentFactory) + WidgetFactory *parentFactory = d->factories[winfo.m_parentFactoryName]; + if (!parentFactory) return; - tqparentFactory->setPropertyOptions(buf, winfo, w); + parentFactory->setPropertyOptions(buf, winfo, w); } WidgetFactory* WidgetLibrary::factory(const char* factoryName) const |