diff options
| author | Ulf Hermann <ulf.hermann@qt.io> | 2016-08-03 17:55:54 +0200 |
|---|---|---|
| committer | Ulf Hermann <ulf.hermann@qt.io> | 2016-08-05 10:52:53 +0000 |
| commit | 15fbfaf2e94b72cfd54bb0bd6f2b9ab87b870795 (patch) | |
| tree | e0ec09f6b6b97f0a9b61fd3b27c379cc84d1f3ce /src/plugins/coreplugin/navigationwidget.cpp | |
| parent | 5d6f5ff2c969046cd19c13a5b7bb0775c9925ea3 (diff) | |
| download | qt-creator-15fbfaf2e94b72cfd54bb0bd6f2b9ab87b870795.tar.gz | |
Move icons to Utils
This way we can use them from libraries, not only from plugins.
Change-Id: Ic35cfd5f04d638d87606bf272b2c00ded1267c1b
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Diffstat (limited to 'src/plugins/coreplugin/navigationwidget.cpp')
| -rw-r--r-- | src/plugins/coreplugin/navigationwidget.cpp | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/src/plugins/coreplugin/navigationwidget.cpp b/src/plugins/coreplugin/navigationwidget.cpp index 8f8f1435c2..287e519872 100644 --- a/src/plugins/coreplugin/navigationwidget.cpp +++ b/src/plugins/coreplugin/navigationwidget.cpp @@ -27,7 +27,6 @@ #include "navigationsubwidget.h" #include "icontext.h" #include "icore.h" -#include "coreicons.h" #include "inavigationwidgetfactory.h" #include "modemanager.h" #include "actionmanager/actionmanager.h" @@ -35,6 +34,8 @@ #include "id.h" #include "imode.h" +#include <utils/utilsicons.h> + #include <QCoreApplication> #include <QDebug> #include <QSettings> @@ -243,7 +244,7 @@ Internal::NavigationSubWidget *NavigationWidget::insertSubItem(int position,int } if (!d->m_subWidgets.isEmpty()) // Make all icons the bottom icon - d->m_subWidgets.at(0)->setCloseIcon(Icons::CLOSE_SPLIT_BOTTOM.icon()); + d->m_subWidgets.at(0)->setCloseIcon(Utils::Icons::CLOSE_SPLIT_BOTTOM.icon()); Internal::NavigationSubWidget *nsw = new Internal::NavigationSubWidget(this, position, index); connect(nsw, &Internal::NavigationSubWidget::splitMe, @@ -252,8 +253,8 @@ Internal::NavigationSubWidget *NavigationWidget::insertSubItem(int position,int insertWidget(position, nsw); d->m_subWidgets.insert(position, nsw); d->m_subWidgets.at(0)->setCloseIcon(d->m_subWidgets.size() == 1 - ? Icons::CLOSE_SPLIT_LEFT.icon() - : Icons::CLOSE_SPLIT_TOP.icon()); + ? Utils::Icons::CLOSE_SPLIT_LEFT.icon() + : Utils::Icons::CLOSE_SPLIT_TOP.icon()); return nsw; } @@ -296,8 +297,8 @@ void NavigationWidget::closeSubWidget() // update close button of top item if (d->m_subWidgets.size() == 1) d->m_subWidgets.at(0)->setCloseIcon(d->m_subWidgets.size() == 1 - ? Icons::CLOSE_SPLIT_LEFT.icon() - : Icons::CLOSE_SPLIT_TOP.icon()); + ? Utils::Icons::CLOSE_SPLIT_LEFT.icon() + : Utils::Icons::CLOSE_SPLIT_TOP.icon()); } else { setShown(false); } |