summaryrefslogtreecommitdiffstats
path: root/kexi/plugins/macros/kexipart
diff options
context:
space:
mode:
Diffstat (limited to 'kexi/plugins/macros/kexipart')
-rw-r--r--kexi/plugins/macros/kexipart/keximacrodesignview.cpp26
-rw-r--r--kexi/plugins/macros/kexipart/keximacrodesignview.h4
-rw-r--r--kexi/plugins/macros/kexipart/keximacroerror.cpp8
-rw-r--r--kexi/plugins/macros/kexipart/keximacroerror.h2
-rw-r--r--kexi/plugins/macros/kexipart/keximacropart.cpp2
-rw-r--r--kexi/plugins/macros/kexipart/keximacroproperty.cpp42
-rw-r--r--kexi/plugins/macros/kexipart/keximacroproperty.h8
-rw-r--r--kexi/plugins/macros/kexipart/keximacroview.cpp6
-rw-r--r--kexi/plugins/macros/kexipart/keximacroview.h2
9 files changed, 50 insertions, 50 deletions
diff --git a/kexi/plugins/macros/kexipart/keximacrodesignview.cpp b/kexi/plugins/macros/kexipart/keximacrodesignview.cpp
index 5406e8ca..dd8b9a92 100644
--- a/kexi/plugins/macros/kexipart/keximacrodesignview.cpp
+++ b/kexi/plugins/macros/kexipart/keximacrodesignview.cpp
@@ -137,7 +137,7 @@ KexiMacroDesignView::KexiMacroDesignView(KexiMainWindow *mainwin, TQWidget *pare
TQStringList actionnames = KoMacro::Manager::self()->actionNames();
TQStringList::ConstIterator it, end( actionnames.constEnd() );
for( it = actionnames.constBegin(); it != end; ++it) {
- KSharedPtr<KoMacro::Action> action = KoMacro::Manager::self()->action(*it);
+ TDESharedPtr<KoMacro::Action> action = KoMacro::Manager::self()->action(*it);
items.append( action->text() );
}
@@ -218,7 +218,7 @@ void KexiMacroDesignView::updateData()
d->tabledata->append(tableitem);
}
// Set the action-column.
- KSharedPtr<KoMacro::Action> action = (*it)->action();
+ TDESharedPtr<KoMacro::Action> action = (*it)->action();
if(action.data()) {
int i = actionnames.findIndex( action->name() );
if(i >= 0) {
@@ -273,11 +273,11 @@ void KexiMacroDesignView::beforeCellChanged(KexiTableItem* item, int colnum, TQV
// If the rowindex doesn't exists yet, we need to append new
// items till we are able to access the item we like to use.
for(int i = macro()->items().count(); i <= rowindex; i++) {
- macro()->addItem( KSharedPtr<KoMacro::MacroItem>( new KoMacro::MacroItem() ) );
+ macro()->addItem( TDESharedPtr<KoMacro::MacroItem>( new KoMacro::MacroItem() ) );
}
// Get the matching MacroItem.
- KSharedPtr<KoMacro::MacroItem> macroitem = macro()->items()[rowindex];
+ TDESharedPtr<KoMacro::MacroItem> macroitem = macro()->items()[rowindex];
if(! macroitem.data()) {
kdWarning() << "KexiMacroDesignView::beforeCellChanged() Invalid item for rowindex=" << rowindex << endl;
return;
@@ -293,7 +293,7 @@ void KexiMacroDesignView::beforeCellChanged(KexiTableItem* item, int colnum, TQV
TQStringList actionnames = KoMacro::Manager::self()->actionNames();
actionname = actionnames[ selectedindex - 1 ]; // first item is empty
}
- KSharedPtr<KoMacro::Action> action = KoMacro::Manager::self()->action(actionname);
+ TDESharedPtr<KoMacro::Action> action = KoMacro::Manager::self()->action(actionname);
macroitem->setAction(action);
updateProperties(d->propertyset->currentRow(), d->propertyset->currentPropertySet(), macroitem);
propertySetReloaded(true);
@@ -329,7 +329,7 @@ void KexiMacroDesignView::rowInserted(KexiTableItem*, uint row, bool)
// need to do anything yet cause the new item will be handled on
// beforeCellChanged() anyway.
kdDebug() << "KexiMacroDesignView::rowInserted() Inserting new MacroItem" << endl;
- KSharedPtr<KoMacro::MacroItem> macroitem = KSharedPtr<KoMacro::MacroItem>( new KoMacro::MacroItem() );
+ TDESharedPtr<KoMacro::MacroItem> macroitem = TDESharedPtr<KoMacro::MacroItem>( new KoMacro::MacroItem() );
KoMacro::MacroItem::List::Iterator it = macroitems.at(row);
macroitems.insert(it, macroitem);
}
@@ -347,7 +347,7 @@ void KexiMacroDesignView::rowDeleted()
macroitems.remove( macroitems.at(rowindex) );
}
-bool KexiMacroDesignView::updateSet(KoProperty::Set* set, KSharedPtr<KoMacro::MacroItem> macroitem, const TQString& variablename)
+bool KexiMacroDesignView::updateSet(KoProperty::Set* set, TDESharedPtr<KoMacro::MacroItem> macroitem, const TQString& variablename)
{
kdDebug() << "KexiMacroDesignView::updateSet() variablename=" << variablename << endl;
KoProperty::Property* property = KexiMacroProperty::createProperty(macroitem, variablename);
@@ -357,7 +357,7 @@ bool KexiMacroDesignView::updateSet(KoProperty::Set* set, KSharedPtr<KoMacro::Ma
return true;
}
-void KexiMacroDesignView::updateProperties(int row, KoProperty::Set* set, KSharedPtr<KoMacro::MacroItem> macroitem)
+void KexiMacroDesignView::updateProperties(int row, KoProperty::Set* set, TDESharedPtr<KoMacro::MacroItem> macroitem)
{
kdDebug() << "KexiMacroDesignView::updateProperties() row=" << row << endl;
@@ -365,7 +365,7 @@ void KexiMacroDesignView::updateProperties(int row, KoProperty::Set* set, KShare
return; // ignore invalid rows and avoid infinite recursion.
}
- KSharedPtr<KoMacro::Action> action = macroitem->action();
+ TDESharedPtr<KoMacro::Action> action = macroitem->action();
if(! action.data()) {
// don't display a propertyset if there is no action defined.
d->propertyset->remove(row);
@@ -395,7 +395,7 @@ void KexiMacroDesignView::updateProperties(int row, KoProperty::Set* set, KShare
TQStringList varnames = action->variableNames();
for(TQStringList::Iterator it = varnames.begin(); it != varnames.end(); ++it) {
if(updateSet(set, macroitem, *it)) {
- KSharedPtr<KoMacro::Variable> variable = macroitem->variable(*it, true);
+ TDESharedPtr<KoMacro::Variable> variable = macroitem->variable(*it, true);
kdDebug()<<"KexiMacroDesignView::updateProperties() name=" << *it << " variable=" << variable->variant().toString() << endl;
#if 0
macroitem->setVariable(*it, variable);
@@ -428,7 +428,7 @@ void KexiMacroDesignView::propertyChanged(KoProperty::Set& set, KoProperty::Prop
setDirty();
if(reload) {
// The MacroItem which should be changed.
- KSharedPtr<KoMacro::MacroItem> macroitem = macro()->items()[row];
+ TDESharedPtr<KoMacro::MacroItem> macroitem = macro()->items()[row];
// Update the properties.
updateProperties(row, &set, macroitem);
}
@@ -442,11 +442,11 @@ void KexiMacroDesignView::propertyChanged(KoProperty::Set& set, KoProperty::Prop
*/
/*
- TQStringList dirtyvarnames = macroitem->setVariable(name, KSharedPtr<KoMacro::Variable>(pv));
+ TQStringList dirtyvarnames = macroitem->setVariable(name, TDESharedPtr<KoMacro::Variable>(pv));
bool dirty = false;
bool reload = false;
for(TQStringList::Iterator it = dirtyvarnames.begin(); it != dirtyvarnames.end(); ++it) {
- KSharedPtr<KoMacro::Variable> variable = macroitem->variable(*it);
+ TDESharedPtr<KoMacro::Variable> variable = macroitem->variable(*it);
if(! variable.data()) {
kdDebug() << "KexiMacroDesignView::propertyChanged() name=" << name << " it=" << *it << " skipped cause such a variable is not known." << endl;
continue;
diff --git a/kexi/plugins/macros/kexipart/keximacrodesignview.h b/kexi/plugins/macros/kexipart/keximacrodesignview.h
index eaa64f37..c23e31f9 100644
--- a/kexi/plugins/macros/kexipart/keximacrodesignview.h
+++ b/kexi/plugins/macros/kexipart/keximacrodesignview.h
@@ -118,13 +118,13 @@ class KexiMacroDesignView : public KexiMacroView
* Update the \a KoProperty::Set set with the passed \a KoMacro::MacroItem
* \p item and the variablename \p variablename .
*/
- bool updateSet(KoProperty::Set* set, KSharedPtr<KoMacro::MacroItem> item, const TQString& variablename);
+ bool updateSet(KoProperty::Set* set, TDESharedPtr<KoMacro::MacroItem> item, const TQString& variablename);
/**
* Update the properties of the \a KoProperty::Set \p set at
* row-number \p row with the \a KoMacro::MacroItem \p macroitem .
*/
- void updateProperties(int row, KoProperty::Set* set, KSharedPtr<KoMacro::MacroItem> macroitem);
+ void updateProperties(int row, KoProperty::Set* set, TDESharedPtr<KoMacro::MacroItem> macroitem);
};
#endif
diff --git a/kexi/plugins/macros/kexipart/keximacroerror.cpp b/kexi/plugins/macros/kexipart/keximacroerror.cpp
index 1b23fa50..6c35e8d7 100644
--- a/kexi/plugins/macros/kexipart/keximacroerror.cpp
+++ b/kexi/plugins/macros/kexipart/keximacroerror.cpp
@@ -34,7 +34,7 @@ class KexiMacroError::Private
{
public:
KexiMainWindow* const mainwin;
- KSharedPtr<KoMacro::Context> context;
+ TDESharedPtr<KoMacro::Context> context;
Private(KexiMainWindow* const m, KoMacro::Context* const c)
: mainwin(m)
@@ -43,7 +43,7 @@ class KexiMacroError::Private
}
};
-KexiMacroError::KexiMacroError(KexiMainWindow* mainwin, KSharedPtr<KoMacro::Context> context)
+KexiMacroError::KexiMacroError(KexiMainWindow* mainwin, TDESharedPtr<KoMacro::Context> context)
: KexiMacroErrorBase(mainwin, "KexiMacroError" , /*WFlags*/ TQt::WDestructiveClose)
, d(new Private(mainwin, context))
{
@@ -62,7 +62,7 @@ KexiMacroError::KexiMacroError(KexiMainWindow* mainwin, KSharedPtr<KoMacro::Cont
KListViewItem* listviewitem = new KListViewItem(errorlist);
listviewitem->setText(0,TQString("%1").arg(i++));
listviewitem->setText(1,i18n("Action"));
- KSharedPtr<KoMacro::MacroItem> macroitem = *mit;
+ TDESharedPtr<KoMacro::MacroItem> macroitem = *mit;
if (macroitem != 0 && macroitem->action() != 0)
{
@@ -103,7 +103,7 @@ void KexiMacroError::designbtnClicked()
}
// We need to determinate the KexiPart::Item which should be opened.
- KSharedPtr<KoMacro::Macro> macro = d->context->macro();
+ TDESharedPtr<KoMacro::Macro> macro = d->context->macro();
const TQString name = macro->name();
KexiPart::Item* item = d->mainwin->project()->itemForMimeType("kexi/macro", name);
if(! item) {
diff --git a/kexi/plugins/macros/kexipart/keximacroerror.h b/kexi/plugins/macros/kexipart/keximacroerror.h
index f8fb5756..b3bfcad8 100644
--- a/kexi/plugins/macros/kexipart/keximacroerror.h
+++ b/kexi/plugins/macros/kexipart/keximacroerror.h
@@ -60,7 +60,7 @@ class KexiMacroError : public KexiMacroErrorBase
* @param mainwin The parent @a KexiMainWindow instance.
* @param context The @a KoMacro::Context where the error happened.
*/
- KexiMacroError(KexiMainWindow* mainwin, KSharedPtr<KoMacro::Context> context);
+ KexiMacroError(KexiMainWindow* mainwin, TDESharedPtr<KoMacro::Context> context);
/**
* Destructor.
diff --git a/kexi/plugins/macros/kexipart/keximacropart.cpp b/kexi/plugins/macros/kexipart/keximacropart.cpp
index 1459fffc..c189b8ca 100644
--- a/kexi/plugins/macros/kexipart/keximacropart.cpp
+++ b/kexi/plugins/macros/kexipart/keximacropart.cpp
@@ -129,7 +129,7 @@ KexiViewBase* KexiMacroPart::createView(TQWidget* parent, KexiDialogBase* dialog
//kdDebug() << "KexiMacroPart::createView() itemname=" << itemname << endl;
if(! itemname.isNull()) {
- KSharedPtr<KoMacro::Macro> macro = ::KoMacro::Manager::self()->getMacro(itemname);
+ TDESharedPtr<KoMacro::Macro> macro = ::KoMacro::Manager::self()->getMacro(itemname);
if(! macro) {
// If we don't have a macro with that name yet, create one.
macro = ::KoMacro::Manager::self()->createMacro(itemname);
diff --git a/kexi/plugins/macros/kexipart/keximacroproperty.cpp b/kexi/plugins/macros/kexipart/keximacroproperty.cpp
index 7934ec71..07c8f8e1 100644
--- a/kexi/plugins/macros/kexipart/keximacroproperty.cpp
+++ b/kexi/plugins/macros/kexipart/keximacroproperty.cpp
@@ -47,13 +47,13 @@ class KexiMacroProperty::Private
/** The @a KoMacro::MacroItem the custom property uses
internal. Together with the name we are able to identify
the used variable at runtime. */
- KSharedPtr<KoMacro::MacroItem> macroitem;
+ TDESharedPtr<KoMacro::MacroItem> macroitem;
/** The name the variable @a KoMacro::Variable is known
as in the @a KoMacro::MacroItem defined above. */
TQString name;
};
-KexiMacroProperty::KexiMacroProperty(KoProperty::Property* parent, KSharedPtr<KoMacro::MacroItem> macroitem, const TQString& name)
+KexiMacroProperty::KexiMacroProperty(KoProperty::Property* parent, TDESharedPtr<KoMacro::MacroItem> macroitem, const TQString& name)
: KoProperty::CustomProperty(parent)
, d( new Private() )
{
@@ -72,14 +72,14 @@ void KexiMacroProperty::init()
Q_ASSERT( d->macroitem != 0 );
//kdDebug() << "--------- KexiMacroProperty::set() macroitem=" << d->macroitem->name() << " name=" << d->name << endl;
- KSharedPtr<KoMacro::Action> action = d->macroitem->action();
- KSharedPtr<KoMacro::Variable> actionvariable = action->variable(d->name);
+ TDESharedPtr<KoMacro::Action> action = d->macroitem->action();
+ TDESharedPtr<KoMacro::Variable> actionvariable = action->variable(d->name);
if(! actionvariable.data()) {
kdDebug() << "KexiMacroProperty::createProperty() Skipped cause there exists no such action=" << d->name << endl;
return;
}
- KSharedPtr<KoMacro::Variable> variable = d->macroitem->variable(d->name, true/*checkaction*/);
+ TDESharedPtr<KoMacro::Variable> variable = d->macroitem->variable(d->name, true/*checkaction*/);
if(! variable.data()) {
kdDebug() << "KexiMacroProperty::createProperty() Skipped cause there exists no such variable=" << d->name << endl;
return;
@@ -121,7 +121,7 @@ void KexiMacroProperty::setValue(const TQVariant &value, bool rememberOldValue)
TQVariant KexiMacroProperty::value() const
{
- KSharedPtr<KoMacro::Variable> variable = d->macroitem->variable(d->name, true);
+ TDESharedPtr<KoMacro::Variable> variable = d->macroitem->variable(d->name, true);
Q_ASSERT( variable.data() != 0 );
return variable.data() ? variable->variant() : TQVariant();
}
@@ -131,7 +131,7 @@ bool KexiMacroProperty::handleValue() const
return true; // we handle getting and setting of values and don't need KoProperty::Property for it.
}
-KSharedPtr<KoMacro::MacroItem> KexiMacroProperty::macroItem() const
+TDESharedPtr<KoMacro::MacroItem> KexiMacroProperty::macroItem() const
{
return d->macroitem;
}
@@ -141,12 +141,12 @@ TQString KexiMacroProperty::name() const
return d->name;
}
-KSharedPtr<KoMacro::Variable> KexiMacroProperty::variable() const
+TDESharedPtr<KoMacro::Variable> KexiMacroProperty::variable() const
{
return d->macroitem->variable(d->name, true/*checkaction*/);
}
-KoProperty::Property* KexiMacroProperty::createProperty(KSharedPtr<KoMacro::MacroItem> macroitem, const TQString& name)
+KoProperty::Property* KexiMacroProperty::createProperty(TDESharedPtr<KoMacro::MacroItem> macroitem, const TQString& name)
{
KoProperty::Property* property = new KoProperty::Property();
KexiMacroProperty* customproperty = new KexiMacroProperty(property, macroitem, name);
@@ -184,7 +184,7 @@ KoProperty::CustomProperty* KexiMacroPropertyFactory::createCustomProperty(KoPro
return 0;
}
- KSharedPtr<KoMacro::MacroItem> macroitem = parentcustomproperty->macroItem();
+ TDESharedPtr<KoMacro::MacroItem> macroitem = parentcustomproperty->macroItem();
Q_ASSERT( macroitem.data() != 0 );
const TQString name = parentcustomproperty->name();
Q_ASSERT(! name.isEmpty());
@@ -266,7 +266,7 @@ class EditListBoxItem : public ListBoxItem
}
virtual TQString text() const {
- KSharedPtr<KoMacro::Variable> variable = m_macroproperty->variable();
+ TDESharedPtr<KoMacro::Variable> variable = m_macroproperty->variable();
Q_ASSERT( variable.data() );
//kdDebug()<<"EditListBoxItem::text() text="<<variable->toString()<<endl;
Q_ASSERT( variable->toString() != TQString() );
@@ -274,9 +274,9 @@ class EditListBoxItem : public ListBoxItem
}
KoProperty::Widget* widget() const { return m_widget; }
- KSharedPtr<KoMacro::MacroItem> macroItem() const { return m_macroproperty->macroItem(); }
- KSharedPtr<KoMacro::Variable> variable() const { return m_macroproperty->variable(); }
- KSharedPtr<KoMacro::Action> action() const { return m_macroproperty->macroItem()->action(); }
+ TDESharedPtr<KoMacro::MacroItem> macroItem() const { return m_macroproperty->macroItem(); }
+ TDESharedPtr<KoMacro::Variable> variable() const { return m_macroproperty->variable(); }
+ TDESharedPtr<KoMacro::Action> action() const { return m_macroproperty->macroItem()->action(); }
protected:
virtual void paint(TQPainter* p) {
@@ -290,9 +290,9 @@ class EditListBoxItem : public ListBoxItem
private:
void init() {
- KSharedPtr<KoMacro::MacroItem> macroitem = m_macroproperty->macroItem();
+ TDESharedPtr<KoMacro::MacroItem> macroitem = m_macroproperty->macroItem();
Q_ASSERT( macroitem.data() );
- KSharedPtr<KoMacro::Action> action = m_macroproperty->macroItem()->action();
+ TDESharedPtr<KoMacro::Action> action = m_macroproperty->macroItem()->action();
if(! action.data()) {
kdWarning() << "EditListBoxItem::EditListBoxItem() Skipped cause there exists no action for macroproperty=" << m_macroproperty->name() << endl;
return;
@@ -302,7 +302,7 @@ class EditListBoxItem : public ListBoxItem
kdWarning() << "EditListBoxItem::EditListBoxItem() No parentproperty defined" << endl;
return;
}
- KSharedPtr<KoMacro::Variable> variable = m_macroproperty->variable();
+ TDESharedPtr<KoMacro::Variable> variable = m_macroproperty->variable();
if(! variable.data()) {
kdWarning() << "EditListBoxItem::EditListBoxItem() No variable defined for property=" << parentproperty->name() << endl;
return;
@@ -310,7 +310,7 @@ class EditListBoxItem : public ListBoxItem
TQVariant variant = variable->variant();
- KSharedPtr<KoMacro::Variable> actionvariable = action->variable(m_macroproperty->name());
+ TDESharedPtr<KoMacro::Variable> actionvariable = action->variable(m_macroproperty->name());
if(actionvariable.data()) {
TQVariant actionvariant = actionvariable->variant();
Q_ASSERT( ! actionvariant.isNull() );
@@ -393,13 +393,13 @@ class ListBox : public TQListBox
{
KoMacro::Variable::List actionchildren;
- KSharedPtr<KoMacro::Variable> itemvar = m_macroproperty->macroItem()->variable(name,false);
+ TDESharedPtr<KoMacro::Variable> itemvar = m_macroproperty->macroItem()->variable(name,false);
//kdDebug() << "KexiMacroProperty::ListBox::update() itemvar="<<(itemvar.data() ? "name:"+itemvar->name()+" value:"+itemvar->toString() : "NULL")<<endl;
if(itemvar.data())
actionchildren = itemvar->children();
- KSharedPtr<KoMacro::Action> action = m_edititem->action();
- KSharedPtr<KoMacro::Variable> actionvar = action.data() ? action->variable(name) : KSharedPtr<KoMacro::Variable>();
+ TDESharedPtr<KoMacro::Action> action = m_edititem->action();
+ TDESharedPtr<KoMacro::Variable> actionvar = action.data() ? action->variable(name) : TDESharedPtr<KoMacro::Variable>();
//kdDebug() << "KexiMacroProperty::ListBox::update() actionvar="<<(actionvar.data() ? "name:"+actionvar->name()+" value:"+actionvar->toString() : "NULL")<<endl;
if(actionvar.data())
actionchildren += actionvar->children();
diff --git a/kexi/plugins/macros/kexipart/keximacroproperty.h b/kexi/plugins/macros/kexipart/keximacroproperty.h
index 44ad8bd4..47f7a7e1 100644
--- a/kexi/plugins/macros/kexipart/keximacroproperty.h
+++ b/kexi/plugins/macros/kexipart/keximacroproperty.h
@@ -47,7 +47,7 @@ class KexiMacroProperty
public:
/** Constructor. */
- explicit KexiMacroProperty(KoProperty::Property* parent, KSharedPtr<KoMacro::MacroItem> macroitem, const TQString& name);
+ explicit KexiMacroProperty(KoProperty::Property* parent, TDESharedPtr<KoMacro::MacroItem> macroitem, const TQString& name);
/** Destructor. */
virtual ~KexiMacroProperty();
@@ -73,7 +73,7 @@ class KexiMacroProperty
/** \return the \a KoMacro::MacroItem this custom property has or
NULL if there was no item provided. */
- KSharedPtr<KoMacro::MacroItem> macroItem() const;
+ TDESharedPtr<KoMacro::MacroItem> macroItem() const;
/** \return the name the property has in the \a KoMacro::MacroItem
above. Is TQString() if there was no item provided. */
@@ -82,11 +82,11 @@ class KexiMacroProperty
/** \return the \a KoMacro::Variable which has the name @a name()
in the item @a macroItem() . If such a variable doesn't exists NULL
is returned. */
- KSharedPtr<KoMacro::Variable> variable() const;
+ TDESharedPtr<KoMacro::Variable> variable() const;
/** Factory function to create a new @a KoProperty::Property instance
that will use a @a KexiMacroProperty as container. */
- static KoProperty::Property* createProperty(KSharedPtr<KoMacro::MacroItem> macroitem, const TQString& name);
+ static KoProperty::Property* createProperty(TDESharedPtr<KoMacro::MacroItem> macroitem, const TQString& name);
signals:
diff --git a/kexi/plugins/macros/kexipart/keximacroview.cpp b/kexi/plugins/macros/kexipart/keximacroview.cpp
index 19e789f0..f0e7ea0b 100644
--- a/kexi/plugins/macros/kexipart/keximacroview.cpp
+++ b/kexi/plugins/macros/kexipart/keximacroview.cpp
@@ -47,7 +47,7 @@ class KexiMacroView::Private
* The \a KoMacro::Manager instance used to access the
* Macro Framework.
*/
- KSharedPtr<KoMacro::Macro> macro;
+ TDESharedPtr<KoMacro::Macro> macro;
/**
* Constructor.
@@ -76,7 +76,7 @@ KexiMacroView::~KexiMacroView()
delete d;
}
-KSharedPtr<KoMacro::Macro> KexiMacroView::macro() const
+TDESharedPtr<KoMacro::Macro> KexiMacroView::macro() const
{
return d->macro;
}
@@ -161,7 +161,7 @@ tristate KexiMacroView::storeData(bool /*dontAsk*/)
void KexiMacroView::execute(TQObject* sender)
{
- KSharedPtr<KoMacro::Context> context = d->macro->execute(sender);
+ TDESharedPtr<KoMacro::Context> context = d->macro->execute(sender);
if(context->hadException()) {
KexiMacroError* error = new KexiMacroError(
mainWin(), // The parent KexiMainWindow
diff --git a/kexi/plugins/macros/kexipart/keximacroview.h b/kexi/plugins/macros/kexipart/keximacroview.h
index c11d48e8..ddff961f 100644
--- a/kexi/plugins/macros/kexipart/keximacroview.h
+++ b/kexi/plugins/macros/kexipart/keximacroview.h
@@ -63,7 +63,7 @@ class KexiMacroView : public KexiViewBase
/**
* \return the Macro instance.
*/
- KSharedPtr<KoMacro::Macro> macro() const;
+ TDESharedPtr<KoMacro::Macro> macro() const;
/**
* Load the data from XML source and fill the internally
generated by cgit v1.2.1 (git 2.18.0) at 2024-12-26 13:22:53 +0000