Add short hand append for candidate list.

fcitx · Feb 13, 2020 · 9436416 · 9436416
1 parent 8bee2b2
commit 9436416
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 13 deletions.
diff --git a/src/im/keyboard/keyboard.cpp b/src/im/keyboard/keyboard.cpp
@@ -528,8 +528,8 @@ void KeyboardEngine::updateCandidate(const InputMethodEntry &entry,
     auto candidateList = std::make_unique<CommonCandidateList>();
     auto spellType = guessSpellType(state->buffer_.userInput());
     for (const auto &result : results) {
-        candidateList->append(std::make_unique<KeyboardCandidateWord>(
-            this, Text(formatWord(result, spellType))));
+        candidateList->append<KeyboardCandidateWord>(
+            this, Text(formatWord(result, spellType)));
     }
     candidateList->setSelectionKey(selectionKeys_);
     candidateList->setCursorIncludeUnselected(true);

diff --git a/src/lib/fcitx/candidatelist.h b/src/lib/fcitx/candidatelist.h
@@ -129,6 +129,12 @@ class FCITXCORE_EXPORT ModifiableCandidateList : public BulkCandidateList {
     void append(std::unique_ptr<CandidateWord> word) {
         insert(totalSize(), std::move(word));
     }
+
+    template <typename CandidateWordType, typename... Args>
+    void append(Args &&... args) {
+        append(
+            std::make_unique<CandidateWordType>(std::forward<Args>(args)...));
+    }
 };
 
 class DisplayOnlyCandidateListPrivate;

diff --git a/src/modules/clipboard/clipboard.cpp b/src/modules/clipboard/clipboard.cpp
@@ -265,8 +265,7 @@ void Clipboard::updateUI(InputContext *inputContext) {
     // Append first item from history_.
     auto iter = history_.begin();
     if (iter != history_.end()) {
-        candidateList->append(
-            std::make_unique<ClipboardCandidateWord>(this, *iter));
+        candidateList->append<ClipboardCandidateWord>(this, *iter);
         iter++;
     }
     // Append primary_, but check duplication first.
@@ -279,17 +278,15 @@ void Clipboard::updateUI(InputContext *inputContext) {
             }
         }
         if (!dup) {
-            candidateList->append(
-                std::make_unique<ClipboardCandidateWord>(this, primary_));
+            candidateList->append<ClipboardCandidateWord>(this, primary_);
         }
     }
     // If primary_ is appended, it might squeeze one space out.
     for (; iter != history_.end(); iter++) {
         if (candidateList->totalSize() >= config_.numOfEntries.value()) {
             break;
         }
-        candidateList->append(
-            std::make_unique<ClipboardCandidateWord>(this, *iter));
+        candidateList->append<ClipboardCandidateWord>(this, *iter);
     }
     candidateList->setSelectionKey(selectionKeys_);
     candidateList->setLayoutHint(CandidateLayoutHint::Vertical);

diff --git a/src/modules/quickphrase/quickphrase.cpp b/src/modules/quickphrase/quickphrase.cpp
@@ -265,8 +265,8 @@ void QuickPhrase::updateUI(InputContext *inputContext) {
             text.append(start->second);
             text.append(" ");
             text.append(start->first.substr(state->buffer_.userInput().size()));
-            candidateList->append(std::make_unique<QuickPhraseCandidateWord>(
-                this, std::move(text)));
+            candidateList->append<QuickPhraseCandidateWord>(this,
+                                                            std::move(text));
         }
         candidateList->setSelectionKey(selectionKeys_);
         inputContext->inputPanel().setCandidateList(std::move(candidateList));

diff --git a/src/modules/unicode/unicode.cpp b/src/modules/unicode/unicode.cpp
@@ -227,8 +227,7 @@ void Unicode::updateUI(InputContext *inputContext) {
         candidateList->setPageSize(instance_->globalConfig().defaultPageSize());
         for (auto c : result) {
             if (utf8::UCS4IsValid(c)) {
-                candidateList->append(
-                    std::make_unique<UnicodeCandidateWord>(this, c));
+                candidateList->append<UnicodeCandidateWord>(this, c);
             }
         }
         candidateList->setSelectionKey(selectionKeys_);

diff --git a/test/testcandidatelist.cpp b/test/testcandidatelist.cpp
@@ -39,7 +39,7 @@ int main() {
         Key::keyListFromString("1 2 3 4 5 6 7 8 9 0"));
     candidatelist.setPageSize(3);
     for (int i = 0; i < 10; i++) {
-        candidatelist.append(std::make_unique<TestCandidateWord>(i));
+        candidatelist.append<TestCandidateWord>(i);
     }
 
     FCITX_ASSERT(candidatelist.size() == 3);