git.iko.soy/unity8
on xenial help sign in
Renamed lens/lenses files to scope/scopes.
commit684866db0bc79fa9480e74199239acb0a4bc7cef authorPawel Stolowski <pawel.stolowski@canonical.com> dateThu 6 Jun 2013, 12:37 (13 years ago) parent38257fa
6 files changed+8−11
compare with xenial
unifiedsplit
plugins/Unity/CMakeLists.txt+2−2 plugins/Unity/plugin.cpp+2−2 plugins/Unity/lens.cpp → plugins/Unity/scope.cpp+1−4 plugins/Unity/lens.h → plugins/Unity/scope.h plugins/Unity/lenses.cpp → plugins/Unity/scopes.cpp+3−3 plugins/Unity/lenses.h → plugins/Unity/scopes.h
plugins/Unity/CMakeLists.txt+2−2
@@ -13,8 +13,8 @@ include_directories(
1313
1414set(QMLPLUGIN_SRC
1515 ../Utils/qsortfilterproxymodelqml.cpp # FIXME evaluate a more generic approach for using other plugins
16− lens.cpp
17− lenses.cpp
16+ scope.cpp
17+ scopes.cpp
1818 categories.cpp
1919 categoryfilter.cpp
2020 plugin.cpp
plugins/Unity/plugin.cpp+2−2
@@ -24,8 +24,8 @@
2424#include "plugin.h"
2525
2626// local
27−#include "lens.h"
28−#include "lenses.h"
27+#include "scope.h"
28+#include "scopes.h"
2929#include "categories.h"
3030#include "categoryfilter.h"
3131#include "bottombarvisibilitycommunicatorshell.h"
plugins/Unity/lens.cpp → plugins/Unity/scope.cpprenamed+1−4
@@ -18,7 +18,7 @@
1818 */
1919
2020// Self
21−#include "lens.h"
21+#include "scope.h"
2222#include "categories.h"
2323
2424// Qt
@@ -257,13 +257,11 @@ void Scope::onCategoriesSwarmNameChanged(const std::string& /* swarm_name */)
257257
258258void Scope::onCategoriesChanged(const unity::dash::Categories::Ptr& /* categories */)
259259{
260− qWarning() << "categories changed!";
261260 m_categories->setName(QString::fromStdString(m_unityScope->categories()->swarm_name));
262261}
263262
264263void Scope::onCategoriesModelChanged(unity::glib::Object<DeeModel> model)
265264{
266− qWarning() << "categories model changed!";
267265 m_categories->setModel(model);
268266}
269267
@@ -276,7 +274,6 @@ void Scope::onSearchFinished(const std::string &query, unity::glib::HintsMap con
276274{
277275 QString hint;
278276
279− qWarning() << "Result count:" << id() << m_unityScope->results()->count() << QString::fromStdString(m_unityScope->results()->swarm_name) << m_categories->rowCount();
280277 if (!m_unityScope->results()->count()) {
281278 unity::glib::HintsMap::const_iterator it = hints.find("no-results-hint");
282279 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 @@
1818 */
1919
2020// Self
21−#include "lenses.h"
21+#include "scopes.h"
2222
2323// Local
24−#include "lens.h"
24+#include "scope.h"
2525
2626// Qt
2727#include <QDebug>
@@ -172,7 +172,7 @@ void Scopes::addUnityScope(const unity::dash::Scope::Ptr& unity_scope)
172172 Scope* scope = new Scope(this);
173173 scope->setUnityScope(unity_scope);
174174 /* DOCME */
175− QObject::connect(scope, SIGNAL(visibleChanged(bool)), this, SLOT(onLensPropertyChanged()));
175+ QObject::connect(scope, SIGNAL(visibleChanged(bool)), this, SLOT(onScopePropertyChanged()));
176176 m_scopes.append(scope);
177177}
178178
plugins/Unity/lenses.h → plugins/Unity/scopes.hrenamed

The content is the same.