diff options
| author | Michele Calgaro <[email protected]> | 2024-01-20 21:28:31 +0900 |
|---|---|---|
| committer | Michele Calgaro <[email protected]> | 2024-01-22 19:46:56 +0900 |
| commit | cf1bb69b2973368b5ac0d7d347a7fa7b8dfa43a1 (patch) | |
| tree | 6856cf364ad267dc15815e8d5a6e080822296d38 | |
| parent | e1b37ac1936f81994a2c1aa2778298fbc757531f (diff) | |
| download | koffice-cf1bb69b2973368b5ac0d7d347a7fa7b8dfa43a1.tar.gz koffice-cf1bb69b2973368b5ac0d7d347a7fa7b8dfa43a1.zip | |
Replace auto_ptr
Signed-off-by: Michele Calgaro <[email protected]>
(cherry picked from commit 56ddbe04dc445c012c568083202ce433c1da7026)
| -rw-r--r-- | lib/kformula/kformulacommand.cpp | 4 | ||||
| -rw-r--r-- | lib/kformula/kformulacommand.h | 4 | ||||
| -rw-r--r-- | lib/kformula/kformuladefs.h | 2 | ||||
| -rw-r--r-- | lib/kofficecore/KoDocument.cpp | 2 |
4 files changed, 7 insertions, 5 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, diff --git a/lib/kofficecore/KoDocument.cpp b/lib/kofficecore/KoDocument.cpp index 85397acc..147b2ed1 100644 --- a/lib/kofficecore/KoDocument.cpp +++ b/lib/kofficecore/KoDocument.cpp @@ -992,7 +992,7 @@ bool KoDocument::saveNativeFormat( const TQString & file ) TQCString mimeType = d->outputMimeType; TQCString nativeOasisMime = nativeOasisMimeType(); bool oasis = !mimeType.isEmpty() && ( mimeType == nativeOasisMime || mimeType == nativeOasisMime + "-template" ); - // TODO: use std::auto_ptr or create store on stack [needs API fixing], + // TODO: use std::unique_ptr or create store on stack [needs API fixing], // to remove all the 'delete store' in all the branches KoStore* store = KoStore::createStore( file, KoStore::Write, mimeType, backend ); if ( store->bad() ) |