aa2134a · unity8 · git.iko.soy

git.iko.soy/unity8

Clean up unnecessary methods

commitaa2134a709c5424d1feee4279722438633c4ba2c authorMichal Hruby <michal.mhr@gmail.com> dateMon 1 Jul 2013, 13:10 (13 years ago) parentc868502

2 files changed−13

compare with xenial

unifiedsplit

plugins/Unity/scope.cpp−9 plugins/Unity/scope.h−4

plugins/Unity/scope.cpp−9

@@ -31,7 +31,6 @@

3131Scope::Scope(QObject *parent) :

3232 QObject(parent)

3333{

34− m_results.reset(new DeeListModel(this));

3534 m_categories.reset(new Categories(this));

3635}

3736

@@ -179,8 +178,6 @@ void Scope::setUnityScope(const unity::dash::Scope::Ptr& scope)

179178{

180179 m_unityScope = scope;

181180

182− // TODO: do we even need this?

183− m_results->setModel(m_unityScope->results()->model());

184181 m_categories->setUnityScope(m_unityScope);

185182

186183 m_unityScope->form_factor = m_formFactor.toStdString();

@@ -193,7 +190,6 @@ void Scope::setUnityScope(const unity::dash::Scope::Ptr& scope)

193190 m_unityScope->visible.changed.connect(sigc::mem_fun(this, &Scope::visibleChanged));

194191 m_unityScope->shortcut.changed.connect(sigc::mem_fun(this, &Scope::shortcutChanged));

195192 m_unityScope->connected.changed.connect(sigc::mem_fun(this, &Scope::connectedChanged));

196− m_unityScope->results()->model.changed.connect(sigc::mem_fun(this, &Scope::onResultsModelChanged));

197193 /* Signals forwarding */

198194 connect(this, SIGNAL(searchFinished(const std::string &, unity::glib::HintsMap const &, unity::glib::Error const &)), SLOT(onSearchFinished(const std::string &, unity::glib::HintsMap const &)));

199195

@@ -222,11 +218,6 @@ void Scope::synchronizeStates()

222218 }

223219}

224220

225−void Scope::onResultsModelChanged(unity::glib::Object<DeeModel> /* model */)

226−{

227− m_results->setModel(m_unityScope->results()->model());

228−}

229−

230221void Scope::onSearchFinished(const std::string& /* query */, unity::glib::HintsMap const &hints)

231222{

232223 QString hint;

plugins/Unity/scope.h−4

@@ -100,14 +100,10 @@ private Q_SLOTS:

100100 void onSearchFinished(const std::string &, unity::glib::HintsMap const &);

101101

102102private:

103− void onResultsModelChanged(unity::glib::Object<DeeModel>);

104− void onCategoriesModelChanged(unity::glib::Object<DeeModel>);

105−

106103 void onActivated(unity::dash::LocalResult const& result, unity::dash::ScopeHandledType type, unity::glib::HintsMap const&);

107104 void fallbackActivate(const QString& uri);

108105

109106 unity::dash::Scope::Ptr m_unityScope;

110− std::unique_ptr<DeeListModel> m_results;

111107 std::unique_ptr<Categories> m_categories;

112108 QString m_searchQuery;

113109 QString m_noResultsHint;