From b58fe0f4d3c63bb181786737d0722049d6dabd62 Mon Sep 17 00:00:00 2001 From: hjk Date: Wed, 28 Jan 2009 16:55:09 +0100 Subject: [PATCH 1/5] Fixes: debugger: work on hash dumper for string-ish keys --- share/qtcreator/gdbmacros/gdbmacros.cpp | 70 ++++++++++++++++--------- src/plugins/debugger/gdbengine.cpp | 16 ++++-- tests/manual/gdbdebugger/simple/app.cpp | 27 +++++++--- 3 files changed, 76 insertions(+), 37 deletions(-) diff --git a/share/qtcreator/gdbmacros/gdbmacros.cpp b/share/qtcreator/gdbmacros/gdbmacros.cpp index 5576b36c6f2..d39fd8ddb49 100644 --- a/share/qtcreator/gdbmacros/gdbmacros.cpp +++ b/share/qtcreator/gdbmacros/gdbmacros.cpp @@ -216,7 +216,7 @@ QT_END_NAMESPACE // comma-separated integer list static char qDumpInBuffer[10000]; static char qDumpOutBuffer[100000]; -static char qDumpSize[20]; +//static char qDumpSize[20]; namespace { @@ -314,6 +314,15 @@ static bool isShortKey(const char *type) return isSimpleType(type) || isEqual(type, NS"QString"); } +static bool isStringType(const char *type) +{ + return isEqual(type, NS"QString") + || isEqual(type, NS"QByteArray") + || isEqual(type, "std::string") + || isEqual(type, "std::wstring") + || isEqual(type, "wstring"); +} + static bool isMovableType(const char *type) { if (isPointerType(type)) @@ -555,7 +564,7 @@ void QDumper::addCommaIfNeeded() put(','); } -void QDumper::putBase64Encoded(const char *buf, int n, char delim) +void QDumper::putBase64Encoded(const char *buf, int n) { const char alphabet[] = "ABCDEFGH" "IJKLMNOP" "QRSTUVWX" "YZabcdef" "ghijklmn" "opqrstuv" "wxyz0123" "456789+/"; @@ -740,6 +749,7 @@ static void qDumpInnerValueHelper(QDumper &d, const char *type, const void *addr return; case 'B': if (isEqual(type, "QByteArray")) { + d.addCommaIfNeeded(); d << field << "encoded=\"1\","; P(d, field, *(QByteArray*)addr); } @@ -769,6 +779,7 @@ static void qDumpInnerValueHelper(QDumper &d, const char *type, const void *addr return; case 'S': if (isEqual(type, "QString")) { + d.addCommaIfNeeded(); d << field << "encoded=\"1\","; P(d, field, *(QString*)addr); } @@ -1086,13 +1097,17 @@ static void qDumpQHash(QDumper &d) if (d.dumpChildren) { if (n > 1000) n = 1000; - bool simpleKey = isShortKey(keyType); - bool simpleValue = isShortKey(valueType); + bool isSimpleKey = isSimpleType(keyType); + bool isStringKey = isStringType(keyType); + bool isSimpleValue = isSimpleType(valueType); bool opt = isOptimizedIntKey(keyType); int keyOffset = hashOffset(opt, true, keySize, valueSize); int valueOffset = hashOffset(opt, false, keySize, valueSize); - P(d, "extra", "simplekey: " << simpleKey << " simpleValue: " << simpleValue + P(d, "extra", "isSimpleKey: " << isSimpleKey + << " isStringKey: " << isStringKey + << " isSimpleValue: " << isSimpleValue + << " valueType: '" << valueType << "'" << " keySize: " << keyOffset << " valueOffset: " << valueOffset << " opt: " << opt); @@ -1103,18 +1118,17 @@ static void qDumpQHash(QDumper &d) d << ",children=["; while (node != end) { d.beginHash(); - if (simpleKey) { - P(d, "name", i); - qDumpInnerValueHelper(d, keyType, addOffset(node, keyOffset), "key"); - if (simpleValue) - qDumpInnerValueHelper(d, valueType, addOffset(node, valueOffset)); + P(d, "name", i); + qDumpInnerValueHelper(d, keyType, addOffset(node, keyOffset), "key"); + qDumpInnerValueHelper(d, valueType, addOffset(node, valueOffset)); + if (isSimpleKey && isSimpleValue) { P(d, "type", valueType); P(d, "addr", addOffset(node, valueOffset)); } else { - P(d, "name", i); - //P(d, "exp", "*(char*)" << node); - P(d, "exp", "*('"NS"QHashNode<" << keyType << "," << valueType << " >'*)" << node); - P(d, "type", "'"NS"QHashNode<" << keyType << "," << valueType << " >'"); + P(d, "exp", "*('"NS"QHashNode<" << keyType << "," + << valueType << " >'*)" << node); + P(d, "type", "'"NS"QHashNode<" << keyType << "," + << valueType << " >'"); } d.endHash(); ++i; @@ -1262,8 +1276,8 @@ static void qDumpQLinkedList(QDumper &d) P(d, "numchild", n); P(d, "childtype", d.innertype); if (d.dumpChildren) { - unsigned innerSize = d.extraInt[0]; - bool innerTypeIsPointer = isPointerType(d.innertype); + //unsigned innerSize = d.extraInt[0]; + //bool innerTypeIsPointer = isPointerType(d.innertype); QByteArray strippedInnerType = stripPointerType(d.innertype); const char *stripped = isPointerType(d.innertype) ? strippedInnerType.data() : 0; @@ -1397,13 +1411,13 @@ static void qDumpQMap(QDumper &d) unsigned mapnodesize = d.extraInt[2]; unsigned valueOff = d.extraInt[3]; - bool simpleKey = isShortKey(keyType); - bool simpleValue = isShortKey(valueType); + bool isSimpleKey = isShortKey(keyType); + bool isSimpleValue = isShortKey(valueType); // both negative: int keyOffset = 2 * sizeof(void*) - int(mapnodesize); int valueOffset = 2 * sizeof(void*) - int(mapnodesize) + valueOff; - P(d, "extra", "simplekey: " << simpleKey << " simpleValue: " << simpleValue + P(d, "extra", "simplekey: " << isSimpleKey << " isSimpleValue: " << isSimpleValue << " keyOffset: " << keyOffset << " valueOffset: " << valueOffset << " mapnodesize: " << mapnodesize); d << ",children=["; @@ -1415,10 +1429,10 @@ static void qDumpQMap(QDumper &d) while (node != end) { d.beginHash(); P(d, "name", i); - if (simpleKey) { + if (isSimpleKey) { P(d, "type", valueType); qDumpInnerValueHelper(d, keyType, addOffset(node, keyOffset), "key"); - if (simpleValue) + if (isSimpleValue) qDumpInnerValueHelper(d, valueType, addOffset(node, valueOffset)); P(d, "type", valueType); @@ -2199,26 +2213,30 @@ static void qDumpStdMap(QDumper &d) P(d, "pairtype", pairType); if (d.dumpChildren) { - bool simpleKey = isSimpleType(keyType); - bool simpleValue = isShortKey(valueType); + bool isSimpleKey = isSimpleType(keyType); + bool isStringKey = isStringType(keyType); + bool isSimpleValue = isShortKey(valueType); int valueOffset = d.extraInt[2]; d << ",children=["; it = map.begin(); for (int i = 0; i < 1000 && it != map.end(); ++i, ++it) { const void *node = it.operator->(); - if (simpleKey) { + if (isSimpleKey) { d.beginHash(); P(d, "type", valueType); - qDumpInnerValueHelper(d, keyType, node, "name"); + P(d, "name", i); + qDumpInnerValueHelper(d, keyType, node, "key"); P(d, "nameisindex", "1"); - if (simpleValue) + if (isSimpleValue) qDumpInnerValueHelper(d, valueType, addOffset(node, valueOffset)); P(d, "addr", addOffset(node, valueOffset)); d.endHash(); } else { d.beginHash(); P(d, "name", i); + if (isStringKey) + qDumpInnerValueHelper(d, keyType, node, "key"); P(d, "addr", it.operator->()); P(d, "type", pairType); d.endHash(); diff --git a/src/plugins/debugger/gdbengine.cpp b/src/plugins/debugger/gdbengine.cpp index 1924de93038..aab7dc1025e 100644 --- a/src/plugins/debugger/gdbengine.cpp +++ b/src/plugins/debugger/gdbengine.cpp @@ -2833,9 +2833,12 @@ static bool extractTemplate(const QString &type, QString *tmplate, QString *inne // 'tmplate' and "Inner1@Inner2@..." etc in 'inner'. Result indicates // whether parsing was successful int level = 0; + bool skipSpace = false; for (int i = 0; i != type.size(); ++i) { QChar c = type[i]; - if (c == '<') { + if (c == ' ' && skipSpace) { + skipSpace = false; + } else if (c == '<') { *(level == 0 ? tmplate : inner) += c; ++level; } else if (c == '>') { @@ -2843,6 +2846,7 @@ static bool extractTemplate(const QString &type, QString *tmplate, QString *inne *(level == 0 ? tmplate : inner) += c; } else if (c == ',') { *inner += (level == 1) ? '@' : ','; + skipSpace = true; } else { *(level == 0 ? tmplate : inner) += c; } @@ -3555,9 +3559,15 @@ void GdbEngine::handleDumpCustomValue2(const GdbResultRecord &record, data1.name = '[' + data1.name + ']'; QString key = item.findChild("key").data(); if (!key.isEmpty()) { - if (item.findChild("keyencoded").data()[0] == '1') + if (item.findChild("keyencoded").data()[0] == '1') { key = '"' + QByteArray::fromBase64(key.toUtf8()) + '"'; - data1.name += " (" + key + ")"; + if (key.size() > 13) { + key = key.left(12); + key += "..."; + } + } + //data1.name += " (" + key + ")"; + data1.name = key; } setWatchDataType(data1, item.findChild("type")); setWatchDataExpression(data1, item.findChild("exp")); diff --git a/tests/manual/gdbdebugger/simple/app.cpp b/tests/manual/gdbdebugger/simple/app.cpp index 98fa2111dc9..76eadf2d9fd 100644 --- a/tests/manual/gdbdebugger/simple/app.cpp +++ b/tests/manual/gdbdebugger/simple/app.cpp @@ -159,16 +159,27 @@ void testQHash() #if 1 - QHash hgg1; + QHash hgg1; hgg1["22.0"] = 22.0; - hgg1["23.0"] = 22.0; - hgg1["24.0"] = 22.0; - hgg1["25.0"] = 22.0; - hgg1["26.0"] = 22.0; - hgg1["27.0"] = 27.0; - hgg1["28.0"] = 28.0; - hgg1["29.0"] = 29.0; + hgg1["123.0"] = 22.0; + hgg1["111111ss111128.0"] = 28.0; + hgg1["11124.0"] = 22.0; + hgg1["1111125.0"] = 22.0; + hgg1["11111126.0"] = 22.0; + hgg1["111111127.0"] = 27.0; + hgg1["111111111128.0"] = 28.0; + hgg1["111111111111111111129.0"] = 29.0; + QHash hgx1; + hgx1["22.0"] = 22.0; + hgx1["123.0"] = 22.0; + hgx1["111111ss111128.0"] = 28.0; + hgx1["11124.0"] = 22.0; + hgx1["1111125.0"] = 22.0; + hgx1["11111126.0"] = 22.0; + hgx1["111111127.0"] = 27.0; + hgx1["111111111128.0"] = 28.0; + hgx1["111111111111111111129.0"] = 29.0; #endif #if 1 From 500f2e5d8484bd7233f7a70c51a0d54ff8d574ee Mon Sep 17 00:00:00 2001 From: Olli Werwolff Date: Wed, 28 Jan 2009 17:01:01 +0100 Subject: [PATCH 2/5] Fixes: Fixed duplicate check when adding files using the resource editor Task: 238308 RevBy: eike AutoTest: - Details: Instead of the text and prefix of the file to add, pointers were compared. Thus the function always returned false and duplicates were not recognized. Replaced struct FileList with a class FileList, which is inherited from QList and added the function containsList which checks the needed values. --- src/shared/qrceditor/resourcefile.cpp | 17 +++++++++++++++-- src/shared/qrceditor/resourcefile_p.h | 7 ++++++- 2 files changed, 21 insertions(+), 3 deletions(-) diff --git a/src/shared/qrceditor/resourcefile.cpp b/src/shared/qrceditor/resourcefile.cpp index b88444c6e16..bfab4b0315f 100644 --- a/src/shared/qrceditor/resourcefile.cpp +++ b/src/shared/qrceditor/resourcefile.cpp @@ -54,6 +54,19 @@ TRANSLATOR qdesigner_internal::ResourceModel namespace qdesigner_internal { + +/****************************************************************************** +** FileList +*/ + +bool FileList::containsFile(File *file) +{ + foreach(File *tmpFile, *this) + if (tmpFile->name == file->name && tmpFile->prefix() == file->prefix()) + return true; + return false; +} + /****************************************************************************** ** ResourceFile */ @@ -375,7 +388,7 @@ bool ResourceFile::contains(const QString &prefix, const QString &file) const Prefix * const p = m_prefix_list.at(pref_idx); Q_ASSERT(p); File equalFile(p, absolutePath(file)); - return p->file_list.contains(&equalFile); + return p->file_list.containsFile(&equalFile); } bool ResourceFile::contains(int pref_idx, const QString &file) const @@ -383,7 +396,7 @@ bool ResourceFile::contains(int pref_idx, const QString &file) const Q_ASSERT(pref_idx >= 0 && pref_idx < m_prefix_list.count()); Prefix * const p = m_prefix_list.at(pref_idx); File equalFile(p, absolutePath(file)); - return p->file_list.contains(&equalFile); + return p->file_list.containsFile(&equalFile); } /*static*/ QString ResourceFile::fixPrefix(const QString &prefix) diff --git a/src/shared/qrceditor/resourcefile_p.h b/src/shared/qrceditor/resourcefile_p.h index 61b6c594b64..3ee346cb0e6 100644 --- a/src/shared/qrceditor/resourcefile_p.h +++ b/src/shared/qrceditor/resourcefile_p.h @@ -90,7 +90,12 @@ struct File : public Node { QString name; QString alias; }; -typedef QList FileList; + +class FileList : public QList +{ +public: + bool containsFile(File *file); +}; /*! \class Prefix From 943efa766c70ff98ce3ed89c924aa3fc5780beb1 Mon Sep 17 00:00:00 2001 From: hjk Date: Wed, 28 Jan 2009 17:34:23 +0100 Subject: [PATCH 3/5] Fixes: debugger: work on hash and map dumper with simple keys or values --- share/qtcreator/gdbmacros/gdbmacros.cpp | 80 +++++++++++-------------- src/plugins/debugger/gdbengine.cpp | 2 +- 2 files changed, 37 insertions(+), 45 deletions(-) diff --git a/share/qtcreator/gdbmacros/gdbmacros.cpp b/share/qtcreator/gdbmacros/gdbmacros.cpp index d39fd8ddb49..eca4db27ec3 100644 --- a/share/qtcreator/gdbmacros/gdbmacros.cpp +++ b/share/qtcreator/gdbmacros/gdbmacros.cpp @@ -309,11 +309,7 @@ static bool isSimpleType(const char *type) return false; } -static bool isShortKey(const char *type) -{ - return isSimpleType(type) || isEqual(type, NS"QString"); -} - +#if 0 static bool isStringType(const char *type) { return isEqual(type, NS"QString") @@ -322,6 +318,7 @@ static bool isStringType(const char *type) || isEqual(type, "std::wstring") || isEqual(type, "wstring"); } +#endif static bool isMovableType(const char *type) { @@ -1098,16 +1095,14 @@ static void qDumpQHash(QDumper &d) if (n > 1000) n = 1000; bool isSimpleKey = isSimpleType(keyType); - bool isStringKey = isStringType(keyType); bool isSimpleValue = isSimpleType(valueType); bool opt = isOptimizedIntKey(keyType); int keyOffset = hashOffset(opt, true, keySize, valueSize); int valueOffset = hashOffset(opt, false, keySize, valueSize); P(d, "extra", "isSimpleKey: " << isSimpleKey - << " isStringKey: " << isStringKey << " isSimpleValue: " << isSimpleValue - << " valueType: '" << valueType << "'" + << " valueType: '" << isSimpleValue << " keySize: " << keyOffset << " valueOffset: " << valueOffset << " opt: " << opt); @@ -1145,15 +1140,18 @@ static void qDumpQHashNode(QDumper &d) const char *keyType = d.templateParameters[0]; const char *valueType = d.templateParameters[1]; - P(d, "value", ""); + unsigned keySize = d.extraInt[0]; + unsigned valueSize = d.extraInt[1]; + bool opt = isOptimizedIntKey(keyType); + int keyOffset = hashOffset(opt, true, keySize, valueSize); + int valueOffset = hashOffset(opt, false, keySize, valueSize); + if (isSimpleType(valueType)) + qDumpInnerValueHelper(d, valueType, addOffset(h, valueOffset)); + else + P(d, "value", ""); + P(d, "numchild", 2); if (d.dumpChildren) { - unsigned keySize = d.extraInt[0]; - unsigned valueSize = d.extraInt[1]; - bool opt = isOptimizedIntKey(keyType); - int keyOffset = hashOffset(opt, true, keySize, valueSize); - int valueOffset = hashOffset(opt, false, keySize, valueSize); - // there is a hash specialization in cast the key are integers or shorts d << ",children=["; d.beginHash(); @@ -1411,8 +1409,8 @@ static void qDumpQMap(QDumper &d) unsigned mapnodesize = d.extraInt[2]; unsigned valueOff = d.extraInt[3]; - bool isSimpleKey = isShortKey(keyType); - bool isSimpleValue = isShortKey(valueType); + bool isSimpleKey = isSimpleType(keyType); + bool isSimpleValue = isSimpleType(valueType); // both negative: int keyOffset = 2 * sizeof(void*) - int(mapnodesize); int valueOffset = 2 * sizeof(void*) - int(mapnodesize) + valueOff; @@ -1429,12 +1427,9 @@ static void qDumpQMap(QDumper &d) while (node != end) { d.beginHash(); P(d, "name", i); - if (isSimpleKey) { - P(d, "type", valueType); - qDumpInnerValueHelper(d, keyType, addOffset(node, keyOffset), "key"); - if (isSimpleValue) - qDumpInnerValueHelper(d, valueType, addOffset(node, valueOffset)); - + qDumpInnerValueHelper(d, keyType, addOffset(node, keyOffset), "key"); + qDumpInnerValueHelper(d, valueType, addOffset(node, valueOffset)); + if (isSimpleKey && isSimpleValue) { P(d, "type", valueType); P(d, "addr", addOffset(node, valueOffset)); } else { @@ -2208,39 +2203,36 @@ static void qDumpStdMap(QDumper &d) // (#4, "std::allocator >") // as it is there, and, equally importantly, in an order that // gdb accepts when fed with it. - char *pairType = (char *)(d.templateParameters[3]) + 16; + char *pairType = (char *)(d.templateParameters[3]) + 15; pairType[strlen(pairType) - 2] = 0; P(d, "pairtype", pairType); if (d.dumpChildren) { bool isSimpleKey = isSimpleType(keyType); - bool isStringKey = isStringType(keyType); - bool isSimpleValue = isShortKey(valueType); + bool isSimpleValue = isSimpleType(valueType); int valueOffset = d.extraInt[2]; + P(d, "extra", "isSimpleKey: " << isSimpleKey + << " isSimpleValue: " << isSimpleValue + << " valueType: '" << valueType + << " valueOffset: " << valueOffset); + d << ",children=["; it = map.begin(); for (int i = 0; i < 1000 && it != map.end(); ++i, ++it) { - const void *node = it.operator->(); - if (isSimpleKey) { - d.beginHash(); - P(d, "type", valueType); + d.beginHash(); + const void *node = it.operator->(); P(d, "name", i); qDumpInnerValueHelper(d, keyType, node, "key"); - P(d, "nameisindex", "1"); - if (isSimpleValue) - qDumpInnerValueHelper(d, valueType, addOffset(node, valueOffset)); - P(d, "addr", addOffset(node, valueOffset)); - d.endHash(); - } else { - d.beginHash(); - P(d, "name", i); - if (isStringKey) - qDumpInnerValueHelper(d, keyType, node, "key"); - P(d, "addr", it.operator->()); - P(d, "type", pairType); - d.endHash(); - } + qDumpInnerValueHelper(d, valueType, addOffset(node, valueOffset)); + if (isSimpleKey && isSimpleValue) { + P(d, "type", valueType); + P(d, "addr", addOffset(node, valueOffset)); + } else { + P(d, "addr", node); + P(d, "type", pairType); + } + d.endHash(); } if (it != map.end()) d.putEllipsis(); diff --git a/src/plugins/debugger/gdbengine.cpp b/src/plugins/debugger/gdbengine.cpp index aab7dc1025e..fa2d2bacbe4 100644 --- a/src/plugins/debugger/gdbengine.cpp +++ b/src/plugins/debugger/gdbengine.cpp @@ -2854,7 +2854,7 @@ static bool extractTemplate(const QString &type, QString *tmplate, QString *inne *tmplate = tmplate->trimmed(); *tmplate = tmplate->remove("<>"); *inner = inner->trimmed(); - //qDebug() << "EXTRACT TEMPLATE: " << *tmplate << *inner; + //qDebug() << "EXTRACT TEMPLATE: " << *tmplate << *inner << " FROM " << type; return !inner->isEmpty(); } From 0f5de365b9a05efb85d89b82a115c1a20c99a852 Mon Sep 17 00:00:00 2001 From: con Date: Wed, 28 Jan 2009 17:38:41 +0100 Subject: [PATCH 4/5] Fixes: - Some layouting issues --- src/libs/utils/pathchooser.cpp | 2 +- src/shared/qrceditor/qrceditor.cpp | 4 +--- src/tools/qtcreatorwidgets/qtcreatorwidgets.pro | 10 ++++++++-- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/src/libs/utils/pathchooser.cpp b/src/libs/utils/pathchooser.cpp index 0f83cf1c4cb..2555399a422 100644 --- a/src/libs/utils/pathchooser.cpp +++ b/src/libs/utils/pathchooser.cpp @@ -110,7 +110,7 @@ PathChooser::PathChooser(QWidget *parent) : connect(m_d->m_lineEdit, SIGNAL(textChanged(QString)), this, SIGNAL(changed())); connect(m_d->m_lineEdit, SIGNAL(validChanged()), this, SIGNAL(validChanged())); - m_d->m_lineEdit->setMinimumWidth(260); + m_d->m_lineEdit->setMinimumWidth(200); hLayout->addWidget(m_d->m_lineEdit); hLayout->setSizeConstraint(QLayout::SetMinimumSize); diff --git a/src/shared/qrceditor/qrceditor.cpp b/src/shared/qrceditor/qrceditor.cpp index a353d738394..bd25a42d742 100644 --- a/src/shared/qrceditor/qrceditor.cpp +++ b/src/shared/qrceditor/qrceditor.cpp @@ -39,7 +39,7 @@ #include #include -namespace SharedTools { +using namespace SharedTools; QrcEditor::QrcEditor(QWidget *parent) : QWidget(parent), @@ -405,5 +405,3 @@ void QrcEditor::onRedo() updateCurrent(); updateHistoryControls(); } - -} // namespace SharedTools diff --git a/src/tools/qtcreatorwidgets/qtcreatorwidgets.pro b/src/tools/qtcreatorwidgets/qtcreatorwidgets.pro index 6923e09837d..ce209c86d77 100644 --- a/src/tools/qtcreatorwidgets/qtcreatorwidgets.pro +++ b/src/tools/qtcreatorwidgets/qtcreatorwidgets.pro @@ -9,7 +9,7 @@ SOURCES = customwidgets.cpp # Link against the qtcreator utils lib -unix { +linux-* { # form abs path to qtcreator lib dir GH_LIB=$$dirname(PWD) GH_LIB=$$dirname(GH_LIB) @@ -19,7 +19,13 @@ unix { } INCLUDEPATH += ../../../src/libs -LIBS += -L../../../lib -lUtils +macx { + LIBS += -L../../../bin/QtCreator.app/Contents/PlugIns + CONFIG(debug, debug|release):LIBS += -lUtils_debug + else:LIBS += -lUtils +} else { + LIBS += -L../../../lib -lUtils +} DESTDIR= $$[QT_INSTALL_PLUGINS]/designer From 0b4dfc9cd2c1b0eee58185a65173b068e9435b0c Mon Sep 17 00:00:00 2001 From: con Date: Wed, 28 Jan 2009 17:53:10 +0100 Subject: [PATCH 5/5] Fixes: - Resource editors not restored from session Details: - Mismatch of kinds in editor and editor factory. --- src/plugins/resourceeditor/resourceeditorconstants.h | 1 - src/plugins/resourceeditor/resourceeditorw.cpp | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/src/plugins/resourceeditor/resourceeditorconstants.h b/src/plugins/resourceeditor/resourceeditorconstants.h index 007d537c36e..645461a4ddd 100644 --- a/src/plugins/resourceeditor/resourceeditorconstants.h +++ b/src/plugins/resourceeditor/resourceeditorconstants.h @@ -38,7 +38,6 @@ namespace ResourceEditor { namespace Constants { const char * const C_RESOURCEEDITOR = "Resource Editor"; -const char * const C_RESOURCEWINDOW = "Resourcewindow"; const char * const C_RESOURCE_MIMETYPE = "application/vnd.nokia.xml.qt.resource"; } // namespace Constants diff --git a/src/plugins/resourceeditor/resourceeditorw.cpp b/src/plugins/resourceeditor/resourceeditorw.cpp index c8e0bbf5107..833c6547c92 100644 --- a/src/plugins/resourceeditor/resourceeditorw.cpp +++ b/src/plugins/resourceeditor/resourceeditorw.cpp @@ -161,7 +161,7 @@ bool ResourceEditorFile::save(const QString &name /*= QString()*/) } const char *ResourceEditorW::kind() const { - return ResourceEditor::Constants::C_RESOURCEWINDOW; + return ResourceEditor::Constants::C_RESOURCEEDITOR; } QString ResourceEditorFile::fileName() const