diff options
Diffstat (limited to 'kexi/formeditor/widgetlibrary.cpp')
| -rw-r--r-- | kexi/formeditor/widgetlibrary.cpp | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/kexi/formeditor/widgetlibrary.cpp b/kexi/formeditor/widgetlibrary.cpp index 3d8607ba..c9f9bd9b 100644 --- a/kexi/formeditor/widgetlibrary.cpp +++ b/kexi/formeditor/widgetlibrary.cpp @@ -43,8 +43,8 @@ namespace KFormDesigner { class XMLGUIClient : public TQObject, public KXMLGUIClient { public: - XMLGUIClient(KXMLGUIClient* tqparent, const TQString& xmlFileName) - : TQObject(tqparent->actionCollection()), KXMLGUIClient(tqparent) + XMLGUIClient(KXMLGUIClient* parent, const TQString& xmlFileName) + : TQObject(parent->actionCollection()), KXMLGUIClient(parent) { setXMLFile( xmlFileName, true /*merge*/ ); } @@ -107,8 +107,8 @@ using namespace KFormDesigner; //------------------------------------------- -WidgetLibrary::WidgetLibrary(TQObject *tqparent, const TQStringList& supportedFactoryGroups) - : TQObject(tqparent) +WidgetLibrary::WidgetLibrary(TQObject *parent, const TQStringList& supportedFactoryGroups) + : TQObject(parent) , d(new WidgetLibraryPrivate()) { for (TQStringList::ConstIterator it = supportedFactoryGroups.constBegin(); @@ -138,7 +138,7 @@ WidgetLibrary::loadFactoryWidgets(WidgetFactory *f) WidgetFactory *parentFactory = d->factories[w->m_parentFactoryName]; if (!parentFactory) { kdWarning() << "WidgetLibrary::loadFactoryWidgets(): class '" << w->className() - << "' - no such tqparent factory '" << w->m_parentFactoryName << "'" << endl; + << "' - no such parent factory '" << w->m_parentFactoryName << "'" << endl; continue; } WidgetInfo* inheritedClass = parentFactory->m_classesByName[ w->m_inheritedClassName ]; @@ -319,7 +319,7 @@ WidgetLibrary::createXML() }*/ ActionList -WidgetLibrary::createWidgetActions(KXMLGUIClient* client, KActionCollection *tqparent, +WidgetLibrary::createWidgetActions(KXMLGUIClient* client, KActionCollection *parent, TQObject *receiver, const char *slot) { loadFactories(); @@ -340,7 +340,7 @@ WidgetLibrary::createWidgetActions(KXMLGUIClient* client, KActionCollection *tqp { LibActionWidget *a = new LibActionWidget(it.current(), it.current()->factory()->m_guiClient - ? it.current()->factory()->m_guiClient->actionCollection() : tqparent); + ? it.current()->factory()->m_guiClient->actionCollection() : parent); connect(a, TQT_SIGNAL(prepareInsert(const TQCString &)), receiver, slot); actions.append(a); } @@ -359,7 +359,7 @@ WidgetLibrary::addCustomWidgetActions(KActionCollection *col) } TQWidget* -WidgetLibrary::createWidget(const TQCString &classname, TQWidget *tqparent, const char *name, Container *c, +WidgetLibrary::createWidget(const TQCString &classname, TQWidget *parent, const char *name, Container *c, int options) { loadFactories(); @@ -367,12 +367,12 @@ WidgetLibrary::createWidget(const TQCString &classname, TQWidget *tqparent, cons if(!wclass) return 0; - TQWidget *widget = wclass->factory()->createWidget(wclass->className(), tqparent, name, c, options); + TQWidget *widget = wclass->factory()->createWidget(wclass->className(), parent, name, c, options); if (!widget) { //try to instantiate from inherited class if (wclass->inheritedClass()) widget = wclass->inheritedClass()->factory()->createWidget( - wclass->className(), tqparent, name, c, options); + wclass->className(), parent, name, c, options); if (!widget) return 0; } @@ -536,18 +536,18 @@ WidgetLibrary::iconName(const TQCString &classname) } bool -WidgetLibrary::saveSpecialProperty(const TQCString &classname, const TQString &name, const TQVariant &value, TQWidget *w, TQDomElement &parentNode, TQDomDocument &tqparent) +WidgetLibrary::saveSpecialProperty(const TQCString &classname, const TQString &name, const TQVariant &value, TQWidget *w, TQDomElement &parentNode, TQDomDocument &parent) { loadFactories(); WidgetInfo *wi = d->widgets.find(classname); if (!wi) return false; - if (wi->factory()->saveSpecialProperty(classname, name, value, w, parentNode, tqparent)) + if (wi->factory()->saveSpecialProperty(classname, name, value, w, parentNode, parent)) return true; //try from inherited class if (wi->inheritedClass()) - return wi->inheritedClass()->factory()->saveSpecialProperty(wi->className(), name, value, w, parentNode, tqparent); + return wi->inheritedClass()->factory()->saveSpecialProperty(wi->className(), name, value, w, parentNode, parent); return false; } @@ -648,7 +648,7 @@ TQString WidgetLibrary::propertyDescForName(WidgetInfo *winfo, const TQCString& if (winfo->m_parentFactoryName.isEmpty()) return TQString(); - //try in tqparent factory, if exists + //try in parent factory, if exists WidgetFactory *parentFactory = d->factories[winfo->m_parentFactoryName]; if (!parentFactory) return TQString(); @@ -666,7 +666,7 @@ TQString WidgetLibrary::propertyDescForValue(WidgetInfo *winfo, const TQCString& if (winfo->m_parentFactoryName.isEmpty()) return TQString(); - //try in tqparent factory, if exists + //try in parent factory, if exists WidgetFactory *parentFactory = d->factories[winfo->m_parentFactoryName]; if (!parentFactory) return TQString(); @@ -705,7 +705,7 @@ TQString WidgetLibrary::internalProperty(const TQCString& classname, const TQCSt } WidgetFactory::CreateWidgetOptions WidgetLibrary::showOrientationSelectionPopup( - const TQCString &classname, TQWidget* tqparent, const TQPoint& pos) + const TQCString &classname, TQWidget* parent, const TQPoint& pos) { loadFactories(); WidgetInfo *wclass = d->widgets[classname]; @@ -738,7 +738,7 @@ WidgetFactory::CreateWidgetOptions WidgetLibrary::showOrientationSelectionPopup( if (textVertical.isEmpty()) //default textVertical = i18n("InsertQt::Vertical Widget", "InsertQt::Vertical"); - KPopupMenu* popup = new KPopupMenu(tqparent, "orientationSelectionPopup"); + KPopupMenu* popup = new KPopupMenu(parent, "orientationSelectionPopup"); popup->insertTitle(SmallIcon(wclass->pixmap()), i18n("Insert Widget: %1").tqarg(wclass->name())); popup->insertItem(iconHorizontal, textHorizontal, 1); popup->insertItem(iconVertical, textVertical, 2); |