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

core: progress on the QString->QByteArray for Core::Id, remove UniqueIDManager

Browse Source 
Change-Id: I94bec127866822b790a6e45a4201a7a5fe71d6ce
Reviewed-on: http://codereview.qt.nokia.com/4208
Reviewed-by: hjk <qthjk@ovi.com>
This commit is contained in:
hjk
2011-09-02 12:45:36 +02:00
committed by hjk
parent efa79035d4
commit df2858bb6c
17 changed files with 87 additions and 149 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/coreplugin/actionmanager/command.cpp
View File

@@ -435,7 +435,7 @@ void Action::updateActiveState()
setActive(m_action->isEnabled() && m_action->isVisible() && !m_action->isSeparator());
}
static inline QString msgActionWarning(QAction *newAction, int k, QAction *oldAction)
static QString msgActionWarning(QAction *newAction, int k, QAction *oldAction)
{
QString msg;
QTextStream str(&msg);
@@ -444,7 +444,7 @@ static inline QString msgActionWarning(QAction *newAction, int k, QAction *oldAc
if (oldAction)
str << oldAction->objectName() << '/' << oldAction->text();
str << " is already registered for context " << k << ' '
<< Core::ICore::instance()->uniqueIDManager()->stringForUniqueIdentifier(k)
<< Core::Id::fromUniqueIdentifier(k).toString()
<< '.';
return msg;
}