diff --git a/libWords/libwords.cpp b/libWords/libwords.cpp index c9409af..344359d 100644 --- a/libWords/libwords.cpp +++ b/libWords/libwords.cpp @@ -5,12 +5,12 @@ using namespace lib_words; -std::shared_ptr WordReader::wordsFrom(const QString& path) const { +std::shared_ptr WordReader::wordsFrom(const QString& path) const { auto primary_words = extract_primary(path); if (!primary_words.size()) return nullptr; - std::shared_ptr prev_ptr = std::make_shared(primary_words.last(), nullptr); + std::shared_ptr prev_ptr = std::make_shared(primary_words.last(), nullptr); for (auto idx = primary_words.size() - 2; idx >= 0; --idx) { auto content_ptr = primary_words[idx]; prev_ptr = std::make_shared(content_ptr, prev_ptr); @@ -58,7 +58,7 @@ QList> WordReader::parse_line(uint64_t start_po return primary_words; } -WordImpl::WordImpl(std::shared_ptr content, std::shared_ptr next) +WordImpl::WordImpl(std::shared_ptr content, std::shared_ptr next) : content_ptr(content), next_ptr(next) { } QString WordImpl::file() const { @@ -81,7 +81,7 @@ int WordImpl::column() const { return content_ptr->column(); } -std::shared_ptr WordImpl::nextWord() const { +std::shared_ptr WordImpl::nextWord() const { return next_ptr; } @@ -116,6 +116,6 @@ int WordContent::column() const { return col_n; } -std::shared_ptr WordContent::nextWord() const { +std::shared_ptr WordContent::nextWord() const { return nullptr; } diff --git a/libWords/libwords.h b/libWords/libwords.h index feadea0..562faea 100644 --- a/libWords/libwords.h +++ b/libWords/libwords.h @@ -45,7 +45,7 @@ namespace lib_words { * * \return */ - virtual std::shared_ptr nextWord() const = 0; + virtual std::shared_ptr nextWord() const = 0; }; /** @@ -67,16 +67,16 @@ namespace lib_words { virtual QString content() const override; virtual int row() const override; virtual int column() const override; - virtual std::shared_ptr nextWord() const override; + virtual std::shared_ptr nextWord() const override; }; class LIBWORDS_EXPORT WordImpl : public IPrimitiveWord { private: std::shared_ptr content_ptr; - std::shared_ptr next_ptr; + std::shared_ptr next_ptr; public: - WordImpl(std::shared_ptr content, std::shared_ptr next); + WordImpl(std::shared_ptr content, std::shared_ptr next); // 通过 IWordBase 继承 QString file() const override; @@ -84,7 +84,7 @@ namespace lib_words { QString content() const override; int row() const override; int column() const override; - std::shared_ptr nextWord() const override; + std::shared_ptr nextWord() const override; }; @@ -100,7 +100,7 @@ namespace lib_words { /** * @brief 提取源码中所有的词语 */ - std::shared_ptr wordsFrom(const QString& path) const; + std::shared_ptr wordsFrom(const QString& path) const; };