From 3a8a23605d20ab8e3bd62f6ed10c4811742475ce Mon Sep 17 00:00:00 2001
From: Xavier Robin <xavalias-github@xavier.robin.name>
Date: Thu, 27 Jul 2023 10:29:37 +0200
Subject: [PATCH] refactor: SCHWED-4345 move IsValid to the implementation
---
modules/mol/base/src/atom_base.cc | 5 +++++
modules/mol/base/src/atom_base.hh | 2 +-
modules/mol/base/src/chain_base.cc | 5 +++++
modules/mol/base/src/chain_base.hh | 2 +-
modules/mol/base/src/residue_base.cc | 5 +++++
modules/mol/base/src/residue_base.hh | 2 +-
6 files changed, 18 insertions(+), 3 deletions(-)
diff --git a/modules/mol/base/src/atom_base.cc b/modules/mol/base/src/atom_base.cc
index 482464768..3dae54fb8 100644
--- a/modules/mol/base/src/atom_base.cc
+++ b/modules/mol/base/src/atom_base.cc
@@ -102,6 +102,11 @@ String AtomBase::GetQualifiedName() const
return Impl()->GetQualifiedName();
}
+bool AtomBase::IsValid() const
+{
+ return Impl().get()!=0;
+}
+
void AtomBase::CheckValidity() const
{
if (! (impl_ && impl_->GetEntity()))
diff --git a/modules/mol/base/src/atom_base.hh b/modules/mol/base/src/atom_base.hh
index b69c8ceb0..b30693b5b 100644
--- a/modules/mol/base/src/atom_base.hh
+++ b/modules/mol/base/src/atom_base.hh
@@ -57,7 +57,7 @@ public:
operator bool() const { return this->IsValid(); }
/// \brief check validity of handle
/// \sa #operator bool()
- bool IsValid() const { return Impl().get()!=0; }
+ bool IsValid() const;
//@}
friend class ConstGenericPropContainer<AtomBase>;
///\brief Get atom name.
diff --git a/modules/mol/base/src/chain_base.cc b/modules/mol/base/src/chain_base.cc
index 28263e738..322177349 100644
--- a/modules/mol/base/src/chain_base.cc
+++ b/modules/mol/base/src/chain_base.cc
@@ -52,6 +52,11 @@ String ChainBase::GetDescription() const {
return impl_->GetDescription();
}
+bool ChainBase::IsValid() const
+{
+ return Impl().get()!=0;
+}
+
void ChainBase::CheckValidity() const {
if (! (impl_ && impl_->GetEntity()))
throw InvalidHandle();
diff --git a/modules/mol/base/src/chain_base.hh b/modules/mol/base/src/chain_base.hh
index 0ab82a3db..ec02a795f 100644
--- a/modules/mol/base/src/chain_base.hh
+++ b/modules/mol/base/src/chain_base.hh
@@ -55,7 +55,7 @@ public:
operator bool() const { return this->IsValid(); }
/// \brief check validity of handle
/// \sa #operator bool()
- bool IsValid() const { return Impl().get()!=0; }
+ bool IsValid() const;
//@}
friend class ConstGenericPropContainer<ChainBase>;
String GetName() const;
diff --git a/modules/mol/base/src/residue_base.cc b/modules/mol/base/src/residue_base.cc
index 01b996679..c227e090e 100644
--- a/modules/mol/base/src/residue_base.cc
+++ b/modules/mol/base/src/residue_base.cc
@@ -156,6 +156,11 @@ const impl::ResidueImplPtr& ResidueBase::Impl() const
return impl_;
}
+bool ResidueBase::IsValid() const
+{
+ return Impl().get()!=0;
+}
+
void ResidueBase::CheckValidity() const
{
if (! (impl_ && impl_->GetEntity()))
diff --git a/modules/mol/base/src/residue_base.hh b/modules/mol/base/src/residue_base.hh
index 0011a962a..753fc139e 100644
--- a/modules/mol/base/src/residue_base.hh
+++ b/modules/mol/base/src/residue_base.hh
@@ -81,7 +81,7 @@ public:
operator bool() const { return this->IsValid(); }
/// \brief check validity of handle
/// \sa #operator bool()
- bool IsValid() const { return Impl().get()!=0; }
+ bool IsValid() const;
friend class ConstGenericPropContainer<ResidueBase>;
/// \brief return residue number
const ResNum& GetNumber() const;
--
GitLab