← Back to branch summary

~zsombi/ubuntu-ui-toolkit/00-remove-unity-actions

« back to all changes in this revision

Viewing changes to modules/Ubuntu/Components/plugin/ucactioncontext.cpp

  • Committer: Zsombor Egri
  • Date: 2014-09-16 15:54:35 UTC
  • Revision ID: zsombor.egri@canonical.com-20140916155435-ocatbof74n9t3gur
comments applied

Show diffs side-by-side

added added

removed removed

Lines of Context:
modules/Ubuntu/Components/plugin/ucactioncontext.cpp
134
134
{
135
135
    UCAction *toolkitAction = qobject_cast<UCAction*>(action);
136
136
    if (!toolkitAction) {
137
 
        qmlInfo(action) << "Invalid Action. Please use Action from Ubuntu.Components.";
 
137
        qmlInfo(action) << "Unity.Action deprecated. Please use Action from Ubuntu.Components.";
138
138
        return;
139
139
    }
140
140
    if (m_actions.contains(toolkitAction)) {
156
156
    }
157
157
    UCAction *toolkitAction = qobject_cast<UCAction*>(action);
158
158
    if (!toolkitAction) {
159
 
        qmlInfo(action) << "Invalid Action. Please use Action from Ubuntu.Components.";
 
159
        qmlInfo(action) << "Unity.Action deprecated. Please use Action from Ubuntu.Components.";
160
160
        return;
161
161
    }
162
162
    m_actions.remove(toolkitAction);