summaryrefslogtreecommitdiffstats
path: root/lib/kformula
diff options
context:
space:
mode:
authorMichele Calgaro <michele.calgaro@yahoo.it>2024-01-20 21:28:31 +0900
committerMichele Calgaro <michele.calgaro@yahoo.it>2024-01-20 21:28:31 +0900
commit56ddbe04dc445c012c568083202ce433c1da7026 (patch)
tree63e1ff606dbdd9479d573604d67eecd52bb7a179 /lib/kformula
parentc0332621bc998c9786f4841e86a62b7711fe4abf (diff)
downloadkoffice-56ddbe04dc445c012c568083202ce433c1da7026.tar.gz
koffice-56ddbe04dc445c012c568083202ce433c1da7026.zip
Replace auto_ptr
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
Diffstat (limited to 'lib/kformula')
-rw-r--r--lib/kformula/kformulacommand.cpp4
-rw-r--r--lib/kformula/kformulacommand.h4
-rw-r--r--lib/kformula/kformuladefs.h2
3 files changed, 6 insertions, 4 deletions
diff --git a/lib/kformula/kformulacommand.cpp b/lib/kformula/kformulacommand.cpp
index 4aa31161..24ae790f 100644
--- a/lib/kformula/kformulacommand.cpp
+++ b/lib/kformula/kformulacommand.cpp
@@ -458,8 +458,8 @@ void KFCAddReplacing::unexecute()
// ****** Add index command
-KFCAddGenericIndex::KFCAddGenericIndex(Container* document, ElementIndexPtr _index)
- : KFCAdd(i18n("Add Index"), document), index(_index)
+KFCAddGenericIndex::KFCAddGenericIndex(Container* document, ElementIndexPtr &_index)
+ : KFCAdd(i18n("Add Index"), document), index(std::move(_index))
{
addElement(new SequenceElement());
}
diff --git a/lib/kformula/kformulacommand.h b/lib/kformula/kformulacommand.h
index bc1703be..75a47da3 100644
--- a/lib/kformula/kformulacommand.h
+++ b/lib/kformula/kformulacommand.h
@@ -435,7 +435,9 @@ class KFCAddGenericIndex : public KFCAdd
{
public:
- KFCAddGenericIndex(Container* document, ElementIndexPtr index);
+ KFCAddGenericIndex(Container* document, ElementIndexPtr &index);
+ KFCAddGenericIndex(KFCAddGenericIndex const &) = delete;
+ KFCAddGenericIndex& operator=(KFCAddGenericIndex const &) = delete;
virtual void execute();
diff --git a/lib/kformula/kformuladefs.h b/lib/kformula/kformuladefs.h
index d4a3739f..28322608 100644
--- a/lib/kformula/kformuladefs.h
+++ b/lib/kformula/kformuladefs.h
@@ -276,7 +276,7 @@ public:
virtual BasicElement* getElement() = 0;
};
-typedef std::auto_ptr<ElementIndex> ElementIndexPtr;
+typedef std::unique_ptr<ElementIndex> ElementIndexPtr;
enum RequestID {
req_addBracket,