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

13
src/plugins/fakevim/fakevimplugin.cpp
View File

@@ -380,8 +380,6 @@ void FakeVimExCommandsPage::initialize()
{
ActionManager *am = ICore::instance()->actionManager();
QTC_ASSERT(am, return);
UniqueIDManager *uidm = UniqueIDManager::instance();
QTC_ASSERT(uidm, return);
QMap<QString, QTreeWidgetItem *> sections;
@@ -392,7 +390,7 @@ void FakeVimExCommandsPage::initialize()
QTreeWidgetItem *item = new QTreeWidgetItem;
item->setData(0, CommandRole, int(c->id()));
const QString name = uidm->stringForUniqueIdentifier(c->id());
const QString name = Id::fromUniqueIdentifier(c->id()).toString();
const int pos = name.indexOf(QLatin1Char('.'));
const QString section = name.left(pos);
const QString subId = name.mid(pos + 1);
@@ -445,9 +443,8 @@ void FakeVimExCommandsPage::targetIdentifierChanged()
if (!current)
return;
UniqueIDManager *uidm = UniqueIDManager::instance();
int id = current->data(0, CommandRole).toInt();
const QString name = uidm->stringForUniqueIdentifier(id);
const QString name = Id::fromUniqueIdentifier(id).toString();
const QString regex = targetEdit()->text();
if (current->data(0, Qt::UserRole).isValid()) {
@@ -463,9 +460,8 @@ void FakeVimExCommandsPage::resetTargetIdentifier()
QTreeWidgetItem *current = commandList()->currentItem();
if (!current)
return;
UniqueIDManager *uidm = UniqueIDManager::instance();
int id = current->data(0, CommandRole).toInt();
const QString name = uidm->stringForUniqueIdentifier(id);
const QString name = Id::fromUniqueIdentifier(id).toString();
QString regex;
if (defaultExCommandMap().contains(name))
regex = defaultExCommandMap()[name].pattern();
@@ -479,7 +475,6 @@ void FakeVimExCommandsPage::removeTargetIdentifier()
void FakeVimExCommandsPage::defaultAction()
{
UniqueIDManager *uidm = UniqueIDManager::instance();
int n = commandList()->topLevelItemCount();
for (int i = 0; i != n; ++i) {
QTreeWidgetItem *section = commandList()->topLevelItem(i);
@@ -487,7 +482,7 @@ void FakeVimExCommandsPage::defaultAction()
for (int j = 0; j != m; ++j) {
QTreeWidgetItem *item = section->child(j);
const int id = item->data(0, CommandRole).toInt();
const QString name = uidm->stringForUniqueIdentifier(id);
const QString name = Id::fromUniqueIdentifier(id).toString();
QString regex;
if (defaultExCommandMap().contains(name))
regex = defaultExCommandMap()[name].pattern();