diff options
Diffstat (limited to 'kexi/plugins/macros')
5 files changed, 15 insertions, 15 deletions
diff --git a/kexi/plugins/macros/kexipart/keximacroerrorbase.ui b/kexi/plugins/macros/kexipart/keximacroerrorbase.ui index cc3b6754..d44b8aee 100644 --- a/kexi/plugins/macros/kexipart/keximacroerrorbase.ui +++ b/kexi/plugins/macros/kexipart/keximacroerrorbase.ui @@ -206,7 +206,7 @@ <slot>close()</slot> </connection> </connections> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>klistview.h</includehint> </includehints> diff --git a/kexi/plugins/macros/kexipart/keximacroproperty.cpp b/kexi/plugins/macros/kexipart/keximacroproperty.cpp index 578ba69b..aed4a9bd 100644 --- a/kexi/plugins/macros/kexipart/keximacroproperty.cpp +++ b/kexi/plugins/macros/kexipart/keximacroproperty.cpp @@ -96,7 +96,7 @@ void KexiMacroProperty::init() m_property->setType( KEXIMACRO_PROPERTYEDITORTYPE ); // use our own propertytype } -KoProperty::Property* KexiMacroProperty::tqparentProperty() const +KoProperty::Property* KexiMacroProperty::parentProperty() const { return m_property; } @@ -178,15 +178,15 @@ KoProperty::CustomProperty* KexiMacroPropertyFactory::createCustomProperty(KoPro kdDebug()<<"KexiMacroPropertyFactory::createCustomProperty tqparent="<<tqparent->name()<<endl; KoProperty::CustomProperty* customproperty = tqparent->customProperty(); - KexiMacroProperty* tqparentcustomproperty = dynamic_cast<KexiMacroProperty*>(customproperty); - if(! tqparentcustomproperty) { + KexiMacroProperty* parentcustomproperty = dynamic_cast<KexiMacroProperty*>(customproperty); + if(! parentcustomproperty) { kdWarning() << "KexiMacroPropertyFactory::createCustomProperty() tqparent=" << tqparent->name() << " has an invalid customproperty." << endl; return 0; } - KSharedPtr<KoMacro::MacroItem> macroitem = tqparentcustomproperty->macroItem(); + KSharedPtr<KoMacro::MacroItem> macroitem = parentcustomproperty->macroItem(); Q_ASSERT( macroitem.data() != 0 ); - const TQString name = tqparentcustomproperty->name(); + const TQString name = parentcustomproperty->name(); Q_ASSERT(! name.isEmpty()); KexiMacroProperty* macroproperty = new KexiMacroProperty(tqparent, macroitem, name); @@ -297,14 +297,14 @@ class EditListBoxItem : public ListBoxItem kdWarning() << "EditListBoxItem::EditListBoxItem() Skipped cause there exists no action for macroproperty=" << m_macroproperty->name() << endl; return; } - KoProperty::Property* tqparentproperty = m_macroproperty->tqparentProperty(); - if(! tqparentproperty) { - kdWarning() << "EditListBoxItem::EditListBoxItem() No tqparentproperty defined" << endl; + KoProperty::Property* parentproperty = m_macroproperty->parentProperty(); + if(! parentproperty) { + kdWarning() << "EditListBoxItem::EditListBoxItem() No parentproperty defined" << endl; return; } KSharedPtr<KoMacro::Variable> variable = m_macroproperty->variable(); if(! variable.data()) { - kdWarning() << "EditListBoxItem::EditListBoxItem() No variable defined for property=" << tqparentproperty->name() << endl; + kdWarning() << "EditListBoxItem::EditListBoxItem() No variable defined for property=" << parentproperty->name() << endl; return; } @@ -342,7 +342,7 @@ class EditListBoxItem : public ListBoxItem variable->text(), // caption TQString(), // description type, // type - 0 //tqparentproperty // tqparent + 0 //parentproperty // tqparent ); m_widget = KoProperty::FactoryManager::self()->createWidgetForProperty(m_prop); diff --git a/kexi/plugins/macros/kexipart/keximacroproperty.h b/kexi/plugins/macros/kexipart/keximacroproperty.h index b1c256e9..b80857d1 100644 --- a/kexi/plugins/macros/kexipart/keximacroproperty.h +++ b/kexi/plugins/macros/kexipart/keximacroproperty.h @@ -52,7 +52,7 @@ class KexiMacroProperty virtual ~KexiMacroProperty(); /** @return the tqparent @a KoProperty::Property instance. */ - KoProperty::Property* tqparentProperty() const; + KoProperty::Property* parentProperty() const; /** This function is called by @ref KoProperty::Property::setValue() when a custom property is set. diff --git a/kexi/plugins/macros/kexipart/keximacrotextview.cpp b/kexi/plugins/macros/kexipart/keximacrotextview.cpp index deec9633..11d9cee5 100644 --- a/kexi/plugins/macros/kexipart/keximacrotextview.cpp +++ b/kexi/plugins/macros/kexipart/keximacrotextview.cpp @@ -82,7 +82,7 @@ bool KexiMacroTextView::loadData() tristate KexiMacroTextView::storeData(bool /*dontAsk*/) { - kexipluginsdbg << TQString("KexiMacroTextView::storeData() %1 [%2]\n%3").tqarg(tqparentDialog()->partItem()->name()).tqarg(tqparentDialog()->id()).tqarg(d->editor->text()) << endl; + kexipluginsdbg << TQString("KexiMacroTextView::storeData() %1 [%2]\n%3").tqarg(parentDialog()->partItem()->name()).tqarg(parentDialog()->id()).tqarg(d->editor->text()) << endl; return storeDataBlock( d->editor->text() ); } diff --git a/kexi/plugins/macros/kexipart/keximacroview.cpp b/kexi/plugins/macros/kexipart/keximacroview.cpp index 507764a7..e13483c1 100644 --- a/kexi/plugins/macros/kexipart/keximacroview.cpp +++ b/kexi/plugins/macros/kexipart/keximacroview.cpp @@ -139,7 +139,7 @@ KexiDB::SchemaData* KexiMacroView::storeNewData(const KexiDB::SchemaData& sdata, if(! storeData()) { kexipluginsdbg << "KexiMacroView::storeNewData() Failed to store the data." << endl; //failure: remove object's schema data to avoid garbage - KexiDB::Connection *conn = tqparentDialog()->mainWin()->project()->dbConnection(); + KexiDB::Connection *conn = parentDialog()->mainWin()->project()->dbConnection(); conn->removeObject( schema->id() ); delete schema; return 0; @@ -154,7 +154,7 @@ tristate KexiMacroView::storeData(bool /*dontAsk*/) TQDomElement macroelem = d->macro->toXML(); domdoc.appendChild(macroelem); const TQString xml = domdoc.toString(2); - const TQString name = TQString("%1 [%2]").tqarg(tqparentDialog()->partItem()->name()).tqarg(tqparentDialog()->id()); + const TQString name = TQString("%1 [%2]").tqarg(parentDialog()->partItem()->name()).tqarg(parentDialog()->id()); kexipluginsdbg << TQString("KexiMacroView::storeData %1\n%2").tqarg(name).tqarg(xml) << endl; return storeDataBlock(xml); } |