feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Move icons to Utils

Browse Source 
This way we can use them from libraries, not only from plugins.

Change-Id: Ic35cfd5f04d638d87606bf272b2c00ded1267c1b
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
This commit is contained in:
Ulf Hermann
2016-08-03 17:55:54 +02:00
parent 5d6f5ff2c9
commit 15fbfaf2e9
214 changed files with 598 additions and 654 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/git/gitplugin.cpp
View File

@@ -45,7 +45,6 @@
#include <coreplugin/icore.h>
#include <coreplugin/coreconstants.h>
#include <coreplugin/coreicons.h>
#include <coreplugin/documentmanager.h>
#include <coreplugin/actionmanager/actionmanager.h>
#include <coreplugin/actionmanager/actioncontainer.h>
@@ -63,6 +62,7 @@
#include <utils/qtcassert.h>
#include <utils/parameteraction.h>
#include <utils/pathchooser.h>
#include <utils/utilsicons.h>
#include <texteditor/texteditor.h>
#include <vcsbase/basevcseditorfactory.h>
@@ -743,7 +743,7 @@ class RebaseItemDelegate : public IconItemDelegate
{
public:
RebaseItemDelegate(LogChangeWidget *widget)
: IconItemDelegate(widget, Core::Icons::UNDO.imageFileName())
: IconItemDelegate(widget, Utils::Icons::UNDO.imageFileName())
{
}

4
src/plugins/git/gitsubmiteditorwidget.cpp
View File

@@ -29,8 +29,8 @@
#include "logchangedialog.h"
#include <coreplugin/coreconstants.h>
#include <coreplugin/coreicons.h>
#include <utils/completingtextedit.h>
#include <utils/utilsicons.h>
#include <QRegExpValidator>
#include <QTextEdit>
@@ -52,7 +52,7 @@ GitSubmitEditorWidget::GitSubmitEditorWidget() :
new GitSubmitHighlighter(descriptionEdit());
m_emailValidator = new QRegExpValidator(QRegExp("[^@ ]+@[^@ ]+\\.[a-zA-Z]+"), this);
const QPixmap error = Core::Icons::ERROR.pixmap();
const QPixmap error = Utils::Icons::ERROR.pixmap();
m_gitSubmitPanelUi.invalidAuthorLabel->setPixmap(error);
m_gitSubmitPanelUi.invalidEmailLabel->setToolTip(tr("Provide a valid email to commit."));
m_gitSubmitPanelUi.invalidEmailLabel->setPixmap(error);