diff --git a/debugger/variable/variablecollection.cpp b/debugger/variable/variablecollection.cpp --- a/debugger/variable/variablecollection.cpp +++ b/debugger/variable/variablecollection.cpp @@ -68,10 +68,14 @@ Variable::Variable(TreeModel* model, TreeItem* parent, const QString& expression, const QString& display) - : TreeItem(model, parent), - m_inScope(true), m_topLevel(true), m_changed(false), m_showError(false), m_format(Natural) + : TreeItem(model, parent) + , m_expression(expression) + , m_inScope(true) + , m_topLevel(true) + , m_changed(false) + , m_showError(false) + , m_format(Natural) { - m_expression = expression; // FIXME: should not duplicate the data, instead overload 'data' // and return expression_ directly. if (display.isEmpty()) diff --git a/language/backgroundparser/documentchangetracker.cpp b/language/backgroundparser/documentchangetracker.cpp --- a/language/backgroundparser/documentchangetracker.cpp +++ b/language/backgroundparser/documentchangetracker.cpp @@ -62,9 +62,11 @@ { DocumentChangeTracker::DocumentChangeTracker( KTextEditor::Document* document ) - : m_needUpdate(false), m_document(document), m_moving(nullptr) + : m_needUpdate(false) + , m_document(document) + , m_moving(nullptr) + , m_url(IndexedString(document->url())) { - m_url = IndexedString(document->url()); Q_ASSERT(document); Q_ASSERT(document->url().isValid()); diff --git a/language/duchain/aliasdeclaration.h b/language/duchain/aliasdeclaration.h --- a/language/duchain/aliasdeclaration.h +++ b/language/duchain/aliasdeclaration.h @@ -32,8 +32,8 @@ AliasDeclarationData() {} AliasDeclarationData( const AliasDeclarationData& rhs ) : ClassMemberDeclarationData( rhs ) + , m_aliasedDeclaration(rhs.m_aliasedDeclaration) { - m_aliasedDeclaration = rhs.m_aliasedDeclaration; } IndexedDeclaration m_aliasedDeclaration; }; diff --git a/language/duchain/classmemberdeclaration.cpp b/language/duchain/classmemberdeclaration.cpp --- a/language/duchain/classmemberdeclaration.cpp +++ b/language/duchain/classmemberdeclaration.cpp @@ -28,33 +28,33 @@ { ClassMemberDeclarationData::ClassMemberDeclarationData() + : m_accessPolicy(Declaration::Public) + , m_isStatic(false) + , m_isAuto(false) + , m_isFriend(false) + , m_isRegister(false) + , m_isExtern(false) + , m_isMutable(false) + , m_isNative(false) + , m_isSynchronized(false) + , m_isStrictFP(false) + , m_isAbstract(false) { - m_accessPolicy = Declaration::Public; - m_isStatic = false; - m_isAuto = false; - m_isFriend = false; - m_isRegister = false; - m_isExtern = false; - m_isMutable = false; - m_isNative = false; - m_isSynchronized = false; - m_isStrictFP = false; - m_isAbstract = false; } ClassMemberDeclarationData::ClassMemberDeclarationData( const ClassMemberDeclarationData& rhs ) - : DeclarationData( rhs ) -{ - m_accessPolicy = rhs.m_accessPolicy; - m_isStatic = rhs.m_isStatic; - m_isAuto = rhs.m_isAuto; - m_isFriend = rhs.m_isFriend; - m_isRegister = rhs.m_isRegister; - m_isExtern = rhs.m_isExtern; - m_isMutable = rhs.m_isMutable; - m_isNative = rhs.m_isNative; - m_isSynchronized = rhs.m_isSynchronized; - m_isStrictFP = rhs.m_isStrictFP; - m_isAbstract = rhs.m_isAbstract; + : DeclarationData(rhs) + , m_accessPolicy(rhs.m_accessPolicy) + , m_isStatic(rhs.m_isStatic) + , m_isAuto(rhs.m_isAuto) + , m_isFriend(rhs.m_isFriend) + , m_isRegister(rhs.m_isRegister) + , m_isExtern(rhs.m_isExtern) + , m_isMutable(rhs.m_isMutable) + , m_isNative(rhs.m_isNative) + , m_isSynchronized(rhs.m_isSynchronized) + , m_isStrictFP(rhs.m_isStrictFP) + , m_isAbstract(rhs.m_isAbstract) +{ } ClassMemberDeclaration::ClassMemberDeclaration(const ClassMemberDeclaration& rhs) : Declaration(*new ClassMemberDeclarationData(*rhs.d_func())) { diff --git a/language/duchain/declaration.cpp b/language/duchain/declaration.cpp --- a/language/duchain/declaration.cpp +++ b/language/duchain/declaration.cpp @@ -54,6 +54,7 @@ DeclarationData::DeclarationData() : m_comment(0) + , m_kind(Declaration::Instance) , m_isDefinition(false) , m_inSymbolTable(false) , m_isTypeAlias(false) @@ -63,7 +64,6 @@ , m_isAutoDeclaration(false) , m_isExplicitlyDeleted(false) { - m_kind = Declaration::Instance; } DeclarationData::DeclarationData( const DeclarationData& rhs ) : DUChainBaseData(rhs), diff --git a/language/duchain/ducontext.cpp b/language/duchain/ducontext.cpp --- a/language/duchain/ducontext.cpp +++ b/language/duchain/ducontext.cpp @@ -1627,8 +1627,8 @@ DUContext::Import::Import(const DeclarationId& id, const CursorInRevision& _position) : position(_position) + , m_declaration(id) { - m_declaration = id; } DUContext* DUContext::Import::context(const TopDUContext* topContext, bool instantiateIfRequired) const { diff --git a/language/duchain/namespacealiasdeclaration.h b/language/duchain/namespacealiasdeclaration.h --- a/language/duchain/namespacealiasdeclaration.h +++ b/language/duchain/namespacealiasdeclaration.h @@ -30,8 +30,8 @@ NamespaceAliasDeclarationData() {} NamespaceAliasDeclarationData( const NamespaceAliasDeclarationData& rhs ) : DeclarationData( rhs ) + , m_importIdentifier(rhs.m_importIdentifier) { - m_importIdentifier = rhs.m_importIdentifier; } IndexedQualifiedIdentifier m_importIdentifier; //The identifier that was imported }; diff --git a/language/duchain/navigation/navigationaction.h b/language/duchain/navigation/navigationaction.h --- a/language/duchain/navigation/navigationaction.h +++ b/language/duchain/navigation/navigationaction.h @@ -51,8 +51,7 @@ NavigationAction( DeclarationPointer decl_, Type type_ ) : targetContext(nullptr), decl(decl_), type(type_) { } - NavigationAction( const QUrl& _document, const KTextEditor::Cursor& _cursor) : targetContext(nullptr), document(_document), cursor(_cursor) { - type = JumpToSource; + NavigationAction( const QUrl& _document, const KTextEditor::Cursor& _cursor) : targetContext(nullptr), type(JumpToSource), document(_document), cursor(_cursor) { } NavigationAction(AbstractNavigationContext* _targetContext) : targetContext(_targetContext) { diff --git a/language/interfaces/editorcontext.cpp b/language/interfaces/editorcontext.cpp --- a/language/interfaces/editorcontext.cpp +++ b/language/interfaces/editorcontext.cpp @@ -30,11 +30,11 @@ { public: EditorContextPrivate( KTextEditor::View* view, const KTextEditor::Cursor& position ) - : m_view( view ) + : m_url(view->document()->url()) + , m_position(position) + , m_currentLine(view->document()->line(m_position.line())) + , m_view( view ) { - m_url = view->document()->url(); - m_position = position; - m_currentLine = view->document()->line(m_position.line()); int wordStart = m_position.column(); int wordEnd = m_position.column(); while(wordStart > 0 && wordStart < m_currentLine.length() && (m_currentLine[wordStart-1].isLetterOrNumber() || m_currentLine[wordStart-1] == '_')) diff --git a/plugins/subversion/kdevsvncpp/context_listener.hpp b/plugins/subversion/kdevsvncpp/context_listener.hpp --- a/plugins/subversion/kdevsvncpp/context_listener.hpp +++ b/plugins/subversion/kdevsvncpp/context_listener.hpp @@ -129,22 +129,27 @@ bool maySave; SslServerTrustData(const apr_uint32_t failures_ = 0) - : failures(failures_), hostname(""), fingerprint(""), - validFrom(""), validUntil(""), issuerDName(""), - realm(""), maySave(true) + : failures(failures_) + , hostname("") + , fingerprint("") + , validFrom("") + , validUntil("") + , issuerDName("") + , realm("") + , maySave(true) { } SslServerTrustData(const SslServerTrustData & src) : failures(src.failures) + , hostname(src.hostname) + , fingerprint(src.fingerprint) + , validFrom(src.validFrom) + , validUntil(src.validUntil) + , issuerDName(src.issuerDName) + , realm(src.realm) + , maySave(src.maySave) { - hostname = src.hostname; - fingerprint = src.fingerprint; - validFrom = src.validFrom; - validUntil = src.validUntil; - issuerDName = src.issuerDName; - realm = src.realm; - maySave = src.maySave; } SslServerTrustData & diff --git a/plugins/subversion/kdevsvncpp/dirent.cpp b/plugins/subversion/kdevsvncpp/dirent.cpp --- a/plugins/subversion/kdevsvncpp/dirent.cpp +++ b/plugins/subversion/kdevsvncpp/dirent.cpp @@ -48,11 +48,14 @@ } Data(const char * _name, const svn_dirent_t * dirEntry) - : name(_name), kind(dirEntry->kind), size(dirEntry->size), - hasProps(dirEntry->has_props != 0), - createdRev(dirEntry->created_rev), time(dirEntry->time) + : name(_name) + , kind(dirEntry->kind) + , size(dirEntry->size) + , hasProps(dirEntry->has_props != 0) + , createdRev(dirEntry->created_rev) + , time(dirEntry->time) + , lastAuthor(dirEntry->last_author ? dirEntry->last_author : "") { - lastAuthor = dirEntry->last_author == nullptr ? "" : dirEntry->last_author; } Data(const DirEntry & src) diff --git a/plugins/subversion/kdevsvncpp/targets.cpp b/plugins/subversion/kdevsvncpp/targets.cpp --- a/plugins/subversion/kdevsvncpp/targets.cpp +++ b/plugins/subversion/kdevsvncpp/targets.cpp @@ -37,8 +37,8 @@ namespace svn { Targets::Targets(const PathVector & targets) + : m_targets(targets) { - m_targets = targets; } Targets::Targets(const apr_array_header_t * apr_targets) @@ -58,8 +58,8 @@ } Targets::Targets(const Targets & targets) + : m_targets(targets.targets()) { - m_targets = targets.targets(); } Targets::Targets(const char * target) diff --git a/project/projectbuildsetmodel.cpp b/project/projectbuildsetmodel.cpp --- a/project/projectbuildsetmodel.cpp +++ b/project/projectbuildsetmodel.cpp @@ -53,8 +53,8 @@ } BuildItem::BuildItem( const BuildItem& rhs ) + : m_itemPath(rhs.itemPath()) { - m_itemPath = rhs.itemPath(); } void BuildItem::initializeFromItem( KDevelop::ProjectBaseItem* item )