684866d · unity8 · git.iko.soy

plugins/Unity/CMakeLists.txt+2−2

compare with xenial

unifiedsplit

@@ -13,8 +13,8 @@ include_directories(

13

14set(QMLPLUGIN_SRC

15 ../Utils/qsortfilterproxymodelqml.cpp # FIXME evaluate a more generic approach for using other plugins

16− lens.cpp

16+ scope.cpp

17− lenses.cpp

17+ scopes.cpp

18 categories.cpp

19 categoryfilter.cpp

20 plugin.cpp

plugins/Unity/plugin.cpp+2−2

@@ -24,8 +24,8 @@

24#include "plugin.h"

25

26// local

27−#include "lens.h"

27+#include "scope.h"

28−#include "lenses.h"

28+#include "scopes.h"

29#include "categories.h"

30#include "categoryfilter.h"

31#include "bottombarvisibilitycommunicatorshell.h"

plugins/Unity/lens.cpp → plugins/Unity/scope.cpprenamed+1−4

@@ -18,7 +18,7 @@

18 */

19

20// Self

21−#include "lens.h"

21+#include "scope.h"

22#include "categories.h"

23

24// Qt

@@ -257,13 +257,11 @@ void Scope::onCategoriesSwarmNameChanged(const std::string& /* swarm_name */)

257

258void Scope::onCategoriesChanged(const unity::dash::Categories::Ptr& /* categories */)

259{

260− qWarning() << "categories changed!";

261 m_categories->setName(QString::fromStdString(m_unityScope->categories()->swarm_name));

260 m_categories->setName(QString::fromStdString(m_unityScope->categories()->swarm_name));

262}

261}

263

262

264void Scope::onCategoriesModelChanged(unity::glib::Object<DeeModel> model)

263void Scope::onCategoriesModelChanged(unity::glib::Object<DeeModel> model)

265{

264{

266− qWarning() << "categories model changed!";

267 m_categories->setModel(model);

265 m_categories->setModel(model);

268}

266}

269

267

@@ -276,7 +274,6 @@ void Scope::onSearchFinished(const std::string &query, unity::glib::HintsMap con

276{

274{

277 QString hint;

275 QString hint;

278

276

279− qWarning() << "Result count:" << id() << m_unityScope->results()->count() << QString::fromStdString(m_unityScope->results()->swarm_name) << m_categories->rowCount();

280 if (!m_unityScope->results()->count()) {

277 if (!m_unityScope->results()->count()) {

281 unity::glib::HintsMap::const_iterator it = hints.find("no-results-hint");

278 unity::glib::HintsMap::const_iterator it = hints.find("no-results-hint");

282 if (it != hints.end()) {

279 if (it != hints.end()) {

plugins/Unity/lens.h → plugins/Unity/scope.hrenamed

The content is the same.

plugins/Unity/lenses.cpp → plugins/Unity/scopes.cpprenamed+3−3

@@ -18,10 +18,10 @@

18 */

19

20// Self

21−#include "lenses.h"

21+#include "scopes.h"

22

23// Local

24−#include "lens.h"

24+#include "scope.h"

25

26// Qt

27#include <QDebug>

@@ -172,7 +172,7 @@ void Scopes::addUnityScope(const unity::dash::Scope::Ptr& unity_scope)

172 Scope* scope = new Scope(this);

173 scope->setUnityScope(unity_scope);

174 /* DOCME */

175− QObject::connect(scope, SIGNAL(visibleChanged(bool)), this, SLOT(onLensPropertyChanged()));

175+ QObject::connect(scope, SIGNAL(visibleChanged(bool)), this, SLOT(onScopePropertyChanged()));

176 m_scopes.append(scope);

177}

178

plugins/Unity/lenses.h → plugins/Unity/scopes.hrenamed

The content is the same.