X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-toolkit%2Finternal%2Ftext%2Fcontroller%2Ftext-controller-impl.h;h=1844cb0eb93ff6f03b73837590a0423dd65c722e;hb=557926c429fa6d9f4fad47e45caa7cf71644d57b;hp=656b9bf633856a93a0ccc61e8e723a2201b50362;hpb=dacfa04c292116a2df17a37e722963c40c287464;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git diff --git a/dali-toolkit/internal/text/controller/text-controller-impl.h b/dali-toolkit/internal/text/controller/text-controller-impl.h index 656b9bf..1844cb0 100644 --- a/dali-toolkit/internal/text/controller/text-controller-impl.h +++ b/dali-toolkit/internal/text/controller/text-controller-impl.h @@ -19,7 +19,7 @@ */ // EXTERNAL INCLUDES -#include +#include #include #include @@ -371,9 +371,9 @@ struct Controller::Impl mModel = Model::New(); mFontClient = TextAbstraction::FontClient::Get(); - if(mEditableControlInterface != nullptr && Clipboard::IsAvailable()) + if(mEditableControlInterface != nullptr && TextClipboard::IsAvailable()) { - mClipboard = Clipboard::Get(); + mClipboard = TextClipboard::Get(); } mView.SetVisualModel(mModel->mVisualModel); @@ -568,7 +568,7 @@ struct Controller::Impl { if(!mClipboard) { - mClipboard = Clipboard::Get(); + mClipboard = TextClipboard::Get(); } return mClipboard != nullptr ? true : false; @@ -576,13 +576,13 @@ struct Controller::Impl bool IsClipboardEmpty() { - bool result(Clipboard::IsAvailable() && EnsureClipboardCreated() && mClipboard.NumberOfItems()); + bool result(TextClipboard::IsAvailable() && EnsureClipboardCreated() && mClipboard.NumberOfItems()); return !result; // If NumberOfItems greater than 0, return false } bool IsClipboardVisible() { - bool result(Clipboard::IsAvailable() && EnsureClipboardCreated() && mClipboard.IsVisible()); + bool result(TextClipboard::IsAvailable() && EnsureClipboardCreated() && mClipboard.IsVisible()); return result; } @@ -1016,7 +1016,7 @@ public: OutlineDefaults* mOutlineDefaults; ///< Avoid allocating this when the user does not specify outline parameters. EventData* mEventData; ///< Avoid allocating everything for text input until EnableTextInput(). TextAbstraction::FontClient mFontClient; ///< Handle to the font client. - Clipboard mClipboard; ///< Handle to the system clipboard + TextClipboard mClipboard; ///< Handle to the system clipboard View mView; ///< The view interface to the rendering back-end. MetricsPtr mMetrics; ///< A wrapper around FontClient used to get metrics & potentially down-scaled Emoji metrics. Layout::Engine mLayoutEngine; ///< The layout engine.