unity-scopes-shell

Merge lp:~mhr3/unity-scopes-shell/no-force-new-scopes into lp:unity-scopes-shell

  1. no-force-new-scopes
  2. Merge into trunk
Proposed by Michal Hruby
Status: Merged
Approved by: Michał Sawicz
Approved revision: 61
Merged at revision: 63
Proposed branch: lp:~mhr3/unity-scopes-shell/no-force-new-scopes
Merge into: lp:unity-scopes-shell
Diff against target: 41 lines (+12/-19)
1 file modified
src/Unity/plugin.cpp (+12/-19)
To merge this branch: bzr merge lp:~mhr3/unity-scopes-shell/no-force-new-scopes
Reviewer Review Type Date Requested Status
Michał Sawicz Approve
Review via email: mp+207398@code.launchpad.net

Commit message

Remove support for UNITY_FORCE_NEW_SCOPES envvar.

Description of the change

Remove support for UNITY_FORCE_NEW_SCOPES envvar, as new scopes haven't been compatible with old dash for quite a while.

To post a comment you must log in.
Revision history for this message
Michał Sawicz (saviq) wrote :

Yeah.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/Unity/plugin.cpp'
2--- src/Unity/plugin.cpp 2014-02-12 21:02:00 +0000
3+++ src/Unity/plugin.cpp 2014-02-20 10:40:38 +0000
4@@ -51,25 +51,18 @@
5 {
6 Q_ASSERT(uri == QLatin1String("Unity"));
7
8- if (qgetenv("UNITY_FORCE_NEW_SCOPES").isNull()) {
9- qmlRegisterUncreatableType<Preview>(uri, 0, 1, "Preview", "Can't create Preview object in QML.");
10- qmlRegisterUncreatableType<PreviewAction>(uri, 0, 1, "PreviewAction", "Can't create PreviewAction object in QML.");
11- qmlRegisterUncreatableType<PreviewInfoHint>(uri, 0, 1, "PreviewInfoHint", "Can't create PreviewInfoHint object in QML.");
12- qmlRegisterUncreatableType<SocialPreviewComment>(uri, 0, 1, "SocialPreviewComment", "Can't create SocialPreviewComment object in QML.");
13- qmlRegisterUncreatableType<GenericOptionsModel>(uri, 0, 1, "GenericOptionsModel", "Can't create options model in QML.");
14- qmlRegisterUncreatableType<Result>(uri, 0, 1, "Result", "Can't create result object in QML.");
15- qmlRegisterType<Scope>(uri, 0, 1, "Scope");
16- qmlRegisterType<Scopes>(uri, 0, 1, "Scopes");
17- qmlRegisterType<Categories>(uri, 0, 1, "Categories");
18- qmlRegisterUncreatableType<CategoryResults>(uri, 0, 1, "CategoryResults", "Can't create new Category Results in QML. Get them from Categories instance.");
19- qmlRegisterType<DeeListModel>(uri, 0, 1, "DeeListModel");
20- qmlRegisterType<MusicPreviewTrackModel>(uri, 0, 1, "MusicPreviewTrackModel");
21- } else {
22- qmlRegisterType<scopes_ng::Scope>(uri, 0, 1, "Scope");
23- qmlRegisterType<scopes_ng::Scopes>(uri, 0, 1, "Scopes");
24- qmlRegisterType<scopes_ng::Categories>(uri, 0, 1, "Categories");
25- qmlRegisterUncreatableType<scopes_ng::ResultsModel>(uri, 0, 1, "ResultsModel", "Can't create new Results Model in QML. Get them from Categories instance.");
26- }
27+ qmlRegisterUncreatableType<Preview>(uri, 0, 1, "Preview", "Can't create Preview object in QML.");
28+ qmlRegisterUncreatableType<PreviewAction>(uri, 0, 1, "PreviewAction", "Can't create PreviewAction object in QML.");
29+ qmlRegisterUncreatableType<PreviewInfoHint>(uri, 0, 1, "PreviewInfoHint", "Can't create PreviewInfoHint object in QML.");
30+ qmlRegisterUncreatableType<SocialPreviewComment>(uri, 0, 1, "SocialPreviewComment", "Can't create SocialPreviewComment object in QML.");
31+ qmlRegisterUncreatableType<GenericOptionsModel>(uri, 0, 1, "GenericOptionsModel", "Can't create options model in QML.");
32+ qmlRegisterUncreatableType<Result>(uri, 0, 1, "Result", "Can't create result object in QML.");
33+ qmlRegisterType<Scope>(uri, 0, 1, "Scope");
34+ qmlRegisterType<Scopes>(uri, 0, 1, "Scopes");
35+ qmlRegisterType<Categories>(uri, 0, 1, "Categories");
36+ qmlRegisterUncreatableType<CategoryResults>(uri, 0, 1, "CategoryResults", "Can't create new Category Results in QML. Get them from Categories instance.");
37+ qmlRegisterType<DeeListModel>(uri, 0, 1, "DeeListModel");
38+ qmlRegisterType<MusicPreviewTrackModel>(uri, 0, 1, "MusicPreviewTrackModel");
39
40 // new Scopes classes
41 qmlRegisterType<scopes_ng::Scope>(uri, 0, 2, "Scope");

Subscribers

People subscribed via source and target branches

to all changes: