diff options
author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-31 00:15:51 -0600 |
---|---|---|
committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-31 00:15:51 -0600 |
commit | f7055674768fa7f0267da4a14b9061e60ebab3fc (patch) | |
tree | 9cf91b2040d16220234c24c945e950952c359832 /kexi/plugins/macros/kexiactions | |
parent | af2ab9c9888013e42237f71166eeafe5e988da0f (diff) | |
download | koffice-f7055674768fa7f0267da4a14b9061e60ebab3fc.tar.gz koffice-f7055674768fa7f0267da4a14b9061e60ebab3fc.zip |
Rename KShared
Diffstat (limited to 'kexi/plugins/macros/kexiactions')
-rw-r--r-- | kexi/plugins/macros/kexiactions/datatableaction.cpp | 24 | ||||
-rw-r--r-- | kexi/plugins/macros/kexiactions/datatableaction.h | 4 | ||||
-rw-r--r-- | kexi/plugins/macros/kexiactions/executeaction.cpp | 14 | ||||
-rw-r--r-- | kexi/plugins/macros/kexiactions/executeaction.h | 4 | ||||
-rw-r--r-- | kexi/plugins/macros/kexiactions/messageaction.cpp | 4 | ||||
-rw-r--r-- | kexi/plugins/macros/kexiactions/messageaction.h | 2 | ||||
-rw-r--r-- | kexi/plugins/macros/kexiactions/navigateaction.cpp | 18 | ||||
-rw-r--r-- | kexi/plugins/macros/kexiactions/navigateaction.h | 4 | ||||
-rw-r--r-- | kexi/plugins/macros/kexiactions/objectnamevariable.h | 2 | ||||
-rw-r--r-- | kexi/plugins/macros/kexiactions/objectvariable.h | 2 | ||||
-rw-r--r-- | kexi/plugins/macros/kexiactions/openaction.cpp | 18 | ||||
-rw-r--r-- | kexi/plugins/macros/kexiactions/openaction.h | 4 |
12 files changed, 50 insertions, 50 deletions
diff --git a/kexi/plugins/macros/kexiactions/datatableaction.cpp b/kexi/plugins/macros/kexiactions/datatableaction.cpp index 19922122..4e211a53 100644 --- a/kexi/plugins/macros/kexiactions/datatableaction.cpp +++ b/kexi/plugins/macros/kexiactions/datatableaction.cpp @@ -46,7 +46,7 @@ namespace KexiMacro { { TQStringList list; list << "import" << "export"; - this->appendChild( KSharedPtr<KoMacro::Variable>( new KoMacro::Variable(list, "@list") ) ); + this->appendChild( TDESharedPtr<KoMacro::Variable>( new KoMacro::Variable(list, "@list") ) ); this->setVariant( list[0] ); } @@ -61,7 +61,7 @@ namespace KexiMacro { { TQStringList list; list << "file" << "clipboard"; - this->appendChild( KSharedPtr<KoMacro::Variable>( new KoMacro::Variable(list, "@list") ) ); + this->appendChild( TDESharedPtr<KoMacro::Variable>( new KoMacro::Variable(list, "@list") ) ); this->setVariant( list[0] ); } @@ -87,10 +87,10 @@ namespace KexiMacro { namelist << info->objectName() + "." + item_it.current()->name(); } for(TQStringList::Iterator it = namelist.begin(); it != namelist.end(); ++it) - this->appendChild( KSharedPtr<KoMacro::Variable>(new KoMacro::Variable(*it)) ); + this->appendChild( TDESharedPtr<KoMacro::Variable>(new KoMacro::Variable(*it)) ); //const TQString name = info->objectName(); //info->groupName(); - //this->appendChild( KSharedPtr<KoMacro::Variable>(new KoMacro::Variable(name)) ); + //this->appendChild( TDESharedPtr<KoMacro::Variable>(new KoMacro::Variable(name)) ); } const TQString n = namelist.contains(partitem) @@ -106,20 +106,20 @@ namespace KexiMacro { DataTableAction::DataTableAction() : KexiAction("datatable", i18n("Data Table")) { - setVariable(KSharedPtr<KoMacro::Variable>( new MethodVariable<DataTableAction>(this) )); - setVariable(KSharedPtr<KoMacro::Variable>( new TypeVariable<DataTableAction>(this) )); - setVariable(KSharedPtr<KoMacro::Variable>( new PartItemVariable<DataTableAction>(this) )); + setVariable(TDESharedPtr<KoMacro::Variable>( new MethodVariable<DataTableAction>(this) )); + setVariable(TDESharedPtr<KoMacro::Variable>( new TypeVariable<DataTableAction>(this) )); + setVariable(TDESharedPtr<KoMacro::Variable>( new PartItemVariable<DataTableAction>(this) )); } DataTableAction::~DataTableAction() { } -bool DataTableAction::notifyUpdated(KSharedPtr<KoMacro::MacroItem> macroitem, const TQString& name) +bool DataTableAction::notifyUpdated(TDESharedPtr<KoMacro::MacroItem> macroitem, const TQString& name) { kdDebug()<<"DataTableAction::notifyUpdated() name="<<name<<" macroitem.action="<<(macroitem->action() ? macroitem->action()->name() : "NOACTION")<<endl; /* - KSharedPtr<KoMacro::Variable> variable = macroitem->variable(name, false); + TDESharedPtr<KoMacro::Variable> variable = macroitem->variable(name, false); if(! variable) { kdWarning()<<"DataTableAction::notifyUpdated() No such variable="<<name<<" in macroitem."<<endl; return false; @@ -128,16 +128,16 @@ bool DataTableAction::notifyUpdated(KSharedPtr<KoMacro::MacroItem> macroitem, co if(name == "method") { const int partitem = macroitem->variant(OBJECT, true).toString(); macroitem->variable(OBJECT, true)->setChildren( - KoMacro::Variable::List() << KSharedPtr<KoMacro::Variable>(new ObjectVariable<ExecuteAction>(this, partitem)) ); + KoMacro::Variable::List() << TDESharedPtr<KoMacro::Variable>(new ObjectVariable<ExecuteAction>(this, partitem)) ); } */ return true; } -void DataTableAction::activate(KSharedPtr<KoMacro::Context> context) +void DataTableAction::activate(TDESharedPtr<KoMacro::Context> context) { if(! mainWin()->project()) { - kdWarning() << "ExecuteAction::activate(KSharedPtr<KoMacro::Context>) Invalid project" << endl; + kdWarning() << "ExecuteAction::activate(TDESharedPtr<KoMacro::Context>) Invalid project" << endl; return; } diff --git a/kexi/plugins/macros/kexiactions/datatableaction.h b/kexi/plugins/macros/kexiactions/datatableaction.h index e3f71601..a3acf5f8 100644 --- a/kexi/plugins/macros/kexiactions/datatableaction.h +++ b/kexi/plugins/macros/kexiactions/datatableaction.h @@ -61,7 +61,7 @@ namespace KexiMacro { * @return true if the update was successfully else false * is returned. */ - virtual bool notifyUpdated(KSharedPtr<KoMacro::MacroItem> macroitem, const TQString& name); + virtual bool notifyUpdated(TDESharedPtr<KoMacro::MacroItem> macroitem, const TQString& name); public slots: @@ -69,7 +69,7 @@ namespace KexiMacro { * Called if the @a Action should be executed within the * defined @p context . */ - virtual void activate(KSharedPtr<KoMacro::Context> context); + virtual void activate(TDESharedPtr<KoMacro::Context> context); }; } diff --git a/kexi/plugins/macros/kexiactions/executeaction.cpp b/kexi/plugins/macros/kexiactions/executeaction.cpp index 564b03c8..7383b9a8 100644 --- a/kexi/plugins/macros/kexiactions/executeaction.cpp +++ b/kexi/plugins/macros/kexiactions/executeaction.cpp @@ -40,20 +40,20 @@ ExecuteAction::ExecuteAction() : KexiAction("execute", i18n("Execute")) { int conditions = ObjectVariable<ExecuteAction>::VisibleInNav | ObjectVariable<ExecuteAction>::Executable; - KSharedPtr<KoMacro::Variable> objvar = new ObjectVariable<ExecuteAction>(this, conditions); + TDESharedPtr<KoMacro::Variable> objvar = new ObjectVariable<ExecuteAction>(this, conditions); setVariable(objvar); - setVariable(KSharedPtr<KoMacro::Variable>( new ObjectNameVariable<ExecuteAction>(this, objvar->variant().toString()) )); + setVariable(TDESharedPtr<KoMacro::Variable>( new ObjectNameVariable<ExecuteAction>(this, objvar->variant().toString()) )); } ExecuteAction::~ExecuteAction() { } -bool ExecuteAction::notifyUpdated(KSharedPtr<KoMacro::MacroItem> macroitem, const TQString& name) +bool ExecuteAction::notifyUpdated(TDESharedPtr<KoMacro::MacroItem> macroitem, const TQString& name) { kdDebug()<<"ExecuteAction::notifyUpdated() name="<<name<<" macroitem.action="<<(macroitem->action() ? macroitem->action()->name() : "NOACTION")<<endl; - KSharedPtr<KoMacro::Variable> variable = macroitem->variable(name, false); + TDESharedPtr<KoMacro::Variable> variable = macroitem->variable(name, false); if(! variable) { kdWarning()<<"ExecuteAction::notifyUpdated() No such variable="<<name<<" in macroitem."<<endl; return false; @@ -64,16 +64,16 @@ bool ExecuteAction::notifyUpdated(KSharedPtr<KoMacro::MacroItem> macroitem, cons const TQString objectvalue = macroitem->variant(OBJECT, true).toString(); // e.g. "macro" or "script" const TQString objectname = macroitem->variant(NAME, true).toString(); // e.g. "macro1" or "macro2" if objectvalue above is "macro" macroitem->variable(NAME, true)->setChildren( - KoMacro::Variable::List() << KSharedPtr<KoMacro::Variable>(new ObjectNameVariable<ExecuteAction>(this, objectvalue, objectname)) ); + KoMacro::Variable::List() << TDESharedPtr<KoMacro::Variable>(new ObjectNameVariable<ExecuteAction>(this, objectvalue, objectname)) ); } return true; } -void ExecuteAction::activate(KSharedPtr<KoMacro::Context> context) +void ExecuteAction::activate(TDESharedPtr<KoMacro::Context> context) { if(! mainWin()->project()) { - kdWarning() << "ExecuteAction::activate(KSharedPtr<KoMacro::Context>) Invalid project" << endl; + kdWarning() << "ExecuteAction::activate(TDESharedPtr<KoMacro::Context>) Invalid project" << endl; return; } diff --git a/kexi/plugins/macros/kexiactions/executeaction.h b/kexi/plugins/macros/kexiactions/executeaction.h index 04fef2dc..be7c95dc 100644 --- a/kexi/plugins/macros/kexiactions/executeaction.h +++ b/kexi/plugins/macros/kexiactions/executeaction.h @@ -63,7 +63,7 @@ namespace KexiMacro { * @return true if the update was successfully else false * is returned. */ - virtual bool notifyUpdated(KSharedPtr<KoMacro::MacroItem> macroitem, const TQString& name); + virtual bool notifyUpdated(TDESharedPtr<KoMacro::MacroItem> macroitem, const TQString& name); public slots: @@ -71,7 +71,7 @@ namespace KexiMacro { * Called if the @a Action should be executed within the * defined @p context . */ - virtual void activate(KSharedPtr<KoMacro::Context> context); + virtual void activate(TDESharedPtr<KoMacro::Context> context); }; } diff --git a/kexi/plugins/macros/kexiactions/messageaction.cpp b/kexi/plugins/macros/kexiactions/messageaction.cpp index a36d0526..f421abb5 100644 --- a/kexi/plugins/macros/kexiactions/messageaction.cpp +++ b/kexi/plugins/macros/kexiactions/messageaction.cpp @@ -39,9 +39,9 @@ MessageAction::~MessageAction() { } -void MessageAction::activate(KSharedPtr<KoMacro::Context> context) +void MessageAction::activate(TDESharedPtr<KoMacro::Context> context) { - kdDebug() << "MessageAction::activate(KSharedPtr<Context>)" << endl; + kdDebug() << "MessageAction::activate(TDESharedPtr<Context>)" << endl; const TQString caption = context->variable("caption")->variant().toString(); const TQString message = context->variable("message")->variant().toString(); KMessageBox::information(mainWin(), message, caption); diff --git a/kexi/plugins/macros/kexiactions/messageaction.h b/kexi/plugins/macros/kexiactions/messageaction.h index da7723c3..9af12b89 100644 --- a/kexi/plugins/macros/kexiactions/messageaction.h +++ b/kexi/plugins/macros/kexiactions/messageaction.h @@ -59,7 +59,7 @@ namespace KexiMacro { * Called if the @a Action should be executed within the * defined @param context . */ - virtual void activate(KSharedPtr<KoMacro::Context> context); + virtual void activate(TDESharedPtr<KoMacro::Context> context); }; } diff --git a/kexi/plugins/macros/kexiactions/navigateaction.cpp b/kexi/plugins/macros/kexiactions/navigateaction.cpp index 815b8723..336039ae 100644 --- a/kexi/plugins/macros/kexiactions/navigateaction.cpp +++ b/kexi/plugins/macros/kexiactions/navigateaction.cpp @@ -47,7 +47,7 @@ namespace KexiMacro { { TQStringList list; list << "first" << "previous" << "next" << "last" << "goto"; - this->appendChild( KSharedPtr<KoMacro::Variable>( new KoMacro::Variable(list, "@list") ) ); + this->appendChild( TDESharedPtr<KoMacro::Variable>( new KoMacro::Variable(list, "@list") ) ); /*TODO should this actions belong to navigate? maybe it would be more wise to have such kind of functionality in an own e.g. "Modify" action to outline, that @@ -64,25 +64,25 @@ NavigateAction::NavigateAction() : KexiAction("navigate", i18n("Navigate")) { KoMacro::Variable* navvar = new NavigateVariable<NavigateAction>(this); - setVariable(KSharedPtr<KoMacro::Variable>( navvar )); + setVariable(TDESharedPtr<KoMacro::Variable>( navvar )); KoMacro::Variable* rowvar = new KexiVariable<NavigateAction>(this, "rownr", i18n("Row")); rowvar->setVariant(0); - setVariable(KSharedPtr<KoMacro::Variable>(rowvar)); + setVariable(TDESharedPtr<KoMacro::Variable>(rowvar)); KoMacro::Variable* colvar = new KexiVariable<NavigateAction>(this, "colnr", i18n("Column")); colvar->setVariant(0); - setVariable(KSharedPtr<KoMacro::Variable>(colvar)); + setVariable(TDESharedPtr<KoMacro::Variable>(colvar)); } NavigateAction::~NavigateAction() { } -bool NavigateAction::notifyUpdated(KSharedPtr<KoMacro::MacroItem> macroitem, const TQString& name) +bool NavigateAction::notifyUpdated(TDESharedPtr<KoMacro::MacroItem> macroitem, const TQString& name) { kdDebug()<<"NavigateAction::notifyUpdated() name="<<name<<" macroitem.action="<<(macroitem->action() ? macroitem->action()->name() : "NOACTION")<<endl; - KSharedPtr<KoMacro::Variable> variable = macroitem->variable(name, false); + TDESharedPtr<KoMacro::Variable> variable = macroitem->variable(name, false); if(! variable) { kdWarning()<<"NavigateAction::notifyUpdated() No such variable="<<name<<" in macroitem."<<endl; return false; @@ -94,15 +94,15 @@ bool NavigateAction::notifyUpdated(KSharedPtr<KoMacro::MacroItem> macroitem, con const int colnr = macroitem->variant("colnr", true).toInt(); // e.g. "macro1" or "macro2" if objectvalue above is "macro" macroitem->variable("rownr", true)->setChildren( - KoMacro::Variable::List() << KSharedPtr<KoMacro::Variable>(new KoMacro::Variable(rownr)) ); + KoMacro::Variable::List() << TDESharedPtr<KoMacro::Variable>(new KoMacro::Variable(rownr)) ); macroitem->variable("colnr", true)->setChildren( - KoMacro::Variable::List() << KSharedPtr<KoMacro::Variable>(new KoMacro::Variable(colnr)) ); + KoMacro::Variable::List() << TDESharedPtr<KoMacro::Variable>(new KoMacro::Variable(colnr)) ); } return true; } -void NavigateAction::activate(KSharedPtr<KoMacro::Context> context) +void NavigateAction::activate(TDESharedPtr<KoMacro::Context> context) { KexiDialogBase* dialog = dynamic_cast<KexiDialogBase*>( mainWin()->activeWindow() ); if(! dialog) { diff --git a/kexi/plugins/macros/kexiactions/navigateaction.h b/kexi/plugins/macros/kexiactions/navigateaction.h index 449a9459..0dcff98a 100644 --- a/kexi/plugins/macros/kexiactions/navigateaction.h +++ b/kexi/plugins/macros/kexiactions/navigateaction.h @@ -63,7 +63,7 @@ namespace KexiMacro { * @return true if the update was successfully else false * is returned. */ - virtual bool notifyUpdated(KSharedPtr<KoMacro::MacroItem> macroitem, const TQString& name); + virtual bool notifyUpdated(TDESharedPtr<KoMacro::MacroItem> macroitem, const TQString& name); public slots: @@ -71,7 +71,7 @@ namespace KexiMacro { * Called if the @a Action should be executed within the * defined @p context . */ - virtual void activate(KSharedPtr<KoMacro::Context> context); + virtual void activate(TDESharedPtr<KoMacro::Context> context); }; } diff --git a/kexi/plugins/macros/kexiactions/objectnamevariable.h b/kexi/plugins/macros/kexiactions/objectnamevariable.h index 1a0aabf8..03545f69 100644 --- a/kexi/plugins/macros/kexiactions/objectnamevariable.h +++ b/kexi/plugins/macros/kexiactions/objectnamevariable.h @@ -61,7 +61,7 @@ namespace KexiMacro { namelist << ""; for(TQStringList::Iterator it = namelist.begin(); it != namelist.end(); ++it) - this->appendChild( KSharedPtr<KoMacro::Variable>(new KoMacro::Variable(*it)) ); + this->appendChild( TDESharedPtr<KoMacro::Variable>(new KoMacro::Variable(*it)) ); this->setVariant( (name.isNull() || ! namelist.contains(name)) ? namelist[0] : name ); diff --git a/kexi/plugins/macros/kexiactions/objectvariable.h b/kexi/plugins/macros/kexiactions/objectvariable.h index c27f024b..65def3aa 100644 --- a/kexi/plugins/macros/kexiactions/objectvariable.h +++ b/kexi/plugins/macros/kexiactions/objectvariable.h @@ -67,7 +67,7 @@ namespace KexiMacro { continue; const TQString name = info->objectName(); //info->groupName(); - this->appendChild( KSharedPtr<KoMacro::Variable>(new KoMacro::Variable(name)) ); + this->appendChild( TDESharedPtr<KoMacro::Variable>(new KoMacro::Variable(name)) ); } if(! objectname.isNull()) diff --git a/kexi/plugins/macros/kexiactions/openaction.cpp b/kexi/plugins/macros/kexiactions/openaction.cpp index d7c4e7aa..f5206ff5 100644 --- a/kexi/plugins/macros/kexiactions/openaction.cpp +++ b/kexi/plugins/macros/kexiactions/openaction.cpp @@ -63,7 +63,7 @@ namespace KexiMacro { if(viewmodes & Kexi::TextViewMode) namelist << TEXTVIEW; for(TQStringList::Iterator it = namelist.begin(); it != namelist.end(); ++it) - this->children().append( KSharedPtr<KoMacro::Variable>(new KoMacro::Variable(*it)) ); + this->children().append( TDESharedPtr<KoMacro::Variable>(new KoMacro::Variable(*it)) ); } const TQString n = namelist.contains(viewname) @@ -81,21 +81,21 @@ OpenAction::OpenAction() { const int conditions = ObjectVariable<OpenAction>::VisibleInNav; - KSharedPtr<KoMacro::Variable> objvar = new ObjectVariable<OpenAction>(this, conditions); + TDESharedPtr<KoMacro::Variable> objvar = new ObjectVariable<OpenAction>(this, conditions); setVariable(objvar); - setVariable(KSharedPtr<KoMacro::Variable>( new ObjectNameVariable<OpenAction>(this, objvar->variant().toString()) )); - setVariable(KSharedPtr<KoMacro::Variable>( new ViewVariable<OpenAction>(this, objvar->variant().toString()) )); + setVariable(TDESharedPtr<KoMacro::Variable>( new ObjectNameVariable<OpenAction>(this, objvar->variant().toString()) )); + setVariable(TDESharedPtr<KoMacro::Variable>( new ViewVariable<OpenAction>(this, objvar->variant().toString()) )); } OpenAction::~OpenAction() { } -bool OpenAction::notifyUpdated(KSharedPtr<KoMacro::MacroItem> macroitem, const TQString& name) +bool OpenAction::notifyUpdated(TDESharedPtr<KoMacro::MacroItem> macroitem, const TQString& name) { kdDebug()<<"OpenAction::notifyUpdated() name="<<name<<" macroitem.action="<<(macroitem->action() ? macroitem->action()->name() : "NOACTION")<<endl; - KSharedPtr<KoMacro::Variable> variable = macroitem->variable(name, false); + TDESharedPtr<KoMacro::Variable> variable = macroitem->variable(name, false); if(! variable) { kdWarning()<<"OpenAction::notifyUpdated() No such variable="<<name<<" in macroitem."<<endl; return false; @@ -108,15 +108,15 @@ bool OpenAction::notifyUpdated(KSharedPtr<KoMacro::MacroItem> macroitem, const T const TQString viewname = macroitem->variant(VIEW, true).toString(); // "data", "design" or "text" macroitem->variable(NAME, true)->setChildren( - KoMacro::Variable::List() << KSharedPtr<KoMacro::Variable>(new ObjectNameVariable<OpenAction>(this, objectvalue, objectname)) ); + KoMacro::Variable::List() << TDESharedPtr<KoMacro::Variable>(new ObjectNameVariable<OpenAction>(this, objectvalue, objectname)) ); macroitem->variable(VIEW, true)->setChildren( - KoMacro::Variable::List() << KSharedPtr<KoMacro::Variable>(new ViewVariable<OpenAction>(this, objectvalue, viewname)) ); + KoMacro::Variable::List() << TDESharedPtr<KoMacro::Variable>(new ViewVariable<OpenAction>(this, objectvalue, viewname)) ); } return true; } -void OpenAction::activate(KSharedPtr<KoMacro::Context> context) +void OpenAction::activate(TDESharedPtr<KoMacro::Context> context) { if(! mainWin()->project()) { throw KoMacro::Exception(i18n("No project loaded.")); diff --git a/kexi/plugins/macros/kexiactions/openaction.h b/kexi/plugins/macros/kexiactions/openaction.h index 092dc371..700b6ef6 100644 --- a/kexi/plugins/macros/kexiactions/openaction.h +++ b/kexi/plugins/macros/kexiactions/openaction.h @@ -64,7 +64,7 @@ namespace KexiMacro { * @return true if the update was successfully else false * is returned. */ - virtual bool notifyUpdated(KSharedPtr<KoMacro::MacroItem> macroitem, const TQString& name); + virtual bool notifyUpdated(TDESharedPtr<KoMacro::MacroItem> macroitem, const TQString& name); public slots: @@ -72,7 +72,7 @@ namespace KexiMacro { * Called if the @a Action should be executed within the * defined @p context . */ - virtual void activate(KSharedPtr<KoMacro::Context> context); + virtual void activate(TDESharedPtr<KoMacro::Context> context); }; } |