From 90b7c1729f6f9fd6bf67e2ca55478c5a4be4100d Mon Sep 17 00:00:00 2001 From: Keisuke Kuroyanagi Date: Fri, 1 Aug 2014 12:04:14 +0900 Subject: [PATCH] Remove DictContent. Bug: 14425059 Change-Id: I74fa4b6ba4605447c1c87427371e4be5eb8e7ae6 --- .../structure/v4/content/dict_content.h | 35 ------------------- .../v4/content/single_dict_content.h | 3 +- .../v4/content/sparse_table_dict_content.h | 3 +- 3 files changed, 2 insertions(+), 39 deletions(-) delete mode 100644 native/jni/src/suggest/policyimpl/dictionary/structure/v4/content/dict_content.h diff --git a/native/jni/src/suggest/policyimpl/dictionary/structure/v4/content/dict_content.h b/native/jni/src/suggest/policyimpl/dictionary/structure/v4/content/dict_content.h deleted file mode 100644 index c264aeac4..000000000 --- a/native/jni/src/suggest/policyimpl/dictionary/structure/v4/content/dict_content.h +++ /dev/null @@ -1,35 +0,0 @@ -/* - * Copyright (C) 2013, The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#ifndef LATINIME_DICT_CONTENT_H -#define LATINIME_DICT_CONTENT_H - -#include "defines.h" - -namespace latinime { - -class DictContent { - public: - virtual ~DictContent() {} - - protected: - DictContent() {} - - private: - DISALLOW_COPY_AND_ASSIGN(DictContent); -}; -} // namespace latinime -#endif /* LATINIME_DICT_CONTENT_H */ diff --git a/native/jni/src/suggest/policyimpl/dictionary/structure/v4/content/single_dict_content.h b/native/jni/src/suggest/policyimpl/dictionary/structure/v4/content/single_dict_content.h index 69a11425f..203c79095 100644 --- a/native/jni/src/suggest/policyimpl/dictionary/structure/v4/content/single_dict_content.h +++ b/native/jni/src/suggest/policyimpl/dictionary/structure/v4/content/single_dict_content.h @@ -21,14 +21,13 @@ #include #include "defines.h" -#include "suggest/policyimpl/dictionary/structure/v4/content/dict_content.h" #include "suggest/policyimpl/dictionary/structure/v4/ver4_dict_constants.h" #include "suggest/policyimpl/dictionary/utils/buffer_with_extendable_buffer.h" #include "suggest/policyimpl/dictionary/utils/dict_file_writing_utils.h" namespace latinime { -class SingleDictContent : public DictContent { +class SingleDictContent { public: SingleDictContent(uint8_t *const buffer, const int bufferSize) : mExpandableContentBuffer(buffer, bufferSize, diff --git a/native/jni/src/suggest/policyimpl/dictionary/structure/v4/content/sparse_table_dict_content.h b/native/jni/src/suggest/policyimpl/dictionary/structure/v4/content/sparse_table_dict_content.h index cdf870bd2..d6659615e 100644 --- a/native/jni/src/suggest/policyimpl/dictionary/structure/v4/content/sparse_table_dict_content.h +++ b/native/jni/src/suggest/policyimpl/dictionary/structure/v4/content/sparse_table_dict_content.h @@ -21,7 +21,6 @@ #include #include "defines.h" -#include "suggest/policyimpl/dictionary/structure/v4/content/dict_content.h" #include "suggest/policyimpl/dictionary/structure/v4/ver4_dict_constants.h" #include "suggest/policyimpl/dictionary/utils/buffer_with_extendable_buffer.h" #include "suggest/policyimpl/dictionary/utils/sparse_table.h" @@ -29,7 +28,7 @@ namespace latinime { // TODO: Support multiple contents. -class SparseTableDictContent : public DictContent { +class SparseTableDictContent { public: AK_FORCE_INLINE SparseTableDictContent(uint8_t *const *buffers, const int *bufferSizes, const int sparseTableBlockSize, const int sparseTableDataSize)