diff --git a/.gitignore b/.gitignore
index 19ae3e5680995b48b9188db5de850b9d0cf33892..f782bcdc6f8f45b0060e6656d5377f578b287fe0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -29,7 +29,7 @@ qrc_*.cpp
Thumbs.db
# qtcreator generated files
-*.pro.user
+*.pro.user*
# xemacs temporary files
*.flc
diff --git a/dist/changes-2.0.0 b/dist/changes-2.0.0
index 2a7c30ebe85a69a44602f2e8d1a0266bce478507..3565b8ba48be3d51a24e28063cdc3ad102989857 100644
--- a/dist/changes-2.0.0
+++ b/dist/changes-2.0.0
@@ -19,6 +19,7 @@ General
setting
* New "Design" mode for visual editors (.ui & .qml files)
* Fixed crash when working with empty pro-file
+ * Ask for close, save, or save as when file is removed while open in Qt Creator
Editing
* Text based search and replace in multiple files
diff --git a/share/qtcreator/gdbmacros/dumper.py b/share/qtcreator/gdbmacros/dumper.py
index 83b28ac89c03b8ef645642672b89772676c2b7ff..644f4f9a38cf245f2cae2e997b11ea9b29453bea 100644
--- a/share/qtcreator/gdbmacros/dumper.py
+++ b/share/qtcreator/gdbmacros/dumper.py
@@ -253,7 +253,7 @@ def listOfLocals(varList):
items = []
if hasBlock and isGoodGdb():
- warn("IS GOOD: %s " % varList)
+ #warn("IS GOOD: %s " % varList)
try:
block = frame.block()
#warn("BLOCK: %s " % block)
@@ -340,6 +340,14 @@ def listOfLocals(varList):
except RuntimeError:
pass
#continue
+ except:
+ # Something breaking the list, like intermediate gdb warnings
+ # like 'Warning: can't find linker symbol for virtual table for
+ # `std::less<char const*>' value\n\nwarning: found
+ # `myns::QHashData::shared_null' instead [...]
+ # that break subsequent parsing. Chicken out and take the
+ # next "usable" line.
+ continue
items.append(item)
return items
@@ -1197,7 +1205,9 @@ class Dumper:
# UCS-4:
self.putValue(encodeChar4Array(value, 100), Hex8EncodedBigEndian)
- if (not isHandled) and str(type.strip_typedefs()).find("(") != -1:
+ strippedType = str(type.strip_typedefs()) \
+ .replace("(anonymous namespace)", "")
+ if (not isHandled) and strippedType.find("(") != -1:
# A function pointer.
self.putValue(str(item.value))
self.putAddress(value.address)
@@ -1274,7 +1284,7 @@ class Dumper:
#warn("INAMES: %s " % self.expandedINames)
#warn("EXPANDED: %s " % (item.iname in self.expandedINames))
- # insufficient, see http://sourceware.org/bugzilla/show_bug.cgi?id=10953
+ # Insufficient, see http://sourceware.org/bugzilla/show_bug.cgi?id=10953
#fields = value.type.fields()
fields = value.type.strip_typedefs().fields()
diff --git a/share/qtcreator/gdbmacros/gdbmacros.cpp b/share/qtcreator/gdbmacros/gdbmacros.cpp
index 85cf81ee2d7819f3fdb777349bc515b9dbd27b60..7f0462d919eb9c8715d3cc49e22d8f8b95a6c183 100644
--- a/share/qtcreator/gdbmacros/gdbmacros.cpp
+++ b/share/qtcreator/gdbmacros/gdbmacros.cpp
@@ -1077,8 +1077,7 @@ static void qDumpQAbstractItem(QDumper &d)
QModelIndex mi;
{
ModelIndex *mm = reinterpret_cast<ModelIndex *>(&mi);
- mm->r = mm->c = 0;
- mm->p = mm->m = 0;
+ memset(&mi, 0, sizeof(mi));
static const char *printFormat = sizeof(void *) == sizeof(long) ?
"%d,%d,0x%lx,0x%lx" : "%d,%d,0x%llx,0x%llx";
sscanf(d.templateParameters[0], printFormat, &mm->r, &mm->c, &mm->p, &mm->m);
diff --git a/share/qtcreator/gdbmacros/gdbmacros.py b/share/qtcreator/gdbmacros/gdbmacros.py
index 7c5a1acf05d68c25870b324f178e087d9c1e7c37..cda5a040f9834177a1c387532190fe63cb408ad8 100644
--- a/share/qtcreator/gdbmacros/gdbmacros.py
+++ b/share/qtcreator/gdbmacros/gdbmacros.py
@@ -579,16 +579,26 @@ def extractCString(table, offset):
return result
+def qdump__QWidget(d, item):
+ qdump__QObject(d, item)
+
def qdump__QObject(d, item):
#warn("OBJECT: %s " % item.value)
staticMetaObject = item.value["staticMetaObject"]
#warn("SMO: %s " % staticMetaObject)
+ #warn("SMO DATA: %s " % staticMetaObject["d"]["stringdata"])
+ superData = staticMetaObject["d"]["superdata"]
+ #warn("SUPERDATA: %s" % superData)
+ #while not isNull(superData):
+ # superData = superData.dereference()["d"]["superdata"]
+ # warn("SUPERDATA: %s" % superData)
+
privateType = gdb.lookup_type(d.ns + "QObjectPrivate").pointer()
d_ptr = item.value["d_ptr"]["d"].cast(privateType).dereference()
#warn("D_PTR: %s " % d_ptr)
objectName = d_ptr["objectName"]
#warn("OBJECTNAME: %s " % objectName)
- #warn("D_PTR: %s " % d_ptr.dereference())
+ #warn("D_PTR: %s " % d_ptr)
mo = d_ptr["metaObject"]
type = d.stripNamespaceFromType(item.value.type)
if isNull(mo):
@@ -608,13 +618,16 @@ def qdump__QObject(d, item):
if d.isExpanded(item):
d.beginChildren()
- # parent and children
+ # Parent and children.
d.putItem(Item(d_ptr["parent"], item.iname, "parent", "parent"))
d.putItem(Item(d_ptr["children"], item.iname, "children", "children"))
- # properties
+ # Properties.
d.beginHash()
- propertyCount = metaData[6]
+ #propertyCount = metaData[6]
+ # FIXME: Replace with plain memory accesses.
+ propertyCount = int(call(mo, "propertyCount()"))
+ warn("PROPERTY COUNT: %s" % propertyCount)
propertyData = metaData[7]
d.putName("properties")
d.putItemCount(propertyCount)
@@ -630,28 +643,43 @@ def qdump__QObject(d, item):
d.putName(propertyName)
#flags = metaData[offset + 2]
#warn("FLAGS: %s " % flags)
- warn("PROPERTY TYPE: %s " % propertyType)
+ #warn("PROPERTY: %s %s " % (propertyType, propertyName))
# #exp = '((\'%sQObject\'*)%s)->property("%s")' \
# % (d.ns, item.value.address, propertyName)
#exp = '"((\'%sQObject\'*)%s)"' % (d.ns, item.value.address,)
#warn("EXPRESSION: %s" % exp)
value = call(item.value, 'property("%s")' % propertyName)
- warn("VALUE: %s" % value)
- warn("TYPE: %s" % value.type)
- if True and propertyType == "QString":
- # FIXME: re-use parts of QVariant dumper
- #d.putType(d.ns + "QString")
- data = value["d"]["data"]["ptr"]
- innerType = gdb.lookup_type(d.ns + "QString")
- d.putItemHelper(
- Item(data.cast(innerType), item.iname, property))
- #d.putNumChild(0)
+ val, inner, innert = qdumpHelper__QVariant(d, value)
+ if len(inner):
+ # Build-in types.
+ d.putType(inner)
+ d.putItemHelper(Item(val, item.iname + ".properties",
+ propertyName, propertyName))
+
else:
- iname = "%s.properties.%s" % (item.iname, propertyName)
- d.putItemHelper(Item(value, iname, propertyName))
+ # User types.
+ # func = "typeToName(('%sQVariant::Type')%d)" % (d.ns, variantType)
+ # type = str(call(item.value, func))
+ # type = type[type.find('"') + 1 : type.rfind('"')]
+ # type = type.replace("Q", d.ns + "Q") # HACK!
+ # data = call(item.value, "constData()")
+ # tdata = data.cast(gdb.lookup_type(type).pointer()).dereference()
+ # d.putValue("(%s)" % tdata.type)
+ # d.putType(tdata.type)
+ # d.putNumChild(1)
+ # if d.isExpanded(item):
+ # d.beginChildren()
+ # d.putItem(Item(tdata, item.iname, "data", "data"))
+ # d.endChildren()
+ warn("FIXME: CUSTOM QOBJECT PROPERTIES NOT IMPLEMENTED: %s %s"
+ % (propertyType, innert))
+ d.putType(propertyType)
+ d.putValue("...")
+ d.putNumChild(0)
+
d.endHash()
d.endChildren()
- d.endHash()
+
# connections
d.beginHash()
@@ -679,7 +707,7 @@ def qdump__QObject(d, item):
d.endChildren()
d.endHash()
- # signals
+ # Signals
signalCount = metaData[13]
d.beginHash()
d.putName("signals")
@@ -703,7 +731,7 @@ def qdump__QObject(d, item):
d.endChildren()
d.endHash()
- # slots
+ # Slots
d.beginHash()
slotCount = metaData[4] - signalCount
d.putName("slots")
@@ -991,55 +1019,6 @@ def qdump__QObject(d, item):
# d.disarm()
# }
#
-# static void dumpQObjectPropertyList(QDumper &d)
-# {
-# const QObject *ob = (const QObject *)d.data
-# const QMetaObject *mo = ob->metaObject()
-# const int propertyCount = mo->propertyCount()
-# d.putField("addr", "<synthetic>")
-# d.putField("type", ns + "QObjectPropertyList")
-# d.putField("numchild", propertyCount)
-# d.putItemCount(propertyCount)
-# if d.isExpanded(item):
-# d.beginChildren()
-# for (int i = propertyCount; --i >= 0; ) {
-# const QMetaProperty & prop = mo->property(i)
-# d.beginHash()
-# d.putName(prop.name())
-# switch (prop.type()) {
-# case QVariant::String:
-# d.putField("type", prop.typeName())
-# d.putValue(prop.read(ob).toString(), 2)
-# d.putField("numchild", "0")
-# break
-# case QVariant::Bool:
-# d.putField("type", prop.typeName())
-# d.putValue((prop.read(ob).toBool() ? "true" : "false"))
-# d.putField("numchild", "0")
-# break
-# case QVariant::Int:
-# if prop.isEnumType()) {
-# dumpMetaEnumValue(d, prop, prop.read(ob).toInt())
-# } elif prop.isFlagType()) {
-# dumpMetaFlagValue(d, prop, prop.read(ob).toInt())
-# } else {
-# d.putValue(prop.read(ob).toInt())
-# d.putField("numchild", "0")
-# }
-# break
-# default:
-# d.putField("addr", d.data)
-# d.putField("type", ns + "QObjectProperty")
-# d.putField("numchild", "1")
-# break
-# }
-# d.endHash()
-# }
-# d.endChildren()
-# }
-# d.disarm()
-# }
-#
# static void dumpQObjectMethodList(QDumper &d)
# {
# const QObject *ob = (const QObject *)d.data
@@ -1512,12 +1491,11 @@ def qdump__QTextCodec(d, item):
d.putCallItem("mibEnum", item, "mibEnum()")
d.endChildren()
-
-def qdump__QVariant(d, item):
- union = item.value["d"]
- data = union["data"]
- variantType = int(union["type"])
+def qdumpHelper__QVariant(d, value):
#warn("VARIANT TYPE: %s : " % variantType)
+ data = value["d"]["data"]
+ variantType = int(value["d"]["type"])
+ val = None
inner = ""
innert = ""
if variantType == 0: # QVariant::Invalid
@@ -1526,22 +1504,28 @@ def qdump__QVariant(d, item):
elif variantType == 1: # QVariant::Bool
d.putValue(select(data["b"], "true", "false"))
d.putNumChild(0)
+ inner = "bool"
elif variantType == 2: # QVariant::Int
d.putValue(data["i"])
d.putNumChild(0)
+ inner = "int"
elif variantType == 3: # uint
d.putValue(data["u"])
d.putNumChild(0)
+ inner = "uint"
elif variantType == 4: # qlonglong
d.putValue(data["ll"])
d.putNumChild(0)
+ inner = "qlonglong"
elif variantType == 5: # qulonglong
d.putValue(data["ull"])
d.putNumChild(0)
+ inner = "qulonglong"
elif variantType == 6: # QVariant::Double
value = data["d"]
d.putValue(data["d"])
d.putNumChild(0)
+ inner = "double"
elif variantType == 7: # QVariant::QChar
inner = d.ns + "QChar"
elif variantType == 8: # QVariant::VariantMap
@@ -1634,25 +1618,37 @@ def qdump__QVariant(d, item):
elif variantType == 86: # QVariant::Quadernion
inner = d.ns + "QQuadernion"
+ if len(inner):
+ innerType = gdb.lookup_type(inner)
+ sizePD = gdb.lookup_type(d.ns + 'QVariant::Private::Data').sizeof
+ if innerType.sizeof > sizePD:
+ sizePS = gdb.lookup_type(d.ns + 'QVariant::PrivateShared').sizeof
+ val = (sizePS + data.cast(gdb.lookup_type('char').pointer())) \
+ .cast(innerType.pointer()).dereference()
+ else:
+ val = data.cast(innerType)
+
+ if len(innert) == 0:
+ innert = inner
+
+ return val, inner, innert
+
+
+def qdump__QVariant(d, item):
+ val, inner, innert = qdumpHelper__QVariant(d, item.value)
+
if len(inner):
# Build-in types.
- if len(innert) == 0:
- innert = inner
d.putValue("(%s)" % innert)
d.putNumChild(1)
if d.isExpanded(item):
- innerType = gdb.lookup_type(inner)
d.beginChildren()
- d.beginHash()
- #d.putName("data")
- #d.putField("type", innert)
- val = gdb.Value(data["ptr"]).cast(innerType)
- d.putItemHelper(Item(val, item.iname, "data", "data"))
- d.endHash()
+ d.putItem(Item(val, item.iname, "data", "data"))
d.endChildren()
else:
# User types.
- func = "typeToName(('%sQVariant::Type')%d)" % (d.ns, variantType)
+ d_member = item.value["d"]
+ func = "typeToName(('%sQVariant::Type')%d)" % (d.ns, d_member["type"])
type = str(call(item.value, func))
type = type[type.find('"') + 1 : type.rfind('"')]
type = type.replace("Q", d.ns + "Q") # HACK!
@@ -1808,9 +1804,9 @@ def qdump__std__map(d, item):
d.putValue(" ")
if d.isExpandedIName("%s.%d" % (item.iname, i)):
d.beginChildren(2, None)
- iname = "%s.%d." % (item.iname, i)
- keyItem = Item(pair["first"], iname + "key", "key", "first")
- valueItem = Item(pair["second"], iname + "value", "value", "second")
+ iname = "%s.%d" % (item.iname, i)
+ keyItem = Item(pair["first"], iname, "first", "first")
+ valueItem = Item(pair["second"], iname, "second", "second")
d.putItem(keyItem)
d.putItem(valueItem)
d.endChildren()
diff --git a/share/qtcreator/patches/gdb-increased-dcache-line-size.patch b/share/qtcreator/patches/gdb-increased-dcache-line-size.patch
new file mode 100644
index 0000000000000000000000000000000000000000..edc714f5d0d6d9f7af1b2d4688cc00d58b8d8a67
--- /dev/null
+++ b/share/qtcreator/patches/gdb-increased-dcache-line-size.patch
@@ -0,0 +1,13 @@
+diff --git a/gdb/dcache.c b/gdb/dcache.c
+index e1386e0..65b1a02 100644
+--- a/gdb/dcache.c
++++ b/gdb/dcache.c
+@@ -76,7 +76,7 @@
+ /* The size of a cache line. Smaller values reduce the time taken to
+ read a single byte and make the cache more granular, but increase
+ overhead and reduce the effectiveness of the cache as a prefetcher. */
+-#define LINE_SIZE_POWER 6
++#define LINE_SIZE_POWER 8
+ #define LINE_SIZE (1 << LINE_SIZE_POWER)
+
+ /* Each cache block holds LINE_SIZE bytes of data
diff --git a/share/qtcreator/qml-type-descriptions/qmlproject-types.xml b/share/qtcreator/qml-type-descriptions/qmlproject-types.xml
index c042b164d053310e0a6fc6fa5b992ff55d787c5a..1b3e35fc9ccb4496cf994d9af8b204fbe228dee1 100644
--- a/share/qtcreator/qml-type-descriptions/qmlproject-types.xml
+++ b/share/qtcreator/qml-type-descriptions/qmlproject-types.xml
@@ -2,7 +2,7 @@
<module>
<type name="QmlProject.Project">
<property name="sourceDirectory" type="string"/>
- <property name="libraryPaths" type="string" isList="true"/>
+ <property name="importPaths" type="string" isList="true"/>
<property name="content" type="QmlProjectItem" isList="true"/>
</type>
<type name="QmlProjectItem">
diff --git a/share/qtcreator/qmldesigner/propertyeditor/Qt/AnchorBox.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/AnchorBox.qml
index 4614567c3ceb71c74849a5cc5665fc9fb2c26503..22a593de73d99243a29e0ddbfb5c364feeffa871 100644
--- a/share/qtcreator/qmldesigner/propertyeditor/Qt/AnchorBox.qml
+++ b/share/qtcreator/qmldesigner/propertyeditor/Qt/AnchorBox.qml
@@ -6,18 +6,16 @@ QWidget {
height:220;fixedHeight: height
styleSheetFile: "anchorbox.css"
- Script {
- function isBorderAnchored() {
- return anchorBackend.leftAnchored || anchorBackend.topAnchored || anchorBackend.rightAnchored || anchorBackend.bottomAnchored;
- }
+ function isBorderAnchored() {
+ return anchorBackend.leftAnchored || anchorBackend.topAnchored || anchorBackend.rightAnchored || anchorBackend.bottomAnchored;
+ }
- function fill() {
- anchorBackend.fill();
- }
+ function fill() {
+ anchorBackend.fill();
+ }
- function breakLayout() {
- anchorBackend.resetLayout()
- }
+ function breakLayout() {
+ anchorBackend.resetLayout()
}
QPushButton {
diff --git a/share/qtcreator/qmldesigner/propertyeditor/Qt/AnchorButtons.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/AnchorButtons.qml
index 614a197065e9b861cd1c07d04dd82a2f62821a27..abac8f209c91b7cd4f2db01a02878404ad953407 100644
--- a/share/qtcreator/qmldesigner/propertyeditor/Qt/AnchorButtons.qml
+++ b/share/qtcreator/qmldesigner/propertyeditor/Qt/AnchorButtons.qml
@@ -6,19 +6,16 @@ QWidget {
id: anchorButtons
fixedHeight: 32
+ function isBorderAnchored() {
+ return anchorBackend.leftAnchored || anchorBackend.topAnchored || anchorBackend.rightAnchored || anchorBackend.bottomAnchored;
+ }
- Script {
- function isBorderAnchored() {
- return anchorBackend.leftAnchored || anchorBackend.topAnchored || anchorBackend.rightAnchored || anchorBackend.bottomAnchored;
- }
-
- function fill() {
- anchorBackend.fill();
- }
+ function fill() {
+ anchorBackend.fill();
+ }
- function breakLayout() {
- anchorBackend.resetLayout()
- }
+ function breakLayout() {
+ anchorBackend.resetLayout()
}
QPushButton {
diff --git a/share/qtcreator/qmldesigner/propertyeditor/Qt/CheckBox.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/CheckBox.qml
index 91b8ccd878c1e5b0420a476992bf2f0e0bda3e76..db3dd5f07c9aefde151e65eb9f0b50bd62813335 100644
--- a/share/qtcreator/qmldesigner/propertyeditor/Qt/CheckBox.qml
+++ b/share/qtcreator/qmldesigner/propertyeditor/Qt/CheckBox.qml
@@ -31,22 +31,20 @@ QWidget { //This is a special checkBox that does color coding for states
evaluate();
}
- Script {
- function evaluate() {
- if (!enabled) {
- localLabel.setStyleSheet("color: "+scheme.disabledColor);
+ function evaluate() {
+ if (!enabled) {
+ localLabel.setStyleSheet("color: "+scheme.disabledColor);
+ } else {
+ if (baseStateFlag) {
+ if (backendValue.isInModel)
+ localLabel.setStyleSheet("color: "+scheme.changedBaseColor);
+ else
+ localLabel.setStyleSheet("color: "+scheme.boldTextColor);
} else {
- if (baseStateFlag) {
- if (backendValue.isInModel)
- localLabel.setStyleSheet("color: "+scheme.changedBaseColor);
- else
- localLabel.setStyleSheet("color: "+scheme.boldTextColor);
- } else {
- if (backendValue.isInSubState)
- localLabel.setStyleSheet("color: "+scheme.changedStateColor);
- else
- localLabel.setStyleSheet("color: "+scheme.boldTextColor);
- }
+ if (backendValue.isInSubState)
+ localLabel.setStyleSheet("color: "+scheme.changedStateColor);
+ else
+ localLabel.setStyleSheet("color: "+scheme.boldTextColor);
}
}
}
diff --git a/share/qtcreator/qmldesigner/propertyeditor/Qt/ColorGroupBox.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/ColorGroupBox.qml
index b17fc609212bc5e710565e3f1fa41a6b80b92e17..51b039f948ad49455ebb5b6cd1909dc0d5a7e986 100644
--- a/share/qtcreator/qmldesigner/propertyeditor/Qt/ColorGroupBox.qml
+++ b/share/qtcreator/qmldesigner/propertyeditor/Qt/ColorGroupBox.qml
@@ -52,35 +52,33 @@ QExtGroupBox {
evaluate();
}
- Script {
- function evaluate() {
- if (backendColor === undefined)
- return;
- if (!enabled) {
- valueSpinBox.setStyleSheet("color: "+scheme.disabledColor);
- hueSpinBox.setStyleSheet("color: "+scheme.disabledColor);
- saturationSpinBox.setStyleSheet("color: "+scheme.disabledColor);
+ function evaluate() {
+ if (backendColor === undefined)
+ return;
+ if (!enabled) {
+ valueSpinBox.setStyleSheet("color: "+scheme.disabledColor);
+ hueSpinBox.setStyleSheet("color: "+scheme.disabledColor);
+ saturationSpinBox.setStyleSheet("color: "+scheme.disabledColor);
+ } else {
+ if (baseStateFlag) {
+ if (backendColor.isInModel) {
+ valueSpinBox.setStyleSheet("color: "+scheme.changedBaseColor);
+ hueSpinBox.setStyleSheet("color: "+scheme.changedBaseColor);
+ saturationSpinBox.setStyleSheet("color: "+scheme.changedBaseColor);
+ } else {
+ valueSpinBox.setStyleSheet("color: "+scheme.defaultColor);
+ hueSpinBox.setStyleSheet("color: "+scheme.defaultColor);
+ saturationSpinBox.setStyleSheet("color: "+scheme.defaultColor);
+ }
} else {
- if (baseStateFlag) {
- if (backendColor.isInModel) {
- valueSpinBox.setStyleSheet("color: "+scheme.changedBaseColor);
- hueSpinBox.setStyleSheet("color: "+scheme.changedBaseColor);
- saturationSpinBox.setStyleSheet("color: "+scheme.changedBaseColor);
- } else {
- valueSpinBox.setStyleSheet("color: "+scheme.defaultColor);
- hueSpinBox.setStyleSheet("color: "+scheme.defaultColor);
- saturationSpinBox.setStyleSheet("color: "+scheme.defaultColor);
- }
+ if (backendColor.isInSubState) {
+ valueSpinBox.setStyleSheet("color: "+scheme.changedStateColor);
+ hueSpinBox.setStyleSheet("color: "+scheme.changedStateColor);
+ saturationSpinBox.setStyleSheet("color: "+scheme.changedStateColor);
} else {
- if (backendColor.isInSubState) {
- valueSpinBox.setStyleSheet("color: "+scheme.changedStateColor);
- hueSpinBox.setStyleSheet("color: "+scheme.changedStateColor);
- saturationSpinBox.setStyleSheet("color: "+scheme.changedStateColor);
- } else {
- valueSpinBox.setStyleSheet("color: "+scheme.defaultColor);
- hueSpinBox.setStyleSheet("color: "+scheme.defaultColor);
- saturationSpinBox.setStyleSheet("color: "+scheme.defaultColor);
- }
+ valueSpinBox.setStyleSheet("color: "+scheme.defaultColor);
+ hueSpinBox.setStyleSheet("color: "+scheme.defaultColor);
+ saturationSpinBox.setStyleSheet("color: "+scheme.defaultColor);
}
}
}
diff --git a/share/qtcreator/qmldesigner/propertyeditor/Qt/ComboBox.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/ComboBox.qml
index beae1d6b9207555409098e753770d19d899fb557..f83e985ea9a60fc835c3574d9ca822fccab1627a 100644
--- a/share/qtcreator/qmldesigner/propertyeditor/Qt/ComboBox.qml
+++ b/share/qtcreator/qmldesigner/propertyeditor/Qt/ComboBox.qml
@@ -22,26 +22,23 @@ QWidget {
evaluate();
}
- Script {
- function evaluate() {
- if (backendValue === undefined)
- return;
- if (!enabled) {
- box.setStyleSheet("color: "+scheme.disabledColor);
+ function evaluate() {
+ if (backendValue === undefined)
+ return;
+ if (!enabled) {
+ box.setStyleSheet("color: "+scheme.disabledColor);
+ } else {
+ if (baseStateFlag) {
+ if (backendValue.isInModel)
+ box.setStyleSheet("QComboBox,QComboBox:on{color: "+scheme.changedBaseColor+"}QComboBox:off{color:"+scheme.optionsColor+"}");
+ else
+ box.setStyleSheet("QComboBox,QComboBox:on{color: "+scheme.defaultColor+"}QComboBox:off{color:"+scheme.optionsColor+"}");
} else {
- if (baseStateFlag) {
- if (backendValue.isInModel)
- box.setStyleSheet("QComboBox,QComboBox:on{color: "+scheme.changedBaseColor+"}QComboBox:off{color:"+scheme.optionsColor+"}");
- else
- box.setStyleSheet("QComboBox,QComboBox:on{color: "+scheme.defaultColor+"}QComboBox:off{color:"+scheme.optionsColor+"}");
- } else {
- if (backendValue.isInSubState)
- box.setStyleSheet("QComboBox,QComboBox:on{color: "+scheme.changedStateColor+"}QComboBox:off{color:"+scheme.optionsColor+"}");
- else
- box.setStyleSheet("QComboBox,QComboBox:on{color: "+scheme.defaultColor+"}QComboBox:off{color:"+scheme.optionsColor+"}");
- }
+ if (backendValue.isInSubState)
+ box.setStyleSheet("QComboBox,QComboBox:on{color: "+scheme.changedStateColor+"}QComboBox:off{color:"+scheme.optionsColor+"}");
+ else
+ box.setStyleSheet("QComboBox,QComboBox:on{color: "+scheme.defaultColor+"}QComboBox:off{color:"+scheme.optionsColor+"}");
}
-
}
}
diff --git a/share/qtcreator/qmldesigner/propertyeditor/Qt/DoubleSpinBox.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/DoubleSpinBox.qml
index a055dc717f1bbb319cf3d06537aa3d3ff6158bc6..9530811d7aab649bfb27b94b22ed07af263d38c9 100644
--- a/share/qtcreator/qmldesigner/propertyeditor/Qt/DoubleSpinBox.qml
+++ b/share/qtcreator/qmldesigner/propertyeditor/Qt/DoubleSpinBox.qml
@@ -29,25 +29,23 @@ QWidget { //This is a special doubleSpinBox that does color coding for states
evaluate();
}
- Script {
- function evaluate() {
- if (backendValue === undefined)
- return;
- if (!enabled) {
- box.setStyleSheet("color: "+scheme.disabledColor);
- } else {
- if (baseStateFlag) {
- if (backendValue.isInModel)
+ function evaluate() {
+ if (backendValue === undefined)
+ return;
+ if (!enabled) {
+ box.setStyleSheet("color: "+scheme.disabledColor);
+ } else {
+ if (baseStateFlag) {
+ if (backendValue.isInModel)
box.setStyleSheet("color: "+scheme.changedBaseColor);
- else
+ else
box.setStyleSheet("color: "+scheme.defaultColor);
- } else {
- if (backendValue.isInSubState)
+ } else {
+ if (backendValue.isInSubState)
box.setStyleSheet("color: "+scheme.changedStateColor);
- else
+ else
box.setStyleSheet("color: "+scheme.defaultColor);
- }
- }
+ }
}
}
diff --git a/share/qtcreator/qmldesigner/propertyeditor/Qt/ExtendedFunctionButton.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/ExtendedFunctionButton.qml
index c88d0ed9ee5303adcb9538b114b5851a3ce564a5..bf99982d1a7b84bdc5fb5b8fafc88d17e926c02d 100644
--- a/share/qtcreator/qmldesigner/propertyeditor/Qt/ExtendedFunctionButton.qml
+++ b/share/qtcreator/qmldesigner/propertyeditor/Qt/ExtendedFunctionButton.qml
@@ -6,23 +6,20 @@ QToolButton {
property var backendValue
- Script {
- function setIcon() {
- if (backendValue == null)
- extendedFunctionButton.iconFromFile = "images/placeholder.png"
- else if (backendValue.isBound) {
- extendedFunctionButton.iconFromFile = "images/expression.png"
+ function setIcon() {
+ if (backendValue == null)
+ extendedFunctionButton.iconFromFile = "images/placeholder.png"
+ else if (backendValue.isBound) {
+ extendedFunctionButton.iconFromFile = "images/expression.png"
+ } else {
+ if (backendValue.complexNode != null && backendValue.complexNode.exists) {
+ extendedFunctionButton.iconFromFile = "images/behaivour.png"
} else {
- if (backendValue.complexNode != null && backendValue.complexNode.exists) {
- extendedFunctionButton.iconFromFile = "images/behaivour.png"
- } else {
- extendedFunctionButton.iconFromFile = "images/placeholder.png"
- }
+ extendedFunctionButton.iconFromFile = "images/placeholder.png"
}
}
}
-
onBackendValueChanged: {
setIcon();
}
diff --git a/share/qtcreator/qmldesigner/propertyeditor/Qt/FontComboBox.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/FontComboBox.qml
index e10124fce68a9368c8c54974ff9c2c950c8acbe0..d1395293ab60687903ceea3dd8b813422203c262 100644
--- a/share/qtcreator/qmldesigner/propertyeditor/Qt/FontComboBox.qml
+++ b/share/qtcreator/qmldesigner/propertyeditor/Qt/FontComboBox.qml
@@ -22,23 +22,20 @@ QWidget {
evaluate();
}
-
- Script {
- function evaluate() {
- if (!enabled) {
- fontSelector.setStyleSheet("color: "+scheme.disabledColor);
- } else {
- if (baseStateFlag) {
- if (backendValue != null && backendValue.isInModel)
- fontSelector.setStyleSheet("QComboBox,QComboBox:on{color: "+scheme.changedBaseColor+"}QComboBox:off{color:"+scheme.optionsColor+"}");
- else
- fontSelector.setStyleSheet("QComboBox,QComboBox:on{color: "+scheme.defaultColor+"}QComboBox:off{color:"+scheme.optionsColor+"}");
- } else {
- if (backendValue != null && backendValue.isInSubState)
- fontSelector.setStyleSheet("QComboBox,QComboBox:on{color: "+scheme.changedStateColor+"}QComboBox:off{color:"+scheme.optionsColor+"}");
- else
- fontSelector.setStyleSheet("QComboBox,QComboBox:on{color: "+scheme.defaultColor+"}QComboBox:off{color:"+scheme.optionsColor+"}");
- }
+ function evaluate() {
+ if (!enabled) {
+ fontSelector.setStyleSheet("color: "+scheme.disabledColor);
+ } else {
+ if (baseStateFlag) {
+ if (backendValue != null && backendValue.isInModel)
+ fontSelector.setStyleSheet("QComboBox,QComboBox:on{color: "+scheme.changedBaseColor+"}QComboBox:off{color:"+scheme.optionsColor+"}");
+ else
+ fontSelector.setStyleSheet("QComboBox,QComboBox:on{color: "+scheme.defaultColor+"}QComboBox:off{color:"+scheme.optionsColor+"}");
+ } else {
+ if (backendValue != null && backendValue.isInSubState)
+ fontSelector.setStyleSheet("QComboBox,QComboBox:on{color: "+scheme.changedStateColor+"}QComboBox:off{color:"+scheme.optionsColor+"}");
+ else
+ fontSelector.setStyleSheet("QComboBox,QComboBox:on{color: "+scheme.defaultColor+"}QComboBox:off{color:"+scheme.optionsColor+"}");
}
}
}
diff --git a/share/qtcreator/qmldesigner/propertyeditor/Qt/LineEdit.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/LineEdit.qml
index 02535b446f5b5b2a489053694f508d613d5776fd..ac782b83543ad72ac4def66fe904d064688684df 100644
--- a/share/qtcreator/qmldesigner/propertyeditor/Qt/LineEdit.qml
+++ b/share/qtcreator/qmldesigner/propertyeditor/Qt/LineEdit.qml
@@ -21,23 +21,21 @@ QWidget {
evaluate();
}
- Script {
- function evaluate() {
- if (!enabled) {
- lineEditWidget.setStyleSheet("color: "+scheme.disabledColor);
- } else {
- if (baseStateFlag) {
- if (backendValue != null && backendValue.isInModel)
- lineEditWidget.setStyleSheet("color: "+scheme.changedBaseColor);
- else
- lineEditWidget.setStyleSheet("color: "+scheme.defaultColor);
- } else {
- if (backendValue != null && backendValue.isInSubState)
- lineEditWidget.setStyleSheet("color: "+scheme.changedStateColor);
- else
- lineEditWidget.setStyleSheet("color: "+scheme.defaultColor);
- }
- }
+ function evaluate() {
+ if (!enabled) {
+ lineEditWidget.setStyleSheet("color: "+scheme.disabledColor);
+ } else {
+ if (baseStateFlag) {
+ if (backendValue != null && backendValue.isInModel)
+ lineEditWidget.setStyleSheet("color: "+scheme.changedBaseColor);
+ else
+ lineEditWidget.setStyleSheet("color: "+scheme.defaultColor);
+ } else {
+ if (backendValue != null && backendValue.isInSubState)
+ lineEditWidget.setStyleSheet("color: "+scheme.changedStateColor);
+ else
+ lineEditWidget.setStyleSheet("color: "+scheme.defaultColor);
+ }
}
}
diff --git a/share/qtcreator/qmldesigner/propertyeditor/Qt/SpinBox.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/SpinBox.qml
index 31e02b1eda21c6a61fb15d0a6f448c2f09991c5c..488a44c34397988ff56f9146e7fbdc1844f96570 100644
--- a/share/qtcreator/qmldesigner/propertyeditor/Qt/SpinBox.qml
+++ b/share/qtcreator/qmldesigner/propertyeditor/Qt/SpinBox.qml
@@ -27,25 +27,22 @@ QWidget { //This is a special spinBox that does color coding for states
evaluate();
}
-
- Script {
- function evaluate() {
- if (backendValue === undefined)
- return;
- if (!enabled) {
- box.setStyleSheet("color: "+scheme.disabledColor);
- } else {
- if (!(baseStateFlag === undefined) && baseStateFlag) {
- if (backendValue.isInModel)
- box.setStyleSheet("color: "+scheme.changedBaseColor);
- else
- box.setStyleSheet("color: "+scheme.defaultColor);
- } else {
- if (backendValue.isInSubState)
- box.setStyleSheet("color: "+scheme.changedStateColor);
- else
- box.setStyleSheet("color: "+scheme.defaultColor);
- }
+ function evaluate() {
+ if (backendValue === undefined)
+ return;
+ if (!enabled) {
+ box.setStyleSheet("color: "+scheme.disabledColor);
+ } else {
+ if (!(baseStateFlag === undefined) && baseStateFlag) {
+ if (backendValue.isInModel)
+ box.setStyleSheet("color: "+scheme.changedBaseColor);
+ else
+ box.setStyleSheet("color: "+scheme.defaultColor);
+ } else {
+ if (backendValue.isInSubState)
+ box.setStyleSheet("color: "+scheme.changedStateColor);
+ else
+ box.setStyleSheet("color: "+scheme.defaultColor);
}
}
}
diff --git a/share/qtcreator/static.pro b/share/qtcreator/static.pro
index ddb9ac8f3d57850cf1040839b7c2c4a3b73eedf1..4210cbebea8d9452afe38c3c292a12744b0207a1 100644
--- a/share/qtcreator/static.pro
+++ b/share/qtcreator/static.pro
@@ -35,9 +35,9 @@ DATA_DIRS = \
!isEmpty(copydata) {
for(data_dir, DATA_DIRS) {
- files = $$files($$PWD/$$data_dir/*.*, true)
+ files = $$files($$PWD/$$data_dir/*, true)
win32:files ~= s|\\\\|/|g
- FILES += $$files
+ for(file, files):!exists($$file/*):FILES += $$file
}
copy2build.input = FILES
diff --git a/share/qtcreator/styles/fakevim.xml b/share/qtcreator/styles/darkvim.xml
similarity index 96%
rename from share/qtcreator/styles/fakevim.xml
rename to share/qtcreator/styles/darkvim.xml
index 592507a2f5afdd3d18182f4a604e2c01e2251ecd..626012ff70591ee0740dd00ef63125bd34b6cb00 100644
--- a/share/qtcreator/styles/fakevim.xml
+++ b/share/qtcreator/styles/darkvim.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<style-scheme version="1.0" name="FakeVim (dark)">
+<style-scheme version="1.0" name="Vim (dark)">
<!--
Based on the default vim theme for a dark background, Linux console colors.
-->
diff --git a/share/qtcreator/templates/wizards/helloworld/wizard_sample.xml b/share/qtcreator/templates/wizards/helloworld/wizard_sample.xml
index 58e7748bccc6c7bf4e27563ff022c973f52f963a..23af3d6802b20509c6a0d119528b8fa8db70542e 100644
--- a/share/qtcreator/templates/wizards/helloworld/wizard_sample.xml
+++ b/share/qtcreator/templates/wizards/helloworld/wizard_sample.xml
@@ -53,7 +53,8 @@ leave room for the Qt 4 target page.
<fieldpagetitle xml:lang="de">Hallo Welt Parameter</fieldpagetitle>
<fields>
<field mandatory="true" name="MESSAGE">
- <fieldcontrol class="QLineEdit" validator='^[^"]+$' defaulttext="Hello world!" />
+ <fieldcontrol class="QLineEdit" validator='^[^"]+$'
+ defaulttext="Hello world from project '%ProjectName:c%'!" />
<fielddescription>Hello world message:</fielddescription>
<fielddescription xml:lang="de">Hallo-Welt-Nachricht:</fielddescription>
</field>
diff --git a/share/qtcreator/templates/wizards/qml-runtime/object.cpp b/share/qtcreator/templates/wizards/qml-runtime/object.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..f2d9eb39d08033e639662ac86fbc7f02204d4049
--- /dev/null
+++ b/share/qtcreator/templates/wizards/qml-runtime/object.cpp
@@ -0,0 +1,63 @@
+/**************************************************************************
+**
+** This file is part of Qt Creator
+**
+** Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+**
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** Commercial Usage
+**
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
+**
+** GNU Lesser General Public License Usage
+**
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at http://qt.nokia.com/contact.
+**
+**************************************************************************/
+
+#include <QtCore/QTime>
+#include <QtDeclarative/qdeclarative.h>
+
+#include "%ObjectName%.h"
+
+%ObjectName%::%ObjectName%(QObject *parent):
+ QObject(parent)
+{
+ timer = new QTimer(this);
+ timer->setInterval(750);
+ connect(timer, SIGNAL(timeout()), this, SLOT(timerFired()));
+ timer->start();
+}
+
+QString %ObjectName%::text() const
+{
+ return theText;
+}
+
+void %ObjectName%::setText(const QString &text)
+{
+ if (theText != text) {
+ theText = text;
+ emit textChanged(theText);
+ }
+}
+
+void %ObjectName%::timerFired()
+{
+ QTime t = QTime::currentTime();
+ setText(t.toString(QLatin1String("HH:mm:ss")));
+}
+
+QML_DECLARE_TYPE(%ObjectName%);
diff --git a/src/shared/cplusplus/Array.cpp b/share/qtcreator/templates/wizards/qml-runtime/object.h
similarity index 68%
rename from src/shared/cplusplus/Array.cpp
rename to share/qtcreator/templates/wizards/qml-runtime/object.h
index 26de0b23048fc33d86f6aae016845ed2b0944c19..50898b454ce4076bd8d3f17ba2017eaff869e68d 100644
--- a/src/shared/cplusplus/Array.cpp
+++ b/share/qtcreator/templates/wizards/qml-runtime/object.h
@@ -27,4 +27,36 @@
**
**************************************************************************/
-#include "Array.h"
+#ifndef EXAMPLEITEM_H
+#define EXAMPLEITEM_H
+
+#include <QtCore/QObject>
+#include <QtCore/QString>
+#include <QtCore/QTimer>
+
+class %ObjectName% : public QObject
+{
+ Q_OBJECT
+
+ Q_PROPERTY(QString text READ text WRITE setText NOTIFY textChanged)
+
+public:
+ %ObjectName%(QObject *parent = 0);
+
+ QString text() const;
+ void setText(const QString &text);
+
+signals:
+ void textChanged(const QString &newText);
+
+private slots:
+ void timerFired();
+
+private:
+ QString theText;
+ QTimer *timer;
+
+ Q_DISABLE_COPY(%ObjectName%)
+};
+
+#endif // EXAMPLEITEM_H
diff --git a/share/qtcreator/templates/wizards/qml-runtime/plugin.cpp b/share/qtcreator/templates/wizards/qml-runtime/plugin.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..ec2a0a1d50efb8bebdb7db70075585e41bad3154
--- /dev/null
+++ b/share/qtcreator/templates/wizards/qml-runtime/plugin.cpp
@@ -0,0 +1,52 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights. These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "%ProjectName%.h"
+#include "%ObjectName%.h"
+
+void %ProjectName%::registerTypes(const char *uri)
+{
+ Q_UNUSED(uri);
+
+ QML_REGISTER_TYPE(%ProjectName%,1,0,%ObjectName%,%ObjectName%);
+}
+
+Q_EXPORT_PLUGIN(%ProjectName%);
diff --git a/share/qtcreator/templates/wizards/qml-runtime/plugin.h b/share/qtcreator/templates/wizards/qml-runtime/plugin.h
new file mode 100644
index 0000000000000000000000000000000000000000..d42a3c51239fc6be0ac4db2cf7e48103f4a1463f
--- /dev/null
+++ b/share/qtcreator/templates/wizards/qml-runtime/plugin.h
@@ -0,0 +1,56 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights. These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef EXAMPLECOREPLUGIN_H
+#define EXAMPLECOREPLUGIN_H
+
+#include <QtDeclarative/qdeclarative.h>
+#include <QtDeclarative/QDeclarativeExtensionPlugin>
+
+class %ProjectName% : public QDeclarativeExtensionPlugin
+{
+ Q_OBJECT
+
+public:
+ void registerTypes(const char *uri);
+};
+
+#endif // EXAMPLECOREPLUGIN_H
diff --git a/share/qtcreator/templates/wizards/qml-runtime/project.pro b/share/qtcreator/templates/wizards/qml-runtime/project.pro
new file mode 100644
index 0000000000000000000000000000000000000000..72bb0c1e0e3e597c20771c883b8d98eeda3f6afb
--- /dev/null
+++ b/share/qtcreator/templates/wizards/qml-runtime/project.pro
@@ -0,0 +1,18 @@
+TEMPLATE = lib
+TARGET = %ProjectName%
+QT += declarative
+CONFIG += qt plugin
+
+TARGET = $$qtLibraryTarget($$TARGET)
+DESTDIR = %ProjectName%
+
+# Input
+SOURCES += \
+ %ProjectName%.cpp \
+ %ObjectName%.cpp
+
+OTHER_FILES=%ProjectName%/qmldir
+
+HEADERS += \
+ %ProjectName%.h \
+ %ObjectName%.h
diff --git a/share/qtcreator/templates/wizards/qml-runtime/qmldir b/share/qtcreator/templates/wizards/qml-runtime/qmldir
new file mode 100644
index 0000000000000000000000000000000000000000..ee07ff6b101cdf13a5b717960901eecade844126
--- /dev/null
+++ b/share/qtcreator/templates/wizards/qml-runtime/qmldir
@@ -0,0 +1 @@
+plugin %ProjectName%
diff --git a/share/qtcreator/templates/wizards/qml-runtime/wizard.xml b/share/qtcreator/templates/wizards/qml-runtime/wizard.xml
new file mode 100644
index 0000000000000000000000000000000000000000..14db77f70e3ba71411194cebde280fc0261b6d9d
--- /dev/null
+++ b/share/qtcreator/templates/wizards/qml-runtime/wizard.xml
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/**************************************************************************
+**
+** This file is part of Qt Creator
+**
+** Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+**
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** Commercial Usage
+**
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
+**
+** GNU Lesser General Public License Usage
+**
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at http://qt.nokia.com/contact.
+**
+**************************************************************************/
+
+Custom project wizard configuration example file. Note that by convention,
+the project file goes last.
+The "class" and "firstpage" attributes specify that it is a Qt 4 wizard and
+leave room for the Qt 4 target page.
+-->
+<wizard version="1" kind="project"
+ class="qt4project" firstpage="10"
+ id="QmlRuntimePlugin" category="F.Projects">
+ <description>Creates a plug-in for the QML runtime.</description>
+ <displayName>QML Runtime Plug-in</displayName>
+ <displayCategory>QML Runtime Plug-in</displayCategory>
+ <files>
+ <file source="qmldir" target="%ProjectName%/qmldir"/>
+ <file source="plugin.h" target="%ProjectName%.h"/>
+ <file source="plugin.cpp" target="%ProjectName%.cpp"/>
+ <file source="object.h" target="%ObjectName%.h"/>
+ <file source="object.cpp" target="%ObjectName%.cpp"/>
+ <file source="project.pro" target="%ProjectName%.pro"/>
+ </files>
+ <!-- Create a 2nd wizard page with parameters -->
+ <fieldpagetitle>QML Runtime Plug-in Parameters</fieldpagetitle>
+ <fields>
+ <field mandatory="false" name="ObjectName">
+ <fieldcontrol class="QLineEdit" validator='^[A-Za-z0-9_]+$' defaulttext="ExampleObject"/>
+ <fielddescription>Example Object Class-name:</fielddescription>
+ </field>
+ </fields>
+</wizard>
diff --git a/src/libs/3rdparty/net7ssh/src/src.pro b/src/libs/3rdparty/net7ssh/src/src.pro
index a0feafc4ae1c88cdf7cc8a8f5d881e227c61025e..e7d2e40d5291911b81e139f499c6b9865da93fcc 100644
--- a/src/libs/3rdparty/net7ssh/src/src.pro
+++ b/src/libs/3rdparty/net7ssh/src/src.pro
@@ -20,6 +20,7 @@ win32 {
unix {
QMAKE_CXXFLAGS_HIDESYMS -= -fvisibility-inlines-hidden # for ubuntu 7.04
+ QMAKE_CXXFLAGS += -Wno-unused-parameter
}
# Input
diff --git a/src/libs/cplusplus/CheckUndefinedSymbols.cpp b/src/libs/cplusplus/CheckUndefinedSymbols.cpp
index 3e435077a60cf806126312e25b4c6acc0b863832..7c5edf508e45890f0273bfa45ad0af1e149c70af 100644
--- a/src/libs/cplusplus/CheckUndefinedSymbols.cpp
+++ b/src/libs/cplusplus/CheckUndefinedSymbols.cpp
@@ -186,7 +186,7 @@ void CheckUndefinedSymbols::buildTypeMap(NamespaceBinding *binding, QSet<Namespa
_namespaceNames.insert(QByteArray(id->chars(), id->size()));
}
- foreach (Namespace *ns, binding->symbols) {
+ foreach (Namespace *ns, binding->symbols()) {
for (unsigned i = 0; i < ns->memberCount(); ++i) {
Symbol *member = ns->memberAt(i);
@@ -217,7 +217,7 @@ void CheckUndefinedSymbols::buildTypeMap(NamespaceBinding *binding, QSet<Namespa
}
}
- foreach (NamespaceBinding *childBinding, binding->children) {
+ foreach (NamespaceBinding *childBinding, binding->children()) {
buildTypeMap(childBinding, processed);
}
}
diff --git a/src/libs/cplusplus/CppBindings.cpp b/src/libs/cplusplus/CppBindings.cpp
index 577fa6c4ba233590b31b5bc40b2a9e2405f4ed7f..ecd2fff861144abaa5feeb35e580492984c19e66 100644
--- a/src/libs/cplusplus/CppBindings.cpp
+++ b/src/libs/cplusplus/CppBindings.cpp
@@ -65,24 +65,26 @@ Location::Location(const StringLiteral *fileId, unsigned sourceLocation)
// NamespaceBinding
////////////////////////////////////////////////////////////////////////////////
-NamespaceBinding::NamespaceBinding(NamespaceBinding *parent)
- : parent(parent),
- anonymousNamespaceBinding(0)
+NamespaceBinding::NamespaceBinding(NamespaceBinding *nsparent)
+ : parent_(nsparent),
+ anonymousNamespaceBinding_(0)
{
- if (parent)
- parent->children.append(this);
+ if (parent())
+ parent()->addChild(this);
}
NamespaceBinding::~NamespaceBinding()
{
- qDeleteAll(children);
- qDeleteAll(classBindings);
+ if(parent())
+ parent()->removeChild(this);
+ qDeleteAll(children_);
+ qDeleteAll(classBindings_);
}
const NameId *NamespaceBinding::name() const
{
- if (symbols.size()) {
- if (const Name *name = symbols.first()->name()) {
+ if (symbols().size()) {
+ if (const Name *name = symbols().first()->name()) {
const NameId *nameId = name->asNameId();
Q_ASSERT(nameId != 0);
@@ -101,19 +103,19 @@ const Identifier *NamespaceBinding::identifier() const
return 0;
}
-NamespaceBinding *NamespaceBinding::globalNamespaceBinding()
+NamespaceBinding *NamespaceBinding::globalNamespaceBinding() const
{
- NamespaceBinding *it = this;
+ NamespaceBinding *it = const_cast<NamespaceBinding *>(this);
- for (; it; it = it->parent) {
- if (! it->parent)
+ for (; it; it = it->parent()) {
+ if (! it->parent())
break;
}
return it;
}
-Binding *NamespaceBinding::findClassOrNamespaceBinding(const Identifier *id, QSet<Binding *> *processed)
+Binding *NamespaceBinding::findClassOrNamespaceBinding(const Identifier *id, QSet<const Binding *> *processed) const
{
if (processed->contains(this))
return 0;
@@ -123,28 +125,28 @@ Binding *NamespaceBinding::findClassOrNamespaceBinding(const Identifier *id, QSe
if (id->isEqualTo(identifier()))
return const_cast<NamespaceBinding *>(this);
- foreach (NamespaceBinding *nestedNamespaceBinding, children) {
+ foreach (NamespaceBinding *nestedNamespaceBinding, children()) {
if (id->isEqualTo(nestedNamespaceBinding->identifier()))
return nestedNamespaceBinding;
}
- foreach (ClassBinding *classBinding, classBindings) {
+ foreach (ClassBinding *classBinding, classBindings()) {
if (id->isEqualTo(classBinding->identifier()))
return classBinding;
}
- foreach (NamespaceBinding *u, usings) {
+ foreach (NamespaceBinding *u, usings()) {
if (Binding *b = u->findClassOrNamespaceBinding(id, processed))
return b;
}
- if (parent)
- return parent->findClassOrNamespaceBinding(id, processed);
+ if (parent())
+ return parent()->findClassOrNamespaceBinding(id, processed);
return 0;
}
-ClassBinding *NamespaceBinding::findClassBinding(const Name *name, QSet<Binding *> *processed)
+ClassBinding *NamespaceBinding::findClassBinding(const Name *name, QSet<const Binding *> *processed) const
{
if (! name)
return 0;
@@ -153,15 +155,15 @@ ClassBinding *NamespaceBinding::findClassBinding(const Name *name, QSet<Binding
return 0;
if (const QualifiedNameId *q = name->asQualifiedNameId()) {
- Binding *current = this;
+ const Binding *current = this;
for (unsigned i = 0; i < q->nameCount(); ++i) {
const Identifier *nameId = q->nameAt(i)->identifier();
if (! nameId)
return 0;
- QSet<Binding *> visited;
- Binding *binding = current->findClassOrNamespaceBinding(nameId, &visited); // ### TODO: check recursion.
+ QSet<const Binding *> visited;
+ const Binding *binding = current->findClassOrNamespaceBinding(nameId, &visited); // ### TODO: check recursion.
if (! binding)
return 0;
@@ -175,15 +177,15 @@ ClassBinding *NamespaceBinding::findClassBinding(const Name *name, QSet<Binding
const Identifier *id = name->identifier();
- foreach (ClassBinding *classBinding, classBindings) {
+ foreach (ClassBinding *classBinding, classBindings()) {
if (id->isEqualTo(classBinding->identifier()))
return classBinding;
}
- if (parent)
- return parent->findClassBinding(name, processed);
+ if (parent())
+ return parent()->findClassBinding(name, processed);
- foreach (NamespaceBinding *u, usings) {
+ foreach (NamespaceBinding *u, usings()) {
if (ClassBinding *classBinding = u->findClassBinding(name, processed))
return classBinding;
}
@@ -191,16 +193,16 @@ ClassBinding *NamespaceBinding::findClassBinding(const Name *name, QSet<Binding
return 0;
}
-NamespaceBinding *NamespaceBinding::findNamespaceBinding(const Name *name)
+NamespaceBinding *NamespaceBinding::findNamespaceBinding(const Name *name) const
{
if (! name)
- return anonymousNamespaceBinding;
+ return anonymousNamespaceBinding();
else if (const NameId *nameId = name->asNameId())
return findNamespaceBindingForNameId(nameId, /*lookAtParent = */ true);
else if (const QualifiedNameId *q = name->asQualifiedNameId()) {
- NamespaceBinding *current = this;
+ NamespaceBinding *current = const_cast<NamespaceBinding *>(this);
for (unsigned i = 0; i < q->nameCount(); ++i) {
const NameId *namespaceName = q->nameAt(i)->asNameId();
@@ -226,22 +228,22 @@ NamespaceBinding *NamespaceBinding::findNamespaceBinding(const Name *name)
}
NamespaceBinding *NamespaceBinding::findNamespaceBindingForNameId(const NameId *name,
- bool lookAtParentNamespace)
+ bool lookAtParentNamespace) const
{
- QSet<NamespaceBinding *> processed;
+ QSet<const NamespaceBinding *> processed;
return findNamespaceBindingForNameId_helper(name, lookAtParentNamespace, &processed);
}
NamespaceBinding *NamespaceBinding::findNamespaceBindingForNameId_helper(const NameId *name,
bool lookAtParentNamespace,
- QSet<NamespaceBinding *> *processed)
+ QSet<const NamespaceBinding *> *processed) const
{
if (processed->contains(this))
return 0;
processed->insert(this);
- foreach (NamespaceBinding *binding, children) {
+ foreach (NamespaceBinding *binding, children()) {
const Name *bindingName = binding->name();
if (! bindingName)
@@ -253,51 +255,52 @@ NamespaceBinding *NamespaceBinding::findNamespaceBindingForNameId_helper(const N
}
}
- foreach (NamespaceBinding *u, usings) {
+ foreach (NamespaceBinding *u, usings()) {
if (NamespaceBinding *b = u->findNamespaceBindingForNameId_helper(name, lookAtParentNamespace, processed)) {
return b;
}
}
- if (lookAtParentNamespace && parent)
- return parent->findNamespaceBindingForNameId_helper(name, lookAtParentNamespace, processed);
+ if (lookAtParentNamespace && parent())
+ return parent()->findNamespaceBindingForNameId_helper(name, lookAtParentNamespace, processed);
return 0;
}
NamespaceBinding *NamespaceBinding::findOrCreateNamespaceBinding(Namespace *symbol)
{
- if (NamespaceBinding *binding = findNamespaceBinding(symbol->name())) {
+ NamespaceBinding *binding = findNamespaceBinding(symbol->name());
+ if (binding) {
int index = 0;
- for (; index < binding->symbols.size(); ++index) {
- Namespace *ns = binding->symbols.at(index);
+ for (; index < binding->symbols().size(); ++index) {
+ Namespace *ns = binding->symbols().at(index);
if (ns == symbol)
break;
}
- if (index == binding->symbols.size())
- binding->symbols.append(symbol);
+ if (index == binding->symbols().size())
+ binding->addSymbol(symbol);
return binding;
}
- NamespaceBinding *binding = new NamespaceBinding(this);
- binding->symbols.append(symbol);
+ binding = new NamespaceBinding(this);
+ binding->addSymbol(symbol);
if (! symbol->name()) {
- Q_ASSERT(! anonymousNamespaceBinding);
+ Q_ASSERT(! anonymousNamespaceBinding());
- anonymousNamespaceBinding = binding;
+ setAnonymousNamespaceBinding(binding);
}
return binding;
}
static void closure(const Location &loc,
- NamespaceBinding *binding, const Name *name,
- QList<NamespaceBinding *> *bindings)
+ const NamespaceBinding *binding, const Name *name,
+ QList<const NamespaceBinding *> *bindings)
{
if (bindings->contains(binding))
return;
@@ -309,7 +312,7 @@ static void closure(const Location &loc,
const Identifier *id = name->asNameId()->identifier();
bool ignoreUsingDirectives = false;
- foreach (Namespace *symbol, binding->symbols) {
+ foreach (Namespace *symbol, binding->symbols()) {
Scope *scope = symbol->members();
for (Symbol *symbol = scope->lookat(id); symbol; symbol = symbol->next()) {
@@ -328,25 +331,25 @@ static void closure(const Location &loc,
if (ignoreUsingDirectives)
return;
- foreach (NamespaceBinding *u, binding->usings)
+ foreach (NamespaceBinding *u, binding->usings())
closure(loc, u, name, bindings);
}
NamespaceBinding *NamespaceBinding::resolveNamespace(const Location &loc,
const Name *name,
- bool lookAtParent)
+ bool lookAtParent) const
{
if (! name)
return 0;
else if (const NameId *nameId = name->asNameId()) {
- QList<NamespaceBinding *> bindings;
+ QList<const NamespaceBinding *> bindings;
closure(loc, this, nameId, &bindings);
QList<NamespaceBinding *> results;
- foreach (NamespaceBinding *binding, bindings) {
+ foreach (const NamespaceBinding *binding, bindings) {
if (NamespaceBinding *b = binding->findNamespaceBinding(nameId))
results.append(b);
}
@@ -359,8 +362,8 @@ NamespaceBinding *NamespaceBinding::resolveNamespace(const Location &loc,
return results.at(0);
}
- else if (parent && lookAtParent)
- return parent->resolveNamespace(loc, name);
+ else if (parent() && lookAtParent)
+ return parent()->resolveNamespace(loc, name);
} else if (const QualifiedNameId *q = name->asQualifiedNameId()) {
if (q->nameCount() == 1) {
@@ -369,7 +372,7 @@ NamespaceBinding *NamespaceBinding::resolveNamespace(const Location &loc,
return globalNamespaceBinding()->resolveNamespace(loc, q->nameAt(0));
}
- NamespaceBinding *current = this;
+ const NamespaceBinding *current = this;
if (q->isGlobal())
current = globalNamespaceBinding();
@@ -377,7 +380,7 @@ NamespaceBinding *NamespaceBinding::resolveNamespace(const Location &loc,
for (unsigned i = 1; current && i < q->nameCount(); ++i)
current = current->resolveNamespace(loc, q->nameAt(i), false);
- return current;
+ return const_cast<NamespaceBinding *>(current);
}
return 0;
@@ -386,12 +389,12 @@ NamespaceBinding *NamespaceBinding::resolveNamespace(const Location &loc,
// ### rewrite me
QByteArray NamespaceBinding::qualifiedId() const
{
- if (! parent)
+ if (! parent())
return "<root>";
QByteArray s;
- s.append(parent->qualifiedId());
+ s.append(parent()->qualifiedId());
s.append("::");
if (const Identifier *id = identifier())
@@ -406,7 +409,7 @@ QByteArray NamespaceBinding::qualifiedId() const
// ### rewrite me
QByteArray ClassBinding::qualifiedId() const
{
- QByteArray s = parent->qualifiedId();
+ QByteArray s = parent()->qualifiedId();
s += "::";
if (const Identifier *id = identifier())
@@ -418,22 +421,22 @@ QByteArray ClassBinding::qualifiedId() const
return s;
}
-Binding *ClassBinding::findClassOrNamespaceBinding(const Identifier *id, QSet<Binding *> *processed)
+Binding *ClassBinding::findClassOrNamespaceBinding(const Identifier *id, QSet<const Binding *> *processed) const
{
if (id->isEqualTo(identifier()))
- return this;
+ return const_cast<ClassBinding *>(this);
if (processed->contains(this))
return 0;
processed->insert(this);
- foreach (ClassBinding *nestedClassBinding, children) {
+ foreach (ClassBinding *nestedClassBinding, children()) {
if (id->isEqualTo(nestedClassBinding->identifier()))
return nestedClassBinding;
}
- foreach (ClassBinding *baseClassBinding, baseClassBindings) {
+ foreach (ClassBinding *baseClassBinding, baseClassBindings()) {
if (! baseClassBinding)
continue;
@@ -441,13 +444,13 @@ Binding *ClassBinding::findClassOrNamespaceBinding(const Identifier *id, QSet<Bi
return b;
}
- if (parent)
- return parent->findClassOrNamespaceBinding(id, processed);
+ if (parent())
+ return parent()->findClassOrNamespaceBinding(id, processed);
return 0;
}
-ClassBinding *ClassBinding::findClassBinding(const Name *name, QSet<Binding *> *processed)
+ClassBinding *ClassBinding::findClassBinding(const Name *name, QSet<const Binding *> *processed) const
{
if (! name)
return 0;
@@ -458,14 +461,14 @@ ClassBinding *ClassBinding::findClassBinding(const Name *name, QSet<Binding *> *
processed->insert(this);
if (const QualifiedNameId *q = name->asQualifiedNameId()) {
- Binding *currentBinding = this;
+ const Binding *currentBinding = this;
for (unsigned i = 0; i < q->nameCount() - 1; ++i) {
const Identifier *id = q->nameAt(i)->identifier();
if (! id)
return 0;
- Binding *classOrNamespaceBinding = currentBinding->findClassOrNamespaceBinding(id, processed);
+ const Binding *classOrNamespaceBinding = currentBinding->findClassOrNamespaceBinding(id, processed);
if (! classOrNamespaceBinding)
return 0;
@@ -481,17 +484,17 @@ ClassBinding *ClassBinding::findClassBinding(const Name *name, QSet<Binding *> *
if (const Identifier *id = name->identifier()) {
if (id->isEqualTo(identifier()))
- return this;
+ return const_cast<ClassBinding *>(this);
- foreach (ClassBinding *nestedClassBinding, children) {
+ foreach (ClassBinding *nestedClassBinding, children()) {
if (const Identifier *nestedClassId = nestedClassBinding->identifier()) {
if (nestedClassId->isEqualTo(id))
return nestedClassBinding;
}
}
- if (parent)
- return parent->findClassBinding(name, processed);
+ if (parent())
+ return parent()->findClassBinding(name, processed);
}
return 0;
@@ -502,15 +505,15 @@ static int depth;
void NamespaceBinding::dump()
{
qDebug() << QByteArray(depth, ' ').constData() << "namespace" << qualifiedId().constData()
- << " # " << symbols.size();
+ << " # " << symbols().size();
++depth;
- foreach (ClassBinding *classBinding, classBindings) {
+ foreach (ClassBinding *classBinding, classBindings()) {
classBinding->dump();
}
- foreach (NamespaceBinding *child, children) {
+ foreach (NamespaceBinding *child, children()) {
child->dump();
}
@@ -520,11 +523,11 @@ void NamespaceBinding::dump()
void ClassBinding::dump()
{
qDebug() << QByteArray(depth, ' ').constData() << "class" << qualifiedId().constData()
- << " # " << symbols.size();
+ << " # " << symbols().size();
++depth;
- foreach (ClassBinding *classBinding, children) {
+ foreach (ClassBinding *classBinding, children()) {
classBinding->dump();
}
@@ -534,27 +537,33 @@ void ClassBinding::dump()
////////////////////////////////////////////////////////////////////////////////
// ClassBinding
////////////////////////////////////////////////////////////////////////////////
-ClassBinding::ClassBinding(NamespaceBinding *parent)
- : parent(parent)
+ClassBinding::ClassBinding(NamespaceBinding *nsbparent)
+ : parent_(nsbparent)
{
- parent->classBindings.append(this);
+ nsbparent->addClassBinding(this);
}
ClassBinding::ClassBinding(ClassBinding *parentClass)
- : parent(parentClass)
+ : parent_(parentClass)
{
- parentClass->children.append(this);
+ parentClass->addChild(this);
}
ClassBinding::~ClassBinding()
-{ qDeleteAll(children); }
+{
+ if(parent()->asClassBinding() != NULL)
+ parent()->asClassBinding()->removeChild(this);
+ if(parent()->asNamespaceBinding() != NULL)
+ parent()->asNamespaceBinding()->removeClassBinding(this);
+ qDeleteAll(children_);
+}
const Name *ClassBinding::name() const
{
- if (symbols.isEmpty())
+ if (symbols().isEmpty())
return 0;
- return symbols.first()->name();
+ return symbols().first()->name();
}
const Identifier *ClassBinding::identifier() const
@@ -612,7 +621,7 @@ protected:
}
Namespace *ns = doc->globalNamespace();
- _globals->symbols.append(ns);
+ _globals->addSymbol(ns);
for (unsigned i = 0; i < ns->memberCount(); ++i) {
(void) bind(ns->memberAt(i), _globals);
@@ -628,7 +637,7 @@ protected:
NamespaceBinding *switchNamespaceBinding(NamespaceBinding *binding);
ClassBinding *findOrCreateClassBinding(Class *classSymbol);
- ClassBinding *findClassBinding(const Name *name);
+ ClassBinding *findClassBinding(const Name *name) const;
ClassBinding *switchClassBinding(ClassBinding *binding);
@@ -663,7 +672,9 @@ NamespaceBinding *Binder::bind(Symbol *symbol, NamespaceBinding *binding)
}
NamespaceBinding *Binder::findOrCreateNamespaceBinding(Namespace *symbol)
-{ return namespaceBinding->findOrCreateNamespaceBinding(symbol); }
+{
+ return namespaceBinding->findOrCreateNamespaceBinding(symbol);
+}
NamespaceBinding *Binder::resolveNamespace(const Location &loc, const Name *name)
{
@@ -690,13 +701,13 @@ ClassBinding *Binder::findOrCreateClassBinding(Class *classSymbol)
else
binding = new ClassBinding(namespaceBinding);
- binding->symbols.append(classSymbol);
+ binding->addSymbol(classSymbol);
return binding;
}
-ClassBinding *Binder::findClassBinding(const Name *name)
+ClassBinding *Binder::findClassBinding(const Name *name) const
{
- QSet<Binding *> processed;
+ QSet<const Binding *> processed;
if (classBinding) {
if (ClassBinding *k = classBinding->findClassBinding(name, &processed))
@@ -738,7 +749,7 @@ bool Binder::visit(UsingNamespaceDirective *u)
if (! resolved)
return false;
- namespaceBinding->usings.append(resolved);
+ namespaceBinding->addUsing(resolved);
return false;
}
@@ -751,7 +762,7 @@ bool Binder::visit(Class *classSymbol)
for (unsigned i = 0; i < classSymbol->baseClassCount(); ++i) {
BaseClass *baseClass = classSymbol->baseClassAt(i);
ClassBinding *baseClassBinding = findClassBinding(baseClass->name());
- binding->baseClassBindings.append(baseClassBinding);
+ binding->addBaseClassBinding(baseClassBinding);
}
for (unsigned i = 0; i < classSymbol->memberCount(); ++i)
@@ -776,15 +787,15 @@ static NamespaceBinding *find_helper(Namespace *symbol, NamespaceBinding *bindin
if (binding && ! processed->contains(binding)) {
processed->insert(binding);
- if (binding->symbols.contains(symbol))
+ if (binding->symbols().contains(symbol))
return binding;
- foreach (NamespaceBinding *nestedBinding, binding->children) {
+ foreach (NamespaceBinding *nestedBinding, binding->children()) {
if (NamespaceBinding *ns = find_helper(symbol, nestedBinding, processed))
return ns;
}
- if (NamespaceBinding *a = find_helper(symbol, binding->anonymousNamespaceBinding, processed))
+ if (NamespaceBinding *a = find_helper(symbol, binding->anonymousNamespaceBinding(), processed))
return a;
}
@@ -798,26 +809,26 @@ static ClassBinding *find_helper(Class *symbol, Binding *binding,
processed->insert(binding);
if (NamespaceBinding *namespaceBinding = binding->asNamespaceBinding()) {
- foreach (ClassBinding *classBinding, namespaceBinding->classBindings) {
+ foreach (ClassBinding *classBinding, namespaceBinding->classBindings()) {
if (ClassBinding *c = find_helper(symbol, classBinding, processed))
return c;
}
- foreach (NamespaceBinding *nestedBinding, namespaceBinding->children) {
+ foreach (NamespaceBinding *nestedBinding, namespaceBinding->children()) {
if (ClassBinding *c = find_helper(symbol, nestedBinding, processed))
return c;
}
- if (ClassBinding *a = find_helper(symbol, namespaceBinding->anonymousNamespaceBinding, processed))
+ if (ClassBinding *a = find_helper(symbol, namespaceBinding->anonymousNamespaceBinding(), processed))
return a;
} else if (ClassBinding *classBinding = binding->asClassBinding()) {
- foreach (Class *klass, classBinding->symbols) {
+ foreach (Class *klass, classBinding->symbols()) {
if (klass == symbol)
return classBinding;
}
- foreach (ClassBinding *nestedClassBinding, classBinding->children) {
+ foreach (ClassBinding *nestedClassBinding, classBinding->children()) {
if (ClassBinding *c = find_helper(symbol, nestedClassBinding, processed))
return c;
}
@@ -853,3 +864,72 @@ NamespaceBindingPtr CPlusPlus::bind(Document::Ptr doc, Snapshot snapshot)
return global;
}
+void NamespaceBinding::addChild(NamespaceBinding *nsbind)
+{
+ children_.append(nsbind);
+}
+
+void NamespaceBinding::removeChild(NamespaceBinding *nsbind)
+{
+ children_.removeAll(nsbind);
+}
+
+void NamespaceBinding::addUsing(NamespaceBinding *nsbind)
+{
+ usings_.append(nsbind);
+}
+
+void NamespaceBinding::removeUsing(NamespaceBinding *nsbind)
+{
+ usings_.removeAll(nsbind);
+}
+
+void NamespaceBinding::addSymbol(Namespace *nsbind)
+{
+ symbols_.append(nsbind);
+}
+
+void NamespaceBinding::removeSymbol(Namespace *nsbind)
+{
+ symbols_.removeAll(nsbind);
+}
+
+void NamespaceBinding::addClassBinding(ClassBinding *cbind)
+{
+ classBindings_.append(cbind);
+}
+
+void NamespaceBinding::removeClassBinding(ClassBinding *cbind)
+{
+ classBindings_.removeAll(cbind);
+}
+
+void ClassBinding::addChild(ClassBinding *cbind)
+{
+ children_.append(cbind);
+}
+
+void ClassBinding::removeChild(ClassBinding *cbind)
+{
+ children_.removeAll(cbind);
+}
+
+void ClassBinding::addSymbol(Class *symbol)
+{
+ symbols_.append(symbol);
+}
+
+void ClassBinding::removeSymbol(Class *symbol)
+{
+ symbols_.removeAll(symbol);
+}
+
+void ClassBinding::addBaseClassBinding(ClassBinding *cbind)
+{
+ baseClassBindings_.append(cbind);
+}
+
+void ClassBinding::removeBaseClassBinding(ClassBinding *cbind)
+{
+ baseClassBindings_.removeAll(cbind);
+}
diff --git a/src/libs/cplusplus/CppBindings.h b/src/libs/cplusplus/CppBindings.h
index d4f7380be73a12bd0a56963a6574edfdbeafe1e9..d7e9685dd82c717fdb2674403eb3cad62aa343b2 100644
--- a/src/libs/cplusplus/CppBindings.h
+++ b/src/libs/cplusplus/CppBindings.h
@@ -81,11 +81,11 @@ public:
virtual ~Binding() {}
virtual QByteArray qualifiedId() const = 0;
- virtual NamespaceBinding *asNamespaceBinding() { return 0; }
- virtual ClassBinding *asClassBinding() { return 0; }
+ virtual NamespaceBinding *asNamespaceBinding() const { return 0; }
+ virtual ClassBinding *asClassBinding() const { return 0; }
- virtual ClassBinding *findClassBinding(const Name *name, QSet<Binding *> *processed) = 0;
- virtual Binding *findClassOrNamespaceBinding(const Identifier *id, QSet<Binding *> *processed) = 0;
+ virtual ClassBinding *findClassBinding(const Name *name, QSet<const Binding *> *processed) const = 0;
+ virtual Binding *findClassOrNamespaceBinding(const Identifier *id, QSet<const Binding *> *processed) const = 0;
};
class CPLUSPLUS_EXPORT NamespaceBinding: public Binding
@@ -104,20 +104,20 @@ public:
const Identifier *identifier() const;
/// Returns the binding for the global namespace (aka ::).
- NamespaceBinding *globalNamespaceBinding();
+ NamespaceBinding *globalNamespaceBinding() const;
/// Returns the binding for the given namespace symbol.
- NamespaceBinding *findNamespaceBinding(const Name *name);
+ NamespaceBinding *findNamespaceBinding(const Name *name) const;
/// Returns the binding associated with the given symbol.
NamespaceBinding *findOrCreateNamespaceBinding(Namespace *symbol);
NamespaceBinding *resolveNamespace(const Location &loc,
const Name *name,
- bool lookAtParent = true);
+ bool lookAtParent = true) const;
- virtual ClassBinding *findClassBinding(const Name *name, QSet<Binding *> *processed);
- virtual Binding *findClassOrNamespaceBinding(const Identifier *id, QSet<Binding *> *processed);
+ virtual ClassBinding *findClassBinding(const Name *name, QSet<const Binding *> *processed) const;
+ virtual Binding *findClassOrNamespaceBinding(const Identifier *id, QSet<const Binding *> *processed) const;
/// Helpers.
virtual QByteArray qualifiedId() const;
@@ -128,31 +128,46 @@ public:
static NamespaceBinding *find(Namespace *symbol, NamespaceBinding *binding);
static ClassBinding *find(Class *symbol, NamespaceBinding *binding);
+ NamespaceBinding *parent() const {return parent_;}
+ NamespaceBinding *anonymousNamespaceBinding() const {return anonymousNamespaceBinding_;}
+ void setAnonymousNamespaceBinding(NamespaceBinding *binding) { anonymousNamespaceBinding_ = binding; }
+ const QList<NamespaceBinding *> &children() const {return children_;}
+ void addChild(NamespaceBinding *);
+ void removeChild(NamespaceBinding *);
+ const QList<NamespaceBinding *> &usings() const {return usings_;}
+ void addUsing(NamespaceBinding *);
+ void removeUsing(NamespaceBinding *);
+ const QList<Namespace *> &symbols() const {return symbols_;}
+ void addSymbol(Namespace *);
+ void removeSymbol(Namespace *);
+ const QList<ClassBinding *> &classBindings() const {return classBindings_;}
+ void addClassBinding(ClassBinding *);
+ void removeClassBinding(ClassBinding *);
private:
NamespaceBinding *findNamespaceBindingForNameId(const NameId *name,
- bool lookAtParentNamespace);
+ bool lookAtParentNamespace) const;
NamespaceBinding *findNamespaceBindingForNameId_helper(const NameId *name,
bool lookAtParentNamespace,
- QSet<NamespaceBinding *> *processed);
+ QSet<const NamespaceBinding *> *processed) const;
-public: // attributes
+private: // attributes
/// This binding's parent.
- NamespaceBinding *parent;
+ NamespaceBinding *parent_;
/// Binding for anonymous namespace symbols.
- NamespaceBinding *anonymousNamespaceBinding;
+ NamespaceBinding *anonymousNamespaceBinding_;
/// This binding's connections.
- QList<NamespaceBinding *> children;
+ QList<NamespaceBinding *> children_;
/// This binding's list of using namespaces.
- QList<NamespaceBinding *> usings;
+ QList<NamespaceBinding *> usings_;
/// This binding's namespace symbols.
- QList<Namespace *> symbols;
+ QList<Namespace *> symbols_;
- QList<ClassBinding *> classBindings;
+ QList<ClassBinding *> classBindings_;
};
class CPLUSPLUS_EXPORT ClassBinding: public Binding
@@ -171,21 +186,32 @@ public:
const Identifier *identifier() const;
virtual QByteArray qualifiedId() const;
- virtual ClassBinding *findClassBinding(const Name *name, QSet<Binding *> *processed);
- virtual Binding *findClassOrNamespaceBinding(const Identifier *id, QSet<Binding *> *processed);
+ virtual ClassBinding *findClassBinding(const Name *name, QSet<const Binding *> *processed) const;
+ virtual Binding *findClassOrNamespaceBinding(const Identifier *id, QSet<const Binding *> *processed) const;
void dump();
-public: // attributes
- Binding *parent;
+ Binding *parent() const { return parent_; }
+ const QList<ClassBinding *> &children() const { return children_; }
+ void addChild(ClassBinding *);
+ void removeChild(ClassBinding *);
+ const QList<Class *> &symbols() const { return symbols_; }
+ void addSymbol(Class *symbol);
+ void removeSymbol(Class *symbol);
+ const QList<ClassBinding *> &baseClassBindings() const { return baseClassBindings_; }
+ void addBaseClassBinding(ClassBinding *);
+ void removeBaseClassBinding(ClassBinding *);
- QList<ClassBinding *> children;
+private: // attributes
+ Binding *parent_;
+
+ QList<ClassBinding *> children_;
/// This binding's class symbols.
- QList<Class *> symbols;
+ QList<Class *> symbols_;
/// Bindings for the base classes.
- QList<ClassBinding *> baseClassBindings;
+ QList<ClassBinding *> baseClassBindings_;
};
CPLUSPLUS_EXPORT NamespaceBindingPtr bind(Document::Ptr doc, Snapshot snapshot);
diff --git a/src/libs/cplusplus/CppDocument.cpp b/src/libs/cplusplus/CppDocument.cpp
index 3a5e21198e3526762f28f045a4eb31a8e988ede1..bc6605f2bc2520acfaa8bf4db24d614c5b443bb1 100644
--- a/src/libs/cplusplus/CppDocument.cpp
+++ b/src/libs/cplusplus/CppDocument.cpp
@@ -304,6 +304,11 @@ Namespace *Document::globalNamespace() const
return _globalNamespace;
}
+void Document::setGlobalNamespace(Namespace *globalNamespace)
+{
+ _globalNamespace = globalNamespace;
+}
+
Symbol *Document::findSymbolAt(unsigned line, unsigned column) const
{
return findSymbolAt(line, column, globalSymbols());
diff --git a/src/libs/cplusplus/CppDocument.h b/src/libs/cplusplus/CppDocument.h
index 6a9a1e302debeddb7ce9e9ded6dfd4308067611c..f2159142f38252ae23d3c86f940d7dfde5a21aa7 100644
--- a/src/libs/cplusplus/CppDocument.h
+++ b/src/libs/cplusplus/CppDocument.h
@@ -86,7 +86,9 @@ public:
unsigned globalSymbolCount() const;
Symbol *globalSymbolAt(unsigned index) const;
Scope *globalSymbols() const; // ### deprecate?
+
Namespace *globalNamespace() const;
+ void setGlobalNamespace(Namespace *globalNamespace); // ### internal
QList<Macro> definedMacros() const
{ return _definedMacros; }
diff --git a/src/libs/cplusplus/LookupContext.cpp b/src/libs/cplusplus/LookupContext.cpp
index 93b1c0704750781511f1eaea394e20d544b8a774..3d24d198eedd159fe4c81768034642bd84a44bf9 100644
--- a/src/libs/cplusplus/LookupContext.cpp
+++ b/src/libs/cplusplus/LookupContext.cpp
@@ -643,7 +643,7 @@ static void visibleClassBindings_helper(ClassBinding *classBinding,
processed->insert(classBinding);
- foreach (ClassBinding *baseClassBinding, classBinding->baseClassBindings)
+ foreach (ClassBinding *baseClassBinding, classBinding->baseClassBindings())
visibleClassBindings_helper(baseClassBinding, allClassBindings, processed);
allClassBindings->append(classBinding);
@@ -682,7 +682,7 @@ Symbol *LookupContext::canonicalSymbol(Symbol *symbol,
if (! baseClassBinding)
continue;
- foreach (Class *baseClass, baseClassBinding->symbols) {
+ foreach (Class *baseClass, baseClassBinding->symbols()) {
if (! baseClass)
continue;
diff --git a/src/libs/cplusplus/ResolveExpression.cpp b/src/libs/cplusplus/ResolveExpression.cpp
index 8f05b78c366f12cc3d5ff86bab0760c8e0bf2c5f..0dc42ca9cca78a6c28545c284873dba3507d181d 100644
--- a/src/libs/cplusplus/ResolveExpression.cpp
+++ b/src/libs/cplusplus/ResolveExpression.cpp
@@ -295,7 +295,7 @@ bool ResolveExpression::visit(ThisExpressionAST *)
bool ResolveExpression::visit(CompoundExpressionAST *ast)
{
- CompoundStatementAST *cStmt = ast->compoundStatement;
+ CompoundStatementAST *cStmt = ast->statement;
if (cStmt && cStmt->statement_list) {
accept(cStmt->statement_list->lastValue());
}
diff --git a/src/libs/cplusplus/TypePrettyPrinter.cpp b/src/libs/cplusplus/TypePrettyPrinter.cpp
index d0f958d1dba7ef7f3b49f07ff9b00cb3c337d5cf..5fc4f4f86f530ad0a054a8a7d13327cf9ec8ad40 100644
--- a/src/libs/cplusplus/TypePrettyPrinter.cpp
+++ b/src/libs/cplusplus/TypePrettyPrinter.cpp
@@ -150,8 +150,14 @@ void TypePrettyPrinter::applyPtrOperators(bool wantSpace)
if (op->isPointerType()) {
_text += QLatin1Char('*');
outCV(op);
- } else if (op->isReferenceType()) {
- _text += QLatin1Char('&');
+ } else if (const ReferenceType *ref = op->asReferenceType()) {
+ if (_text.endsWith(QLatin1Char('&')))
+ _text += QLatin1Char(' ');
+
+ if (ref->isRvalueReference())
+ _text += QLatin1String("&&");
+ else
+ _text += QLatin1Char('&');
} else if (const PointerToMemberType *memPtrTy = op->asPointerToMemberType()) {
space();
_text += _overview->prettyName(memPtrTy->memberName());
diff --git a/src/libs/qmljs/parser/cmd.sed b/src/libs/qmljs/parser/cmd.sed
index 86fb183eaa9deb43ef0570f437de0e0276b537db..740da4e3d1acb77deb7d27d619d3db9935b6de58 100644
--- a/src/libs/qmljs/parser/cmd.sed
+++ b/src/libs/qmljs/parser/cmd.sed
@@ -1,4 +1,11 @@
-s/qdeclarativejs/qmljs/g
-s/QDECLARATIVEJS/QMLJS/g
-s/QDeclarativeJS/QmlJS/g
-s/QDeclarativeParser/QmlParser/g
+s/qdeclarative/qml/g
+s/QDECLARATIVE/QML/g
+s/QDeclarative/Qml/g
+
+# adjust pri file
+s/ \$\$PWD\/qmljsglobal_p.h/ $$PWD\/qmljsglobal_p.h \\\
+ $$PWD\/qmldirparser_p.h \\\
+ $$PWD\/qmlerror.h/
+s/ \$\$PWD\/qmljsparser.cpp/ $$PWD\/qmljsparser.cpp \\\
+ $$PWD\/qmldirparser.cpp \\\
+ $$PWD\/qmlerror.cpp/
diff --git a/src/libs/qmljs/parser/gen-parser.sh b/src/libs/qmljs/parser/gen-parser.sh
old mode 100644
new mode 100755
index fed0e4d0421eb13ab390bde4a72c0673bcdf6796..5b999e27f158cb2b18c9c9d8e1f227733d61ba27
--- a/src/libs/qmljs/parser/gen-parser.sh
+++ b/src/libs/qmljs/parser/gen-parser.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
me=$(dirname $0)
@@ -6,4 +6,9 @@ for i in $QTDIR/src/declarative/qml/parser/*.{h,cpp,pri}; do
sed -f $me/cmd.sed $i > $me/$(echo $(basename $i) | sed s/qdeclarativejs/qmljs/)
done
+for i in $QTDIR/src/declarative/qml/qdeclarative{error.{h,cpp},dirparser{_p.h,.cpp}}; do
+ sed -f $me/cmd.sed $i > $me/$(echo $(basename $i) | sed s/qdeclarative/qml/)
+done
+# export QmlDirParser
+perl -p -0777 -i -e 's/QT_BEGIN_NAMESPACE\n\nclass QmlError;\n\nclass QmlDirParser/#include "qmljsglobal_p.h"\n\nQT_BEGIN_NAMESPACE\n\nclass QmlError;\n\nclass QML_PARSER_EXPORT QmlDirParser/' qmldirparser_p.h
diff --git a/src/libs/qmljs/parser/parser.pri b/src/libs/qmljs/parser/parser.pri
index 45304798d5373e046addc4903805bb8bfba72e2c..849f306aa55d22c7034bd7e8a12680d1d7718fad 100644
--- a/src/libs/qmljs/parser/parser.pri
+++ b/src/libs/qmljs/parser/parser.pri
@@ -10,7 +10,9 @@ HEADERS += \
$$PWD/qmljsmemorypool_p.h \
$$PWD/qmljsnodepool_p.h \
$$PWD/qmljsparser_p.h \
- $$PWD/qmljsglobal_p.h
+ $$PWD/qmljsglobal_p.h \
+ $$PWD/qmldirparser_p.h \
+ $$PWD/qmlerror.h
SOURCES += \
$$PWD/qmljsast.cpp \
@@ -18,4 +20,6 @@ SOURCES += \
$$PWD/qmljsengine_p.cpp \
$$PWD/qmljsgrammar.cpp \
$$PWD/qmljslexer.cpp \
- $$PWD/qmljsparser.cpp
+ $$PWD/qmljsparser.cpp \
+ $$PWD/qmldirparser.cpp \
+ $$PWD/qmlerror.cpp
diff --git a/src/libs/qmljs/parser/qmldirparser.cpp b/src/libs/qmljs/parser/qmldirparser.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..60beb720978b6ef8642be9b3e49fb199f3e7747d
--- /dev/null
+++ b/src/libs/qmljs/parser/qmldirparser.cpp
@@ -0,0 +1,220 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights. These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "qmldirparser_p.h"
+#include "qmlerror.h"
+
+#include <QtCore/QTextStream>
+#include <QtCore/QtDebug>
+
+QT_BEGIN_NAMESPACE
+
+QmlDirParser::QmlDirParser()
+ : _isParsed(false)
+{
+}
+
+QmlDirParser::~QmlDirParser()
+{
+}
+
+QUrl QmlDirParser::url() const
+{
+ return _url;
+}
+
+void QmlDirParser::setUrl(const QUrl &url)
+{
+ _url = url;
+}
+
+QString QmlDirParser::source() const
+{
+ return _source;
+}
+
+void QmlDirParser::setSource(const QString &source)
+{
+ _isParsed = false;
+ _source = source;
+}
+
+bool QmlDirParser::isParsed() const
+{
+ return _isParsed;
+}
+
+bool QmlDirParser::parse()
+{
+ if (_isParsed)
+ return true;
+
+ _isParsed = true;
+ _errors.clear();
+ _plugins.clear();
+ _components.clear();
+
+ QTextStream stream(&_source);
+ int lineNumber = 0;
+
+ forever {
+ ++lineNumber;
+
+ const QString line = stream.readLine();
+ if (line.isNull())
+ break;
+
+ QString sections[3];
+ int sectionCount = 0;
+
+ int index = 0;
+ const int length = line.length();
+
+ while (index != length) {
+ const QChar ch = line.at(index);
+
+ if (ch.isSpace()) {
+ do { ++index; }
+ while (index != length && line.at(index).isSpace());
+
+ } else if (ch == QLatin1Char('#')) {
+ // recognized a comment
+ break;
+
+ } else {
+ const int start = index;
+
+ do { ++index; }
+ while (index != length && !line.at(index).isSpace());
+
+ const QString lexeme = line.mid(start, index - start);
+
+ if (sectionCount >= 3) {
+ reportError(lineNumber, start, QLatin1String("unexpected token"));
+
+ } else {
+ sections[sectionCount++] = lexeme;
+ }
+ }
+ }
+
+ if (sectionCount == 0) {
+ continue; // no sections, no party.
+
+ } else if (sections[0] == QLatin1String("plugin")) {
+ if (sectionCount < 2) {
+ reportError(lineNumber, -1,
+ QString::fromUtf8("plugin directive requires 2 arguments, but %1 were provided").arg(sectionCount + 1));
+
+ continue;
+ }
+
+ const Plugin entry(sections[1], sections[2]);
+
+ _plugins.append(entry);
+
+ } else if (sectionCount == 3) {
+ const QString &version = sections[1];
+ const int dotIndex = version.indexOf(QLatin1Char('.'));
+
+ if (dotIndex == -1) {
+ qWarning() << "expected '.'"; // ### use reportError
+
+ } else if (version.indexOf(QLatin1Char('.'), dotIndex + 1) != -1) {
+ qWarning() << "unexpected '.'"; // ### use reportError
+
+ } else {
+ bool validVersionNumber = false;
+ const int majorVersion = version.left(dotIndex).toInt(&validVersionNumber);
+
+ if (validVersionNumber) {
+ const int minorVersion = version.mid(dotIndex + 1).toInt(&validVersionNumber);
+
+ if (validVersionNumber) {
+ const Component entry(sections[0], sections[2], majorVersion, minorVersion);
+
+ _components.append(entry);
+ }
+ }
+ }
+ } else {
+ // ### use reportError
+ qWarning() << "a component declaration requires 3 arguments, but" << (sectionCount + 1) << "were provided";
+ }
+ }
+
+ return hasError();
+}
+
+void QmlDirParser::reportError(int line, int column, const QString &description)
+{
+ QmlError error;
+ error.setUrl(_url);
+ error.setLine(line);
+ error.setColumn(column);
+ error.setDescription(description);
+ _errors.append(error);
+}
+
+bool QmlDirParser::hasError() const
+{
+ if (! _errors.isEmpty())
+ return true;
+
+ return false;
+}
+
+QList<QmlError> QmlDirParser::errors() const
+{
+ return _errors;
+}
+
+QList<QmlDirParser::Plugin> QmlDirParser::plugins() const
+{
+ return _plugins;
+}
+
+QList<QmlDirParser::Component> QmlDirParser::components() const
+{
+ return _components;
+}
+
+QT_END_NAMESPACE
diff --git a/src/libs/qmljs/parser/qmldirparser_p.h b/src/libs/qmljs/parser/qmldirparser_p.h
new file mode 100644
index 0000000000000000000000000000000000000000..8ab6095c3825116a28abe9cdbf07d102b3f86de3
--- /dev/null
+++ b/src/libs/qmljs/parser/qmldirparser_p.h
@@ -0,0 +1,127 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights. These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QMLDIRPARSER_P_H
+#define QMLDIRPARSER_P_H
+
+//
+// W A R N I N G
+// -------------
+//
+// This file is not part of the Qt API. It exists purely as an
+// implementation detail. This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
+#include <QtCore/QUrl>
+#include <QtCore/QHash>
+
+#include "qmljsglobal_p.h"
+
+QT_BEGIN_NAMESPACE
+
+class QmlError;
+
+class QML_PARSER_EXPORT QmlDirParser
+{
+ Q_DISABLE_COPY(QmlDirParser)
+
+public:
+ QmlDirParser();
+ ~QmlDirParser();
+
+ QUrl url() const;
+ void setUrl(const QUrl &url);
+
+ QString source() const;
+ void setSource(const QString &source);
+
+ bool isParsed() const;
+ bool parse();
+
+ bool hasError() const;
+ QList<QmlError> errors() const;
+
+ struct Plugin
+ {
+ Plugin() {}
+
+ Plugin(const QString &name, const QString &path)
+ : name(name), path(path) {}
+
+ QString name;
+ QString path;
+ };
+
+ struct Component
+ {
+ Component()
+ : majorVersion(0), minorVersion(0) {}
+
+ Component(const QString &typeName, const QString &fileName, int majorVersion, int minorVersion)
+ : typeName(typeName), fileName(fileName), majorVersion(majorVersion), minorVersion(minorVersion) {}
+
+ QString typeName;
+ QString fileName;
+ int majorVersion;
+ int minorVersion;
+ };
+
+ QList<Component> components() const;
+ QList<Plugin> plugins() const;
+
+private:
+ void reportError(int line, int column, const QString &message);
+
+private:
+ QList<QmlError> _errors;
+ QUrl _url;
+ QString _source;
+ QList<Component> _components;
+ QList<Plugin> _plugins;
+ unsigned _isParsed: 1;
+};
+
+QT_END_NAMESPACE
+
+#endif // QMLDIRPARSER_P_H
diff --git a/src/libs/qmljs/parser/qmlerror.cpp b/src/libs/qmljs/parser/qmlerror.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..fc4bcd512ac26e5f07da339d0e76aed3531251c3
--- /dev/null
+++ b/src/libs/qmljs/parser/qmlerror.cpp
@@ -0,0 +1,258 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights. These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "qmlerror.h"
+
+#include <QtCore/qdebug.h>
+#include <QtCore/qfile.h>
+#include <QtCore/qstringlist.h>
+
+QT_BEGIN_NAMESPACE
+
+/*!
+ \class QmlError
+ \since 4.7
+ \brief The QmlError class encapsulates a QML error
+*/
+class QmlErrorPrivate
+{
+public:
+ QmlErrorPrivate();
+
+ QUrl url;
+ QString description;
+ int line;
+ int column;
+};
+
+QmlErrorPrivate::QmlErrorPrivate()
+: line(-1), column(-1)
+{
+}
+
+/*!
+ Create an empty error object.
+*/
+QmlError::QmlError()
+: d(0)
+{
+}
+
+/*!
+ Create a copy of \a other.
+*/
+QmlError::QmlError(const QmlError &other)
+: d(0)
+{
+ *this = other;
+}
+
+/*!
+ Assign \a other to this error object.
+*/
+QmlError &QmlError::operator=(const QmlError &other)
+{
+ if (!other.d) {
+ delete d;
+ d = 0;
+ } else {
+ if (!d) d = new QmlErrorPrivate;
+ d->url = other.d->url;
+ d->description = other.d->description;
+ d->line = other.d->line;
+ d->column = other.d->column;
+ }
+ return *this;
+}
+
+/*!
+ \internal
+*/
+QmlError::~QmlError()
+{
+ delete d; d = 0;
+}
+
+/*!
+ Return true if this error is valid, otherwise false.
+*/
+bool QmlError::isValid() const
+{
+ return d != 0;
+}
+
+/*!
+ Return the url for the file that caused this error.
+*/
+QUrl QmlError::url() const
+{
+ if (d) return d->url;
+ else return QUrl();
+}
+
+/*!
+ Set the \a url for the file that caused this error.
+*/
+void QmlError::setUrl(const QUrl &url)
+{
+ if (!d) d = new QmlErrorPrivate;
+ d->url = url;
+}
+
+/*!
+ Return the error description.
+*/
+QString QmlError::description() const
+{
+ if (d) return d->description;
+ else return QString();
+}
+
+/*!
+ Set the error \a description.
+*/
+void QmlError::setDescription(const QString &description)
+{
+ if (!d) d = new QmlErrorPrivate;
+ d->description = description;
+}
+
+/*!
+ Return the error line number.
+*/
+int QmlError::line() const
+{
+ if (d) return d->line;
+ else return -1;
+}
+
+/*!
+ Set the error \a line number.
+*/
+void QmlError::setLine(int line)
+{
+ if (!d) d = new QmlErrorPrivate;
+ d->line = line;
+}
+
+/*!
+ Return the error column number.
+*/
+int QmlError::column() const
+{
+ if (d) return d->column;
+ else return -1;
+}
+
+/*!
+ Set the error \a column number.
+*/
+void QmlError::setColumn(int column)
+{
+ if (!d) d = new QmlErrorPrivate;
+ d->column = column;
+}
+
+/*!
+ Return the error as a human readable string.
+*/
+QString QmlError::toString() const
+{
+ QString rv;
+ rv = url().toString() + QLatin1Char(':') + QString::number(line());
+ if(column() != -1)
+ rv += QLatin1Char(':') + QString::number(column());
+
+ rv += QLatin1String(": ") + description();
+
+ return rv;
+}
+
+/*!
+ \relates QmlError
+ \fn QDebug operator<<(QDebug debug, const QmlError &error)
+
+ Output a human readable version of \a error to \a debug.
+*/
+
+QDebug operator<<(QDebug debug, const QmlError &error)
+{
+ debug << qPrintable(error.toString());
+
+ QUrl url = error.url();
+
+ if (error.line() > 0 && url.scheme() == QLatin1String("file")) {
+ QString file = url.toLocalFile();
+ QFile f(file);
+ if (f.open(QIODevice::ReadOnly)) {
+ QByteArray data = f.readAll();
+ QTextStream stream(data, QIODevice::ReadOnly);
+ stream.setCodec("UTF-8");
+ const QString code = stream.readAll();
+ const QStringList lines = code.split(QLatin1Char('\n'));
+
+ if (lines.count() >= error.line()) {
+ const QString &line = lines.at(error.line() - 1);
+ debug << "\n " << qPrintable(line);
+
+ if(error.column() > 0) {
+ int column = qMax(0, error.column() - 1);
+ column = qMin(column, line.length());
+
+ QByteArray ind;
+ ind.reserve(column);
+ for (int i = 0; i < column; ++i) {
+ const QChar ch = line.at(i);
+ if (ch.isSpace())
+ ind.append(ch.unicode());
+ else
+ ind.append(' ');
+ }
+ ind.append('^');
+ debug << "\n " << ind.constData();
+ }
+ }
+ }
+ }
+ return debug;
+}
+
+QT_END_NAMESPACE
diff --git a/src/libs/qmljs/parser/qmlerror.h b/src/libs/qmljs/parser/qmlerror.h
new file mode 100644
index 0000000000000000000000000000000000000000..5abd431cb344819ca90fc1d93e66b0aec5945495
--- /dev/null
+++ b/src/libs/qmljs/parser/qmlerror.h
@@ -0,0 +1,86 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights. These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QMLERROR_H
+#define QMLERROR_H
+
+#include <QtCore/qurl.h>
+#include <QtCore/qstring.h>
+
+QT_BEGIN_HEADER
+
+QT_BEGIN_NAMESPACE
+
+QT_MODULE(Declarative)
+
+class QDebug;
+class QmlErrorPrivate;
+class QmlError
+{
+public:
+ QmlError();
+ QmlError(const QmlError &);
+ QmlError &operator=(const QmlError &);
+ ~QmlError();
+
+ bool isValid() const;
+
+ QUrl url() const;
+ void setUrl(const QUrl &);
+ QString description() const;
+ void setDescription(const QString &);
+ int line() const;
+ void setLine(int);
+ int column() const;
+ void setColumn(int);
+
+ QString toString() const;
+private:
+ QmlErrorPrivate *d;
+};
+
+QDebug operator<<(QDebug debug, const QmlError &error);
+
+QT_END_NAMESPACE
+
+QT_END_HEADER
+
+#endif // QMLERROR_H
diff --git a/src/libs/qmljs/qmljsdocument.cpp b/src/libs/qmljs/qmljsdocument.cpp
index 68693c4772d9b9d96919907070fea914090a852e..6b4f3ed96ba7d7c9b84549da5dc3c4d7d440f67b 100644
--- a/src/libs/qmljs/qmljsdocument.cpp
+++ b/src/libs/qmljs/qmljsdocument.cpp
@@ -202,6 +202,22 @@ Bind *Document::bind() const
return _bind;
}
+LibraryInfo::LibraryInfo()
+ : _valid(false)
+{
+}
+
+LibraryInfo::LibraryInfo(const QmlDirParser &parser)
+ : _valid(true)
+ , _components(parser.components())
+ , _plugins(parser.plugins())
+{
+}
+
+LibraryInfo::~LibraryInfo()
+{
+}
+
Snapshot::Snapshot()
{
}
@@ -216,6 +232,11 @@ void Snapshot::insert(const Document::Ptr &document)
_documents.insert(document->fileName(), document);
}
+void Snapshot::insertLibraryInfo(const QString &path, const LibraryInfo &info)
+{
+ _libraries.insert(path, info);
+}
+
Document::Ptr Snapshot::documentFromSource(const QString &code,
const QString &fileName) const
{
diff --git a/src/libs/qmljs/qmljsdocument.h b/src/libs/qmljs/qmljsdocument.h
index 126f364e6203ad66259f214957f8c6933bac0f41..fd3742e8b86db3339b4b531b2a12ebb4c41b8c7d 100644
--- a/src/libs/qmljs/qmljsdocument.h
+++ b/src/libs/qmljs/qmljsdocument.h
@@ -35,6 +35,7 @@
#include <QtCore/QSharedPointer>
#include <QtCore/QString>
+#include "parser/qmldirparser_p.h"
#include "parser/qmljsengine_p.h"
#include "qmljs_global.h"
@@ -102,10 +103,32 @@ private:
friend class Snapshot;
};
+class QMLJS_EXPORT LibraryInfo
+{
+ bool _valid;
+ QList<QmlDirParser::Component> _components;
+ QList<QmlDirParser::Plugin> _plugins;
+
+public:
+ LibraryInfo();
+ LibraryInfo(const QmlDirParser &parser);
+ ~LibraryInfo();
+
+ QList<QmlDirParser::Component> components() const
+ { return _components; }
+
+ QList<QmlDirParser::Plugin> plugins() const
+ { return _plugins; }
+
+ bool isValid() const
+ { return _valid; }
+};
+
class QMLJS_EXPORT Snapshot
{
typedef QMap<QString, Document::Ptr> _Base;
QMap<QString, Document::Ptr> _documents;
+ QMap<QString, LibraryInfo> _libraries;
public:
Snapshot();
@@ -118,10 +141,14 @@ public:
const_iterator end() const { return _documents.end(); }
void insert(const Document::Ptr &document);
+ void insertLibraryInfo(const QString &path, const LibraryInfo &info);
Document::Ptr document(const QString &fileName) const
{ return _documents.value(fileName); }
+ LibraryInfo libraryInfo(const QString &path) const
+ { return _libraries.value(path); }
+
Document::Ptr documentFromSource(const QString &code,
const QString &fileName) const;
diff --git a/src/libs/qmljs/qmljsinterpreter.h b/src/libs/qmljs/qmljsinterpreter.h
index 7c9d0201d9d9a32f040f3f17c35c876d447be80d..83bcce2be8eca9f5c6a16535202867da8421679a 100644
--- a/src/libs/qmljs/qmljsinterpreter.h
+++ b/src/libs/qmljs/qmljsinterpreter.h
@@ -401,7 +401,7 @@ private:
QString _className;
};
-class QmlObjectValue: public ObjectValue
+class QMLJS_EXPORT QmlObjectValue: public ObjectValue
{
public:
static const int NoVersion;
diff --git a/src/libs/qmljs/qmljslink.cpp b/src/libs/qmljs/qmljslink.cpp
index dfadb9d91da86c84085a2f87df0b70c389fe2579..24d417baa87886238828b3fd008b19c3f0564014 100644
--- a/src/libs/qmljs/qmljslink.cpp
+++ b/src/libs/qmljs/qmljslink.cpp
@@ -288,13 +288,25 @@ void Link::importNonFile(Interpreter::ObjectValue *typeEnv, Document::Ptr doc, A
QDir dir(importPath);
if (!dir.cd(package))
continue;
- if (!dir.exists("qmldir"))
+
+ const LibraryInfo libraryInfo = _snapshot.libraryInfo(dir.path());
+ if (!libraryInfo.isValid())
continue;
+ QSet<QString> importedTypes;
+ foreach (const QmlDirParser::Component &component, libraryInfo.components()) {
+ if (importedTypes.contains(component.typeName))
+ continue;
+
+ if (component.majorVersion > majorVersion
+ || (component.majorVersion == majorVersion
+ && component.minorVersion > minorVersion))
+ continue;
- // ### Should read qmldir file and import accordingly.
- foreach (Document::Ptr otherDoc, _documentByPath.values(dir.path())) {
- namespaceObject->setProperty(componentName(otherDoc->fileName()), otherDoc->bind()->rootObjectValue());
+ importedTypes.insert(component.typeName);
+ if (Document::Ptr importedDoc = _snapshot.document(dir.filePath(component.fileName))) {
+ namespaceObject->setProperty(component.typeName, importedDoc->bind()->rootObjectValue());
+ }
}
break;
diff --git a/src/libs/utils/consoleprocess_unix.cpp b/src/libs/utils/consoleprocess_unix.cpp
index 45a57149316c9baba0a5fdee1e27b1c8a3a45d20..63c97cc038fe98d8c98d0fc1bcc10deafabb4321 100644
--- a/src/libs/utils/consoleprocess_unix.cpp
+++ b/src/libs/utils/consoleprocess_unix.cpp
@@ -101,7 +101,7 @@ bool ConsoleProcess::start(const QString &program, const QStringList &args)
<< m_stubServer.fullServerName()
<< msgPromptToClose()
<< workingDirectory()
- << (m_tempFile ? m_tempFile->fileName() : 0)
+ << (m_tempFile ? m_tempFile->fileName() : QString())
<< program << args;
QString xterm = xtermArgs.takeFirst();
diff --git a/src/libs/utils/fancymainwindow.cpp b/src/libs/utils/fancymainwindow.cpp
index 0331313e2b9c73c116d47d57b63f64c5f38a7d96..cf845989a1620fdf0ba19755125d36bed29b205c 100644
--- a/src/libs/utils/fancymainwindow.cpp
+++ b/src/libs/utils/fancymainwindow.cpp
@@ -55,7 +55,6 @@ FancyMainWindowPrivate::FancyMainWindowPrivate() :
FancyMainWindow::FancyMainWindow(QWidget *parent) :
QMainWindow(parent), d(new FancyMainWindowPrivate)
{
- setProperty("panelwidget", true);
}
FancyMainWindow::~FancyMainWindow()
diff --git a/src/libs/utils/reloadpromptutils.cpp b/src/libs/utils/reloadpromptutils.cpp
index 2ef1689c73e459df4cac9f559617cd7431c0849e..23678a9a41863c0c931ff4cb28311c2d807dbc39 100644
--- a/src/libs/utils/reloadpromptutils.cpp
+++ b/src/libs/utils/reloadpromptutils.cpp
@@ -29,9 +29,11 @@
#include "reloadpromptutils.h"
-#include <QtGui/QMessageBox>
#include <QtCore/QCoreApplication>
#include <QtCore/QDir>
+#include <QtGui/QMessageBox>
+#include <QtGui/QPushButton>
+#include <QtGui/QAbstractButton>
using namespace Utils;
@@ -68,3 +70,27 @@ QTCREATOR_UTILS_EXPORT Utils::ReloadPromptAnswer
}
return ReloadNone;
}
+
+QTCREATOR_UTILS_EXPORT Utils::FileDeletedPromptAnswer
+ Utils::fileDeletedPrompt(const QString &fileName, QWidget *parent)
+{
+ const QString title = QCoreApplication::translate("Utils::fileDeletedPrompt", "File has been removed");
+ QString msg;
+ msg = QCoreApplication::translate("Utils::fileDeletedPrompt",
+ "The file %1 has been removed outside Qt Creator. Do you want to save it under a different name, or close the editor?").arg(QDir::toNativeSeparators(fileName));
+ QMessageBox box(QMessageBox::Question, title, msg, QMessageBox::NoButton, parent);
+ QPushButton *close = box.addButton(QCoreApplication::translate("Utils::fileDeletedPrompt", "Close"), QMessageBox::RejectRole);
+ QPushButton *saveas = box.addButton(QCoreApplication::translate("Utils::fileDeletedPrompt", "Save as..."), QMessageBox::ActionRole);
+ QPushButton *save = box.addButton(QCoreApplication::translate("Utils::fileDeletedPrompt", "Save"), QMessageBox::AcceptRole);
+ box.setDefaultButton(saveas);
+ box.exec();
+ QAbstractButton *clickedbutton = box.clickedButton();
+ if (clickedbutton == close) {
+ return FileDeletedClose;
+ } else if (clickedbutton == saveas) {
+ return FileDeletedSaveAs;
+ } else if (clickedbutton == save) {
+ return FileDeletedSave;
+ }
+ return FileDeletedClose;
+}
diff --git a/src/libs/utils/reloadpromptutils.h b/src/libs/utils/reloadpromptutils.h
index 72da183fc98081c2edea852b4164101a0732345c..8f0d3ad258cfac549ad31857664527a28472d360 100644
--- a/src/libs/utils/reloadpromptutils.h
+++ b/src/libs/utils/reloadpromptutils.h
@@ -44,6 +44,10 @@ enum ReloadPromptAnswer { ReloadCurrent, ReloadAll, ReloadSkipCurrent, ReloadNon
QTCREATOR_UTILS_EXPORT ReloadPromptAnswer reloadPrompt(const QString &fileName, bool modified, QWidget *parent);
QTCREATOR_UTILS_EXPORT ReloadPromptAnswer reloadPrompt(const QString &title, const QString &prompt, QWidget *parent);
+enum FileDeletedPromptAnswer { FileDeletedClose, FileDeletedSaveAs, FileDeletedSave };
+
+QTCREATOR_UTILS_EXPORT FileDeletedPromptAnswer fileDeletedPrompt(const QString &fileName, QWidget *parent);
+
} // namespace Utils
#endif // RELOADPROMPTUTILS_H
diff --git a/src/libs/utils/stylehelper.cpp b/src/libs/utils/stylehelper.cpp
index 42690c190ef9679d5f70cd9f39ebbd590efbd6b6..c82abb050baef1a001c8a6f23a9c5d8182445376 100644
--- a/src/libs/utils/stylehelper.cpp
+++ b/src/libs/utils/stylehelper.cpp
@@ -231,9 +231,9 @@ void StyleHelper::horizontalGradient(QPainter *painter, const QRect &spanRect, c
if (StyleHelper::usePixmapCache()) {
QString key;
QColor keyColor = baseColor(lightColored);
- key.sprintf("mh_horizontal %d %d %d %d %d",
+ key.sprintf("mh_horizontal %d %d %d %d %d %d",
spanRect.width(), spanRect.height(), clipRect.width(),
- clipRect.height(), keyColor.rgb());
+ clipRect.height(), keyColor.rgb(), spanRect.x());
QPixmap pixmap;
if (!QPixmapCache::find(key, pixmap)) {
diff --git a/src/libs/utils/stylehelper.h b/src/libs/utils/stylehelper.h
index 334418816fbcb8d84caf8847f004125f671787c8..f6d3eba4dac30138be29cd21309989a640e3cb21 100644
--- a/src/libs/utils/stylehelper.h
+++ b/src/libs/utils/stylehelper.h
@@ -78,8 +78,6 @@ public:
static void horizontalGradient(QPainter *painter, const QRect &spanRect, const QRect &clipRect, bool lightColored = false);
static void verticalGradient(QPainter *painter, const QRect &spanRect, const QRect &clipRect, bool lightColored = false);
static void menuGradient(QPainter *painter, const QRect &spanRect, const QRect &clipRect);
-
- // Pixmap cache should only be enabled for X11 due to slow gradients
static bool usePixmapCache() { return true; }
static void drawIconWithShadow(const QPixmap &px, const QPoint &pos, QPainter *p,
diff --git a/src/plugins/bineditor/bineditorplugin.cpp b/src/plugins/bineditor/bineditorplugin.cpp
index 012ac0bccd627b0f1d60d4fec180912f55772aea..432df20a97a335fc366c3dbc7c30369ecad87a7b 100644
--- a/src/plugins/bineditor/bineditorplugin.cpp
+++ b/src/plugins/bineditor/bineditorplugin.cpp
@@ -47,6 +47,7 @@
#include <coreplugin/editormanager/editormanager.h>
#include <coreplugin/editormanager/ieditor.h>
#include <coreplugin/icore.h>
+#include <coreplugin/ifile.h>
#include <coreplugin/mimedatabase.h>
#include <coreplugin/uniqueidmanager.h>
#include <extensionsystem/pluginmanager.h>
@@ -251,41 +252,24 @@ public:
bool isSaveAsAllowed() const { return true; }
- void modified(ReloadBehavior *behavior) {
- const QString fileName = m_fileName;
+ ReloadBehavior reloadBehavior(ChangeTrigger state, ChangeType type) const {
+ if (type == TypePermissions)
+ return BehaviorSilent;
+ if (type == TypeContents) {
+ if (state == TriggerInternal && !isModified())
+ return BehaviorSilent;
+ return BehaviorAsk;
+ }
+ return BehaviorAsk;
+ }
- switch (*behavior) {
- case Core::IFile::ReloadNone:
- return;
- case Core::IFile::ReloadUnmodified:
- if (!isModified()) {
- open(fileName);
- return;
- }
- break;
- case Core::IFile::ReloadAll:
- open(fileName);
+ void reload(ReloadFlag flag, ChangeType type) {
+ if (flag == FlagIgnore)
return;
- case Core::IFile::ReloadPermissions:
+ if (type == TypePermissions) {
emit changed();
- return;
- case Core::IFile::AskForReload:
- break;
- }
-
- switch (Utils::reloadPrompt(fileName, isModified(), Core::ICore::instance()->mainWindow())) {
- case Utils::ReloadCurrent:
- open(fileName);
- break;
- case Utils::ReloadAll:
- open(fileName);
- *behavior = Core::IFile::ReloadAll;
- break;
- case Utils::ReloadSkipCurrent:
- break;
- case Utils::ReloadNone:
- *behavior = Core::IFile::ReloadNone;
- break;
+ } else {
+ open(m_fileName);
}
}
diff --git a/src/plugins/bineditor/imageviewer.cpp b/src/plugins/bineditor/imageviewer.cpp
index f465d5b8056ad07a8ca9bda2a4e143b503f17ac4..94adaef58765429c1fa8d576c83fc17ef4de28e6 100644
--- a/src/plugins/bineditor/imageviewer.cpp
+++ b/src/plugins/bineditor/imageviewer.cpp
@@ -114,34 +114,25 @@ ImageViewerFile::ImageViewerFile(ImageViewer *parent)
}
-void ImageViewerFile::modified(ReloadBehavior * behavior)
+Core::IFile::ReloadBehavior ImageViewerFile::reloadBehavior(Core::IFile::ChangeTrigger state,
+ Core::IFile::ChangeType type) const
{
- switch (*behavior) {
- case Core::IFile::ReloadNone:
- return;
- case Core::IFile::ReloadUnmodified:
- case Core::IFile::ReloadAll:
- m_editor->open(m_fileName);
- return;
- case Core::IFile::ReloadPermissions:
- return;
- case Core::IFile::AskForReload:
- break;
- }
+ if (type == TypePermissions)
+ return BehaviorSilent;
+ if (type == TypeContents && state == TriggerInternal)
+ return BehaviorSilent;
+ return BehaviorAsk;
+}
- switch (Utils::reloadPrompt(m_fileName, isModified(), Core::ICore::instance()->mainWindow())) {
- case Utils::ReloadCurrent:
- m_editor->open(m_fileName);
- break;
- case Utils::ReloadAll:
+void ImageViewerFile::reload(Core::IFile::ReloadFlag flag,
+ Core::IFile::ChangeType type)
+{
+ if (flag == FlagIgnore)
+ return;
+ if (type == TypePermissions) {
+ emit changed();
+ } else {
m_editor->open(m_fileName);
- *behavior = Core::IFile::ReloadAll;
- break;
- case Utils::ReloadSkipCurrent:
- break;
- case Utils::ReloadNone:
- *behavior = Core::IFile::ReloadNone;
- break;
}
}
diff --git a/src/plugins/bineditor/imageviewer.h b/src/plugins/bineditor/imageviewer.h
index c7cdbd81b5c04c7e4eac760d8a22900a76b45d27..edaa9d86d37c1464edec48c8f18297ab3e5d161e 100644
--- a/src/plugins/bineditor/imageviewer.h
+++ b/src/plugins/bineditor/imageviewer.h
@@ -80,7 +80,8 @@ public:
bool isReadOnly() const { return true; }
bool isSaveAsAllowed() const { return false; }
- void modified(ReloadBehavior *behavior);
+ ReloadBehavior reloadBehavior(ChangeTrigger state, ChangeType type) const;
+ void reload(ReloadFlag flag, ChangeType type);
void checkPermissions() {}
diff --git a/src/plugins/cmakeprojectmanager/cmakeproject.cpp b/src/plugins/cmakeprojectmanager/cmakeproject.cpp
index b4304bb60a0882b9e710b0fb4f18f168b2959104..0ef66e8f20ec8aa453a0a11dbf51413e629561b9 100644
--- a/src/plugins/cmakeprojectmanager/cmakeproject.cpp
+++ b/src/plugins/cmakeprojectmanager/cmakeproject.cpp
@@ -598,9 +598,17 @@ bool CMakeFile::isSaveAsAllowed() const
return false;
}
-void CMakeFile::modified(ReloadBehavior *behavior)
+Core::IFile::ReloadBehavior CMakeFile::reloadBehavior(ChangeTrigger state, ChangeType type) const
{
- Q_UNUSED(behavior)
+ Q_UNUSED(state)
+ Q_UNUSED(type)
+ return BehaviorSilent;
+}
+
+void CMakeFile::reload(ReloadFlag flag, ChangeType type)
+{
+ Q_UNUSED(flag)
+ Q_UNUSED(type)
}
CMakeBuildSettingsWidget::CMakeBuildSettingsWidget(CMakeProject *project)
diff --git a/src/plugins/cmakeprojectmanager/cmakeproject.h b/src/plugins/cmakeprojectmanager/cmakeproject.h
index 3f4a148abf80bcbbabd216073c41115c7506abba..62612c0f7c7b52b4f92ed537a94db49ecb9162b5 100644
--- a/src/plugins/cmakeprojectmanager/cmakeproject.h
+++ b/src/plugins/cmakeprojectmanager/cmakeproject.h
@@ -193,7 +193,9 @@ public:
bool isReadOnly() const;
bool isSaveAsAllowed() const;
- void modified(ReloadBehavior *behavior);
+ ReloadBehavior reloadBehavior(ChangeTrigger state, ChangeType type) const;
+ void reload(ReloadFlag flag, ChangeType type);
+
private:
CMakeProject *m_project;
QString m_fileName;
diff --git a/src/plugins/coreplugin/actionmanager/commandmappings.cpp b/src/plugins/coreplugin/actionmanager/commandmappings.cpp
index ecc677eec8e517325b0337857e695a660d8c86eb..d24cbe7918c172c017455c3c7a42773836f37ff1 100644
--- a/src/plugins/coreplugin/actionmanager/commandmappings.cpp
+++ b/src/plugins/coreplugin/actionmanager/commandmappings.cpp
@@ -69,11 +69,11 @@ QWidget *CommandMappings::createPage(QWidget *parent)
m_page = new Ui_CommandMappings();
QWidget *w = new QWidget(parent);
m_page->setupUi(w);
-
- m_page->resetButton->setIcon(QIcon(Constants::ICON_RESET));
+ m_page->targetEdit->setPixmap(QPixmap(Constants::ICON_RESET));
+ m_page->targetEdit->setSide(Utils::FancyLineEdit::Right);
m_page->targetEdit->installEventFilter(this);
- connect(m_page->resetButton, SIGNAL(clicked()),
+ connect(m_page->targetEdit, SIGNAL(buttonClicked()),
this, SLOT(resetTargetIdentifier()));
connect(m_page->removeButton, SIGNAL(clicked()),
this, SLOT(removeTargetIdentifier()));
diff --git a/src/plugins/coreplugin/actionmanager/commandmappings.ui b/src/plugins/coreplugin/actionmanager/commandmappings.ui
index 5b862875231cc147e3dc84fb33b6113dba54672b..a2d75371508368d8991aa18bf9cf9bed860141dd 100644
--- a/src/plugins/coreplugin/actionmanager/commandmappings.ui
+++ b/src/plugins/coreplugin/actionmanager/commandmappings.ui
@@ -27,7 +27,7 @@
</widget>
</item>
<item>
- <widget class="QLineEdit" name="filterEdit"/>
+ <widget class="Utils::FilterLineEdit" name="filterEdit"/>
</item>
</layout>
</item>
@@ -119,21 +119,7 @@
</widget>
</item>
<item>
- <widget class="QLineEdit" name="targetEdit"/>
- </item>
- <item>
- <widget class="QToolButton" name="resetButton">
- <property name="toolTip">
- <string>Reset</string>
- </property>
- <property name="text">
- <string/>
- </property>
- <property name="icon">
- <iconset resource="../core.qrc">
- <normaloff>:/core/images/reset.png</normaloff>:/core/images/reset.png</iconset>
- </property>
- </widget>
+ <widget class="Utils::FancyLineEdit" name="targetEdit"/>
</item>
<item>
<widget class="QToolButton" name="removeButton">
@@ -147,6 +133,12 @@
<iconset resource="../core.qrc">
<normaloff>:/core/images/clear.png</normaloff>:/core/images/clear.png</iconset>
</property>
+ <property name="iconSize">
+ <size>
+ <width>16</width>
+ <height>16</height>
+ </size>
+ </property>
</widget>
</item>
</layout>
@@ -163,6 +155,18 @@
</item>
</layout>
</widget>
+ <customwidgets>
+ <customwidget>
+ <class>Utils::FilterLineEdit</class>
+ <extends>QLineEdit</extends>
+ <header location="global">utils/filterlineedit.h</header>
+ </customwidget>
+ <customwidget>
+ <class>Utils::FancyLineEdit</class>
+ <extends>QLineEdit</extends>
+ <header location="global">utils/fancylineedit.h</header>
+ </customwidget>
+ </customwidgets>
<resources>
<include location="../core.qrc"/>
</resources>
diff --git a/src/plugins/coreplugin/designmode.cpp b/src/plugins/coreplugin/designmode.cpp
index fbabebb959c93fbfa042009918ede313ebdcfa7b..2568cb5f3b9b312edcf2b1718070f4d0bb68b979 100644
--- a/src/plugins/coreplugin/designmode.cpp
+++ b/src/plugins/coreplugin/designmode.cpp
@@ -86,6 +86,7 @@ bool DesignModeCoreListener::coreAboutToClose()
struct DesignEditorInfo {
int widgetIndex;
QStringList mimeTypes;
+ QList<int> context;
bool preferredMode;
QWidget *widget;
};
@@ -100,6 +101,7 @@ struct DesignModePrivate {
EditorManager *m_editorManager;
QStackedWidget *m_stackWidget;
+ QList<int> m_activeContext;
};
DesignModePrivate::DesignModePrivate(DesignMode *q, EditorManager *editorManager) :
@@ -118,6 +120,9 @@ DesignMode::DesignMode(EditorManager *editorManager) :
connect(editorManager, SIGNAL(currentEditorChanged(Core::IEditor*)),
this, SLOT(currentEditorChanged(Core::IEditor*)));
+
+ connect(ModeManager::instance(), SIGNAL(currentModeChanged(Core::IMode*,Core::IMode*)),
+ this, SLOT(updateContext(Core::IMode*,Core::IMode*)));
}
DesignMode::~DesignMode()
@@ -169,13 +174,17 @@ QStringList DesignMode::registeredMimeTypes() const
return rc;
}
-void DesignMode::registerDesignWidget(QWidget *widget, const QStringList &mimeTypes, bool preferDesignMode)
+void DesignMode::registerDesignWidget(QWidget *widget,
+ const QStringList &mimeTypes,
+ const QList<int> &context,
+ bool preferDesignMode)
{
int index = d->m_stackWidget->addWidget(widget);
DesignEditorInfo *info = new DesignEditorInfo;
info->preferredMode = preferDesignMode;
info->mimeTypes = mimeTypes;
+ info->context = context;
info->widgetIndex = index;
info->widget = widget;
d->m_editors.append(info);
@@ -206,12 +215,11 @@ void DesignMode::currentEditorChanged(Core::IEditor *editor)
if (type && !type.type().isEmpty())
mimeType = type.type();
-
-
- foreach(DesignEditorInfo *editorInfo, d->m_editors) {
- foreach(QString mime, editorInfo->mimeTypes) {
+ foreach (DesignEditorInfo *editorInfo, d->m_editors) {
+ foreach (const QString &mime, editorInfo->mimeTypes) {
if (mime == mimeType) {
d->m_stackWidget->setCurrentIndex(editorInfo->widgetIndex);
+ setActiveContext(editorInfo->context);
mimeEditorAvailable = true;
setEnabled(true);
if (editorInfo->preferredMode && core->modeManager()->currentMode() != this) {
@@ -225,8 +233,10 @@ void DesignMode::currentEditorChanged(Core::IEditor *editor)
break;
}
}
- if (!mimeEditorAvailable)
+ if (!mimeEditorAvailable) {
+ setActiveContext(QList<int>());
setEnabled(false);
+ }
if (!mimeEditorAvailable && core->modeManager()->currentMode() == this)
{
@@ -253,4 +263,38 @@ void DesignMode::updateActions()
emit actionsUpdated(d->m_currentEditor.data());
}
+void DesignMode::updateContext(Core::IMode *newMode, Core::IMode *oldMode)
+{
+ if (newMode == this) {
+ // Apply active context
+ Core::ICore *core = Core::ICore::instance();
+ foreach (int contextId, d->m_activeContext)
+ core->addAdditionalContext(contextId);
+ core->updateContext();
+ } else if (oldMode == this) {
+ // Remove active context
+ Core::ICore *core = Core::ICore::instance();
+ foreach (int contextId, d->m_activeContext)
+ core->removeAdditionalContext(contextId);
+ core->updateContext();
+ }
+}
+
+void DesignMode::setActiveContext(const QList<int> &context)
+{
+ if (d->m_activeContext == context)
+ return;
+
+ if (ModeManager::instance()->currentMode() == this) {
+ // Update active context
+ Core::ICore *core = Core::ICore::instance();
+ foreach (int contextId, d->m_activeContext)
+ core->removeAdditionalContext(contextId);
+ foreach (int contextId, context)
+ core->addAdditionalContext(contextId);
+ core->updateContext();
+ }
+ d->m_activeContext = context;
+}
+
} // namespace Core
diff --git a/src/plugins/coreplugin/designmode.h b/src/plugins/coreplugin/designmode.h
index 030199a065526b390cfbf97493df32eda659561f..eaeecd99323e7a3efafca89ad46ae7ce74241f42 100644
--- a/src/plugins/coreplugin/designmode.h
+++ b/src/plugins/coreplugin/designmode.h
@@ -57,7 +57,9 @@ public:
explicit DesignMode(EditorManager *editorManager);
virtual ~DesignMode();
- void registerDesignWidget(QWidget *widget, const QStringList &mimeTypes,
+ void registerDesignWidget(QWidget *widget,
+ const QStringList &mimeTypes,
+ const QList<int> &context,
bool preferDesignMode = false);
void unregisterDesignWidget(QWidget *widget);
@@ -79,8 +81,11 @@ signals:
private slots:
void currentEditorChanged(Core::IEditor *editor);
void updateActions();
+ void updateContext(Core::IMode *newMode, Core::IMode *oldMode);
private:
+ void setActiveContext(const QList<int> &context);
+
DesignModePrivate *d;
friend class Internal::DesignModeCoreListener;
};
diff --git a/src/plugins/coreplugin/dialogs/shortcutsettings.cpp b/src/plugins/coreplugin/dialogs/shortcutsettings.cpp
index 7dc83c6b2d751cb593fd0750c3c106fef0c0d985..b756dd9d51b39172e06672c822b5f5eea4b4e7d9 100644
--- a/src/plugins/coreplugin/dialogs/shortcutsettings.cpp
+++ b/src/plugins/coreplugin/dialogs/shortcutsettings.cpp
@@ -116,8 +116,7 @@ void ShortcutSettings::finish()
bool ShortcutSettings::eventFilter(QObject *o, QEvent *e)
{
- Q_UNUSED(o)
-
+ Q_UNUSED(o);
if ( e->type() == QEvent::KeyPress ) {
QKeyEvent *k = static_cast<QKeyEvent*>(e);
handleKeyEvent(k);
@@ -125,9 +124,15 @@ bool ShortcutSettings::eventFilter(QObject *o, QEvent *e)
}
if ( e->type() == QEvent::Shortcut ||
- e->type() == QEvent::ShortcutOverride ||
- e->type() == QEvent::KeyRelease )
+ e->type() == QEvent::KeyRelease ) {
return true;
+ }
+
+ if (e->type() == QEvent::ShortcutOverride) {
+ // for shortcut overrides, we need to accept as well
+ e->accept();
+ return true;
+ }
return false;
}
diff --git a/src/plugins/coreplugin/editormanager/editormanager.cpp b/src/plugins/coreplugin/editormanager/editormanager.cpp
index 064cc10a597626efc57d6a2b3290289a915f65d8..d78c62913a9904f6cb76344435635c8060981e52 100644
--- a/src/plugins/coreplugin/editormanager/editormanager.cpp
+++ b/src/plugins/coreplugin/editormanager/editormanager.cpp
@@ -214,7 +214,7 @@ struct EditorManagerPrivate {
OpenEditorsModel *m_editorModel;
QString m_externalEditor;
- IFile::ReloadBehavior m_reloadBehavior;
+ IFile::ReloadSetting m_reloadSetting;
};
}
@@ -235,7 +235,7 @@ EditorManagerPrivate::EditorManagerPrivate(ICore *core, QWidget *parent) :
m_openInExternalEditorAction(new QAction(EditorManager::tr("Open in External Editor"), parent)),
m_windowPopup(0),
m_coreListener(0),
- m_reloadBehavior(IFile::AskForReload)
+ m_reloadSetting(IFile::AlwaysAsk)
{
m_editorModel = new OpenEditorsModel(parent);
}
@@ -278,7 +278,8 @@ EditorManager::EditorManager(ICore *core, QWidget *parent) :
ActionManager *am = m_d->m_core->actionManager();
ActionContainer *mfile = am->actionContainer(Constants::M_FILE);
- //Revert to saved
+ // Revert to saved
+ m_d->m_revertToSavedAction->setIcon(QIcon::fromTheme(QLatin1String("document-revert")));
Command *cmd = am->registerAction(m_d->m_revertToSavedAction,
Constants::REVERTTOSAVED, editManagerContext);
cmd->setAttribute(Command::CA_UpdateText);
@@ -286,18 +287,18 @@ EditorManager::EditorManager(ICore *core, QWidget *parent) :
mfile->addAction(cmd, Constants::G_FILE_SAVE);
connect(m_d->m_revertToSavedAction, SIGNAL(triggered()), this, SLOT(revertToSaved()));
- //Save Action
+ // Save Action
am->registerAction(m_d->m_saveAction, Constants::SAVE, editManagerContext);
connect(m_d->m_saveAction, SIGNAL(triggered()), this, SLOT(saveFile()));
- //Save As Action
+ // Save As Action
am->registerAction(m_d->m_saveAsAction, Constants::SAVEAS, editManagerContext);
connect(m_d->m_saveAsAction, SIGNAL(triggered()), this, SLOT(saveFileAs()));
- //Window Menu
+ // Window Menu
ActionContainer *mwindow = am->actionContainer(Constants::M_WINDOW);
- //Window menu separators
+ // Window menu separators
QAction *tmpaction = new QAction(this);
tmpaction->setSeparator(true);
cmd = am->registerAction(tmpaction, QLatin1String("QtCreator.Window.Sep.Split"), editManagerContext);
@@ -308,7 +309,7 @@ EditorManager::EditorManager(ICore *core, QWidget *parent) :
cmd = am->registerAction(tmpaction, QLatin1String("QtCreator.Window.Sep.Navigate"), editManagerContext);
mwindow->addAction(cmd, Constants::G_WINDOW_NAVIGATE);
- //Close Action
+ // Close Action
cmd = am->registerAction(m_d->m_closeCurrentEditorAction, Constants::CLOSE, editManagerContext);
#ifdef Q_WS_WIN
cmd->setDefaultKeySequence(QKeySequence(tr("Ctrl+F4")));
@@ -320,13 +321,13 @@ EditorManager::EditorManager(ICore *core, QWidget *parent) :
mfile->addAction(cmd, Constants::G_FILE_CLOSE);
connect(m_d->m_closeCurrentEditorAction, SIGNAL(triggered()), this, SLOT(closeEditor()));
- //Close All Action
+ // Close All Action
cmd = am->registerAction(m_d->m_closeAllEditorsAction, Constants::CLOSEALL, editManagerContext);
cmd->setDefaultKeySequence(QKeySequence(tr("Ctrl+Shift+W")));
mfile->addAction(cmd, Constants::G_FILE_CLOSE);
connect(m_d->m_closeAllEditorsAction, SIGNAL(triggered()), this, SLOT(closeAllEditors()));
- //Close All Others Action
+ // Close All Others Action
cmd = am->registerAction(m_d->m_closeOtherEditorsAction, Constants::CLOSEOTHERS, editManagerContext);
mfile->addAction(cmd, Constants::G_FILE_CLOSE);
cmd->setAttribute(Core::Command::CA_UpdateText);
@@ -1715,7 +1716,7 @@ void EditorManager::saveSettings()
SettingsDatabase *settings = m_d->m_core->settingsDatabase();
settings->setValue(QLatin1String(documentStatesKey), m_d->m_editorStates);
settings->setValue(QLatin1String(externalEditorKey), m_d->m_externalEditor);
- settings->setValue(QLatin1String(reloadBehaviorKey), m_d->m_reloadBehavior);
+ settings->setValue(QLatin1String(reloadBehaviorKey), m_d->m_reloadSetting);
}
void EditorManager::readSettings()
@@ -1740,7 +1741,7 @@ void EditorManager::readSettings()
m_d->m_externalEditor = settings->value(QLatin1String(externalEditorKey)).toString();
if (settings->contains(QLatin1String(reloadBehaviorKey)))
- m_d->m_reloadBehavior = (IFile::ReloadBehavior)settings->value(QLatin1String(reloadBehaviorKey)).toInt();
+ m_d->m_reloadSetting = (IFile::ReloadSetting)settings->value(QLatin1String(reloadBehaviorKey)).toInt();
}
@@ -1764,8 +1765,7 @@ void EditorManager::revertToSaved()
return;
}
- IFile::ReloadBehavior temp = IFile::ReloadAll;
- currEditor->file()->modified(&temp);
+ currEditor->file()->reload(IFile::FlagReload, IFile::TypeContents);
}
void EditorManager::showEditorInfoBar(const QString &id,
@@ -1898,14 +1898,14 @@ QString EditorManager::externalEditor() const
return m_d->m_externalEditor;
}
-void EditorManager::setReloadBehavior(IFile::ReloadBehavior behavior)
+void EditorManager::setReloadSetting(IFile::ReloadSetting behavior)
{
- m_d->m_reloadBehavior = behavior;
+ m_d->m_reloadSetting = behavior;
}
-IFile::ReloadBehavior EditorManager::reloadBehavior() const
+IFile::ReloadSetting EditorManager::reloadSetting() const
{
- return m_d->m_reloadBehavior;
+ return m_d->m_reloadSetting;
}
Core::IEditor *EditorManager::duplicateEditor(Core::IEditor *editor)
diff --git a/src/plugins/coreplugin/editormanager/editormanager.h b/src/plugins/coreplugin/editormanager/editormanager.h
index f3deeb6812e381a89f9f72088f6d7444c8df7bf9..a762364f6ccd74fc201fe2643f4a44d6b78685af 100644
--- a/src/plugins/coreplugin/editormanager/editormanager.h
+++ b/src/plugins/coreplugin/editormanager/editormanager.h
@@ -185,8 +185,8 @@ public:
QString defaultExternalEditor() const;
QString externalEditorHelpText() const;
- void setReloadBehavior(IFile::ReloadBehavior behavior);
- IFile::ReloadBehavior reloadBehavior() const;
+ void setReloadSetting(IFile::ReloadSetting behavior);
+ IFile::ReloadSetting reloadSetting() const;
// Helper to display a message dialog when encountering a read-only
// file, prompting the user about how to make it writeable.
diff --git a/src/plugins/coreplugin/fancyactionbar.cpp b/src/plugins/coreplugin/fancyactionbar.cpp
index 707ad14e955acc1a7e299cf47154e9a423ddf5f3..57145d3d84b5978ead76f4e83e1e49c5883106be 100644
--- a/src/plugins/coreplugin/fancyactionbar.cpp
+++ b/src/plugins/coreplugin/fancyactionbar.cpp
@@ -45,8 +45,9 @@
#include <QtGui/QStatusBar>
#include <QtGui/QStyle>
#include <QtGui/QStyleOption>
-#include <QtCore/QEvent>
#include <QtGui/QMouseEvent>
+#include <QtGui/QApplication>
+#include <QtCore/QEvent>
#include <QtCore/QAnimationGroup>
#include <QtCore/QPropertyAnimation>
#include <QtCore/QDebug>
@@ -226,13 +227,13 @@ QSize FancyToolButton::sizeHint() const
QFontMetrics fm(boldFont);
qreal lineHeight = fm.height();
const QString projectName = defaultAction()->property("heading").toString();
- buttonSize += QSizeF(0, 4);
+ buttonSize += QSizeF(0, 10);
if (!projectName.isEmpty())
- buttonSize += QSizeF(0, lineHeight + 6);
+ buttonSize += QSizeF(0, lineHeight + 2);
const QString buildConfiguration = defaultAction()->property("subtitle").toString();
if (!buildConfiguration.isEmpty())
- buttonSize += QSizeF(0, lineHeight + 6);
+ buttonSize += QSizeF(0, lineHeight + 2);
}
return buttonSize.toSize();
}
@@ -267,11 +268,29 @@ FancyActionBar::FancyActionBar(QWidget *parent)
setContentsMargins(0,2,0,0);
m_runButton = m_debugButton = 0;
+ m_inDebugMode = false;
connect(Core::ModeManager::instance(), SIGNAL(currentModeChanged(Core::IMode*)),
this, SLOT(modeChanged(Core::IMode*)));
+
+#ifdef Q_WS_MAC
+ qApp->installEventFilter(this);
+#endif
+
}
+#ifdef Q_WS_MAC
+bool FancyActionBar::eventFilter(QObject *, QEvent *e)
+{
+ if (e->type() == QEvent::KeyPress || e->type() == QEvent::KeyRelease) {
+ if (static_cast<QKeyEvent *>(e)->key() == Qt::Key_Alt)
+ updateRunDebug();
+ } else if (e->type() == QEvent::WindowDeactivate)
+ updateRunDebug();
+ return false;
+}
+#endif
+
void FancyActionBar::addProjectSelector(QAction *action)
{
FancyToolButton* toolButton = new FancyToolButton(this);
@@ -295,15 +314,27 @@ void FancyActionBar::insertAction(int index, QAction *action)
void FancyActionBar::modeChanged(Core::IMode *mode)
{
- if (m_runButton && m_debugButton) {
- bool inDebugMode = (mode->id() == QLatin1String("Debugger.Mode.Debug"));
- layout()->setEnabled(false);
- m_runButton->forceVisible(!inDebugMode);
- m_debugButton->forceVisible(inDebugMode);
- layout()->setEnabled(true);
- }
+ m_inDebugMode = (mode->id() == QLatin1String("Debugger.Mode.Debug"));
+ updateRunDebug();
}
+void FancyActionBar::updateRunDebug()
+{
+ if (!m_runButton || !m_debugButton)
+ return;
+
+ bool doDebug = m_inDebugMode;
+#ifdef Q_WS_MAC
+ if (QApplication::keyboardModifiers() && Qt::AltModifier)
+ doDebug = !doDebug;
+#endif
+
+ layout()->setEnabled(false);
+ m_runButton->forceVisible(!doDebug);
+ m_debugButton->forceVisible(doDebug);
+ layout()->setEnabled(true);
+
+}
QLayout *FancyActionBar::actionsLayout() const
{
diff --git a/src/plugins/coreplugin/fancyactionbar.h b/src/plugins/coreplugin/fancyactionbar.h
index 013fdcf8811458c9af2b38bda5a23456ad6dd75d..eb1d52710998921d879ffe5570b9006539074e0f 100644
--- a/src/plugins/coreplugin/fancyactionbar.h
+++ b/src/plugins/coreplugin/fancyactionbar.h
@@ -75,6 +75,9 @@ class FancyActionBar : public QWidget
public:
FancyActionBar(QWidget *parent = 0);
+#ifdef Q_WS_MAC
+ bool eventFilter(QObject *, QEvent *);
+#endif
void paintEvent(QPaintEvent *event);
void insertAction(int index, QAction *action);
void addProjectSelector(QAction *action);
@@ -84,6 +87,8 @@ private slots:
void modeChanged(Core::IMode *mode);
private:
+ void updateRunDebug();
+ bool m_inDebugMode;
QVBoxLayout *m_actionsLayout;
FancyToolButton *m_runButton;
FancyToolButton *m_debugButton;
diff --git a/src/plugins/coreplugin/filemanager.cpp b/src/plugins/coreplugin/filemanager.cpp
index 231828ab3bb7a953b3b9ee538b83f988271913ed..d3f6a0b6eda477c5b9636e08facd3de22592e0e9 100644
--- a/src/plugins/coreplugin/filemanager.cpp
+++ b/src/plugins/coreplugin/filemanager.cpp
@@ -40,6 +40,7 @@
#include <utils/qtcassert.h>
#include <utils/pathchooser.h>
+#include <utils/reloadpromptutils.h>
#include <QtCore/QSettings>
#include <QtCore/QFileInfo>
@@ -227,8 +228,9 @@ void FileManager::addFileInfo(IFile *file)
if (!d->m_states.contains(fixedname)) {
d->m_states.insert(fixedname, Internal::FileState());
- if (!fixedname.isEmpty())
+ if (!fixedname.isEmpty()) {
d->m_fileWatcher->addPath(fixedname);
+ }
}
d->m_states[fixedname].lastUpdatedState.insert(file, item);
@@ -278,8 +280,9 @@ void FileManager::removeFileInfo(const QString &fileName, IFile *file)
if (d->m_states.value(fixedName).lastUpdatedState.isEmpty()) {
d->m_states.remove(fixedName);
- if (!fixedName.isEmpty())
+ if (!fixedName.isEmpty()) {
d->m_fileWatcher->removePath(fixedName);
+ }
}
}
@@ -340,8 +343,10 @@ void FileManager::checkForNewFileName()
const QString &fileName = fixFileName(file->fileName());
// check if the IFile is in the map
- if (d->m_states[fileName].lastUpdatedState.contains(file)) {
- // Should checkForNewFileName also call updateFileInfo if the name didn't change?
+ if (d->m_states.value(fileName).lastUpdatedState.contains(file)) {
+ // the file might have been deleted and written again, so guard against that
+ d->m_fileWatcher->removePath(fileName);
+ d->m_fileWatcher->addPath(fileName);
updateFileInfo(file);
return;
}
@@ -718,17 +723,25 @@ void FileManager::checkForReload()
d->m_blockActivated = true;
- IFile::ReloadBehavior behavior = EditorManager::instance()->reloadBehavior();
+ IFile::ReloadSetting defaultBehavior = EditorManager::instance()->reloadSetting();
+ Utils::ReloadPromptAnswer previousAnswer = Utils::ReloadCurrent;
- QStringList allFileNames;
- foreach(const QString &fileName, d->m_changedFiles) {
- allFileNames << fileName;
+ QList<IEditor*> editorsToClose;
+ QMap<IFile*, QString> filesToSave;
+ QStringList modifiedFileNames;
+ foreach (const QString &fileName, d->m_changedFiles) {
// Get the information from the filesystem
+ IFile::ChangeTrigger behavior = IFile::TriggerExternal;
+ IFile::ChangeType type = IFile::TypeContents;
QFileInfo fi(fileName);
- bool expected = false;
- if (fi.lastModified() == d->m_states.value(fileName).expected.modified
- && fi.permissions() == d->m_states.value(fileName).expected.permissions) {
- expected = true;
+ if (!fi.exists()) {
+ type = IFile::TypeRemoved;
+ } else {
+ modifiedFileNames << fileName;
+ if (fi.lastModified() == d->m_states.value(fileName).expected.modified
+ && fi.permissions() == d->m_states.value(fileName).expected.permissions) {
+ behavior = IFile::TriggerInternal;
+ }
}
const QMap<IFile *, Internal::FileStateItem> &lastUpdated =
@@ -736,35 +749,109 @@ void FileManager::checkForReload()
QMap<IFile *, Internal::FileStateItem>::const_iterator it, end;
it = lastUpdated.constBegin();
end = lastUpdated.constEnd();
-
for ( ; it != end; ++it) {
+ IFile *file = it.key();
// Compare
if (it.value().modified == fi.lastModified()
&& it.value().permissions == fi.permissions()) {
// Already up to date
+ continue;
+ }
+ // we've got some modification
+ // check if it's contents or permissions:
+ if (it.value().modified == fi.lastModified()) {
+ // Only permission change
+ file->reload(IFile::FlagReload, IFile::TypePermissions);
+ // now we know it's a content change or file was removed
+ } else if (defaultBehavior == IFile::ReloadUnmodified
+ && type == IFile::TypeContents && !file->isModified()) {
+ // content change, but unmodified (and settings say to reload in this case)
+ file->reload(IFile::FlagReload, type);
+ // file was removed or it's a content change and the default behavior for
+ // unmodified files didn't kick in
+ } else if (defaultBehavior == IFile::IgnoreAll) {
+ // content change or removed, but settings say ignore
+ file->reload(IFile::FlagIgnore, type);
+ // either the default behavior is to always ask,
+ // or the ReloadUnmodified default behavior didn't kick in,
+ // so do whatever the IFile wants us to do
} else {
- // Update IFile
- if (expected) {
- IFile::ReloadBehavior tempBeh = IFile::ReloadUnmodified;
- it.key()->modified(&tempBeh);
- } else {
- if (it.value().modified == fi.lastModified()) {
- // Only permission change
- IFile::ReloadBehavior tempBeh = IFile::ReloadPermissions;
- it.key()->modified(&tempBeh);
+ // check if IFile wants us to ask
+ if (file->reloadBehavior(behavior, type) == IFile::BehaviorSilent) {
+ // content change or removed, IFile wants silent handling
+ file->reload(IFile::FlagReload, type);
+ // IFile wants us to ask
+ } else if (type == IFile::TypeContents) {
+ // content change, IFile wants to ask user
+ if (previousAnswer == Utils::ReloadNone) {
+ // answer already given, ignore
+ file->reload(IFile::FlagIgnore, IFile::TypeContents);
+ } else if (previousAnswer == Utils::ReloadAll) {
+ // answer already given, reload
+ file->reload(IFile::FlagReload, IFile::TypeContents);
} else {
- it.key()->modified(&behavior);
+ // Ask about content change
+ previousAnswer = Utils::reloadPrompt(fileName, file->isModified(), QApplication::activeWindow());
+ switch (previousAnswer) {
+ case Utils::ReloadAll:
+ case Utils::ReloadCurrent:
+ file->reload(IFile::FlagReload, IFile::TypeContents);
+ break;
+ case Utils::ReloadSkipCurrent:
+ case Utils::ReloadNone:
+ file->reload(IFile::FlagIgnore, IFile::TypeContents);
+ break;
+ }
+ }
+ // IFile wants us to ask, and it's the TypeRemoved case
+ } else {
+ // Ask about removed file
+ bool unhandled = true;
+ while (unhandled) {
+ switch (Utils::fileDeletedPrompt(fileName, QApplication::activeWindow())) {
+ case Utils::FileDeletedSave:
+ filesToSave.insert(file, fileName);
+ unhandled = false;
+ break;
+ case Utils::FileDeletedSaveAs:
+ {
+ const QString &saveFileName = getSaveAsFileName(file);
+ if (!saveFileName.isEmpty()) {
+ filesToSave.insert(file, saveFileName);
+ unhandled = false;
+ }
+ break;
+ }
+ case Utils::FileDeletedClose:
+ editorsToClose << EditorManager::instance()->editorsForFile(file);
+ unhandled = false;
+ break;
+ }
}
}
- updateFileInfo(it.key());
}
+
+ updateFileInfo(file);
}
}
- if (!allFileNames.isEmpty()) {
- d->m_fileWatcher->removePaths(allFileNames);
- d->m_fileWatcher->addPaths(allFileNames);
+
+ // cleanup
+ if (!modifiedFileNames.isEmpty()) {
+ d->m_fileWatcher->removePaths(modifiedFileNames);
+ d->m_fileWatcher->addPaths(modifiedFileNames);
}
d->m_changedFiles.clear();
+
+ // handle deleted files
+ EditorManager::instance()->closeEditors(editorsToClose, false);
+ QMapIterator<IFile *, QString> it(filesToSave);
+ while (it.hasNext()) {
+ it.next();
+ blockFileChange(it.key());
+ it.key()->save(it.value());
+ unblockFileChange(it.key());
+ }
+
d->m_blockActivated = false;
}
diff --git a/src/plugins/coreplugin/generalsettings.cpp b/src/plugins/coreplugin/generalsettings.cpp
index 07a778139be58b4b9e4adc20646487f195324592..da2c7d59c70dba1675d0e91dcef57631d92d666d 100644
--- a/src/plugins/coreplugin/generalsettings.cpp
+++ b/src/plugins/coreplugin/generalsettings.cpp
@@ -124,7 +124,7 @@ QWidget *GeneralSettings::createPage(QWidget *parent)
fillLanguageBox();
m_page->colorButton->setColor(StyleHelper::requestedBaseColor());
m_page->externalEditorEdit->setText(EditorManager::instance()->externalEditor());
- m_page->reloadBehavior->setCurrentIndex(EditorManager::instance()->reloadBehavior());
+ m_page->reloadBehavior->setCurrentIndex(EditorManager::instance()->reloadSetting());
#ifdef Q_OS_UNIX
m_page->terminalEdit->setText(ConsoleProcess::terminalEmulator(settings));
#else
@@ -139,6 +139,7 @@ QWidget *GeneralSettings::createPage(QWidget *parent)
m_page->externalFileBrowserLabel->hide();
m_page->externalFileBrowserEdit->hide();
m_page->resetFileBrowserButton->hide();
+ m_page->helpExternalFileBrowserButton->hide();
#endif
connect(m_page->resetButton, SIGNAL(clicked()),
@@ -181,7 +182,7 @@ void GeneralSettings::apply()
// Apply the new base color if accepted
StyleHelper::setBaseColor(m_page->colorButton->color());
EditorManager::instance()->setExternalEditor(m_page->externalEditorEdit->text());
- EditorManager::instance()->setReloadBehavior(IFile::ReloadBehavior(m_page->reloadBehavior->currentIndex()));
+ EditorManager::instance()->setReloadSetting(IFile::ReloadSetting(m_page->reloadBehavior->currentIndex()));
#ifdef Q_OS_UNIX
ConsoleProcess::setTerminalEmulator(Core::ICore::instance()->settings(),
m_page->terminalEdit->text());
diff --git a/src/plugins/coreplugin/generalsettings.ui b/src/plugins/coreplugin/generalsettings.ui
index cf87dcd8497fd720b6e595e2b7302541335549e0..a143b0eddd2b2fe72b84215e38131800439652cd 100644
--- a/src/plugins/coreplugin/generalsettings.ui
+++ b/src/plugins/coreplugin/generalsettings.ui
@@ -6,11 +6,11 @@
<rect>
<x>0</x>
<y>0</y>
- <width>487</width>
- <height>319</height>
+ <width>492</width>
+ <height>339</height>
</rect>
</property>
- <layout class="QVBoxLayout" name="verticalLayout_3">
+ <layout class="QVBoxLayout" name="verticalLayout">
<item>
<widget class="QGroupBox" name="groupBox_2">
<property name="title">
@@ -28,7 +28,7 @@
</widget>
</item>
<item row="0" column="1">
- <layout class="QHBoxLayout" name="colorHorizontalLayout">
+ <layout class="QHBoxLayout" name="horizontalLayout">
<item>
<widget class="Utils::QtColorButton" name="colorButton">
<property name="sizePolicy">
@@ -69,7 +69,7 @@
</property>
<property name="sizeHint" stdset="0">
<size>
- <width>40</width>
+ <width>285</width>
<height>20</height>
</size>
</property>
@@ -110,7 +110,7 @@
</property>
<property name="sizeHint" stdset="0">
<size>
- <width>40</width>
+ <width>285</width>
<height>20</height>
</size>
</property>
@@ -126,110 +126,94 @@
<property name="title">
<string>System</string>
</property>
- <layout class="QVBoxLayout" name="verticalLayout_2">
- <item>
- <layout class="QGridLayout" name="gridLayout">
- <item row="0" column="0">
- <widget class="QLabel" name="terminalLabel">
- <property name="text">
- <string>Terminal:</string>
- </property>
- </widget>
- </item>
- <item row="0" column="1">
- <layout class="QHBoxLayout" name="terminalHorizontalLayout">
- <item>
- <widget class="QLineEdit" name="terminalEdit"/>
- </item>
- <item>
- <widget class="QToolButton" name="resetTerminalButton">
- <property name="toolTip">
- <string>Reset to default</string>
- </property>
- <property name="text">
- <string>R</string>
- </property>
- <property name="icon">
- <iconset resource="core.qrc">
- <normaloff>:/core/images/reset.png</normaloff>:/core/images/reset.png</iconset>
- </property>
- </widget>
- </item>
- </layout>
- </item>
- <item row="1" column="0">
- <widget class="QLabel" name="editorLabel">
- <property name="text">
- <string>External editor:</string>
- </property>
- </widget>
- </item>
- <item row="1" column="1">
- <layout class="QHBoxLayout" name="editorHorizontalLayout">
- <item>
- <widget class="QLineEdit" name="externalEditorEdit"/>
- </item>
- <item>
- <widget class="QToolButton" name="resetEditorButton">
- <property name="toolTip">
- <string>Reset to default</string>
- </property>
- <property name="text">
- <string>R</string>
- </property>
- <property name="icon">
- <iconset resource="core.qrc">
- <normaloff>:/core/images/reset.png</normaloff>:/core/images/reset.png</iconset>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QToolButton" name="helpExternalEditorButton">
- <property name="text">
- <string>?</string>
- </property>
- </widget>
- </item>
- </layout>
- </item>
- <item row="2" column="0">
- <widget class="QLabel" name="externalFileBrowserLabel">
- <property name="text">
- <string>External file browser:</string>
- </property>
- </widget>
- </item>
- <item row="2" column="1">
- <layout class="QHBoxLayout" name="horizontalLayout">
- <item>
- <widget class="QLineEdit" name="externalFileBrowserEdit"/>
- </item>
- <item>
- <widget class="QToolButton" name="resetFileBrowserButton">
- <property name="toolTip">
- <string>Reset to default</string>
- </property>
- <property name="text">
- <string>R</string>
- </property>
- <property name="icon">
- <iconset resource="core.qrc">
- <normaloff>:/core/images/reset.png</normaloff>:/core/images/reset.png</iconset>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QToolButton" name="helpExternalFileBrowserButton">
- <property name="text">
- <string>?</string>
- </property>
- </widget>
- </item>
- </layout>
- </item>
- </layout>
+ <layout class="QGridLayout" name="gridLayout">
+ <item row="0" column="0">
+ <widget class="QLabel" name="terminalLabel">
+ <property name="text">
+ <string>Terminal:</string>
+ </property>
+ </widget>
+ </item>
+ <item row="0" column="1">
+ <widget class="QLineEdit" name="terminalEdit"/>
+ </item>
+ <item row="0" column="2">
+ <widget class="QToolButton" name="resetTerminalButton">
+ <property name="toolTip">
+ <string>Reset to default</string>
+ </property>
+ <property name="text">
+ <string>R</string>
+ </property>
+ <property name="icon">
+ <iconset resource="core.qrc">
+ <normaloff>:/core/images/reset.png</normaloff>:/core/images/reset.png</iconset>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="0">
+ <widget class="QLabel" name="editorLabel">
+ <property name="text">
+ <string>External editor:</string>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="1">
+ <widget class="QLineEdit" name="externalEditorEdit"/>
+ </item>
+ <item row="1" column="2">
+ <widget class="QToolButton" name="resetEditorButton">
+ <property name="toolTip">
+ <string>Reset to default</string>
+ </property>
+ <property name="text">
+ <string>R</string>
+ </property>
+ <property name="icon">
+ <iconset resource="core.qrc">
+ <normaloff>:/core/images/reset.png</normaloff>:/core/images/reset.png</iconset>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="3">
+ <widget class="QToolButton" name="helpExternalEditorButton">
+ <property name="text">
+ <string>?</string>
+ </property>
+ </widget>
+ </item>
+ <item row="2" column="0">
+ <widget class="QLabel" name="externalFileBrowserLabel">
+ <property name="text">
+ <string>External file browser:</string>
+ </property>
+ </widget>
+ </item>
+ <item row="2" column="1">
+ <widget class="QLineEdit" name="externalFileBrowserEdit"/>
+ </item>
+ <item row="2" column="2">
+ <widget class="QToolButton" name="resetFileBrowserButton">
+ <property name="toolTip">
+ <string>Reset to default</string>
+ </property>
+ <property name="text">
+ <string>R</string>
+ </property>
+ <property name="icon">
+ <iconset resource="core.qrc">
+ <normaloff>:/core/images/reset.png</normaloff>:/core/images/reset.png</iconset>
+ </property>
+ </widget>
+ </item>
+ <item row="2" column="3">
+ <widget class="QToolButton" name="helpExternalFileBrowserButton">
+ <property name="text">
+ <string>?</string>
+ </property>
+ </widget>
</item>
- <item>
+ <item row="3" column="0" colspan="4">
<layout class="QHBoxLayout" name="horizontalLayout_2">
<item>
<widget class="QLabel" name="modifiedLabel">
@@ -250,7 +234,7 @@
</item>
<item>
<property name="text">
- <string>Reload all modified files</string>
+ <string>Reload all unmodified files</string>
</property>
</item>
<item>
diff --git a/src/plugins/coreplugin/ifile.h b/src/plugins/coreplugin/ifile.h
index 59d37bf49d912f88e87939d55cbee98c819c1bc5..575cac9488c9e8a6103ad72f72e20d4a70832927 100644
--- a/src/plugins/coreplugin/ifile.h
+++ b/src/plugins/coreplugin/ifile.h
@@ -44,12 +44,31 @@ class CORE_EXPORT IFile : public QObject
public:
// This enum must match the indexes of the reloadBehavior widget
// in generalsettings.ui
- enum ReloadBehavior {
- AskForReload = 0,
+ enum ReloadSetting {
+ AlwaysAsk = 0,
ReloadUnmodified = 1,
- ReloadNone = 2,
- ReloadAll,
- ReloadPermissions
+ IgnoreAll = 2
+ };
+
+ enum ChangeTrigger {
+ TriggerInternal,
+ TriggerExternal
+ };
+
+ enum ChangeType {
+ TypeContents,
+ TypePermissions,
+ TypeRemoved
+ };
+
+ enum ReloadBehavior {
+ BehaviorAsk,
+ BehaviorSilent
+ };
+
+ enum ReloadFlag {
+ FlagReload,
+ FlagIgnore
};
IFile(QObject *parent = 0) : QObject(parent) {}
@@ -66,7 +85,8 @@ public:
virtual bool isReadOnly() const = 0;
virtual bool isSaveAsAllowed() const = 0;
- virtual void modified(ReloadBehavior *behavior) = 0;
+ virtual ReloadBehavior reloadBehavior(ChangeTrigger state, ChangeType type) const = 0;
+ virtual void reload(ReloadFlag flag, ChangeType type) = 0;
virtual void checkPermissions() {}
diff --git a/src/plugins/coreplugin/iversioncontrol.h b/src/plugins/coreplugin/iversioncontrol.h
index 4b3b7c4cc754defb8d1512b7aa9a82f62029c021..13b43a687adfa5b7284cbc2ed7d3fb2f1de221ce 100644
--- a/src/plugins/coreplugin/iversioncontrol.h
+++ b/src/plugins/coreplugin/iversioncontrol.h
@@ -44,7 +44,8 @@ public:
enum Operation {
AddOperation, DeleteOperation, OpenOperation,
CreateRepositoryOperation,
- SnapshotOperations
+ SnapshotOperations,
+ AnnotateOperation
};
explicit IVersionControl(QObject *parent = 0) : QObject(parent) {}
@@ -126,6 +127,11 @@ public:
*/
virtual bool vcsRemoveSnapshot(const QString &topLevel, const QString &name) = 0;
+ /*!
+ * Display annotation for a file and scroll to line
+ */
+ virtual bool vcsAnnotate(const QString &file, int line) = 0;
+
signals:
void repositoryChanged(const QString &repository);
void filesChanged(const QStringList &files);
diff --git a/src/plugins/coreplugin/mainwindow.cpp b/src/plugins/coreplugin/mainwindow.cpp
index 6fece8bb89e9536bda96612a26caab69af2cb67d..9acd4adcbc550f789a9de4e6800648503602b8a4 100644
--- a/src/plugins/coreplugin/mainwindow.cpp
+++ b/src/plugins/coreplugin/mainwindow.cpp
@@ -314,6 +314,7 @@ bool MainWindow::init(QString *errorMessage)
m_outputView->setWidget(OutputPaneManager::instance()->buttonsWidget());
m_outputView->setPosition(Core::StatusBarWidget::Second);
pm->addObject(m_outputView);
+ m_messageManager->init();
return true;
}
@@ -323,7 +324,6 @@ void MainWindow::extensionsInitialized()
m_statusBarManager->extensionsInitalized();
- m_messageManager->init();
OutputPaneManager::instance()->init();
m_actionManager->initialize();
@@ -579,7 +579,8 @@ void MainWindow::registerDefaultActions()
mfile->addAction(cmd, Constants::G_FILE_SAVE);
// Save As Action
- tmpaction = new QAction(tr("Save &As..."), this);
+ icon = QIcon::fromTheme(QLatin1String("document-save-as"));
+ tmpaction = new QAction(icon, tr("Save &As..."), this);
cmd = am->registerAction(tmpaction, Constants::SAVEAS, m_globalContext);
#ifdef Q_WS_MAC
cmd->setDefaultKeySequence(QKeySequence(tr("Ctrl+Shift+S")));
@@ -604,7 +605,8 @@ void MainWindow::registerDefaultActions()
mfile->addAction(cmd, Constants::G_FILE_PRINT);
// Exit Action
- m_exitAction = new QAction(tr("E&xit"), this);
+ icon = QIcon::fromTheme(QLatin1String("application-exit"));
+ m_exitAction = new QAction(icon, tr("E&xit"), this);
cmd = am->registerAction(m_exitAction, Constants::EXIT, m_globalContext);
cmd->setDefaultKeySequence(QKeySequence(tr("Ctrl+Q")));
mfile->addAction(cmd, Constants::G_FILE_OTHER);
@@ -655,14 +657,16 @@ void MainWindow::registerDefaultActions()
tmpaction->setEnabled(false);
// Select All
- tmpaction = new QAction(tr("&Select All"), this);
+ icon = QIcon::fromTheme(QLatin1String("edit-select-all"));
+ tmpaction = new QAction(icon, tr("&Select All"), this);
cmd = am->registerAction(tmpaction, Constants::SELECTALL, m_globalContext);
cmd->setDefaultKeySequence(QKeySequence::SelectAll);
medit->addAction(cmd, Constants::G_EDIT_SELECTALL);
tmpaction->setEnabled(false);
// Goto Action
- tmpaction = new QAction(tr("&Go To Line..."), this);
+ icon = QIcon::fromTheme(QLatin1String("go-jump"));
+ tmpaction = new QAction(icon, tr("&Go To Line..."), this);
cmd = am->registerAction(tmpaction, Constants::GOTO, m_globalContext);
cmd->setDefaultKeySequence(QKeySequence(tr("Ctrl+L")));
medit->addAction(cmd, Constants::G_EDIT_OTHER);
@@ -724,10 +728,11 @@ void MainWindow::registerDefaultActions()
#endif
// About IDE Action
+ icon = QIcon::fromTheme(QLatin1String("help-about"));
#ifdef Q_WS_MAC
- tmpaction = new QAction(tr("About &Qt Creator"), this); // it's convention not to add dots to the about menu
+ tmpaction = new QAction(icon, tr("About &Qt Creator"), this); // it's convention not to add dots to the about menu
#else
- tmpaction = new QAction(tr("About &Qt Creator..."), this);
+ tmpaction = new QAction(icon, tr("About &Qt Creator..."), this);
#endif
cmd = am->registerAction(tmpaction, Constants::ABOUT_QTCREATOR, m_globalContext);
mhelp->addAction(cmd, Constants::G_HELP_ABOUT);
diff --git a/src/plugins/coreplugin/manhattanstyle.cpp b/src/plugins/coreplugin/manhattanstyle.cpp
index 8260afa3b321a8ffc395e380525eace5f8f78821..ff4dbd16bea1665fd05e58f4d354ee49a41837ee 100644
--- a/src/plugins/coreplugin/manhattanstyle.cpp
+++ b/src/plugins/coreplugin/manhattanstyle.cpp
@@ -36,6 +36,8 @@
#include <utils/qtcassert.h>
#include <utils/stylehelper.h>
+#include <utils/fancymainwindow.h>
+
#include <QtGui/QApplication>
#include <QtGui/QComboBox>
#include <QtGui/QDialog>
@@ -85,6 +87,12 @@ bool panelWidget(const QWidget *widget)
if (qobject_cast<const QDialog *>(widget->window()))
return false;
+ if (qobject_cast<const Utils::FancyMainWindow *>(widget))
+ return true;
+
+ if (qobject_cast<const QTabBar *>(widget))
+ return styleEnabled(widget);
+
const QWidget *p = widget;
while (p) {
if (qobject_cast<const QToolBar *>(p) ||
@@ -197,6 +205,7 @@ int ManhattanStyle::pixelMetric(PixelMetric metric, const QStyleOption *option,
if (panelWidget(widget))
retval = 16;
break;
+ case PM_DockWidgetHandleExtent:
case PM_DockWidgetSeparatorExtent:
return 1;
case PM_MenuPanelWidth:
@@ -257,13 +266,19 @@ void ManhattanStyle::polish(QWidget *widget)
{
QProxyStyle::polish(widget);
- // OxygenStyle forces a rounded widget mask on toolbars
+ // OxygenStyle forces a rounded widget mask on toolbars and dock widgets
if (baseStyle()->inherits("OxygenStyle")) {
- if (qobject_cast<QToolBar*>(widget))
+ if (qobject_cast<QToolBar*>(widget) || qobject_cast<QDockWidget*>(widget)) {
widget->removeEventFilter(baseStyle());
+ widget->setContentsMargins(0, 0, 0, 0);
+ }
}
-
if (panelWidget(widget)) {
+
+ // Oxygen and possibly other styles override this
+ if (qobject_cast<QDockWidget*>(widget))
+ widget->setContentsMargins(0, 0, 0, 0);
+
widget->setAttribute(Qt::WA_LayoutUsesWidgetRect, true);
if (qobject_cast<QToolButton*>(widget)) {
widget->setAttribute(Qt::WA_Hover);
@@ -424,6 +439,12 @@ void ManhattanStyle::drawPrimitive(PrimitiveElement element, const QStyleOption
}
switch (element) {
+ case PE_IndicatorDockWidgetResizeHandle:
+ painter->fillRect(option->rect, Utils::StyleHelper::borderColor());
+ break;
+ case PE_FrameDockWidget:
+ QCommonStyle::drawPrimitive(element, option, painter, widget);
+ break;
case PE_PanelLineEdit:
{
painter->save();
@@ -607,7 +628,8 @@ void ManhattanStyle::drawControl(ControlElement element, const QStyleOption *opt
if (const QStyleOptionTabV3 *tab = qstyleoption_cast<const QStyleOptionTabV3 *>(option)) {
QStyleOptionTabV3 adjustedTab = *tab;
- if (tab->position == QStyleOptionTab::Beginning) {
+ if (tab->position == QStyleOptionTab::Beginning
+ || tab->position == QStyleOptionTab::OnlyOneTab) {
if (option->direction == Qt::LeftToRight)
adjustedTab.rect = adjustedTab.rect.adjusted(-1, 0, 0, 0);
else
@@ -754,42 +776,22 @@ void ManhattanStyle::drawControl(ControlElement element, const QStyleOption *opt
case CE_ToolBar:
{
- QString key;
- QColor keyColor = Utils::StyleHelper::baseColor(lightColored(widget));
- key.sprintf("mh_toolbar %d %d %d", option->rect.width(), option->rect.height(), keyColor.rgb());;
-
- QPixmap pixmap;
- QPainter *p = painter;
QRect rect = option->rect;
bool horizontal = option->state & State_Horizontal;
- if (Utils::StyleHelper::usePixmapCache() && !QPixmapCache::find(key, pixmap)) {
- pixmap = QPixmap(option->rect.size());
- p = new QPainter(&pixmap);
- rect = QRect(0, 0, option->rect.width(), option->rect.height());
- }
-
- if (!Utils::StyleHelper::usePixmapCache() || !QPixmapCache::find(key, pixmap)) {
- // Map offset for global window gradient
- QPoint offset = widget->window()->mapToGlobal(option->rect.topLeft()) -
- widget->mapToGlobal(option->rect.topLeft());
- QRect gradientSpan;
- if (widget) {
- gradientSpan = QRect(offset, widget->window()->size());
- }
- bool drawLightColored = lightColored(widget);
- if (horizontal)
- Utils::StyleHelper::horizontalGradient(p, gradientSpan, rect, drawLightColored);
- else
- Utils::StyleHelper::verticalGradient(p, gradientSpan, rect, drawLightColored);
- }
-
- if (Utils::StyleHelper::usePixmapCache() && !QPixmapCache::find(key, pixmap)) {
- delete p;
- QPixmapCache::insert(key, pixmap);
- }
- if (Utils::StyleHelper::usePixmapCache()) {
- painter->drawPixmap(rect.topLeft(), pixmap);
- }
+ rect = option->rect;
+
+ // Map offset for global window gradient
+ QPoint offset = widget->window()->mapToGlobal(option->rect.topLeft()) -
+ widget->mapToGlobal(option->rect.topLeft());
+ QRect gradientSpan;
+ if (widget)
+ gradientSpan = QRect(offset, widget->window()->size());
+
+ bool drawLightColored = lightColored(widget);
+ if (horizontal)
+ Utils::StyleHelper::horizontalGradient(painter, gradientSpan, rect, drawLightColored);
+ else
+ Utils::StyleHelper::verticalGradient(painter, gradientSpan, rect, drawLightColored);
painter->setPen(Utils::StyleHelper::borderColor());
diff --git a/src/plugins/coreplugin/progressmanager/futureprogress.cpp b/src/plugins/coreplugin/progressmanager/futureprogress.cpp
index aaa56fcb0a1c739c9e0409e6d229a69eed4ef169..f1b888153af96808cdd0ae9819fed8ef53b1090f 100644
--- a/src/plugins/coreplugin/progressmanager/futureprogress.cpp
+++ b/src/plugins/coreplugin/progressmanager/futureprogress.cpp
@@ -43,9 +43,33 @@
#include <utils/stylehelper.h>
using namespace Core;
+using namespace Core::Internal;
const int notificationTimeout = 8000;
+namespace Core {
+namespace Internal {
+
+class FadeWidgetHack : public QWidget
+{
+ Q_OBJECT
+ Q_PROPERTY(float opacity READ opacity WRITE setOpacity)
+public:
+ FadeWidgetHack(QWidget *parent):QWidget(parent), m_opacity(0){
+ setAttribute(Qt::WA_TransparentForMouseEvents);
+ }
+ void paintEvent(QPaintEvent *);
+
+ void setOpacity(float o) { m_opacity = o; update(); }
+ float opacity() const { return m_opacity; }
+
+private:
+ float m_opacity;
+};
+
+} // namespace Internal
+} // namespace Core
+
void FadeWidgetHack::paintEvent(QPaintEvent *)
{
if (m_opacity == 0)
@@ -197,6 +221,13 @@ bool FutureProgress::eventFilter(QObject *, QEvent *e)
void FutureProgress::setFinished()
{
updateToolTip(m_watcher.future().progressText());
+
+ // Special case for concurrent jobs that don't use QFutureInterface to report progress
+ if (m_watcher.progressMinimum() == 0 && m_watcher.progressMaximum() == 0) {
+ m_progress->setRange(0, 1);
+ m_progress->setValue(1);
+ }
+
if (m_watcher.future().isCanceled()) {
m_progress->setError(true);
} else {
@@ -278,3 +309,5 @@ void FutureProgress::fadeAway()
animation->start(QAbstractAnimation::DeleteWhenStopped);
connect(animation, SIGNAL(finished()), this, SIGNAL(removeMe()));
}
+
+#include "futureprogress.moc"
diff --git a/src/plugins/coreplugin/progressmanager/futureprogress.h b/src/plugins/coreplugin/progressmanager/futureprogress.h
index c09cf84ac317af73ec45e34a680fcaf17345198f..31aa15e0bc8e9571de6558a5632ee1ff7a02e4c5 100644
--- a/src/plugins/coreplugin/progressmanager/futureprogress.h
+++ b/src/plugins/coreplugin/progressmanager/futureprogress.h
@@ -42,26 +42,12 @@ class QProgressBar;
class QHBoxLayout;
QT_END_NAMESPACE
-class ProgressBar;
-
namespace Core {
- class FadeWidgetHack : public QWidget
- {
- Q_OBJECT
- Q_PROPERTY(float opacity READ opacity WRITE setOpacity)
- public:
- FadeWidgetHack(QWidget *parent):QWidget(parent), m_opacity(0){
- setAttribute(Qt::WA_TransparentForMouseEvents);
- }
- void paintEvent(QPaintEvent *);
-
- void setOpacity(float o) { m_opacity = o; update(); }
- float opacity() const { return m_opacity; }
-
- private:
- float m_opacity;
- };
+namespace Internal {
+class ProgressBar;
+class FadeWidgetHack;
+} // namespace Internal
class CORE_EXPORT FutureProgress : public QWidget
{
@@ -111,14 +97,13 @@ private slots:
private:
QFutureWatcher<void> m_watcher;
- ProgressBar *m_progress;
+ Internal::ProgressBar *m_progress;
QWidget *m_widget;
QHBoxLayout *m_widgetLayout;
QString m_type;
bool m_keep;
bool m_waitingForUserInteraction;
- FadeWidgetHack *m_faderWidget;
-
+ Internal::FadeWidgetHack *m_faderWidget;
};
} // namespace Core
diff --git a/src/plugins/coreplugin/progressmanager/progressbar.cpp b/src/plugins/coreplugin/progressmanager/progressbar.cpp
index 59b099d9824d337c91f39f76ebbe29a5c9e1d518..16e4ed905c53f6d346933cc94a5ad1f82a75c9e6 100644
--- a/src/plugins/coreplugin/progressmanager/progressbar.cpp
+++ b/src/plugins/coreplugin/progressmanager/progressbar.cpp
@@ -37,7 +37,9 @@
#include <QtGui/QBrush>
#include <QtGui/QColor>
#include <QtGui/QMouseEvent>
-#include <QtDebug>
+
+using namespace Core;
+using namespace Core::Internal;
#define PROGRESSBAR_HEIGHT 13
#define CANCELBUTTON_SIZE 15
diff --git a/src/plugins/coreplugin/progressmanager/progressbar.h b/src/plugins/coreplugin/progressmanager/progressbar.h
index a62e5b1c0e2c6dda6254574a002c46fbd4eab2a4..22a20f288c29bbb0be1d3d6df1ba30b26610e097 100644
--- a/src/plugins/coreplugin/progressmanager/progressbar.h
+++ b/src/plugins/coreplugin/progressmanager/progressbar.h
@@ -33,6 +33,9 @@
#include <QtCore/QString>
#include <QtGui/QWidget>
+namespace Core {
+namespace Internal {
+
class ProgressBar : public QWidget
{
Q_OBJECT
@@ -77,7 +80,9 @@ private:
int m_maximum;
int m_value;
float m_fader;
-
};
+} // namespace Internal
+} // namespace Core
+
#endif // PROGRESSPIE_H
diff --git a/src/plugins/coreplugin/progressmanager/progressmanager_mac.mm b/src/plugins/coreplugin/progressmanager/progressmanager_mac.mm
index 486fa53fb0ef57721f89754e314ca73ca7f1554b..267b6b5dfb090fd374aa2d55909ad0ac27cb0d4e 100644
--- a/src/plugins/coreplugin/progressmanager/progressmanager_mac.mm
+++ b/src/plugins/coreplugin/progressmanager/progressmanager_mac.mm
@@ -41,6 +41,9 @@ void Core::Internal::ProgressManagerPrivate::cleanup()
#import <AppKit/NSDockTile.h>
#import <AppKit/NSApplication.h>
#import <AppKit/NSImageView.h>
+#import <AppKit/NSCIImageRep.h>
+#import <AppKit/NSBezierPath.h>
+#import <AppKit/NSColor.h>
#import <Foundation/NSString.h>
@interface ApplicationProgressView : NSView {
@@ -89,6 +92,7 @@ static ApplicationProgressView *sharedProgressView = nil;
- (void)drawRect:(NSRect)rect
{
+ Q_UNUSED(rect)
NSRect boundary = [self bounds];
[[NSApp applicationIconImage] drawInRect:boundary
fromRect:NSZeroRect
diff --git a/src/plugins/cppeditor/cppclasswizard.cpp b/src/plugins/cppeditor/cppclasswizard.cpp
index b324726624940884eeea1d452586655674aa7638..7e565bfcc624c188c59622d2f7e8fcbd5463d8e5 100644
--- a/src/plugins/cppeditor/cppclasswizard.cpp
+++ b/src/plugins/cppeditor/cppclasswizard.cpp
@@ -282,7 +282,7 @@ bool CppClassWizard::generateHeaderAndSource(const CppClassWizardParameters &par
headerStr << "\n";
headerStr << namespaceIndent << "{\n";
if (defineQObjectMacro)
- headerStr << namespaceIndent << "Q_OBJECT\n";
+ headerStr << namespaceIndent << indent << "Q_OBJECT\n";
headerStr << namespaceIndent << "public:\n"
<< namespaceIndent << indent;
// Constructor
diff --git a/src/plugins/cpptools/cppmodelmanager.cpp b/src/plugins/cpptools/cppmodelmanager.cpp
index 977b0677ef111fd8fecd3918bc0c0528c94deee4..4b2622de4aa158ef216d235bd8955e67b786f26e 100644
--- a/src/plugins/cpptools/cppmodelmanager.cpp
+++ b/src/plugins/cpptools/cppmodelmanager.cpp
@@ -74,6 +74,8 @@
#include <ASTVisitor.h>
#include <Lexer.h>
#include <Token.h>
+#include <Parser.h>
+#include <Control.h>
#include <cplusplus/LookupContext.h>
@@ -194,7 +196,7 @@ void CppPreprocessor::setIncludePaths(const QStringList &includePaths)
m_includePaths.clear();
for (int i = 0; i < includePaths.size(); ++i) {
- const QString path = includePaths.at(i);
+ const QString &path = includePaths.at(i);
#ifdef Q_OS_DARWIN
if (i + 1 < includePaths.size() && path.endsWith(QLatin1String(".framework/Headers"))) {
@@ -261,18 +263,49 @@ public:
if (_workingCopy.contains(doc->fileName()))
mode = Document::FullCheck;
- doc->parse();
- doc->check(mode);
+ if (doc->isParsed() && mode == Document::FastCheck) {
+ TranslationUnit *unit = doc->translationUnit();
+ MemoryPool *pool = unit->memoryPool();
- if (mode == Document::FullCheck) {
- // run the binding pass
- NamespaceBindingPtr ns = bind(doc, _snapshot);
+ Parser parser(unit);
+ Semantic semantic(unit);
- // check for undefined symbols.
- CheckUndefinedSymbols checkUndefinedSymbols(doc);
- checkUndefinedSymbols.setGlobalNamespaceBinding(ns);
+ Namespace *globalNamespace = doc->control()->newNamespace(0);
+ doc->setGlobalNamespace(globalNamespace);
- checkUndefinedSymbols(doc->translationUnit()->ast()); // ### FIXME
+ Scope *globals = globalNamespace->members();
+
+ while (parser.LA()) {
+ unsigned start_declaration = parser.cursor();
+ DeclarationAST *declaration = 0;
+
+ if (parser.parseDeclaration(declaration)) {
+ semantic.check(declaration, globals);
+
+ } else {
+ doc->translationUnit()->error(start_declaration, "expected a declaration");
+ parser.rewind(start_declaration + 1);
+ parser.skipUntilDeclaration();
+ }
+
+ parser.clearTemplateArgumentList();
+ pool->reset();
+ }
+
+ } else {
+ doc->parse();
+ doc->check(mode);
+
+ if (mode == Document::FullCheck) {
+ // run the binding pass
+ NamespaceBindingPtr ns = bind(doc, _snapshot);
+
+ // check for undefined symbols.
+ CheckUndefinedSymbols checkUndefinedSymbols(doc);
+ checkUndefinedSymbols.setGlobalNamespaceBinding(ns);
+
+ checkUndefinedSymbols(doc->translationUnit()->ast()); // ### FIXME
+ }
}
doc->releaseTranslationUnit();
diff --git a/src/plugins/cvs/cvscontrol.cpp b/src/plugins/cvs/cvscontrol.cpp
index e2c559174b1ee325e8a64879213952c8d3fbef78..33e08c03a057173829455091e5232ddbda86a79c 100644
--- a/src/plugins/cvs/cvscontrol.cpp
+++ b/src/plugins/cvs/cvscontrol.cpp
@@ -52,6 +52,7 @@ bool CVSControl::supportsOperation(Operation operation) const
switch (operation) {
case AddOperation:
case DeleteOperation:
+ case AnnotateOperation:
break;
case OpenOperation:
case CreateRepositoryOperation:
@@ -105,6 +106,12 @@ bool CVSControl::vcsRemoveSnapshot(const QString &, const QString &)
return false;
}
+bool CVSControl::vcsAnnotate(const QString &file, int line)
+{
+ m_plugin->vcsAnnotate(file, QString(), line);
+ return true;
+}
+
bool CVSControl::managesDirectory(const QString &directory) const
{
return m_plugin->managesDirectory(directory);
diff --git a/src/plugins/cvs/cvscontrol.h b/src/plugins/cvs/cvscontrol.h
index 74bb1cda882aed66d1ff1c9999d05dc97b6ef904..24483afed331854008d1baafd1fc266cc1f5341e 100644
--- a/src/plugins/cvs/cvscontrol.h
+++ b/src/plugins/cvs/cvscontrol.h
@@ -57,6 +57,7 @@ public:
virtual QStringList vcsSnapshots(const QString &topLevel);
virtual bool vcsRestoreSnapshot(const QString &topLevel, const QString &name);
virtual bool vcsRemoveSnapshot(const QString &topLevel, const QString &name);
+ virtual bool vcsAnnotate(const QString &file, int line);
void emitRepositoryChanged(const QString &s);
void emitFilesChanged(const QStringList &l);
diff --git a/src/plugins/cvs/cvsplugin.cpp b/src/plugins/cvs/cvsplugin.cpp
index 78df829fcda866250da9ac8660ed4b39c8d1e484..b45deb226f9a970d7b1cbcb8f859b33e5af4194f 100644
--- a/src/plugins/cvs/cvsplugin.cpp
+++ b/src/plugins/cvs/cvsplugin.cpp
@@ -771,7 +771,7 @@ void CVSPlugin::annotateCurrentFile()
annotate(state.currentFileTopLevel(), state.relativeCurrentFile());
}
-void CVSPlugin::annotateVersion(const QString &file, const QString &revision, int lineNumber)
+void CVSPlugin::vcsAnnotate(const QString &file, const QString &revision, int lineNumber)
{
const QFileInfo fi(file);
annotate(fi.absolutePath(), fi.fileName(), revision, lineNumber);
@@ -1072,7 +1072,7 @@ Core::IEditor * CVSPlugin::showOutputInEditor(const QString& title, const QStrin
QString s = title;
Core::IEditor *editor = Core::EditorManager::instance()->openEditorWithContents(id, &s, output.toLocal8Bit());
connect(editor, SIGNAL(annotateRevisionRequested(QString,QString,int)),
- this, SLOT(annotateVersion(QString,QString,int)));
+ this, SLOT(vcsAnnotate(QString,QString,int)));
CVSEditor *e = qobject_cast<CVSEditor*>(editor->widget());
if (!e)
return 0;
diff --git a/src/plugins/cvs/cvsplugin.h b/src/plugins/cvs/cvsplugin.h
index 312a085843502cd82c6e434b8dad8593590dc36d..12a1ee674f3ce431fba3bc572da43731fba4b8b2 100644
--- a/src/plugins/cvs/cvsplugin.h
+++ b/src/plugins/cvs/cvsplugin.h
@@ -101,6 +101,9 @@ public:
static CVSPlugin *cvsPluginInstance();
+public slots:
+ void vcsAnnotate(const QString &file, const QString &revision /* = QString() */, int lineNumber);
+
private slots:
void addCurrentFile();
void revertCurrentFile();
@@ -111,7 +114,6 @@ private slots:
void startCommitCurrentFile();
void filelogCurrentFile();
void annotateCurrentFile();
- void annotateVersion(const QString &file, const QString &revision, int lineNumber);
void projectStatus();
void slotDescribe(const QString &source, const QString &changeNr);
void updateProject();
diff --git a/src/plugins/debugger/cdb/cdbsymbolgroupcontext.cpp b/src/plugins/debugger/cdb/cdbsymbolgroupcontext.cpp
index d4850e8e6e9c04e706ee0e55d9f2f6c3f3a3a810..bac771c15836963fab1eb405af1bc17f447f3c97 100644
--- a/src/plugins/debugger/cdb/cdbsymbolgroupcontext.cpp
+++ b/src/plugins/debugger/cdb/cdbsymbolgroupcontext.cpp
@@ -349,11 +349,11 @@ static inline QString fixValue(const QString &value, const QString &type)
if (value.endsWith(QLatin1Char('"')) || value.endsWith(QLatin1Char('\'')))
return value;
const int size = value.size();
- // Unsigned hex numbers
- if (isIntType(type) && (size > 2 && value.at(1) == QLatin1Char('x'))) {
- quint64 intValue;
- if (CdbCore::SymbolGroupContext::getUnsignedHexValue(value, &intValue))
- return QString::number(intValue);
+ // Integer numbers Unsigned hex numbers (0x)/decimal numbers (0n)
+ if (isIntType(type)) {
+ const QVariant intValue = CdbCore::SymbolGroupContext::getIntValue(value);
+ if (intValue.isValid())
+ return intValue.toString();
}
return size < 20 ? value : CdbCore::SymbolGroupContext::removeInnerTemplateType(value);
}
diff --git a/src/plugins/debugger/cdb/symbolgroupcontext.cpp b/src/plugins/debugger/cdb/symbolgroupcontext.cpp
index 6996ce403c51693a8f9332894794bf27a2c06ec0..06f13dceef47fbd8b0ddb4972b6ea4fd7ebe6d1d 100644
--- a/src/plugins/debugger/cdb/symbolgroupcontext.cpp
+++ b/src/plugins/debugger/cdb/symbolgroupcontext.cpp
@@ -34,6 +34,7 @@
#include <QtCore/QCoreApplication>
#include <QtCore/QRegExp>
#include <QtCore/QString>
+#include <QtCore/QVariant>
#include <QtCore/QDebug>
enum { debug = 0 };
@@ -450,6 +451,42 @@ bool SymbolGroupContext::getUnsignedHexValue(QString stringValue, quint64 *value
return ok;
}
+// Return the format specification of a '0x..', '0n..'
+// integer specification or '0' if there is none.
+inline char intFormatSpecification(const QString &stringValue)
+{
+ if (stringValue.size() > 2) {
+ const QChar format = stringValue.at(1);
+ if (!format.isDigit())
+ return format.toLatin1();
+ }
+ return char(0);
+}
+
+QVariant SymbolGroupContext::getIntValue(const QString &stringValue)
+{
+ // Is this a "0x<hex'hex>", "0n<decimal>" or something
+ switch (intFormatSpecification(stringValue)) {
+ case 'x': { // Hex unsigned
+ quint64 uvalue;
+ if (SymbolGroupContext::getUnsignedHexValue(stringValue, &uvalue))
+ return QVariant(uvalue);
+ }
+ break;
+ case '0': // Decimal or none
+ case 'n': {
+ qint64 nvalue;
+ if (SymbolGroupContext::getDecimalIntValue(stringValue, &nvalue))
+ return QVariant(nvalue);
+ }
+ break;
+ default:
+ break;
+ }
+ qWarning("CDB: Integer conversion failed for '%s'.", qPrintable(stringValue));
+ return QVariant();
+}
+
// check for "0x000", "0x000 class X" or its 64-bit equivalents.
bool SymbolGroupContext::isNullPointer(const QString &type , QString valueS)
{
@@ -621,15 +658,24 @@ unsigned SymbolGroupContext::dumpValue(unsigned long index,
return rc;
}
-// Get integer value of symbol group
-bool SymbolGroupContext::getDecimalIntValue(CIDebugSymbolGroup *sg, int index, int *value)
+bool SymbolGroupContext::getDecimalIntValue(QString stringValue, qint64 *value)
{
- const QString valueS = getSymbolString(sg, &IDebugSymbolGroup2::GetSymbolValueTextWide, index);
+ // Strip '0n<digits>' format specifier that occurs
+ // with Debugging tools v6.12 or later
+ if (stringValue.startsWith(QLatin1String("0n")))
+ stringValue.remove(0, 2);
bool ok;
- *value = valueS.toInt(&ok);
+ *value = stringValue.toInt(&ok);
return ok;
}
+// Get integer value of symbol group
+static inline bool getSG_DecimalIntValue(CIDebugSymbolGroup *sg, int index, qint64 *value)
+{
+ const QString valueS = getSymbolString(sg, &IDebugSymbolGroup2::GetSymbolValueTextWide, index);
+ return SymbolGroupContext::getDecimalIntValue(valueS, value);
+}
+
// Get pointer value of symbol group ("0xAAB")
// Note that this is on "00000000`0250124a" on 64bit systems.
static inline bool getSG_UnsignedHexValue(CIDebugSymbolGroup *sg, int index, quint64 *value)
@@ -655,8 +701,8 @@ int SymbolGroupContext::dumpQString(unsigned long index,
const unsigned long sizeIndex = dIndex + 3;
const unsigned long arrayIndex = dIndex + 4;
// Get size and pointer
- int size;
- if (!getDecimalIntValue(m_symbolGroup, sizeIndex, &size))
+ qint64 size;
+ if (!getSG_DecimalIntValue(m_symbolGroup, sizeIndex, &size))
return 4;
quint64 array;
if (!getSG_UnsignedHexValue(m_symbolGroup, arrayIndex, &array))
@@ -671,7 +717,7 @@ int SymbolGroupContext::dumpQString(unsigned long index,
// Should this ever be a remote debugger, need to check byte order.
unsigned short *buf = new unsigned short[size + 1];
unsigned long bytesRead;
- const HRESULT hr = m_dataSpaces->ReadVirtual(array, buf, size * sizeof(unsigned short), &bytesRead);
+ const HRESULT hr = m_dataSpaces->ReadVirtual(array, buf, size * ULONG(sizeof(unsigned short)), &bytesRead);
if (FAILED(hr)) {
delete [] buf;
return 1;
@@ -705,8 +751,8 @@ int SymbolGroupContext::dumpStdString(unsigned long index,
return 2;
// Check if size is something sane
const int sizeIndex = index + 6;
- int size;
- if (!getDecimalIntValue(m_symbolGroup, sizeIndex, &size))
+ qint64 size;
+ if (!getSG_DecimalIntValue(m_symbolGroup, sizeIndex, &size))
return 3;
if (size < 0)
return 1;
diff --git a/src/plugins/debugger/cdb/symbolgroupcontext.h b/src/plugins/debugger/cdb/symbolgroupcontext.h
index 882c1b52d74861589c7ba05b005817bc31626d22..2c10d315752f62c2602a5f1be1a069b6d848f777 100644
--- a/src/plugins/debugger/cdb/symbolgroupcontext.h
+++ b/src/plugins/debugger/cdb/symbolgroupcontext.h
@@ -112,10 +112,13 @@ public:
unsigned dumpValue(unsigned long index, QString *inameIn, QString *nameIn, ULONG64 *addrIn,
ULONG *typeIdIn, QString *typeNameIn, QString *valueIn);
- // For 32bit values (returned as dec)
- static bool getDecimalIntValue(CIDebugSymbolGroup *sg, int index, int *value);
+ // For 64bit values (returned as dec), potentially '0n..'.
+ static bool getDecimalIntValue(QString stringValue, qint64 *value);
// For pointers and 64bit values (returned as hex)
static bool getUnsignedHexValue(QString stringValue, quint64 *value);
+ // Convenience to return an integer (hex/decimal) as matching variant (signed/unsigned).
+ static QVariant getIntValue(const QString &stringValue);
+
// Null-check for pointers
static bool isNullPointer(const QString &type , QString valueS);
// Symbol group values may contain template types which is not desired.
diff --git a/src/plugins/debugger/commonoptionspage.ui b/src/plugins/debugger/commonoptionspage.ui
index 8cbfecf9e2b6a90825db064d973b24da8047117b..d0e0ed5afe968698a714797f09cdfd01e6c6f763 100644
--- a/src/plugins/debugger/commonoptionspage.ui
+++ b/src/plugins/debugger/commonoptionspage.ui
@@ -2,11 +2,38 @@
<ui version="4.0">
<class>CommonOptionsPage</class>
<widget class="QWidget" name="CommonOptionsPage">
+ <property name="geometry">
+ <rect>
+ <x>0</x>
+ <y>0</y>
+ <width>338</width>
+ <height>357</height>
+ </rect>
+ </property>
<layout class="QVBoxLayout" name="verticalLayout">
+ <item>
+ <widget class="QGroupBox" name="groupBox_2">
+ <property name="title">
+ <string>Language</string>
+ </property>
+ <layout class="QGridLayout" name="gridLayout">
+ <item row="0" column="0">
+ <widget class="QCheckBox" name="checkBoxChangeLanguageAutomatically">
+ <property name="toolTip">
+ <string>Changes the debugger language according to the currently opened file.</string>
+ </property>
+ <property name="text">
+ <string>Change debugger language automatically</string>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </widget>
+ </item>
<item>
<widget class="QGroupBox" name="groupBox">
<property name="title">
- <string>User interface</string>
+ <string>C++</string>
</property>
<layout class="QFormLayout" name="formLayout">
<item row="0" column="0" colspan="2">
diff --git a/src/plugins/debugger/debugger.qrc b/src/plugins/debugger/debugger.qrc
index d63be1ecc2d47192da6c26ba60d516fde7884cfc..a542bdfce22d23c9e9783de8e7f4c576dbee18c1 100644
--- a/src/plugins/debugger/debugger.qrc
+++ b/src/plugins/debugger/debugger.qrc
@@ -1,26 +1,23 @@
<RCC>
<qresource prefix="/debugger">
<file>images/debugger_breakpoints.png</file>
+ <file>images/debugger_continue.png</file>
<file>images/debugger_continue_small.png</file>
+ <file>images/debugger_empty_14.png</file>
+ <file>images/debugger_interrupt.png</file>
<file>images/debugger_interrupt_small.png</file>
+ <file>images/debugger_reversemode_16.png</file>
+ <file>images/debugger_singleinstructionmode.png</file>
<file>images/debugger_snapshot_small.png</file>
<file>images/debugger_start.png</file>
<file>images/debugger_start_small.png</file>
<file>images/debugger_stepinto_small.png</file>
+ <file>images/debugger_steponeproc_small.png</file>
<file>images/debugger_stepout_small.png</file>
<file>images/debugger_stepover_small.png</file>
- <file>images/debugger_steponeproc_small.png</file>
<file>images/debugger_stepoverproc_small.png</file>
- <file>images/debugger_stop_small.png</file>
- <file>images/delete.png</file>
- <file>images/done.png</file>
- <file>images/error.png</file>
- <file>images/newitem.png</file>
- <file>images/running.png</file>
- <file>images/debugger_continue.png</file>
- <file>images/debugger_interrupt.png</file>
<file>images/debugger_stop.png</file>
- <file>images/SingleInstructionMode.png</file>
+ <file>images/debugger_stop_small.png</file>
<file>images/breakpoint_16.png</file>
<file>images/breakpoint_24.png</file>
<file>images/breakpoint_disabled_16.png</file>
@@ -28,7 +25,6 @@
<file>images/breakpoint_disabled_32.png</file>
<file>images/breakpoint_pending_16.png</file>
<file>images/breakpoint_pending_24.png</file>
- <file>images/empty14.png</file>
<file>images/location_16.png</file>
<file>images/location_24.png</file>
</qresource>
diff --git a/src/plugins/debugger/debuggeractions.cpp b/src/plugins/debugger/debuggeractions.cpp
index 63eb591de78612a031b4d49eb047a8a4773166a8..e8758c84cff00f7ed87e524c674bf737a916c63e 100644
--- a/src/plugins/debugger/debuggeractions.cpp
+++ b/src/plugins/debugger/debuggeractions.cpp
@@ -163,7 +163,7 @@ DebuggerSettings *DebuggerSettings::instance()
item->setText(tr("Operate by Instruction"));
item->setCheckable(true);
item->setDefaultValue(false);
- item->setIcon(QIcon(":/debugger/images/SingleInstructionMode.png"));
+ item->setIcon(QIcon(":/debugger/images/debugger_singleinstructionmode.png"));
item->setToolTip(tr("This switches the debugger to instruction-wise "
"operation mode. In this mode, stepping operates on single "
"instructions and the source location view also shows the "
@@ -369,7 +369,6 @@ DebuggerSettings *DebuggerSettings::instance()
item->setCheckable(true);
item->setDefaultValue(false);
instance->insertItem(UseAddressInBreakpointsView, item);
- item = new SavedAction(instance);
item = new SavedAction(instance);
item->setSettingsKey(debugModeGroup, QLatin1String("UseAddressInStackView"));
@@ -442,6 +441,14 @@ DebuggerSettings *DebuggerSettings::instance()
item->setDefaultValue(20);
instance->insertItem(GdbWatchdogTimeout, item);
+ // Language switching
+ item = new Utils::SavedAction(instance);
+ item->setSettingsKey(debugModeGroup, QLatin1String("ChangeLanguageAutomatically"));
+ item->setText(tr("Change debugger language automatically"));
+ item->setToolTip(tr("Changes the debugger language according to the currently opened file."));
+ item->setCheckable(true);
+ item->setDefaultValue(true);
+ instance->insertItem(SwitchLanguageAutomatically, item);
return instance;
}
diff --git a/src/plugins/debugger/debuggeractions.h b/src/plugins/debugger/debuggeractions.h
index c85336f1ba05125eab2f84b1e8a56c956cc719ac..368ff1b7b085290f0e4d362386f365484d536c85 100644
--- a/src/plugins/debugger/debuggeractions.h
+++ b/src/plugins/debugger/debuggeractions.h
@@ -136,7 +136,10 @@ enum DebuggerActionCode
SelectedPluginBreakpointsPattern,
UsePreciseBreakpoints,
BreakOnThrow,
- BreakOnCatch
+ BreakOnCatch,
+
+ // UI/Language switching
+ SwitchLanguageAutomatically
};
// singleton access
diff --git a/src/plugins/debugger/debuggerconstants.h b/src/plugins/debugger/debuggerconstants.h
index 6db14726724005b2a805567d40e8d25d2c63ee83..6b2a09549e43726edcfeefec77a02b5521894e8a 100644
--- a/src/plugins/debugger/debuggerconstants.h
+++ b/src/plugins/debugger/debuggerconstants.h
@@ -47,9 +47,10 @@ const char * const STEPOUT = "Debugger.StepOut";
const char * const NEXT = "Debugger.NextLine";
const char * const REVERSE = "Debugger.ReverseDirection";
-const char * const M_DEBUG_LANGUAGES = "Debugger.Menu.View.Languages";
+const char * const M_DEBUG_LANGUAGES = "Debugger.Menu.View.Languages";
const char * const M_DEBUG_VIEWS = "Debugger.Menu.View.Debug";
+const char * const C_BASEDEBUGGER = "BaseDebugger";
const char * const C_GDBDEBUGGER = "Gdb Debugger";
const char * const GDBRUNNING = "Gdb.Running";
diff --git a/src/plugins/debugger/debuggermainwindow.cpp b/src/plugins/debugger/debuggermainwindow.cpp
index 356b0dd269e5b217835ae893acb93853e31b3f17..ba4709813d1c6c4dd7fa286dc74a0e5f795741cf 100644
--- a/src/plugins/debugger/debuggermainwindow.cpp
+++ b/src/plugins/debugger/debuggermainwindow.cpp
@@ -1,3 +1,32 @@
+/**************************************************************************
+**
+** This file is part of Qt Creator
+**
+** Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+**
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** Commercial Usage
+**
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
+**
+** GNU Lesser General Public License Usage
+**
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at http://qt.nokia.com/contact.
+**
+**************************************************************************/
+
#include "debuggermainwindow.h"
#include "debuggeruiswitcher.h"
diff --git a/src/plugins/debugger/debuggermainwindow.h b/src/plugins/debugger/debuggermainwindow.h
index 0e254961829466195de310c164df8ae08c3402af..028e7dad5f7481e5c8025d8eda1e12eecaa7ef12 100644
--- a/src/plugins/debugger/debuggermainwindow.h
+++ b/src/plugins/debugger/debuggermainwindow.h
@@ -1,3 +1,32 @@
+/**************************************************************************
+**
+** This file is part of Qt Creator
+**
+** Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+**
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** Commercial Usage
+**
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
+**
+** GNU Lesser General Public License Usage
+**
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at http://qt.nokia.com/contact.
+**
+**************************************************************************/
+
#ifndef DEBUGGERMAINWINDOW_H
#define DEBUGGERMAINWINDOW_H
diff --git a/src/plugins/debugger/debuggermanager.cpp b/src/plugins/debugger/debuggermanager.cpp
index 399c65e0c60680d45c4e6f91e07cef033f4c52da..097a61f54e9b964928ebd0b0d87e626dfbd99b53 100644
--- a/src/plugins/debugger/debuggermanager.cpp
+++ b/src/plugins/debugger/debuggermanager.cpp
@@ -459,6 +459,8 @@ void DebuggerManager::init()
watchersView->setModel(d->m_watchHandler->model(WatchersWatch));
connect(theDebuggerAction(AssignValue), SIGNAL(triggered()),
this, SLOT(assignValueInDebugger()), Qt::QueuedConnection);
+ connect(theDebuggerAction(RemoveWatchExpression), SIGNAL(triggered()),
+ this, SLOT(updateWatchersWindow()), Qt::QueuedConnection);
// Log
connect(this, SIGNAL(emitShowInput(int, QString)),
@@ -511,12 +513,15 @@ void DebuggerManager::init()
d->m_actions.watchAction2 = new QAction(tr("Add to Watch Window"), this);
d->m_actions.snapshotAction = new QAction(tr("Snapshot"), this);
- d->m_actions.snapshotAction->setIcon(QIcon(":/debugger/images/debugger_snapshot_small.png"));
+ d->m_actions.snapshotAction->setIcon(
+ QIcon(":/debugger/images/debugger_snapshot_small.png"));
- d->m_actions.reverseDirectionAction = new QAction(tr("Reverse Direction"), this);
+ d->m_actions.reverseDirectionAction =
+ new QAction(tr("Reverse Direction"), this);
d->m_actions.reverseDirectionAction->setCheckable(true);
d->m_actions.reverseDirectionAction->setChecked(false);
- d->m_actions.reverseDirectionAction->setIcon(QIcon(":/debugger/images/location_16.png"));
+ d->m_actions.reverseDirectionAction->setIcon(
+ QIcon(":/debugger/images/debugger_reversemode_16.png"));
connect(d->m_actions.continueAction, SIGNAL(triggered()),
this, SLOT(executeContinue()));
@@ -758,10 +763,12 @@ void DebuggerManager::clearStatusMessage()
d->m_statusLabel->setText(d->m_lastPermanentStatusMessage);
}
-void DebuggerManager::showStatusMessage(const QString &msg, int timeout)
+void DebuggerManager::showStatusMessage(const QString &msg0, int timeout)
{
Q_UNUSED(timeout)
- showDebuggerOutput(LogStatus, msg);
+ showDebuggerOutput(LogStatus, msg0);
+ QString msg = msg0;
+ msg.replace(QLatin1Char('\n'), QString());
d->m_statusLabel->setText(QLatin1String(" ") + msg);
if (timeout > 0) {
d->m_statusTimer->setSingleShot(true);
@@ -1802,6 +1809,8 @@ void DebuggerManager::setState(DebuggerState state, bool forced)
theDebuggerAction(ExpandStack)->setEnabled(actionsEnabled);
theDebuggerAction(ExecuteCommand)->setEnabled(d->m_state != DebuggerNotReady);
+ updateWatchersWindow();
+
d->m_plugin->handleStateChanged(d->m_state);
const bool notbusy = state == InferiorStopped
|| state == DebuggerNotReady
@@ -1925,6 +1934,12 @@ void DebuggerManager::fontSettingsChanged(const TextEditor::FontSettings &settin
changeFontSize(d->m_threadsWindow, size);
}
+void DebuggerManager::updateWatchersWindow()
+{
+ d->m_watchersWindow->setVisible(
+ d->m_watchHandler->model(WatchersWatch)->rowCount(QModelIndex()) > 0);
+}
+
//////////////////////////////////////////////////////////////////////
//
// AbstractDebuggerEngine
diff --git a/src/plugins/debugger/debuggermanager.h b/src/plugins/debugger/debuggermanager.h
index 13e9f4f08c1eb5bf88dac417ed666d78249709f9..87e23361ba9e8fe007d49144fb847654e682baa5 100644
--- a/src/plugins/debugger/debuggermanager.h
+++ b/src/plugins/debugger/debuggermanager.h
@@ -258,7 +258,8 @@ public slots:
public slots: // FIXME
void showDebuggerOutput(const QString &msg)
{ showDebuggerOutput(LogDebug, msg); }
- void ensureLogVisible();
+ void ensureLogVisible();
+ void updateWatchersWindow();
//private slots: // FIXME
void showDebuggerOutput(int channel, const QString &msg);
diff --git a/src/plugins/debugger/debuggeroutputwindow.cpp b/src/plugins/debugger/debuggeroutputwindow.cpp
index 9bbb1a030e81987a681a014212aa3611bdee0076..f29d5ab8c72364de35be69ffb544f7f6913a3031 100644
--- a/src/plugins/debugger/debuggeroutputwindow.cpp
+++ b/src/plugins/debugger/debuggeroutputwindow.cpp
@@ -180,6 +180,7 @@ public:
: QPlainTextEdit(parent)
{
setMaximumBlockCount(100000);
+ setFrameStyle(QFrame::NoFrame);
m_clearContentsAction = new QAction(this);
m_clearContentsAction->setText(tr("Clear Contents"));
m_clearContentsAction->setEnabled(true);
diff --git a/src/plugins/debugger/debuggerplugin.cpp b/src/plugins/debugger/debuggerplugin.cpp
index a2f98fc7a0c1d7e309726a1fd8d7f32fb0aa7308..053dc51a0e82ee573238c292d6eb72262ec4cccb 100644
--- a/src/plugins/debugger/debuggerplugin.cpp
+++ b/src/plugins/debugger/debuggerplugin.cpp
@@ -359,6 +359,9 @@ QWidget *CommonOptionsPage::createPage(QWidget *parent)
m_ui.setupUi(w);
m_group.clear();
+ m_group.insert(theDebuggerAction(SwitchLanguageAutomatically),
+ m_ui.checkBoxChangeLanguageAutomatically);
+
m_group.insert(theDebuggerAction(ListSourceFiles),
m_ui.checkBoxListSourceFiles);
m_group.insert(theDebuggerAction(UseAlternatingRowColors),
@@ -388,7 +391,9 @@ QWidget *CommonOptionsPage::createPage(QWidget *parent)
m_group.insert(theDebuggerAction(BreakOnCatch), 0);
if (m_searchKeywords.isEmpty()) {
- QTextStream(&m_searchKeywords) << ' ' << m_ui.checkBoxListSourceFiles->text()
+ QTextStream(&m_searchKeywords) << ' '
+ << m_ui.checkBoxChangeLanguageAutomatically->text()
+ << m_ui.checkBoxListSourceFiles->text()
<< ' ' << m_ui.checkBoxUseMessageBoxForSignals->text()
<< ' ' << m_ui.checkBoxUseAlternatingRowColors->text()
<< ' ' << m_ui.checkBoxUseToolTipsInMainEditor->text()
@@ -678,7 +683,6 @@ bool DebuggerPlugin::initialize(const QStringList &arguments, QString *errorMess
m_debugMode = new DebugMode(this);
m_uiSwitcher = new DebuggerUISwitcher(m_debugMode, this);
ExtensionSystem::PluginManager::instance()->addObject(m_uiSwitcher);
- m_uiSwitcher->addLanguage(LANG_CPP);
ICore *core = ICore::instance();
QTC_ASSERT(core, return false);
@@ -695,8 +699,11 @@ bool DebuggerPlugin::initialize(const QStringList &arguments, QString *errorMess
QList<int> cppcontext;
cppcontext << uidm->uniqueIdentifier(PE::LANG_CXX);
- QList<int> debuggercontext;
- debuggercontext << uidm->uniqueIdentifier(C_GDBDEBUGGER);
+ QList<int> baseDebuggerContext;
+ baseDebuggerContext << uidm->uniqueIdentifier(C_BASEDEBUGGER);
+
+ QList<int> gdbDebuggercontext;
+ gdbDebuggercontext << uidm->uniqueIdentifier(C_GDBDEBUGGER);
QList<int> cppeditorcontext;
cppeditorcontext << uidm->uniqueIdentifier(CppEditor::Constants::C_CPPEDITOR);
@@ -706,6 +713,8 @@ bool DebuggerPlugin::initialize(const QStringList &arguments, QString *errorMess
m_gdbRunningContext = uidm->uniqueIdentifier(Constants::GDBRUNNING);
+ m_uiSwitcher->addLanguage(LANG_CPP, gdbDebuggercontext);
+
DebuggerManager *manager = new DebuggerManager(this);
ExtensionSystem::PluginManager::instance()->addObject(manager);
const QList<Core::IOptionsPage *> engineOptionPages =
@@ -717,7 +726,7 @@ bool DebuggerPlugin::initialize(const QStringList &arguments, QString *errorMess
QList<int> context;
context.append(uidm->uniqueIdentifier(CC::C_EDITORMANAGER));
- context.append(uidm->uniqueIdentifier(C_GDBDEBUGGER));
+ context.append(uidm->uniqueIdentifier(C_BASEDEBUGGER));
context.append(uidm->uniqueIdentifier(CC::C_NAVIGATION_PANE));
m_debugMode->setContext(context);
@@ -760,22 +769,27 @@ bool DebuggerPlugin::initialize(const QStringList &arguments, QString *errorMess
cmd = am->registerAction(m_startExternalAction,
Constants::STARTEXTERNAL, globalcontext);
+ cmd->setAttribute(Command::CA_Hide);
mstart->addAction(cmd, CC::G_DEFAULT_ONE);
cmd = am->registerAction(m_attachExternalAction,
Constants::ATTACHEXTERNAL, globalcontext);
+ cmd->setAttribute(Command::CA_Hide);
mstart->addAction(cmd, CC::G_DEFAULT_ONE);
cmd = am->registerAction(m_attachCoreAction,
Constants::ATTACHCORE, globalcontext);
+ cmd->setAttribute(Command::CA_Hide);
mstart->addAction(cmd, CC::G_DEFAULT_ONE);
cmd = am->registerAction(m_startRemoteAction,
Constants::ATTACHREMOTE, globalcontext);
+ cmd->setAttribute(Command::CA_Hide);
mstart->addAction(cmd, CC::G_DEFAULT_ONE);
cmd = am->registerAction(m_detachAction,
Constants::DETACH, globalcontext);
+ cmd->setAttribute(Command::CA_Hide);
m_uiSwitcher->addMenuAction(cmd, CC::G_DEFAULT_ONE);
cmd = am->registerAction(actions.stopAction,
@@ -796,99 +810,122 @@ bool DebuggerPlugin::initialize(const QStringList &arguments, QString *errorMess
QAction *sep = new QAction(this);
sep->setSeparator(true);
cmd = am->registerAction(sep, _("Debugger.Sep.Step"), globalcontext);
- m_uiSwitcher->addMenuAction(cmd);
+ m_uiSwitcher->addMenuAction(cmd, Constants::LANG_CPP);
cmd = am->registerAction(actions.nextAction,
- Constants::NEXT, debuggercontext);
+ Constants::NEXT, gdbDebuggercontext);
cmd->setDefaultKeySequence(QKeySequence(Constants::NEXT_KEY));
- m_uiSwitcher->addMenuAction(cmd);
+ cmd->setAttribute(Command::CA_Hide);
+ m_uiSwitcher->addMenuAction(cmd, Constants::LANG_CPP);
cmd = am->registerAction(actions.stepAction,
- Constants::STEP, debuggercontext);
+ Constants::STEP, gdbDebuggercontext);
cmd->setDefaultKeySequence(QKeySequence(Constants::STEP_KEY));
- m_uiSwitcher->addMenuAction(cmd);
+ cmd->setAttribute(Command::CA_Hide);
+ m_uiSwitcher->addMenuAction(cmd, Constants::LANG_CPP);
+
cmd = am->registerAction(actions.stepOutAction,
- Constants::STEPOUT, debuggercontext);
+ Constants::STEPOUT, gdbDebuggercontext);
cmd->setDefaultKeySequence(QKeySequence(Constants::STEPOUT_KEY));
- m_uiSwitcher->addMenuAction(cmd);
+ cmd->setAttribute(Command::CA_Hide);
+ m_uiSwitcher->addMenuAction(cmd, Constants::LANG_CPP);
+
cmd = am->registerAction(actions.runToLineAction1,
- Constants::RUN_TO_LINE1, debuggercontext);
+ Constants::RUN_TO_LINE1, gdbDebuggercontext);
cmd->setDefaultKeySequence(QKeySequence(Constants::RUN_TO_LINE_KEY));
- m_uiSwitcher->addMenuAction(cmd);
+ cmd->setAttribute(Command::CA_Hide);
+ m_uiSwitcher->addMenuAction(cmd, Constants::LANG_CPP);
+
cmd = am->registerAction(actions.runToFunctionAction,
- Constants::RUN_TO_FUNCTION, debuggercontext);
+ Constants::RUN_TO_FUNCTION, gdbDebuggercontext);
cmd->setDefaultKeySequence(QKeySequence(Constants::RUN_TO_FUNCTION_KEY));
- m_uiSwitcher->addMenuAction(cmd);
+ cmd->setAttribute(Command::CA_Hide);
+ m_uiSwitcher->addMenuAction(cmd, Constants::LANG_CPP);
+
cmd = am->registerAction(actions.jumpToLineAction1,
- Constants::JUMP_TO_LINE1, debuggercontext);
- m_uiSwitcher->addMenuAction(cmd);
+ Constants::JUMP_TO_LINE1, gdbDebuggercontext);
+ cmd->setAttribute(Command::CA_Hide);
+ m_uiSwitcher->addMenuAction(cmd, Constants::LANG_CPP);
+
cmd = am->registerAction(actions.returnFromFunctionAction,
- Constants::RETURN_FROM_FUNCTION, debuggercontext);
- m_uiSwitcher->addMenuAction(cmd);
+ Constants::RETURN_FROM_FUNCTION, gdbDebuggercontext);
+ cmd->setAttribute(Command::CA_Hide);
+ m_uiSwitcher->addMenuAction(cmd, Constants::LANG_CPP);
+
cmd = am->registerAction(actions.reverseDirectionAction,
- Constants::REVERSE, debuggercontext);
+ Constants::REVERSE, gdbDebuggercontext);
cmd->setDefaultKeySequence(QKeySequence(Constants::REVERSE_KEY));
- m_uiSwitcher->addMenuAction(cmd);
+ cmd->setAttribute(Command::CA_Hide);
+ m_uiSwitcher->addMenuAction(cmd, Constants::LANG_CPP);
+
sep = new QAction(this);
sep->setSeparator(true);
cmd = am->registerAction(sep, _("Debugger.Sep.Break"), globalcontext);
- m_uiSwitcher->addMenuAction(cmd);
+ m_uiSwitcher->addMenuAction(cmd, Constants::LANG_CPP);
+
cmd = am->registerAction(actions.snapshotAction,
- Constants::SNAPSHOT, debuggercontext);
+ Constants::SNAPSHOT, gdbDebuggercontext);
cmd->setDefaultKeySequence(QKeySequence(Constants::SNAPSHOT_KEY));
- m_uiSwitcher->addMenuAction(cmd);
+ cmd->setAttribute(Command::CA_Hide);
+ m_uiSwitcher->addMenuAction(cmd, Constants::LANG_CPP);
+
cmd = am->registerAction(theDebuggerAction(OperateByInstruction),
- Constants::OPERATE_BY_INSTRUCTION, debuggercontext);
- m_uiSwitcher->addMenuAction(cmd);
+ Constants::OPERATE_BY_INSTRUCTION, gdbDebuggercontext);
+ cmd->setAttribute(Command::CA_Hide);
+ m_uiSwitcher->addMenuAction(cmd, Constants::LANG_CPP);
+
cmd = am->registerAction(actions.breakAction,
Constants::TOGGLE_BREAK, cppeditorcontext);
cmd->setDefaultKeySequence(QKeySequence(Constants::TOGGLE_BREAK_KEY));
- m_uiSwitcher->addMenuAction(cmd);
+ m_uiSwitcher->addMenuAction(cmd, Constants::LANG_CPP);
+
//mcppcontext->addAction(cmd);
sep = new QAction(this);
sep->setSeparator(true);
cmd = am->registerAction(sep, _("Debugger.Sep.Watch"), globalcontext);
- m_uiSwitcher->addMenuAction(cmd);
+ m_uiSwitcher->addMenuAction(cmd, Constants::LANG_CPP);
+
cmd = am->registerAction(actions.watchAction1,
Constants::ADD_TO_WATCH1, cppeditorcontext);
cmd->action()->setEnabled(true);
//cmd->setDefaultKeySequence(QKeySequence(tr("ALT+D,ALT+W")));
- m_uiSwitcher->addMenuAction(cmd);
+ m_uiSwitcher->addMenuAction(cmd, Constants::LANG_CPP);
+
// Editor context menu
ActionContainer *editorContextMenu =
am->actionContainer(CppEditor::Constants::M_CONTEXT);
cmd = am->registerAction(sep, _("Debugger.Sep.Views"),
- debuggercontext);
+ gdbDebuggercontext);
editorContextMenu->addAction(cmd);
cmd->setAttribute(Command::CA_Hide);
cmd = am->registerAction(actions.watchAction2,
- Constants::ADD_TO_WATCH2, debuggercontext);
+ Constants::ADD_TO_WATCH2, gdbDebuggercontext);
cmd->action()->setEnabled(true);
editorContextMenu->addAction(cmd);
cmd->setAttribute(Command::CA_Hide);
cmd = am->registerAction(actions.runToLineAction2,
- Constants::RUN_TO_LINE2, debuggercontext);
+ Constants::RUN_TO_LINE2, gdbDebuggercontext);
cmd->action()->setEnabled(true);
editorContextMenu->addAction(cmd);
cmd->setAttribute(Command::CA_Hide);
cmd = am->registerAction(actions.jumpToLineAction2,
- Constants::JUMP_TO_LINE2, debuggercontext);
+ Constants::JUMP_TO_LINE2, gdbDebuggercontext);
cmd->action()->setEnabled(true);
editorContextMenu->addAction(cmd);
cmd->setAttribute(Command::CA_Hide);
@@ -979,6 +1016,10 @@ bool DebuggerPlugin::initialize(const QStringList &arguments, QString *errorMess
connect(theDebuggerAction(EnableReverseDebugging), SIGNAL(valueChanged(QVariant)),
this, SLOT(enableReverseDebuggingTriggered(QVariant)));
+ // UI Switcher
+ connect(DebuggerUISwitcher::instance(), SIGNAL(languageChanged(QString)),
+ this, SLOT(languageChanged(QString)));
+
return true;
}
@@ -1217,6 +1258,21 @@ void DebuggerPlugin::handleStateChanged(int state)
m_detachAction->setEnabled(detachable);
}
+void DebuggerPlugin::languageChanged(const QString &language)
+{
+ if (!m_manager)
+ return;
+
+ const bool debuggerIsCPP = (language == Constants::LANG_CPP);
+
+ m_startExternalAction->setVisible(debuggerIsCPP);
+ m_attachExternalAction->setVisible(debuggerIsCPP);
+ m_attachCoreAction->setVisible(debuggerIsCPP);
+ m_startRemoteAction->setVisible(debuggerIsCPP);
+ m_detachAction->setVisible(debuggerIsCPP);
+
+}
+
void DebuggerPlugin::writeSettings() const
{
QSettings *s = settings();
@@ -1242,9 +1298,8 @@ void DebuggerPlugin::onModeChanged(IMode *mode)
if (editorManager->currentEditor()) {
editorManager->currentEditor()->widget()->setFocus();
- if (editorManager->currentEditor()->id() == CppEditor::Constants::C_CPPEDITOR) {
+ if (editorManager->currentEditor()->id() == CppEditor::Constants::C_CPPEDITOR)
m_uiSwitcher->setActiveLanguage(LANG_CPP);
- }
}
}
diff --git a/src/plugins/debugger/debuggerplugin.h b/src/plugins/debugger/debuggerplugin.h
index 9fade014919a1c2ba39cf0e757810745dcdc5036..9894f25e966f28e969c7ebef1b366a172f4217a2 100644
--- a/src/plugins/debugger/debuggerplugin.h
+++ b/src/plugins/debugger/debuggerplugin.h
@@ -119,6 +119,7 @@ private slots:
void attachCmdLine();
void enableReverseDebuggingTriggered(const QVariant &value);
+ void languageChanged(const QString &debuggerLanguage);
private:
void readSettings();
diff --git a/src/plugins/debugger/debuggeruiswitcher.cpp b/src/plugins/debugger/debuggeruiswitcher.cpp
index 88e5e40e6a988ad4705cd527d910dc709d19f927..1857a4473e6c3730725dfe0d03e24cbd4bd703d5 100644
--- a/src/plugins/debugger/debuggeruiswitcher.cpp
+++ b/src/plugins/debugger/debuggeruiswitcher.cpp
@@ -1,8 +1,44 @@
+/**************************************************************************
+**
+** This file is part of Qt Creator
+**
+** Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+**
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** Commercial Usage
+**
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
+**
+** GNU Lesser General Public License Usage
+**
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at http://qt.nokia.com/contact.
+**
+**************************************************************************/
+
#include "debuggeruiswitcher.h"
#include "debuggermainwindow.h"
+#include "debuggeractions.h"
+#include "debuggerconstants.h"
+#include "savedaction.h"
-#include <debugger/debuggerconstants.h>
+#include <utils/savedaction.h>
#include <utils/styledbar.h>
+#include <coreplugin/actionmanager/command.h>
+#include <debugger/debuggerconstants.h>
+#include <debugger/debuggeractions.h>
+
#include <coreplugin/modemanager.h>
#include <coreplugin/basemode.h>
#include <coreplugin/uniqueidmanager.h>
@@ -51,7 +87,14 @@ struct DebuggerUISwitcherPrivate {
QStackedWidget *m_toolbarStack;
Internal::DebuggerMainWindow *m_mainWindow;
+ // main debugger context
QList<int> m_debuggercontext;
+
+ // global context
+ QList<int> m_globalContext;
+
+ QHash<int, QList<int> > m_contextsForLanguage;
+
QActionGroup *m_languageActionGroup;
int m_activeLanguage;
@@ -66,6 +109,8 @@ struct DebuggerUISwitcherPrivate {
Core::ActionContainer *m_viewsMenu;
Core::ActionContainer *m_debugMenu;
+ QMultiHash< int, Core::Command *> m_menuCommands;
+
static DebuggerUISwitcher *m_instance;
};
@@ -94,12 +139,16 @@ DebuggerUISwitcher::DebuggerUISwitcher(Core::BaseMode *mode, QObject* parent) :
connect(Core::ModeManager::instance(), SIGNAL(currentModeChanged(Core::IMode*)),
SLOT(modeChanged(Core::IMode*)));
+
d->m_debugMenu = am->actionContainer(ProjectExplorer::Constants::M_DEBUG);
+
+ d->m_viewsMenu = am->createMenu(Debugger::Constants::M_DEBUG_VIEWS);
d->m_languageMenu = am->createMenu(Debugger::Constants::M_DEBUG_LANGUAGES);
+
d->m_languageActionGroup->setExclusive(true);
- d->m_viewsMenu = am->createMenu(Debugger::Constants::M_DEBUG_VIEWS);
- d->m_debuggercontext << Core::ICore::instance()->uniqueIDManager()->uniqueIdentifier(Debugger::Constants::C_GDBDEBUGGER);
+ d->m_debuggercontext << core->uniqueIDManager()->uniqueIdentifier(Debugger::Constants::C_BASEDEBUGGER);
+ d->m_globalContext << Core::Constants::C_GLOBAL_ID;
DebuggerUISwitcherPrivate::m_instance = this;
}
@@ -112,21 +161,23 @@ DebuggerUISwitcher::~DebuggerUISwitcher()
delete d;
}
-void DebuggerUISwitcher::addMenuAction(Core::Command *command, const QString &group)
+void DebuggerUISwitcher::addMenuAction(Core::Command *command, const QString &langName,
+ const QString &group)
{
d->m_debugMenu->addAction(command, group);
+ d->m_menuCommands.insert(d->m_languages.indexOf(langName), command);
}
void DebuggerUISwitcher::setActiveLanguage(const QString &langName)
{
- changeDebuggerUI(langName);
+ if (theDebuggerAction(SwitchLanguageAutomatically)->isChecked())
+ changeDebuggerUI(langName);
}
int DebuggerUISwitcher::activeLanguageId() const
{
return d->m_activeLanguage;
}
-
void DebuggerUISwitcher::modeChanged(Core::IMode *mode)
{
d->m_isActiveMode = (mode->id() == Debugger::Constants::MODE_DEBUG);
@@ -179,12 +230,10 @@ void DebuggerUISwitcher::createViewsMenuItems()
d->m_debugMenu->addAction(cmd);
QMenu *mLang = d->m_languageMenu->menu();
- mLang->setEnabled(true);
mLang->setTitle(tr("&Languages"));
d->m_debugMenu->addMenu(d->m_languageMenu, Core::Constants::G_DEFAULT_THREE);
QMenu *m = d->m_viewsMenu->menu();
- m->setEnabled(true);
m->setTitle(tr("&Views"));
d->m_debugMenu->addMenu(d->m_viewsMenu, Core::Constants::G_DEFAULT_THREE);
@@ -203,9 +252,10 @@ DebuggerUISwitcher *DebuggerUISwitcher::instance()
return DebuggerUISwitcherPrivate::m_instance;
}
-void DebuggerUISwitcher::addLanguage(const QString &langName)
+void DebuggerUISwitcher::addLanguage(const QString &langName, const QList<int> &context)
{
d->m_toolBars.insert(langName, 0);
+ d->m_contextsForLanguage.insert(d->m_languages.count(), context);
d->m_languages.append(langName);
Core::ActionManager *am = Core::ICore::instance()->actionManager();
@@ -217,9 +267,8 @@ void DebuggerUISwitcher::addLanguage(const QString &langName)
connect(langChange, SIGNAL(triggered()), SLOT(langChangeTriggered()));
Core::Command *cmd = am->registerAction(langChange,
- "Debugger.Language" + langName, d->m_debuggercontext);
+ "Debugger.Language." + langName, d->m_globalContext);
d->m_languageMenu->addAction(cmd);
-
}
void DebuggerUISwitcher::langChangeTriggered()
@@ -238,8 +287,6 @@ void DebuggerUISwitcher::changeDebuggerUI(const QString &langName)
int langId = d->m_languages.indexOf(langName);
if (langId != d->m_activeLanguage) {
d->m_languageActionGroup->actions()[langId]->setChecked(true);
- d->m_activeLanguage = langId;
-
d->m_toolbarStack->setCurrentWidget(d->m_toolBars.value(langName));
foreach (DebugToolWindow *window, d->m_dockWidgets) {
@@ -263,7 +310,23 @@ void DebuggerUISwitcher::changeDebuggerUI(const QString &langName)
menuitem.second->setVisible(false);
}
}
+
d->m_languageMenu->menu()->setTitle(tr("Language") + " (" + langName + ")");
+ QHashIterator<int, Core::Command *> iter(d->m_menuCommands);
+
+ Core::ICore *core = Core::ICore::instance();
+ const QList<int> &oldContexts = d->m_contextsForLanguage.value(d->m_activeLanguage);
+ const QList<int> &newContexts = d->m_contextsForLanguage.value(langId);
+ foreach(int ctx, oldContexts)
+ core->removeAdditionalContext(ctx);
+
+ foreach(int ctx, newContexts)
+ core->addAdditionalContext(ctx);
+
+ core->updateContext();
+
+ d->m_activeLanguage = langId;
+
emit languageChanged(langName);
}
@@ -346,9 +409,12 @@ QDockWidget *DebuggerUISwitcher::createDockWidget(const QString &langName, QWidg
if (d->m_languages.indexOf(langName) != d->m_activeLanguage)
dockWidget->hide();
+ QList<int> langContext = d->m_contextsForLanguage.value(d->m_languages.indexOf(langName));
+
Core::ActionManager *am = Core::ICore::instance()->actionManager();
Core::Command *cmd = am->registerAction(dockWidget->toggleViewAction(),
- "Debugger." + dockWidget->objectName(), d->m_debuggercontext);
+ "Debugger." + dockWidget->objectName(), langContext);
+ cmd->setAttribute(Core::Command::CA_Hide);
d->m_viewsMenu->addAction(cmd);
d->m_viewsMenuItems.append(qMakePair(d->m_languages.indexOf(langName), dockWidget->toggleViewAction()));
diff --git a/src/plugins/debugger/debuggeruiswitcher.h b/src/plugins/debugger/debuggeruiswitcher.h
index 9ee3c32bf201f1558ed645eb03decbde3e800df8..b4f568acd913cbf323bb8de67c52b4cf40f29723 100644
--- a/src/plugins/debugger/debuggeruiswitcher.h
+++ b/src/plugins/debugger/debuggeruiswitcher.h
@@ -1,3 +1,32 @@
+/**************************************************************************
+**
+** This file is part of Qt Creator
+**
+** Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+**
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** Commercial Usage
+**
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
+**
+** GNU Lesser General Public License Usage
+**
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at http://qt.nokia.com/contact.
+**
+**************************************************************************/
+
#ifndef DEBUGGERUISWITCHER_H
#define DEBUGGERUISWITCHER_H
@@ -6,6 +35,7 @@
#include <QtCore/QObject>
QT_FORWARD_DECLARE_CLASS(QDockWidget);
+#include <QtCore/QMultiHash>
namespace Core {
class ActionContainer;
@@ -16,8 +46,10 @@ namespace Core {
namespace Utils {
class FancyMainWindow;
+ class SavedAction;
}
+
namespace Debugger {
struct DebuggerUISwitcherPrivate;
@@ -35,16 +67,18 @@ public:
static DebuggerUISwitcher *instance();
- // debuggable languages are registered with this function
- void addLanguage(const QString &langName);
+ // debuggable languages are registered with this function.
+ void addLanguage(const QString &langName, const QList<int> &context);
// debugger toolbars are registered with this function
void setToolbar(const QString &langName, QWidget *widget);
// menu actions are registered with this function
- void addMenuAction(Core::Command *command,
- const QString &group = QString());
+ void addMenuAction(Core::Command *command, const QString &langName,
+ const QString &group = QString());
+ // Changes the active language UI to the one specified by langName.
+ // Does nothing if automatic switching is toggled off from settings.
void setActiveLanguage(const QString &langName);
int activeLanguageId() const;
@@ -84,8 +118,9 @@ private:
QWidget *createMainWindow(Core::BaseMode *mode);
DebuggerUISwitcherPrivate *d;
+ Utils::SavedAction *m_changeLanguageAction;
};
-}
+} // namespace Debugger
#endif // DEBUGGERUISWITCHER_H
diff --git a/src/plugins/debugger/gdb/gdbengine.cpp b/src/plugins/debugger/gdb/gdbengine.cpp
index 5d12b9d8a97680a7d395134f9058bfd2d9c1eecb..0f7f707f3518d643a97dbffd5e869ca0f9dbbd37 100644
--- a/src/plugins/debugger/gdb/gdbengine.cpp
+++ b/src/plugins/debugger/gdb/gdbengine.cpp
@@ -33,8 +33,8 @@
#include "gdboptionspage.h"
#include "trkoptions.h"
#include "trkoptionspage.h"
-#include "debugger/debuggeruiswitcher.h"
-#include "debugger/debuggermainwindow.h"
+#include "debuggeruiswitcher.h"
+#include "debuggermainwindow.h"
#include "attachgdbadapter.h"
#include "coregdbadapter.h"
@@ -68,6 +68,8 @@
#include <texteditor/itexteditor.h>
#include <projectexplorer/toolchain.h>
#include <coreplugin/icore.h>
+#include <coreplugin/progressmanager/progressmanager.h>
+#include <coreplugin/progressmanager/futureprogress.h>
#include <QtCore/QCoreApplication>
#include <QtCore/QDebug>
@@ -175,6 +177,7 @@ GdbEngine::GdbEngine(DebuggerManager *manager) : IDebuggerEngine(manager)
m_trkOptions = QSharedPointer<TrkOptions>(new TrkOptions);
m_trkOptions->fromSettings(Core::ICore::instance()->settings());
m_gdbAdapter = 0;
+ m_progress = 0;
m_commandTimer = new QTimer(this);
m_commandTimer->setSingleShot(true);
@@ -277,6 +280,8 @@ void GdbEngine::initializeVariables()
#ifdef Q_OS_LINUX
m_entryPoint.clear();
#endif
+ delete m_progress;
+ m_progress = 0;
}
QString GdbEngine::errorMessage(QProcess::ProcessError error)
@@ -419,6 +424,8 @@ void GdbEngine::handleResponse(const QByteArray &buff)
QByteArray id = result.findChild("id").data();
if (!id.isEmpty())
showStatusMessage(tr("Library %1 loaded.").arg(_(id)), 1000);
+ int progress = m_progress->progressValue();
+ m_progress->setProgressValue(qMin(70, progress + 1));
invalidateSourcesList();
} else if (asyncClass == "library-unloaded") {
// Archer has 'id="/usr/lib/libdrm.so.2",
@@ -429,6 +436,8 @@ void GdbEngine::handleResponse(const QByteArray &buff)
invalidateSourcesList();
} else if (asyncClass == "thread-group-created") {
// Archer has "{id="28902"}"
+ int progress = m_progress->progressValue();
+ m_progress->setProgressValue(qMin(70, progress + 1));
QByteArray id = result.findChild("id").data();
showStatusMessage(tr("Thread group %1 created.").arg(_(id)), 1000);
int pid = id.toInt();
@@ -534,6 +543,10 @@ void GdbEngine::handleResponse(const QByteArray &buff)
if (resultClass == "done") {
response.resultClass = GdbResultDone;
} else if (resultClass == "running") {
+ if (m_progress) {
+ m_progress->setProgressValue(100);
+ m_progress->reportFinished();
+ }
if (state() == InferiorStopped) { // Result of manual command.
m_manager->resetLocation();
setTokenBarrier();
@@ -1565,6 +1578,8 @@ QString GdbEngine::cleanupFullName(const QString &fileName)
void GdbEngine::shutdown()
{
debugMessage(_("INITIATE GDBENGINE SHUTDOWN"));
+ if (m_progress)
+ m_progress->reportCanceled();
switch (state()) {
case DebuggerNotReady: // Nothing to do! :)
case EngineStarting: // We can't get here, really
@@ -1724,6 +1739,13 @@ void GdbEngine::startDebugger(const DebuggerStartParametersPtr &sp)
initializeVariables();
+ m_progress = new QFutureInterface<void>();
+ m_progress->setProgressRange(0, 100);
+ Core::FutureProgress *fp = Core::ICore::instance()->progressManager()
+ ->addTask(m_progress->future(), tr("Launching"), _("Debugger.Launcher"));
+ fp->setKeepOnFinish(false);
+ m_progress->reportStarted();
+
m_startParameters = sp;
delete m_gdbAdapter;
@@ -1733,6 +1755,7 @@ void GdbEngine::startDebugger(const DebuggerStartParametersPtr &sp)
if (m_gdbAdapter->dumperHandling() != AbstractGdbAdapter::DumperNotAvailable)
connectDebuggingHelperActions();
+ m_progress->setProgressValue(20);
m_gdbAdapter->startAdapter();
}
@@ -2931,11 +2954,35 @@ void GdbEngine::handleRegisterListValues(const GdbResponse &response)
Registers registers = manager()->registerHandler()->registers();
// 24^done,register-values=[{number="0",value="0xf423f"},...]
- foreach (const GdbMi &item, response.data.findChild("register-values").children()) {
- int index = item.findChild("number").data().toInt();
+ const GdbMi values = response.data.findChild("register-values");
+ foreach (const GdbMi &item, values.children()) {
+ const int index = item.findChild("number").data().toInt();
if (index < registers.size()) {
Register ® = registers[index];
- QString value = _(item.findChild("value").data());
+ GdbMi val = item.findChild("value");
+ QByteArray ba;
+ bool handled = false;
+ if (val.data().startsWith("{")) {
+ int pos1 = val.data().indexOf("v2_int32");
+ if (pos1 == -1)
+ pos1 = val.data().indexOf("v4_int32");
+ if (pos1 != -1) {
+ // FIXME: This block wastes cycles.
+ pos1 = val.data().indexOf("{", pos1 + 1) + 1;
+ int pos2 = val.data().indexOf("}", pos1);
+ QByteArray ba2 = val.data().mid(pos1, pos2 - pos1);
+ foreach (QByteArray ba3, ba2.split(',')) {
+ ba3 = ba3.trimmed();
+ QTC_ASSERT(ba3.size() >= 3, continue);
+ QTC_ASSERT(ba3.size() <= 10, continue);
+ ba.prepend(QByteArray(10 - ba3.size(), '0'));
+ ba.prepend(ba3.mid(2));
+ }
+ ba.prepend("0x");
+ handled = true;
+ }
+ }
+ const QString value = _(handled ? ba : val.data());
reg.changed = (value != reg.value);
if (reg.changed)
reg.value = value;
@@ -3918,6 +3965,7 @@ bool GdbEngine::startGdb(const QStringList &args, const QString &gdb, const QStr
#ifdef Q_OS_WIN
// Set python path. By convention, python is located below gdb executable.
const QFileInfo fi(location);
+ bool foundPython = false;
if (fi.isAbsolute()) {
const QString winPythonVersion = QLatin1String(winPythonVersionC);
const QDir dir = fi.absoluteDir();
@@ -3937,8 +3985,13 @@ bool GdbEngine::startGdb(const QStringList &args, const QString &gdb, const QStr
_("Python path: %1").arg(pythonPath));
m_gdbProc.setProcessEnvironment(environment);
}
+ foundPython = true;
}
}
+ if (!foundPython) {
+ debugMessage(_("UNSUPPORTED GDB %1 DOES NOT HAVE PYTHON.").arg(location));
+ showStatusMessage(_("Gdb at %1 does not have python.").arg(location));
+ }
#endif
connect(&m_gdbProc, SIGNAL(error(QProcess::ProcessError)),
@@ -4106,6 +4159,8 @@ void GdbEngine::handleGdbFinished(int code, QProcess::ExitStatus type)
void GdbEngine::handleAdapterStartFailed(const QString &msg, const QString &settingsIdHint)
{
+ if (m_progress)
+ m_progress->setProgressValue(30);
setState(AdapterStartFailed);
debugMessage(_("ADAPTER START FAILED"));
if (!msg.isEmpty()) {
@@ -4123,6 +4178,8 @@ void GdbEngine::handleAdapterStartFailed(const QString &msg, const QString &sett
void GdbEngine::handleAdapterStarted()
{
setState(AdapterStarted);
+ if (m_progress)
+ m_progress->setProgressValue(25);
debugMessage(_("ADAPTER SUCCESSFULLY STARTED"));
showStatusMessage(tr("Starting inferior..."));
diff --git a/src/plugins/debugger/gdb/gdbengine.h b/src/plugins/debugger/gdb/gdbengine.h
index e9d5a7a13657811f3e73274730249ed52b7ff1fa..3d989194eb88d459e04b990ef8ddec10d95a0efc 100644
--- a/src/plugins/debugger/gdb/gdbengine.h
+++ b/src/plugins/debugger/gdb/gdbengine.h
@@ -36,6 +36,7 @@
#include "watchutils.h"
#include <QtCore/QByteArray>
+#include <QtCore/QFutureInterface>
#include <QtCore/QHash>
#include <QtCore/QMap>
#include <QtCore/QObject>
@@ -321,6 +322,7 @@ private: ////////// Inferior Management //////////
QByteArray m_entryPoint;
#endif
+ QFutureInterface<void> *m_progress;
private: ////////// View & Data Stuff //////////
diff --git a/src/plugins/debugger/gdb/plaingdbadapter.cpp b/src/plugins/debugger/gdb/plaingdbadapter.cpp
index fb0ce258883bd0e79e52ed508bb7a8185eb39905..05c6b426471c8a47f9692a2c63f5735224ad4c74 100644
--- a/src/plugins/debugger/gdb/plaingdbadapter.cpp
+++ b/src/plugins/debugger/gdb/plaingdbadapter.cpp
@@ -123,8 +123,11 @@ void PlainGdbAdapter::handleFileExecAndSymbols(const GdbResponse &response)
#endif
emit inferiorPrepared();
} else {
- QString msg = tr("Starting executable failed:\n") +
- QString::fromLocal8Bit(response.data.findChild("msg").data());
+ QByteArray ba = response.data.findChild("msg").data();
+ QString msg = QString::fromLocal8Bit(ba);
+ // Extend the message a bit in unknown cases.
+ if (!ba.endsWith("File format not recognized"))
+ msg = tr("Starting executable failed:\n") + msg;
emit inferiorStartFailed(msg);
}
}
diff --git a/src/plugins/debugger/images/Continue.png b/src/plugins/debugger/images/Continue.png
deleted file mode 100644
index f3dd72b56d99fe9b78d672506bd408674c6a67bd..0000000000000000000000000000000000000000
Binary files a/src/plugins/debugger/images/Continue.png and /dev/null differ
diff --git a/src/plugins/debugger/images/empty14.png b/src/plugins/debugger/images/debugger_empty_14.png
similarity index 100%
rename from src/plugins/debugger/images/empty14.png
rename to src/plugins/debugger/images/debugger_empty_14.png
diff --git a/src/plugins/debugger/images/debugger_reversemode.svg b/src/plugins/debugger/images/debugger_reversemode.svg
new file mode 100644
index 0000000000000000000000000000000000000000..5f492bccdb680663a1b2e2e67882e135233dd9c3
--- /dev/null
+++ b/src/plugins/debugger/images/debugger_reversemode.svg
@@ -0,0 +1,174 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://creativecommons.org/ns#"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:xlink="http://www.w3.org/1999/xlink"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ inkscape:output_extension="org.inkscape.output.svg.inkscape"
+ sodipodi:docname="reverse.svg"
+ version="1.0"
+ inkscape:version="0.47pre4 r22446"
+ sodipodi:version="0.32"
+ id="svg2243"
+ height="14"
+ width="14">
+ <defs
+ id="defs2245">
+ <inkscape:perspective
+ sodipodi:type="inkscape:persp3d"
+ inkscape:vp_x="0 : 7 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_z="14 : 7 : 1"
+ inkscape:persp3d-origin="7 : 4.6666667 : 1"
+ id="perspective18" />
+ <linearGradient
+ id="linearGradient3134">
+ <stop
+ style="stop-color:#dcdc23;stop-opacity:1;"
+ offset="0"
+ id="stop3136" />
+ <stop
+ id="stop5080"
+ offset="0.64285713"
+ style="stop-color:#e5d044;stop-opacity:1;" />
+ <stop
+ style="stop-color:#b89354;stop-opacity:1;"
+ offset="1"
+ id="stop3138" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient3137">
+ <stop
+ style="stop-color:#ffffff;stop-opacity:0.86274511;"
+ offset="0"
+ id="stop3139" />
+ <stop
+ style="stop-color:#ffffff;stop-opacity:0;"
+ offset="1"
+ id="stop3141" />
+ </linearGradient>
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient3137"
+ id="linearGradient3143"
+ x1="6.5"
+ y1="3"
+ x2="6.515625"
+ y2="12.180227"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(-0.88,0,0,-0.66666667,12.72,12.666667)" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient3134"
+ id="linearGradient3140"
+ x1="6.5"
+ y1="3.015625"
+ x2="6.484375"
+ y2="11.984375"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(-1,0,0,-1,14,15)" />
+ <filter
+ id="filter6985"
+ inkscape:label="Moonarize"
+ inkscape:menu="Color"
+ inkscape:menu-tooltip="An effect between solarize and invert which often preserves sky and water lights"
+ y="0"
+ x="0"
+ height="1"
+ width="1"
+ color-interpolation-filters="sRGB">
+ <feColorMatrix
+ id="feColorMatrix6987"
+ type="hueRotate"
+ values="180"
+ result="fbSourceGraphic" />
+ <feColorMatrix
+ id="feColorMatrix6989"
+ in="fbSourceGraphic"
+ values="-1 0 0 0 1 0 -1 0 0 1 0 0 -1 0 1 0 0 0 1 0 "
+ result="result3" />
+ <feBlend
+ id="feBlend6991"
+ in2="result3"
+ mode="lighten"
+ in="fbSourceGraphic"
+ result="result2" />
+ <feBlend
+ id="feBlend6993"
+ in2="result2"
+ mode="multiply"
+ result="result1"
+ in="result2" />
+ <feComposite
+ id="feComposite6995"
+ in2="SourceGraphic"
+ operator="in" />
+ </filter>
+ </defs>
+ <sodipodi:namedview
+ id="base"
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1.0"
+ gridtolerance="10000"
+ guidetolerance="10"
+ objecttolerance="10"
+ inkscape:pageopacity="0.0"
+ inkscape:pageshadow="2"
+ inkscape:zoom="64"
+ inkscape:cx="8.3920091"
+ inkscape:cy="7.4257237"
+ inkscape:document-units="px"
+ inkscape:current-layer="layer1"
+ width="14px"
+ height="14px"
+ showborder="true"
+ inkscape:window-width="1600"
+ inkscape:window-height="1174"
+ inkscape:window-x="0"
+ inkscape:window-y="0"
+ showgrid="true"
+ inkscape:grid-points="true"
+ inkscape:window-maximized="0">
+ <inkscape:grid
+ id="GridFromPre046Settings"
+ type="xygrid"
+ originx="0px"
+ originy="0px"
+ spacingx="0.5px"
+ spacingy="0.5px"
+ color="#0000ff"
+ empcolor="#0000ff"
+ opacity="0.2"
+ empopacity="0.4"
+ empspacing="2" />
+ </sodipodi:namedview>
+ <metadata
+ id="metadata2248">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ <dc:title></dc:title>
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <g
+ inkscape:label="Layer 1"
+ inkscape:groupmode="layer"
+ id="layer1">
+ <path
+ style="fill:url(#linearGradient3140);fill-opacity:1;fill-rule:evenodd;stroke:#b18b1b;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;filter:url(#filter6985)"
+ d="m 7.5,12 0,-2.5 6,0 0,-4 -6,0 L 7.5,3 0.875,7.5 7.5,12 z"
+ id="path2216"
+ sodipodi:nodetypes="cccccccc" />
+ </g>
+</svg>
diff --git a/src/plugins/debugger/images/debugger_reversemode_16.png b/src/plugins/debugger/images/debugger_reversemode_16.png
new file mode 100644
index 0000000000000000000000000000000000000000..784914515d7da6f73f91e3e0032f5aa75c349d36
Binary files /dev/null and b/src/plugins/debugger/images/debugger_reversemode_16.png differ
diff --git a/src/plugins/debugger/images/SingleInstructionMode.png b/src/plugins/debugger/images/debugger_singleinstructionmode.png
similarity index 100%
rename from src/plugins/debugger/images/SingleInstructionMode.png
rename to src/plugins/debugger/images/debugger_singleinstructionmode.png
diff --git a/src/plugins/debugger/images/delete.png b/src/plugins/debugger/images/delete.png
deleted file mode 100644
index e4139afc552b36d5d1aabf2fe2697d00d61b6d70..0000000000000000000000000000000000000000
Binary files a/src/plugins/debugger/images/delete.png and /dev/null differ
diff --git a/src/plugins/debugger/images/done.png b/src/plugins/debugger/images/done.png
deleted file mode 100644
index b5238f7680a8aae6176f715786077081f5e02904..0000000000000000000000000000000000000000
Binary files a/src/plugins/debugger/images/done.png and /dev/null differ
diff --git a/src/plugins/debugger/images/error.png b/src/plugins/debugger/images/error.png
deleted file mode 100644
index 700530438a56329decd5d9a2a10cf1bd434c50c4..0000000000000000000000000000000000000000
Binary files a/src/plugins/debugger/images/error.png and /dev/null differ
diff --git a/src/plugins/debugger/images/newitem.png b/src/plugins/debugger/images/newitem.png
deleted file mode 100644
index 7e26ea9b15b3a3eff805a859f51dd5eb5be95e44..0000000000000000000000000000000000000000
Binary files a/src/plugins/debugger/images/newitem.png and /dev/null differ
diff --git a/src/plugins/debugger/images/running.png b/src/plugins/debugger/images/running.png
deleted file mode 100644
index 1cf8888ecb8bca103fc3befad8e02e478c0d215d..0000000000000000000000000000000000000000
Binary files a/src/plugins/debugger/images/running.png and /dev/null differ
diff --git a/src/plugins/debugger/snapshothandler.cpp b/src/plugins/debugger/snapshothandler.cpp
index af6bb22b771aeef2a67e745ce28c7e736f211cb8..6eee3850ad7a8dd779e54c1dc03009f617ddaf0e 100644
--- a/src/plugins/debugger/snapshothandler.cpp
+++ b/src/plugins/debugger/snapshothandler.cpp
@@ -112,7 +112,7 @@ QDebug operator<<(QDebug d, const SnapshotData &f)
SnapshotHandler::SnapshotHandler(QObject *parent)
: QAbstractTableModel(parent),
m_positionIcon(QIcon(":/debugger/images/location_16.png")),
- m_emptyIcon(QIcon(":/debugger/images/empty14.png"))
+ m_emptyIcon(QIcon(":/debugger/images/debugger_empty_14.png"))
{
m_currentIndex = 0;
connect(theDebuggerAction(OperateByInstruction), SIGNAL(triggered()),
diff --git a/src/plugins/debugger/stackhandler.cpp b/src/plugins/debugger/stackhandler.cpp
index 05faf0d96fcd8e4ef6379a8f8338cce93873a005..5913d0c30d39179ab344645bd54672f234a9eba9 100644
--- a/src/plugins/debugger/stackhandler.cpp
+++ b/src/plugins/debugger/stackhandler.cpp
@@ -115,7 +115,7 @@ QDebug operator<<(QDebug d, const StackFrame &f)
StackHandler::StackHandler(QObject *parent)
: QAbstractTableModel(parent),
m_positionIcon(QIcon(":/debugger/images/location_16.png")),
- m_emptyIcon(QIcon(":/debugger/images/empty14.png"))
+ m_emptyIcon(QIcon(":/debugger/images/debugger_empty_14.png"))
{
m_currentIndex = 0;
m_canExpand = false;
@@ -289,7 +289,7 @@ ThreadsHandler::ThreadsHandler(QObject *parent) :
QAbstractTableModel(parent),
m_currentIndex(0),
m_positionIcon(QLatin1String(":/debugger/images/location_16.png")),
- m_emptyIcon(QLatin1String(":/debugger/images/empty14.png"))
+ m_emptyIcon(QLatin1String(":/debugger/images/debugger_empty_14.png"))
{
}
diff --git a/src/plugins/debugger/watchhandler.cpp b/src/plugins/debugger/watchhandler.cpp
index 66794218e01c75bf9f8ff1cb85f1784fce7dca38..ff7eab54fcbc585372a0874f421a55bd41820f62 100644
--- a/src/plugins/debugger/watchhandler.cpp
+++ b/src/plugins/debugger/watchhandler.cpp
@@ -1201,6 +1201,7 @@ void WatchHandler::endCycle()
m_locals->endCycle();
m_watchers->endCycle();
m_tooltips->endCycle();
+ m_manager->updateWatchersWindow();
}
void WatchHandler::cleanup()
diff --git a/src/plugins/debugger/watchhandler.h b/src/plugins/debugger/watchhandler.h
index 37a6d174fabc02634a88423dde4b8f3a630917e6..d3e4a3df43edec87da16eebe9446381436b94030 100644
--- a/src/plugins/debugger/watchhandler.h
+++ b/src/plugins/debugger/watchhandler.h
@@ -174,12 +174,15 @@ private:
explicit WatchModel(WatchHandler *handler, WatchType type);
virtual ~WatchModel();
+public:
+ int rowCount(const QModelIndex &idx) const;
+ int columnCount(const QModelIndex &idx) const;
+
+private:
QVariant data(const QModelIndex &index, int role) const;
bool setData(const QModelIndex &index, const QVariant &value, int role);
QModelIndex index(int, int, const QModelIndex &idx) const;
QModelIndex parent(const QModelIndex &idx) const;
- int rowCount(const QModelIndex &idx) const;
- int columnCount(const QModelIndex &idx) const;
bool hasChildren(const QModelIndex &idx) const;
Qt::ItemFlags flags(const QModelIndex &idx) const;
QVariant headerData(int section, Qt::Orientation orientation,
diff --git a/src/plugins/debugger/watchutils.cpp b/src/plugins/debugger/watchutils.cpp
index 0e3e7f81387a98851f70d2d4a3023e511f357748..bcb17050feefec7add6d5ed4375a4e1943a95dae 100644
--- a/src/plugins/debugger/watchutils.cpp
+++ b/src/plugins/debugger/watchutils.cpp
@@ -539,6 +539,7 @@ bool isIntType(const QString &type)
<< QLatin1String("long") << QLatin1String("bool")
<< QLatin1String("signed char") << QLatin1String("unsigned")
<< QLatin1String("unsigned char") << QLatin1String("unsigned long")
+ << QLatin1String("short") << QLatin1String("unsigned short")
<< QLatin1String("long long") << QLatin1String("unsigned long long")
<< QLatin1String("qint16") << QLatin1String("quint16")
<< QLatin1String("qint32") << QLatin1String("quint32")
diff --git a/src/plugins/designer/formeditorw.cpp b/src/plugins/designer/formeditorw.cpp
index 71daf719c1bf90ebbde415e5b219d41ca4083a0e..dbc133d29a322bf9b2e841d9c41fbb50caa33243 100644
--- a/src/plugins/designer/formeditorw.cpp
+++ b/src/plugins/designer/formeditorw.cpp
@@ -176,9 +176,7 @@ FormEditorW::FormEditorW() :
QTC_ASSERT(m_fwm, return);
Core::UniqueIDManager *idMan = Core::UniqueIDManager::instance();
- m_contexts << idMan->uniqueIdentifier(QLatin1String(Designer::Constants::C_FORMEDITOR))
- << idMan->uniqueIdentifier(QLatin1String(Core::Constants::C_EDITORMANAGER))
- << idMan->uniqueIdentifier(QLatin1String(Core::Constants::C_DESIGN_MODE));
+ m_contexts << idMan->uniqueIdentifier(QLatin1String(Designer::Constants::C_FORMEDITOR));
setupActions();
@@ -333,7 +331,7 @@ void FormEditorW::fullInit()
m_context = new DesignerContext(m_contexts, m_modeWidget, this);
m_core->addContextObject(m_context);
- m_designMode->registerDesignWidget(m_modeWidget, QStringList(QLatin1String(FORM_MIMETYPE)));
+ m_designMode->registerDesignWidget(m_modeWidget, QStringList(QLatin1String(FORM_MIMETYPE)), m_contexts);
setupViewActions();
@@ -360,7 +358,7 @@ void FormEditorW::initDesignerSubWindows()
m_designerSubWindows[PropertyEditorSubWindow] = pe;
QWidget *se = QDesignerComponents::createSignalSlotEditor(m_formeditor, 0);
- se->setWindowTitle(tr("Signals & Slots Editor"));
+ se->setWindowTitle(tr("Signals && Slots Editor"));
m_designerSubWindows[SignalSlotEditorSubWindow] = se;
QDesignerActionEditorInterface *ae = QDesignerComponents::createActionEditor(m_formeditor, 0);
@@ -428,93 +426,90 @@ void FormEditorW::setupActions()
command->setAttribute(Core::Command::CA_Hide);
medit->addAction(command, Core::Constants::G_EDIT_COPYPASTE);
- QList<int> globalcontext;
- globalcontext << m_core->uniqueIDManager()->uniqueIdentifier(Core::Constants::C_GLOBAL);
-
m_actionGroupEditMode = new QActionGroup(this);
m_actionGroupEditMode->setExclusive(true);
connect(m_actionGroupEditMode, SIGNAL(triggered(QAction*)), this, SLOT(activateEditMode(QAction*)));
m_modeActionSeparator = new QAction(this);
m_modeActionSeparator->setSeparator(true);
- command = am->registerAction(m_modeActionSeparator, QLatin1String("FormEditor.Sep.ModeActions"), globalcontext);
+ command = am->registerAction(m_modeActionSeparator, QLatin1String("FormEditor.Sep.ModeActions"), m_contexts);
medit->addAction(command, Core::Constants::G_EDIT_OTHER);
m_toolActionIds.push_back(QLatin1String("FormEditor.WidgetEditor"));
- createEditModeAction(m_actionGroupEditMode, globalcontext, am, medit,
+ createEditModeAction(m_actionGroupEditMode, m_contexts, am, medit,
tr("Edit widgets"), m_toolActionIds.back(),
EditModeWidgetEditor, QLatin1String("widgettool.png"), tr("F3"));
m_toolActionIds.push_back(QLatin1String("FormEditor.SignalsSlotsEditor"));
- createEditModeAction(m_actionGroupEditMode, globalcontext, am, medit,
+ createEditModeAction(m_actionGroupEditMode, m_contexts, am, medit,
tr("Edit signals/slots"), m_toolActionIds.back(),
EditModeSignalsSlotEditor, QLatin1String("signalslottool.png"), tr("F4"));
m_toolActionIds.push_back(QLatin1String("FormEditor.BuddyEditor"));
- createEditModeAction(m_actionGroupEditMode, globalcontext, am, medit,
+ createEditModeAction(m_actionGroupEditMode, m_contexts, am, medit,
tr("Edit buddies"), m_toolActionIds.back(),
EditModeBuddyEditor, QLatin1String("buddytool.png"));
m_toolActionIds.push_back(QLatin1String("FormEditor.TabOrderEditor"));
- createEditModeAction(m_actionGroupEditMode, globalcontext, am, medit,
+ createEditModeAction(m_actionGroupEditMode, m_contexts, am, medit,
tr("Edit tab order"), m_toolActionIds.back(),
EditModeTabOrderEditor, QLatin1String("tabordertool.png"));
//tool actions
m_toolActionIds.push_back(QLatin1String("FormEditor.LayoutHorizontally"));
const QString horizLayoutShortcut = osMac ? tr("Meta+H") : tr("Ctrl+H");
- addToolAction(m_fwm->actionHorizontalLayout(), am, globalcontext,
+ addToolAction(m_fwm->actionHorizontalLayout(), am, m_contexts,
m_toolActionIds.back(), mformtools, horizLayoutShortcut);
m_toolActionIds.push_back(QLatin1String("FormEditor.LayoutVertically"));
const QString vertLayoutShortcut = osMac ? tr("Meta+L") : tr("Ctrl+L");
- addToolAction(m_fwm->actionVerticalLayout(), am, globalcontext,
+ addToolAction(m_fwm->actionVerticalLayout(), am, m_contexts,
m_toolActionIds.back(), mformtools, vertLayoutShortcut);
m_toolActionIds.push_back(QLatin1String("FormEditor.SplitHorizontal"));
- addToolAction(m_fwm->actionSplitHorizontal(), am, globalcontext,
+ addToolAction(m_fwm->actionSplitHorizontal(), am, m_contexts,
m_toolActionIds.back(), mformtools);
m_toolActionIds.push_back(QLatin1String("FormEditor.SplitVertical"));
- addToolAction(m_fwm->actionSplitVertical(), am, globalcontext,
+ addToolAction(m_fwm->actionSplitVertical(), am, m_contexts,
m_toolActionIds.back(), mformtools);
m_toolActionIds.push_back(QLatin1String("FormEditor.LayoutForm"));
- addToolAction(m_fwm->actionFormLayout(), am, globalcontext,
+ addToolAction(m_fwm->actionFormLayout(), am, m_contexts,
m_toolActionIds.back(), mformtools);
m_toolActionIds.push_back(QLatin1String("FormEditor.LayoutGrid"));
const QString gridShortcut = osMac ? tr("Meta+G") : tr("Ctrl+G");
- addToolAction(m_fwm->actionGridLayout(), am, globalcontext,
+ addToolAction(m_fwm->actionGridLayout(), am, m_contexts,
m_toolActionIds.back(), mformtools, gridShortcut);
m_toolActionIds.push_back(QLatin1String("FormEditor.LayoutBreak"));
- addToolAction(m_fwm->actionBreakLayout(), am, globalcontext,
+ addToolAction(m_fwm->actionBreakLayout(), am, m_contexts,
m_toolActionIds.back(), mformtools);
m_toolActionIds.push_back(QLatin1String("FormEditor.LayoutAdjustSize"));
const QString adjustShortcut = osMac ? tr("Meta+J") : tr("Ctrl+J");
- addToolAction(m_fwm->actionAdjustSize(), am, globalcontext,
+ addToolAction(m_fwm->actionAdjustSize(), am, m_contexts,
m_toolActionIds.back(), mformtools, adjustShortcut);
m_toolActionIds.push_back(QLatin1String("FormEditor.SimplifyLayout"));
- addToolAction(m_fwm->actionSimplifyLayout(), am, globalcontext,
+ addToolAction(m_fwm->actionSimplifyLayout(), am, m_contexts,
m_toolActionIds.back(), mformtools);
createSeparator(this, am, m_contexts, mformtools, QLatin1String("FormEditor.Menu.Tools.Separator1"));
- addToolAction(m_fwm->actionLower(), am, globalcontext,
+ addToolAction(m_fwm->actionLower(), am, m_contexts,
QLatin1String("FormEditor.Lower"), mformtools);
- addToolAction(m_fwm->actionRaise(), am, globalcontext,
+ addToolAction(m_fwm->actionRaise(), am, m_contexts,
QLatin1String("FormEditor.Raise"), mformtools);
// Commands that do not go into the editor toolbar
- createSeparator(this, am, globalcontext, mformtools, QLatin1String("FormEditor.Menu.Tools.Separator2"));
+ createSeparator(this, am, m_contexts, mformtools, QLatin1String("FormEditor.Menu.Tools.Separator2"));
m_actionPreview = m_fwm->actionDefaultPreview();
QTC_ASSERT(m_actionPreview, return);
- addToolAction(m_actionPreview, am, globalcontext,
+ addToolAction(m_actionPreview, am, m_contexts,
QLatin1String("FormEditor.Preview"), mformtools, tr("Ctrl+Alt+R"));
// Preview in style...
@@ -524,19 +519,19 @@ void FormEditorW::setupActions()
// Form settings
createSeparator(this, am, m_contexts, medit, QLatin1String("FormEditor.Edit.Separator2"), Core::Constants::G_EDIT_OTHER);
- createSeparator(this, am, globalcontext, mformtools, QLatin1String("FormEditor.Menu.Tools.Separator3"));
+ createSeparator(this, am, m_contexts, mformtools, QLatin1String("FormEditor.Menu.Tools.Separator3"));
QAction *actionFormSettings = m_fwm->actionShowFormWindowSettingsDialog();
- addToolAction(actionFormSettings, am, globalcontext, QLatin1String("FormEditor.FormSettings"), mformtools);
+ addToolAction(actionFormSettings, am, m_contexts, QLatin1String("FormEditor.FormSettings"), mformtools);
- createSeparator(this, am, globalcontext, mformtools, QLatin1String("FormEditor.Menu.Tools.Separator4"));
+ createSeparator(this, am, m_contexts, mformtools, QLatin1String("FormEditor.Menu.Tools.Separator4"));
m_actionAboutPlugins = new QAction(tr("About Qt Designer plugins...."), this);
- addToolAction(m_actionAboutPlugins, am, globalcontext,
+ addToolAction(m_actionAboutPlugins, am, m_contexts,
QLatin1String("FormEditor.AboutPlugins"), mformtools);
connect(m_actionAboutPlugins, SIGNAL(triggered()), m_fwm, SLOT(aboutPlugins()));
m_actionAboutPlugins->setEnabled(false);
// Views. Populated later on.
- createSeparator(this, am, globalcontext, mformtools, QLatin1String("FormEditor.Menu.Tools.SeparatorViews"));
+ createSeparator(this, am, m_contexts, mformtools, QLatin1String("FormEditor.Menu.Tools.SeparatorViews"));
m_viewMenu = am->createMenu(QLatin1String(M_FORMEDITOR_VIEWS));
m_viewMenu->menu()->setTitle(tr("Views"));
@@ -639,6 +634,7 @@ QAction *FormEditorW::createEditModeAction(QActionGroup *ag,
if (!iconName.isEmpty())
rc->setIcon(designerIcon(iconName));
Core::Command *command = am->registerAction(rc, name, context);
+ command->setAttribute(Core::Command::CA_Hide);
if (!keySequence.isEmpty())
command->setDefaultKeySequence(QKeySequence(keySequence));
bindShortcut(command, rc);
@@ -715,12 +711,6 @@ void FormEditorW::currentEditorChanged(Core::IEditor *editor)
QTC_ASSERT(fw, return)
m_editorWidget->setVisibleEditor(xmlEditor);
m_fwm->setActiveFormWindow(fw->formWindow());
- m_actionGroupEditMode->setVisible(true);
- m_modeActionSeparator->setVisible(true);
- } else {
- // Deactivate Designer if a non-form is being edited
- m_actionGroupEditMode->setVisible(false);
- m_modeActionSeparator->setVisible(false);
}
}
diff --git a/src/plugins/designer/formwindowfile.cpp b/src/plugins/designer/formwindowfile.cpp
index 6851d5ed934dc378bbf3184ac12e3a835fc244b6..e95e4b92be2263b330fd56e6b6fdf39909d63c69 100644
--- a/src/plugins/designer/formwindowfile.cpp
+++ b/src/plugins/designer/formwindowfile.cpp
@@ -111,43 +111,26 @@ bool FormWindowFile::isSaveAsAllowed() const
return true;
}
-void FormWindowFile::modified(Core::IFile::ReloadBehavior *behavior)
+Core::IFile::ReloadBehavior FormWindowFile::reloadBehavior(ChangeTrigger state, ChangeType type) const
{
- if (Designer::Constants::Internal::debug)
- qDebug() << Q_FUNC_INFO << m_fileName << *behavior;
+ if (type == TypePermissions)
+ return BehaviorSilent;
+ if (type == TypeContents) {
+ if (state == TriggerInternal && !isModified())
+ return BehaviorSilent;
+ return BehaviorAsk;
+ }
+ return BehaviorAsk;
+}
- switch (*behavior) {
- case Core::IFile::ReloadNone:
- return;
- case Core::IFile::ReloadUnmodified:
- if (!isModified()) {
- reload(m_fileName);
- return;
- }
- break;
- case Core::IFile::ReloadAll:
- emit reload(m_fileName);
+void FormWindowFile::reload(ReloadFlag flag, ChangeType type)
+{
+ if (flag == FlagIgnore)
return;
- case Core::IFile::ReloadPermissions:
+ if (type == TypePermissions) {
emit changed();
- return;
- case Core::IFile::AskForReload:
- break;
- }
-
- switch (Utils::reloadPrompt(m_fileName, isModified(), Core::ICore::instance()->mainWindow())) {
- case Utils::ReloadCurrent:
- emit reload(m_fileName);
- break;
- case Utils::ReloadAll:
+ } else {
emit reload(m_fileName);
- *behavior = Core::IFile::ReloadAll;
- break;
- case Utils::ReloadSkipCurrent:
- break;
- case Utils::ReloadNone:
- *behavior = Core::IFile::ReloadNone;
- break;
}
}
diff --git a/src/plugins/designer/formwindowfile.h b/src/plugins/designer/formwindowfile.h
index 5c08cc8b732bae545d929f7d83ae1d228e8ffd52..5ac62ac4f04157eb77375b0ddf2014d1bbce9037 100644
--- a/src/plugins/designer/formwindowfile.h
+++ b/src/plugins/designer/formwindowfile.h
@@ -55,7 +55,8 @@ public:
virtual bool isModified() const;
virtual bool isReadOnly() const;
virtual bool isSaveAsAllowed() const;
- virtual void modified(Core::IFile::ReloadBehavior *behavior);
+ ReloadBehavior reloadBehavior(ChangeTrigger state, ChangeType type) const;
+ void reload(ReloadFlag flag, ChangeType type);
virtual QString defaultPath() const;
virtual QString suggestedFileName() const;
virtual QString mimeType() const;
diff --git a/src/plugins/fakevim/fakevimhandler.cpp b/src/plugins/fakevim/fakevimhandler.cpp
index 148706b4cea5c0387039cdb3e88f2fef085a9984..4ad0abb42605d47424c361659824e85db455f7d4 100644
--- a/src/plugins/fakevim/fakevimhandler.cpp
+++ b/src/plugins/fakevim/fakevimhandler.cpp
@@ -160,13 +160,15 @@ enum SubSubMode
// typically used for things that require one more data item
// and are 'nested' behind a mode
NoSubSubMode,
- FtSubSubMode, // used for f, F, t, T
- MarkSubSubMode, // used for m
- BackTickSubSubMode, // used for `
- TickSubSubMode, // used for '
+ FtSubSubMode, // used for f, F, t, T
+ MarkSubSubMode, // used for m
+ BackTickSubSubMode, // used for `
+ TickSubSubMode, // used for '
InvertCaseSubSubMode, // used for ~
- DownCaseSubSubMode, // used for gu
- UpCaseSubSubMode, // used for gU
+ DownCaseSubSubMode, // used for gu
+ UpCaseSubSubMode, // used for gU
+ ReplaceSubSubMode, // used for r after visual mode
+ TextObjectSubSubMode, // used for f, F, t, T
};
enum VisualMode
@@ -288,9 +290,11 @@ public:
EventResult handleEvent(QKeyEvent *ev);
bool wantsOverride(QKeyEvent *ev);
- void handleCommand(const QString &cmd); // sets m_tc + handleExCommand
+ void handleCommand(const QString &cmd); // Sets m_tc + handleExCommand
void handleExCommand(const QString &cmd);
- void fixMarks(int positionAction, int positionChange); //Updates marks positions by the difference in positionChange
+
+ // updates marks positions by the difference in positionChange
+ void fixMarks(int positionAction, int positionChange);
void installEventFilter();
void passShortcuts(bool enable);
@@ -307,6 +311,7 @@ public:
EventResult handleCommandMode(int key, int unmodified, const QString &text);
EventResult handleRegisterMode(int key, int unmodified, const QString &text);
EventResult handleMiniBufferModes(int key, int unmodified, const QString &text);
+ EventResult handleCommandSubSubMode(int key, int unmodified, const QString &text);
void finishMovement(const QString &dotCommand = QString());
void finishMovement(const QString &dotCommand, int count);
void resetCommandMode();
@@ -416,6 +421,13 @@ public:
bool isVisualBlockMode() const { return m_visualMode == VisualBlockMode; }
void updateEditor();
+ void selectWordTextObject(bool inner);
+ void selectWORDTextObject(bool inner);
+ void selectSentenceTextObject(bool inner);
+ void selectParagraphTextObject(bool inner);
+ void selectBlockTextObject(bool inner, char left, char right);
+ void selectQuotedStringTextObject(bool inner, int type);
+
public:
QTextEdit *m_textedit;
QPlainTextEdit *m_plaintextedit;
@@ -427,7 +439,6 @@ public:
SubMode m_submode;
SubSubMode m_subsubmode;
int m_subsubdata;
- QString m_input;
QTextCursor m_tc;
int m_oldPosition; // copy from last event to check for external changes
int m_anchor;
@@ -474,6 +485,10 @@ public:
void downCaseSelectedText();
void downCaseTransform(int, QTextCursor *);
+ QChar m_replacingCharacter;
+ void replaceSelectedText(); // replace each character with m_replacingCharacter
+ void replaceTransform(int, QTextCursor *);
+
QString selectedText() const { return text(Range(position(), anchor())); }
QString text(const Range &range) const;
@@ -545,6 +560,13 @@ public:
QVector<CursorPosition> m_jumpListRedo;
QList<QTextEdit::ExtraSelection> m_searchSelections;
+
+ bool handleMapping(const QString &line);
+ // Mappings for a specific mode.
+ typedef QHash<QByteArray, QByteArray> ModeMappings;
+ // All mappings.
+ typedef QHash<char, ModeMappings> Mappings;
+ Mappings m_mappings;
};
QStringList FakeVimHandler::Private::m_searchHistory;
@@ -589,14 +611,17 @@ bool FakeVimHandler::Private::wantsOverride(QKeyEvent *ev)
const int mods = ev->modifiers();
KEY_DEBUG("SHORTCUT OVERRIDE" << key << " PASSING: " << m_passing);
- if (key == Key_Escape || (mods == Qt::ControlModifier && key == Key_BracketLeft)) {
+ if (key == Key_Escape) {
// Not sure this feels good. People often hit Esc several times
- //return !isNoVisualMode() || m_mode != CommandMode;
- return !m_passing;
+ if (isNoVisualMode() && m_mode == CommandMode)
+ return false;
+ return true;
}
// We are interested in overriding most Ctrl key combinations
- if (mods == Qt::ControlModifier && key >= Key_A && key <= Key_Z && key != Key_K) {
+ if (mods == Qt::ControlModifier
+ && ((key >= Key_A && key <= Key_Z && key != Key_K)
+ || key == Key_BracketLeft || key == Key_BracketRight)) {
// Ctrl-K is special as it is the Core's default notion of Locator
if (m_passing) {
KEY_DEBUG(" PASSING CTRL KEY");
@@ -664,10 +689,11 @@ EventResult FakeVimHandler::Private::handleEvent(QKeyEvent *ev)
moveRight();
if ((mods & Qt::ControlModifier) != 0) {
- key += 256;
- key += 32; // make it lower case
+ if (key >= Key_A && key <= Key_Z)
+ key = shift(key); // make it lower case
+ key = control(key);
} else if (key >= Key_A && key <= Key_Z && (mods & Qt::ShiftModifier) == 0) {
- key += 32;
+ key = shift(key);
}
QTC_ASSERT(!(m_mode != InsertMode && m_tc.atBlockEnd() && m_tc.block().length() > 1),
@@ -731,7 +757,6 @@ void FakeVimHandler::Private::setupWidget()
updateSelection();
}
- //showBlackMessage("vi emulation mode. Type :q to leave. Use , Ctrl-R to trigger run.");
updateMiniBuffer();
}
@@ -955,6 +980,10 @@ void FakeVimHandler::Private::finishMovement(const QString &dotCommand)
downCaseSelectedText();
if (!dotCommand.isEmpty())
setDotCommand("gu" + dotCommand);
+ } else if (m_subsubmode == ReplaceSubSubMode) {
+ replaceSelectedText();
+ if (!dotCommand.isEmpty())
+ setDotCommand("r" + dotCommand);
}
m_submode = NoSubMode;
m_subsubmode = NoSubSubMode;
@@ -1147,11 +1176,16 @@ void FakeVimHandler::Private::passShortcuts(bool enable)
QCoreApplication::instance()->removeEventFilter(q);
}
-EventResult FakeVimHandler::Private::handleCommandMode(int key, int unmodified,
+static bool subModeCanUseTextObjects(int submode)
+{
+ return submode == DeleteSubMode;
+}
+
+EventResult FakeVimHandler::Private::handleCommandSubSubMode(int key, int unmodified,
const QString &text)
{
+ Q_UNUSED(unmodified);
EventResult handled = EventHandled;
-
if (m_subsubmode == FtSubSubMode) {
m_semicolonType = m_subsubdata;
m_semicolonKey = key;
@@ -1166,6 +1200,72 @@ EventResult FakeVimHandler::Private::handleCommandMode(int key, int unmodified,
.arg(QChar(m_semicolonType))
.arg(QChar(m_semicolonKey)));
}
+ } else if (m_subsubmode == TextObjectSubSubMode) {
+ if (key == 'w')
+ selectWordTextObject(m_subsubdata == 'i');
+ else if (key == 'W')
+ selectWORDTextObject(m_subsubdata == 'i');
+ else if (key == 's')
+ selectSentenceTextObject(m_subsubdata == 'i');
+ else if (key == 'p')
+ selectParagraphTextObject(m_subsubdata == 'i');
+ else if (key == '[' || key == ']')
+ selectBlockTextObject(m_subsubdata == 'i', '[', ']');
+ else if (key == '(' || key == ')' || key == 'b')
+ selectBlockTextObject(m_subsubdata == 'i', '(', ')');
+ else if (key == '<' || key == '>')
+ selectBlockTextObject(m_subsubdata == 'i', '<', '>');
+ else if (key == '"' || key == '\'' || key == '`')
+ selectQuotedStringTextObject(m_subsubdata == 'i', key);
+ m_subsubmode = NoSubSubMode;
+ finishMovement();
+ } else if (m_submode == TransformSubMode && m_subsubmode == ReplaceSubSubMode) {
+ if (isVisualLineMode())
+ m_rangemode = RangeLineMode;
+ else if (isVisualBlockMode())
+ m_rangemode = RangeBlockMode;
+ if (!text.isEmpty() && text[0].isPrint()) {
+ leaveVisualMode();
+ m_replacingCharacter = text[0];
+ finishMovement();
+ }
+ } else if (m_subsubmode == MarkSubSubMode) {
+ m_marks[key] = m_tc.position();
+ m_subsubmode = NoSubSubMode;
+ } else if (m_subsubmode == BackTickSubSubMode
+ || m_subsubmode == TickSubSubMode) {
+ if (m_marks.contains(key)) {
+ setPosition(m_marks[key]);
+ if (m_subsubmode == TickSubSubMode)
+ moveToFirstNonBlankOnLine();
+ finishMovement();
+ } else {
+ showRedMessage(msgE20MarkNotSet(text));
+ }
+ m_subsubmode = NoSubSubMode;
+ } else {
+ handled = EventUnhandled;
+ }
+ return handled;
+}
+
+EventResult FakeVimHandler::Private::handleCommandMode(int key, int unmodified,
+ const QString &text)
+{
+ EventResult handled = EventHandled;
+
+ if (key == Key_Escape || key == control(Key_BracketLeft)) {
+ if (isVisualMode()) {
+ leaveVisualMode();
+ } else if (m_submode != NoSubMode) {
+ m_submode = NoSubMode;
+ m_subsubmode = NoSubSubMode;
+ finishMovement();
+ } else {
+ resetCommandMode();
+ }
+ } else if (m_subsubmode != NoSubSubMode) {
+ handleCommandSubSubMode(key, unmodified, text);
} else if (m_submode == WindowSubMode) {
emit q->windowCommandRequested(key);
m_submode = NoSubMode;
@@ -1193,6 +1293,9 @@ EventResult FakeVimHandler::Private::handleCommandMode(int key, int unmodified,
handleStartOfLine();
setTargetColumn();
finishMovement();
+ } else if (subModeCanUseTextObjects(m_submode) && (key == 'a' || key == 'i')) {
+ m_subsubmode = TextObjectSubSubMode;
+ m_subsubdata = key;
} else if (m_submode == ShiftLeftSubMode && key == '<') {
setAnchor();
moveDown(count() - 1);
@@ -1242,9 +1345,9 @@ EventResult FakeVimHandler::Private::handleCommandMode(int key, int unmodified,
// Recognize ZZ and ZQ as aliases for ":x" and ":q!".
m_submode = NoSubMode;
if (key == 'Z')
- handleCommand(QString(QLatin1Char('x')));
+ handleExCommand(QString(QLatin1Char('x')));
else if (key == 'Q')
- handleCommand("q!");
+ handleExCommand("q!");
} else if (m_submode == ReplaceSubMode) {
if (count() <= (rightDist() + atEndOfLine()) && text.size() == 1
&& (text.at(0).isPrint() || text.at(0).isSpace())) {
@@ -1261,20 +1364,6 @@ EventResult FakeVimHandler::Private::handleCommandMode(int key, int unmodified,
setTargetColumn();
m_submode = NoSubMode;
finishMovement();
- } else if (m_subsubmode == MarkSubSubMode) {
- m_marks[key] = m_tc.position();
- m_subsubmode = NoSubSubMode;
- } else if (m_subsubmode == BackTickSubSubMode
- || m_subsubmode == TickSubSubMode) {
- if (m_marks.contains(key)) {
- setPosition(m_marks[key]);
- if (m_subsubmode == TickSubSubMode)
- moveToFirstNonBlankOnLine();
- finishMovement();
- } else {
- showRedMessage(msgE20MarkNotSet(text));
- }
- m_subsubmode = NoSubSubMode;
} else if (key >= '0' && key <= '9') {
if (key == '0' && m_mvcount.isEmpty()) {
m_movetype = MoveExclusive;
@@ -1424,7 +1513,8 @@ EventResult FakeVimHandler::Private::handleCommandMode(int key, int unmodified,
setAnchor();
moveToMatchingParanthesis();
finishMovement();
- } else if (key == 'a') {
+ } else if ((!isVisualMode() && key == 'a') || (isVisualMode() && key == 'A')) {
+ leaveVisualMode();
enterInsertMode();
m_lastInsertion.clear();
if (!atEndOfLine())
@@ -1451,12 +1541,17 @@ EventResult FakeVimHandler::Private::handleCommandMode(int key, int unmodified,
moveLeft();
setAnchor();
m_submode = ChangeSubMode;
- } else if (key == 'c' && (isVisualCharMode() || isVisualLineMode())) {
- m_rangemode = isVisualCharMode() ? RangeCharMode : RangeLineMode;
- if (isVisualLineMode()) {
+ } else if ((key == 'c' || key == 'C' || key == 's' || key == 'R')
+ && (isVisualCharMode() || isVisualLineMode())) {
+ if ((key == 'c'|| key == 's') && isVisualCharMode()) {
+ leaveVisualMode();
+ m_rangemode = RangeCharMode;
+ } else {
+ leaveVisualMode();
+ m_rangemode = RangeLineMode;
+ // leaveVisualMode() has set this to MoveInclusive for visual character mode
m_movetype = MoveLineWise;
}
- leaveVisualMode();
m_submode = ChangeSubMode;
finishMovement();
} else if (key == 'C') {
@@ -1586,7 +1681,7 @@ EventResult FakeVimHandler::Private::handleCommandMode(int key, int unmodified,
moveDown(qMax(count() - 1, 0));
handleStartOfLine();
finishMovement();
- } else if (key == 'i' || key == Key_Insert) {
+ } else if (!isVisualMode() && (key == 'i' || key == Key_Insert)) {
setDotCommand(QString(QLatin1Char('i'))); // setDotCommand("%1i", count());
enterInsertMode();
updateMiniBuffer();
@@ -1651,7 +1746,7 @@ EventResult FakeVimHandler::Private::handleCommandMode(int key, int unmodified,
m_movetype = MoveExclusive;
setAnchor();
bool pastEnd = count() >= rightDist() - 1;
- moveRight(qMax(0, qMin(count(), rightDist() - (m_submode==NoSubMode))));
+ moveRight(qMax(0, qMin(count(), rightDist() - (m_submode == NoSubMode))));
setTargetColumn();
if (pastEnd && isVisualMode()) {
m_visualTargetColumn = -1;
@@ -1720,10 +1815,13 @@ EventResult FakeVimHandler::Private::handleCommandMode(int key, int unmodified,
setTargetColumn();
setDotCommand("%1p", count());
finishMovement();
+ } else if (isVisualMode() && key =='r') {
+ m_submode = TransformSubMode;
+ m_subsubmode = ReplaceSubSubMode;
} else if (key == 'r') {
m_submode = ReplaceSubMode;
setDotCommand(QString(QLatin1Char('r')));
- } else if (key == 'R') {
+ } else if (!isVisualMode() && key == 'R') {
// FIXME: right now we repeat the insertion count() times,
// but not the deletion
m_lastInsertion.clear();
@@ -1734,6 +1832,7 @@ EventResult FakeVimHandler::Private::handleCommandMode(int key, int unmodified,
} else if (key == control('r')) {
redo();
} else if (key == 's') {
+ leaveVisualMode();
if (atEndOfLine())
moveLeft();
setAnchor();
@@ -1745,9 +1844,11 @@ EventResult FakeVimHandler::Private::handleCommandMode(int key, int unmodified,
m_mvcount.clear();
enterInsertMode();
} else if (key == 'S') {
- const int line = cursorLineInDocument() + 1;
- setAnchor(firstPositionInLine(line));
- setPosition(lastPositionInLine(line + count() - 1));
+ if (!isVisualMode()) {
+ const int line = cursorLineInDocument() + 1;
+ setAnchor(firstPositionInLine(line));
+ setPosition(lastPositionInLine(line + count() - 1));
+ }
setDotCommand("%1S", count());
enterInsertMode();
m_beginEditBlock = false;
@@ -1756,18 +1857,20 @@ EventResult FakeVimHandler::Private::handleCommandMode(int key, int unmodified,
finishMovement();
} else if (m_gflag && key == 't') {
m_gflag = false;
- handleCommand("tabnext");
+ handleExCommand("tabnext");
} else if (key == 't') {
m_movetype = MoveInclusive;
m_subsubmode = FtSubSubMode;
m_subsubdata = key;
} else if (m_gflag && key == 'T') {
m_gflag = false;
- handleCommand("tabprev");
+ handleExCommand("tabprev");
} else if (key == 'T') {
m_movetype = MoveExclusive;
m_subsubmode = FtSubSubMode;
m_subsubdata = key;
+ } else if (key == control('t')) {
+ handleExCommand("pop");
} else if (!m_gflag && key == 'u') {
undo();
} else if (key == control('u')) {
@@ -1785,13 +1888,13 @@ EventResult FakeVimHandler::Private::handleCommandMode(int key, int unmodified,
enterVisualMode(VisualBlockMode);
} else if (key == 'w') { // tested
// Special case: "cw" and "cW" work the same as "ce" and "cE" if the
- // cursor is on a non-blank - except if the cursor is on the last character of a word:
- // only the current word will be changed
+ // cursor is on a non-blank - except if the cursor is on the last
+ // character of a word: only the current word will be changed
if (m_submode == ChangeSubMode) {
moveToWordBoundary(false, true, true);
m_movetype = MoveInclusive;
} else {
- moveToNextWord(false, m_submode==DeleteSubMode);
+ moveToNextWord(false, m_submode == DeleteSubMode);
m_movetype = MoveExclusive;
}
finishMovement("%1w", count());
@@ -1800,7 +1903,7 @@ EventResult FakeVimHandler::Private::handleCommandMode(int key, int unmodified,
moveToWordBoundary(true, true, true);
m_movetype = MoveInclusive;
} else {
- moveToNextWord(true, m_submode==DeleteSubMode);
+ moveToNextWord(true, m_submode == DeleteSubMode);
m_movetype = MoveExclusive;
}
finishMovement("%1W", count());
@@ -1924,16 +2027,8 @@ EventResult FakeVimHandler::Private::handleCommandMode(int key, int unmodified,
removeSelectedText();
} else if (key == Key_BracketLeft || key == Key_BracketRight) {
- } else if (key == Key_Escape || key == 379 /* ^[ */) {
- if (isVisualMode()) {
- leaveVisualMode();
- } else if (m_submode != NoSubMode) {
- m_submode = NoSubMode;
- m_subsubmode = NoSubSubMode;
- finishMovement();
- } else {
- resetCommandMode();
- }
+ } else if (key == control(Key_BracketRight)) {
+ handleExCommand("tag");
} else {
//qDebug() << "IGNORED IN COMMAND MODE: " << key << text
// << " VISUAL: " << m_visualMode;
@@ -1954,7 +2049,7 @@ EventResult FakeVimHandler::Private::handleInsertMode(int key, int,
const QString &text)
{
if (key == Key_Escape || key == 27 || key == control('c') ||
- key == 379 /* ^[ */) {
+ key == control(Key_BracketLeft)) {
if (isVisualBlockMode() && !m_lastInsertion.contains('\n')) {
leaveVisualMode();
joinPreviousEditBlock();
@@ -2126,7 +2221,7 @@ EventResult FakeVimHandler::Private::handleMiniBufferModes(int key, int unmodifi
{
Q_UNUSED(text)
- if (key == Key_Escape || key == 379 /* ^[ */ || key == control('c')) {
+ if (key == Key_Escape || key == control('c') || key == control(Key_BracketLeft)) {
m_commandBuffer.clear();
enterCommandMode();
updateMiniBuffer();
@@ -2269,6 +2364,7 @@ void FakeVimHandler::Private::selectRange(int beginLine, int endLine)
setPosition(firstPositionInLine(endLine + 1));
}
+// use handleExCommand for invoking commands that might move the cursor
void FakeVimHandler::Private::handleCommand(const QString &cmd)
{
m_tc = EDITOR(textCursor());
@@ -2317,6 +2413,78 @@ static bool isSubstitution(const QString &cmd0, QStringList *result)
return true;
}
+bool FakeVimHandler::Private::handleMapping(const QString &cmd0)
+{
+ QByteArray line = cmd0.toLatin1();
+ int pos1 = line.indexOf(' ');
+ if (pos1 == -1)
+ return false;
+ int pos2 = line.indexOf(' ', pos1 + 1);
+ if (pos2 == -1)
+ return false;
+
+ QByteArray modes;
+ enum Type { Map, Noremap, Unmap } type;
+
+ QByteArray cmd = line.left(pos1);
+
+ // Strange formatting. But everything else is even uglier.
+ if (cmd == "map") { modes = "nvo"; type = Map; } else
+ if (cmd == "nm" || cmd == "nmap") { modes = "n"; type = Map; } else
+ if (cmd == "vm" || cmd == "vmap") { modes = "v"; type = Map; } else
+ if (cmd == "xm" || cmd == "xmap") { modes = "x"; type = Map; } else
+ if (cmd == "smap") { modes = "s"; type = Map; } else
+ if (cmd == "map!") { modes = "ic"; type = Map; } else
+ if (cmd == "im" || cmd == "imap") { modes = "i"; type = Map; } else
+ if (cmd == "lm" || cmd == "lmap") { modes = "l"; type = Map; } else
+ if (cmd == "cm" || cmd == "cmap") { modes = "c"; type = Map; } else
+
+ if (cmd == "no" || cmd == "noremap") { modes = "nvo"; type = Noremap; } else
+ if (cmd == "nn" || cmd == "nnoremap") { modes = "n"; type = Noremap; } else
+ if (cmd == "vn" || cmd == "vnoremap") { modes = "v"; type = Noremap; } else
+ if (cmd == "xn" || cmd == "xnoremap") { modes = "x"; type = Noremap; } else
+ if (cmd == "snor" || cmd == "snoremap") { modes = "s"; type = Noremap; } else
+ if (cmd == "ono" || cmd == "onoremap") { modes = "o"; type = Noremap; } else
+ if (cmd == "no!" || cmd == "noremap!") { modes = "ic"; type = Noremap; } else
+ if (cmd == "ino" || cmd == "inoremap") { modes = "i"; type = Noremap; } else
+ if (cmd == "ln" || cmd == "lnoremap") { modes = "l"; type = Noremap; } else
+ if (cmd == "cno" || cmd == "cnoremap") { modes = "c"; type = Noremap; } else
+
+ if (cmd == "unm" || cmd == "unmap") { modes = "nvo"; type = Unmap; } else
+ if (cmd == "nun" || cmd == "nunmap") { modes = "n"; type = Unmap; } else
+ if (cmd == "vu" || cmd == "vunmap") { modes = "v"; type = Unmap; } else
+ if (cmd == "xu" || cmd == "xunmap") { modes = "x"; type = Unmap; } else
+ if (cmd == "sunm" || cmd == "sunmap") { modes = "s"; type = Unmap; } else
+ if (cmd == "ou" || cmd == "ounmap") { modes = "o"; type = Unmap; } else
+ if (cmd == "unm!" || cmd == "unmap!") { modes = "ic"; type = Unmap; } else
+ if (cmd == "iu" || cmd == "iunmap") { modes = "i"; type = Unmap; } else
+ if (cmd == "lu" || cmd == "lunmap") { modes = "l"; type = Unmap; } else
+ if (cmd == "cu" || cmd == "cunmap") { modes = "c"; type = Unmap; }
+
+ else
+ return false;
+
+ QByteArray lhs = line.mid(pos1 + 1, pos2 - pos1 - 1);
+ QByteArray rhs = line.mid(pos2 + 1);
+ qDebug() << "MAPPING: " << modes << lhs << rhs;
+ switch (type) {
+ case Unmap:
+ foreach (char c, modes)
+ if (m_mappings.contains(c))
+ m_mappings[c].remove(lhs);
+ break;
+ case Map:
+ rhs = rhs; // FIXME: expand rhs.
+ // Fall through.
+ case Noremap:
+ foreach (char c, modes)
+ m_mappings[c][lhs] = rhs;
+ break;
+ }
+ qDebug() << "CURRENT: " << m_mappings;
+ return true;
+}
+
void FakeVimHandler::Private::handleExCommand(const QString &cmd0)
{
QString cmd = cmd0;
@@ -2562,6 +2730,8 @@ void FakeVimHandler::Private::handleExCommand(const QString &cmd0)
notImplementedYet();
}
updateMiniBuffer();
+ } else if (handleMapping(cmd)) {
+ /* done */
} else {
passUnknownExCommand(cmd);
}
@@ -3243,6 +3413,25 @@ void FakeVimHandler::Private::invertCaseTransform(int updateMarksAfter, QTextCur
tc->insertText(str);
}
+void FakeVimHandler::Private::replaceSelectedText()
+{
+ Range range(anchor(), position());
+ range.rangemode = m_rangemode;
+ transformText(range, &FakeVimHandler::Private::replaceTransform);
+}
+
+void FakeVimHandler::Private::replaceTransform(int updateMarksAfter, QTextCursor *tc)
+{
+ Q_UNUSED(updateMarksAfter);
+ QString str = tc->selectedText();
+ tc->removeSelectedText();
+ for (int i = str.size(); --i >= 0; ) {
+ QChar c = str.at(i);
+ str[i] = (c.toAscii() == '\n' || c.toAscii() == '\0') ? QChar('\n') : m_replacingCharacter;
+ }
+ tc->insertText(str);
+}
+
void FakeVimHandler::Private::pasteText(bool afterCursor)
{
const QString text = m_registers[m_register].contents;
@@ -3548,6 +3737,50 @@ void FakeVimHandler::Private::replay(const QString &command, int n)
}
+void FakeVimHandler::Private::selectWordTextObject(bool inner)
+{
+ Q_UNUSED(inner); // FIXME
+ m_movetype = MoveExclusive;
+ moveToWordBoundary(false, false);
+ enterVisualMode(VisualCharMode);
+ moveToWordBoundary(false, true);
+ leaveVisualMode();
+}
+
+void FakeVimHandler::Private::selectWORDTextObject(bool inner)
+{
+ Q_UNUSED(inner); // FIXME
+ m_movetype = MoveExclusive;
+ moveToWordBoundary(true, false);
+ enterVisualMode(VisualCharMode);
+ moveToWordBoundary(true, true);
+ leaveVisualMode();
+}
+
+void FakeVimHandler::Private::selectSentenceTextObject(bool inner)
+{
+ Q_UNUSED(inner);
+}
+
+void FakeVimHandler::Private::selectParagraphTextObject(bool inner)
+{
+ Q_UNUSED(inner);
+}
+
+void FakeVimHandler::Private::selectBlockTextObject(bool inner, char left, char right)
+{
+ Q_UNUSED(inner);
+ Q_UNUSED(left);
+ Q_UNUSED(right);
+}
+
+void FakeVimHandler::Private::selectQuotedStringTextObject(bool inner, int type)
+{
+ Q_UNUSED(inner);
+ Q_UNUSED(type);
+}
+
+
///////////////////////////////////////////////////////////////////////
//
// FakeVimHandler
@@ -3643,7 +3876,6 @@ void FakeVimHandler::showRedMessage(const QString &msg)
d->showRedMessage(msg);
}
-
QWidget *FakeVimHandler::widget()
{
return d->editor();
diff --git a/src/plugins/fakevim/fakevimplugin.cpp b/src/plugins/fakevim/fakevimplugin.cpp
index 92565f56d48a7aa50bd3fe94efed4c8d4b63cb88..5c6aa71004e98650c886a8e0edcf636499e75087 100644
--- a/src/plugins/fakevim/fakevimplugin.cpp
+++ b/src/plugins/fakevim/fakevimplugin.cpp
@@ -67,6 +67,8 @@
#include <utils/savedaction.h>
#include <utils/treewidgetcolumnstretcher.h>
+#include <cppeditor/cppeditorconstants.h>
+
#include <cpptools/cpptoolsconstants.h>
#include <indenter.h>
@@ -553,6 +555,8 @@ FakeVimPluginPrivate::FakeVimPluginPrivate(FakeVimPlugin *plugin)
s_defaultExCommandMap[ProjectExplorer::Constants::BUILD] = QRegExp("^make$");
s_defaultExCommandMap["Coreplugin.OutputPane.previtem"] = QRegExp("^(cN(ext)?|cp(revious)?)!?( (.*))?$");
s_defaultExCommandMap["Coreplugin.OutputPane.nextitem"] = QRegExp("^cn(ext)?!?( (.*))?$");
+ s_defaultExCommandMap[CppEditor::Constants::JUMP_TO_DEFINITION] = QRegExp("^tag?$");
+ s_defaultExCommandMap[Core::Constants::GO_BACK] = QRegExp("^pop?$");
}
FakeVimPluginPrivate::~FakeVimPluginPrivate()
@@ -938,7 +942,7 @@ void FakeVimPluginPrivate::handleExCommand(const QString &cmd)
const QString &id = it.key();
const QRegExp &re = it.value();
- if (re.indexIn(cmd) != -1) {
+ if (!re.pattern().isEmpty() && re.indexIn(cmd) != -1) {
triggerAction(id);
return;
}
diff --git a/src/plugins/find/findtoolbar.cpp b/src/plugins/find/findtoolbar.cpp
index ed359fdc5cd78e7ab6b12b4d1816f18e1cdefbec..3f3449a5c2423624cea69d007ae9fc386117e5cb 100644
--- a/src/plugins/find/findtoolbar.cpp
+++ b/src/plugins/find/findtoolbar.cpp
@@ -133,7 +133,8 @@ FindToolBar::FindToolBar(FindPlugin *plugin, CurrentDocumentFind *currentDocumen
Core::ActionContainer *mfind = am->actionContainer(Constants::M_FIND);
Core::Command *cmd;
- m_findInDocumentAction = new QAction(tr("Find/Replace"), this);
+ QIcon icon = QIcon::fromTheme(QLatin1String("edit-find-replace"));
+ m_findInDocumentAction = new QAction(icon, tr("Find/Replace"), this);
cmd = am->registerAction(m_findInDocumentAction, Constants::FIND_IN_DOCUMENT, globalcontext);
cmd->setDefaultKeySequence(QKeySequence::Find);
mfind->addAction(cmd, Constants::G_FIND_CURRENTDOCUMENT);
diff --git a/src/plugins/genericprojectmanager/genericproject.cpp b/src/plugins/genericprojectmanager/genericproject.cpp
index ffbfa3863046a12578f7cbd0e5efe514f7b6dba2..88af20a68fef78e00752a49a1ec8c53e95af5689 100644
--- a/src/plugins/genericprojectmanager/genericproject.cpp
+++ b/src/plugins/genericprojectmanager/genericproject.cpp
@@ -579,6 +579,15 @@ bool GenericProjectFile::isSaveAsAllowed() const
return false;
}
-void GenericProjectFile::modified(ReloadBehavior *)
+Core::IFile::ReloadBehavior GenericProjectFile::reloadBehavior(ChangeTrigger state, ChangeType type) const
{
+ Q_UNUSED(state)
+ Q_UNUSED(type)
+ return BehaviorSilent;
+}
+
+void GenericProjectFile::reload(ReloadFlag flag, ChangeType type)
+{
+ Q_UNUSED(flag)
+ Q_UNUSED(type)
}
diff --git a/src/plugins/genericprojectmanager/genericproject.h b/src/plugins/genericprojectmanager/genericproject.h
index 1d44268c8fd15c71589eabf51640999f337c665d..124ae9f1449d091b1288cf51acd405b6fff44060 100644
--- a/src/plugins/genericprojectmanager/genericproject.h
+++ b/src/plugins/genericprojectmanager/genericproject.h
@@ -163,7 +163,8 @@ public:
virtual bool isReadOnly() const;
virtual bool isSaveAsAllowed() const;
- virtual void modified(ReloadBehavior *behavior);
+ ReloadBehavior reloadBehavior(ChangeTrigger state, ChangeType type) const;
+ void reload(ReloadFlag flag, ChangeType type);
private:
GenericProject *m_project;
diff --git a/src/plugins/git/gitclient.cpp b/src/plugins/git/gitclient.cpp
index 1646f366a9a5eff1250cb204f96b9bd67e62480a..ab8094672baae338aa9abe9d89f4e190c02e2852 100644
--- a/src/plugins/git/gitclient.cpp
+++ b/src/plugins/git/gitclient.cpp
@@ -302,7 +302,7 @@ void GitClient::status(const QString &workingDirectory)
VCSBase::VCSBaseOutputWindow *outwin = VCSBase::VCSBaseOutputWindow::instance();
outwin->setRepository(workingDirectory);
GitCommand *command = executeGit(workingDirectory, statusArgs, 0, true);
- connect(command, SIGNAL(finished(bool,QVariant)), outwin, SLOT(clearRepository()),
+ connect(command, SIGNAL(finished(bool,int,QVariant)), outwin, SLOT(clearRepository()),
Qt::QueuedConnection);
}
@@ -985,7 +985,7 @@ GitCommand *GitClient::createCommand(const QString &workingDirectory,
VCSBase::VCSBaseOutputWindow *outputWindow = VCSBase::VCSBaseOutputWindow::instance();
GitCommand* command = new GitCommand(binary(), workingDirectory, processEnvironment(), QVariant(editorLineNumber));
if (editor)
- connect(command, SIGNAL(finished(bool,QVariant)), editor, SLOT(commandFinishedGotoLine(bool,QVariant)));
+ connect(command, SIGNAL(finished(bool,int,QVariant)), editor, SLOT(commandFinishedGotoLine(bool,int,QVariant)));
if (outputToWindow) {
if (editor) { // assume that the commands output is the important thing
connect(command, SIGNAL(outputData(QByteArray)), outputWindow, SLOT(appendDataSilently(QByteArray)));
@@ -1035,6 +1035,8 @@ QStringList GitClient::processEnvironment() const
ProjectExplorer::Environment environment = ProjectExplorer::Environment::systemEnvironment();
if (m_settings.adoptPath)
environment.set(QLatin1String("PATH"), m_settings.path);
+ // git svn runs perl which barfs at non-C locales.
+ environment.set(QLatin1String("LANG"), QString(QLatin1Char('C')));
return environment.toStringList();
}
@@ -1443,10 +1445,69 @@ void GitClient::revert(const QStringList &files)
void GitClient::pull(const QString &workingDirectory)
{
- GitCommand *cmd = executeGit(workingDirectory, QStringList(QLatin1String("pull")), 0, true, GitCommand::ReportStderr);
+ pull(workingDirectory, m_settings.pullRebase);
+}
+
+void GitClient::pull(const QString &workingDirectory, bool rebase)
+{
+ QStringList arguments(QLatin1String("pull"));
+ if (rebase)
+ arguments << QLatin1String("--rebase");
+ GitCommand *cmd = executeGit(workingDirectory, arguments, 0, true, GitCommand::ReportStderr);
+ connectRepositoryChanged(workingDirectory, cmd);
+ // Need to clean up if something goes wrong
+ if (rebase) {
+ cmd->setCookie(QVariant(workingDirectory));
+ connect(cmd, SIGNAL(finished(bool,int,QVariant)), this, SLOT(slotPullRebaseFinished(bool,int,QVariant)),
+ Qt::QueuedConnection);
+ }
+}
+
+void GitClient::slotPullRebaseFinished(bool ok, int exitCode, const QVariant &cookie)
+{
+ if (ok && exitCode == 0)
+ return;
+ // Abort rebase to clean if something goes wrong
+ VCSBase::VCSBaseOutputWindow *outwin = VCSBase::VCSBaseOutputWindow::instance();
+ outwin->appendError(tr("git pull --rebase failed, aborting rebase."));
+ const QString workingDir = cookie.toString();
+ QStringList arguments;
+ arguments << QLatin1String("rebase") << QLatin1String("--abort");
+ QByteArray stdOut;
+ QByteArray stdErr;
+ const bool rc = synchronousGit(workingDir, arguments, &stdOut, &stdErr, true);
+ outwin->append(commandOutputFromLocal8Bit(stdOut));
+ if (!rc)
+ outwin->appendError(commandOutputFromLocal8Bit(stdErr));
+}
+
+// Subversion: git svn
+void GitClient::subversionFetch(const QString &workingDirectory)
+{
+ QStringList args;
+ args << QLatin1String("svn") << QLatin1String("fetch");
+ GitCommand *cmd = executeGit(workingDirectory, args, 0, true, GitCommand::ReportStderr);
connectRepositoryChanged(workingDirectory, cmd);
}
+void GitClient::subversionLog(const QString &workingDirectory)
+{
+ if (Git::Constants::debug)
+ qDebug() << "subversionLog" << workingDirectory;
+
+ QStringList arguments;
+ arguments << QLatin1String("svn") << QLatin1String("log");
+ if (m_settings.logCount > 0)
+ arguments << (QLatin1String("--limit=") + QString::number(m_settings.logCount));
+
+ // Create a command editor, no highlighting or interaction.
+ const QString title = tr("Git SVN Log");
+ const QString editorId = QLatin1String(Git::Constants::C_GIT_COMMAND_LOG_EDITOR);
+ const QString sourceFile = VCSBase::VCSBaseEditor::getSource(workingDirectory, QStringList());
+ VCSBase::VCSBaseEditor *editor = createVCSEditor(editorId, title, sourceFile, false, "svnLog", sourceFile);
+ executeGit(workingDirectory, arguments, editor);
+}
+
void GitClient::push(const QString &workingDirectory)
{
executeGit(workingDirectory, QStringList(QLatin1String("push")), 0, true, GitCommand::ReportStderr);
diff --git a/src/plugins/git/gitclient.h b/src/plugins/git/gitclient.h
index 1d7d7570bda022c1a1d2ab827d3b1cfe64ea5405..c81347e32aa76c7a550abd9868ebc6e5dcaca7df 100644
--- a/src/plugins/git/gitclient.h
+++ b/src/plugins/git/gitclient.h
@@ -154,6 +154,10 @@ public:
void pull(const QString &workingDirectory);
void push(const QString &workingDirectory);
+ // git svn support (asynchronous).
+ void subversionFetch(const QString &workingDirectory);
+ void subversionLog(const QString &workingDirectory);
+
void stashPop(const QString &workingDirectory);
void revert(const QStringList &files);
void branchList(const QString &workingDirectory);
@@ -209,6 +213,7 @@ public slots:
private slots:
void slotBlameRevisionRequested(const QString &source, QString change, int lineNumber);
+ void slotPullRebaseFinished(bool ok, int exitCode, const QVariant &cookie);
private:
VCSBase::VCSBaseEditor *createVCSEditor(const QString &kind,
@@ -241,6 +246,7 @@ private:
enum RevertResult { RevertOk, RevertUnchanged, RevertCanceled, RevertFailed };
RevertResult revertI(QStringList files, bool *isDirectory, QString *errorMessage);
void connectRepositoryChanged(const QString & repository, GitCommand *cmd);
+ void pull(const QString &workingDirectory, bool rebase);
const QString m_msgWait;
GitPlugin *m_plugin;
diff --git a/src/plugins/git/gitcommand.cpp b/src/plugins/git/gitcommand.cpp
index 1362e0c670953a2fceede624ba812fd7cfb13d42..7483428eb91e7be18d3ce42b0baa81eed84e3a4c 100644
--- a/src/plugins/git/gitcommand.cpp
+++ b/src/plugins/git/gitcommand.cpp
@@ -133,6 +133,7 @@ void GitCommand::run()
QString error;
const int count = m_jobs.size();
+ int exitCode = -1;
bool ok = true;
for (int j = 0; j < count; j++) {
if (Git::Constants::debug)
@@ -156,14 +157,15 @@ void GitCommand::run()
}
error += QString::fromLocal8Bit(stdErr);
+ exitCode = process.exitCode();
switch (m_reportTerminationMode) {
case NoReport:
break;
case ReportStdout:
- stdOut += msgTermination(process.exitCode(), m_binaryPath, m_jobs.at(j).arguments).toUtf8();
+ stdOut += msgTermination(exitCode, m_binaryPath, m_jobs.at(j).arguments).toUtf8();
break;
case ReportStderr:
- error += msgTermination(process.exitCode(), m_binaryPath, m_jobs.at(j).arguments);
+ error += msgTermination(exitCode, m_binaryPath, m_jobs.at(j).arguments);
break;
}
}
@@ -183,7 +185,7 @@ void GitCommand::run()
if (!error.isEmpty())
emit errorText(error);
- emit finished(ok, m_cookie);
+ emit finished(ok, exitCode, m_cookie);
if (ok)
emit success();
// As it is used asynchronously, we need to delete ourselves
@@ -213,5 +215,16 @@ void GitCommand::removeColorCodes(QByteArray *data)
}
}
+void GitCommand::setCookie(const QVariant &cookie)
+{
+ m_cookie = cookie;
+}
+
+QVariant GitCommand::cookie() const
+{
+ return m_cookie;
+}
+
+
} // namespace Internal
} // namespace Git
diff --git a/src/plugins/git/gitcommand.h b/src/plugins/git/gitcommand.h
index 1e7dce1f24877bb947fb4bb5bce7c59c269c56c1..c9cc058d0199076e019fe918cecd875ad59671f6 100644
--- a/src/plugins/git/gitcommand.h
+++ b/src/plugins/git/gitcommand.h
@@ -72,13 +72,16 @@ public:
static QString msgTimeout(int seconds);
+ void setCookie(const QVariant &cookie);
+ QVariant cookie() const;
+
private:
void run();
Q_SIGNALS:
void outputData(const QByteArray&);
void errorText(const QString&);
- void finished(bool ok, const QVariant &cookie);
+ void finished(bool ok, int exitCode, const QVariant &cookie);
void success();
private:
@@ -93,7 +96,7 @@ private:
QStringList m_basicArguments;
const QString m_workingDirectory;
const QStringList m_environment;
- const QVariant m_cookie;
+ QVariant m_cookie;
QList<Job> m_jobs;
TerminationReportMode m_reportTerminationMode;
diff --git a/src/plugins/git/giteditor.cpp b/src/plugins/git/giteditor.cpp
index 012317c3a33ae73bdf0346869b277d7f1d967a07..bb89ffdc3c1895892e754315461b7ceaab40fdf9 100644
--- a/src/plugins/git/giteditor.cpp
+++ b/src/plugins/git/giteditor.cpp
@@ -179,7 +179,7 @@ void GitEditor::setPlainTextDataFiltered(const QByteArray &a)
}
}
-void GitEditor::commandFinishedGotoLine(bool ok, const QVariant &v)
+void GitEditor::commandFinishedGotoLine(bool ok, int /* exitCode */, const QVariant &v)
{
if (ok && v.type() == QVariant::Int) {
const int line = v.toInt();
diff --git a/src/plugins/git/giteditor.h b/src/plugins/git/giteditor.h
index 962a05694b4b60b499a08187bb9ef5315498cee5..c82a501e545ae85006fe145b26135343997467a6 100644
--- a/src/plugins/git/giteditor.h
+++ b/src/plugins/git/giteditor.h
@@ -52,7 +52,7 @@ public:
public slots:
void setPlainTextDataFiltered(const QByteArray &a);
// Matches the signature of the finished signal of GitCommand
- void commandFinishedGotoLine(bool ok, const QVariant &v);
+ void commandFinishedGotoLine(bool ok, int exitCode, const QVariant &v);
private:
virtual QSet<QString> annotationChanges() const;
diff --git a/src/plugins/git/gitplugin.cpp b/src/plugins/git/gitplugin.cpp
index bcee1990993180fb1586a2b4a72840026f7dbcb9..ccd876d7cf734163aa74a39ca55baa5ce1c356c8 100644
--- a/src/plugins/git/gitplugin.cpp
+++ b/src/plugins/git/gitplugin.cpp
@@ -107,6 +107,8 @@ static inline const VCSBase::VCSBaseEditorParameters *findType(int ie)
return VCSBase::VCSBaseEditor::findType(editorParameters, sizeof(editorParameters)/sizeof(VCSBase::VCSBaseEditorParameters), et);
}
+Q_DECLARE_METATYPE(Git::Internal::GitClientMemberFunc)
+
using namespace Git;
using namespace Git::Internal;
@@ -118,40 +120,22 @@ GitPlugin::GitPlugin() :
VCSBase::VCSBasePlugin(QLatin1String(Git::Constants::GITSUBMITEDITOR_ID)),
m_core(0),
m_commandLocator(0),
- m_diffAction(0),
- m_diffProjectAction(0),
- m_diffRepositoryAction(0),
- m_statusRepositoryAction(0),
- m_logAction(0),
- m_blameAction(0),
- m_logProjectAction(0),
- m_undoFileAction(0),
- m_logRepositoryAction(0),
- m_undoRepositoryAction(0),
- m_createRepositoryAction(0),
m_showAction(0),
- m_stageAction(0),
- m_unstageAction(0),
- m_commitAction(0),
- m_pullAction(0),
- m_pushAction(0),
- m_cleanProjectAction(0),
- m_cleanRepositoryAction(0),
m_submitCurrentAction(0),
m_diffSelectedFilesAction(0),
m_undoAction(0),
m_redoAction(0),
- m_stashAction(0),
- m_stashSnapshotAction(0),
- m_stashPopAction(0),
- m_stashListAction(0),
- m_branchListAction(0),
m_menuAction(0),
m_gitClient(0),
m_changeSelectionDialog(0),
m_submitActionTriggered(false)
{
m_instance = this;
+ const int mid = qRegisterMetaType<GitClientMemberFunc>();
+ Q_UNUSED(mid)
+ m_fileActions.reserve(10);
+ m_projectActions.reserve(10);
+ m_repositoryActions.reserve(15);
}
GitPlugin::~GitPlugin()
@@ -196,6 +180,92 @@ static Core::Command *createSeparator(Core::ActionManager *am,
return am->registerAction(a, id, context);
}
+// Create a parameter action
+ParameterActionCommandPair
+ GitPlugin::createParameterAction(Core::ActionManager *am, Core::ActionContainer *ac,
+ const QString &defaultText, const QString ¶meterText,
+ const QString &id, const QList<int> &context,
+ bool addToLocator)
+{
+ Utils::ParameterAction *action = new Utils::ParameterAction(defaultText, parameterText,
+ Utils::ParameterAction::EnabledWithParameter,
+ this);
+ Core::Command *command = am->registerAction(action, id, context);
+ command->setAttribute(Core::Command::CA_UpdateText);
+ ac->addAction(command);
+ if (addToLocator)
+ m_commandLocator->appendCommand(command);
+ return ParameterActionCommandPair(action, command);
+}
+
+// Create an action to act on a file with a slot.
+ParameterActionCommandPair
+ GitPlugin::createFileAction(Core::ActionManager *am, Core::ActionContainer *ac,
+ const QString &defaultText, const QString ¶meterText,
+ const QString &id, const QList<int> &context, bool addToLocator,
+ const char *pluginSlot)
+{
+ const ParameterActionCommandPair rc = createParameterAction(am, ac, defaultText, parameterText, id, context, addToLocator);
+ m_fileActions.push_back(rc.first);
+ connect(rc.first, SIGNAL(triggered()), this, pluginSlot);
+ return rc;
+}
+
+// Create an action to act on a project with slot.
+ParameterActionCommandPair
+ GitPlugin::createProjectAction(Core::ActionManager *am, Core::ActionContainer *ac,
+ const QString &defaultText, const QString ¶meterText,
+ const QString &id, const QList<int> &context, bool addToLocator,
+ const char *pluginSlot)
+{
+ const ParameterActionCommandPair rc = createParameterAction(am, ac, defaultText, parameterText, id, context, addToLocator);
+ m_projectActions.push_back(rc.first);
+ connect(rc.first, SIGNAL(triggered()), this, pluginSlot);
+ return rc;
+}
+
+// Create an action to act on the repository
+ActionCommandPair
+ GitPlugin::createRepositoryAction(Core::ActionManager *am, Core::ActionContainer *ac,
+ const QString &text, const QString &id,
+ const QList<int> &context, bool addToLocator)
+{
+ QAction *action = new QAction(text, this);
+ Core::Command *command = am->registerAction(action, id, context);
+ ac->addAction(command);
+ m_repositoryActions.push_back(action);
+ if (addToLocator)
+ m_commandLocator->appendCommand(command);
+ return ActionCommandPair(action, command);
+}
+
+// Create an action to act on the repository with slot
+ActionCommandPair
+ GitPlugin::createRepositoryAction(Core::ActionManager *am, Core::ActionContainer *ac,
+ const QString &text, const QString &id,
+ const QList<int> &context, bool addToLocator,
+ const char *pluginSlot)
+{
+ const ActionCommandPair rc = createRepositoryAction(am, ac, text, id, context, addToLocator);
+ connect(rc.first, SIGNAL(triggered()), this, pluginSlot);
+ return rc;
+}
+
+// Action to act on the repository forwarded to a git client member function
+// taking the directory. Store the member function as data on the action.
+ActionCommandPair
+ GitPlugin::createRepositoryAction(Core::ActionManager *am, Core::ActionContainer *ac,
+ const QString &text, const QString &id,
+ const QList<int> &context, bool addToLocator,
+ GitClientMemberFunc func)
+{
+ // Set the member func as data and connect to generic slot
+ const ActionCommandPair rc = createRepositoryAction(am, ac, text, id, context, addToLocator);
+ rc.first->setData(qVariantFromValue(func));
+ connect(rc.first, SIGNAL(triggered()), this, SLOT(gitClientMemberFuncRepositoryAction()));
+ return rc;
+}
+
bool GitPlugin::initialize(const QStringList &arguments, QString *errorMessage)
{
Q_UNUSED(arguments)
@@ -240,183 +310,164 @@ bool GitPlugin::initialize(const QStringList &arguments, QString *errorMessage)
gitContainer->menu()->setTitle(tr("&Git"));
toolsContainer->addMenu(gitContainer);
m_menuAction = gitContainer->menu()->menuAction();
- Core::Command *command;
-
- m_diffAction = new Utils::ParameterAction(tr("Diff Current File"), tr("Diff \"%1\""), Utils::ParameterAction::AlwaysEnabled, this);
- command = actionManager->registerAction(m_diffAction, "Git.Diff", globalcontext);
- command->setAttribute(Core::Command::CA_UpdateText);
- command->setDefaultKeySequence(QKeySequence(tr("Alt+G,Alt+D")));
- connect(m_diffAction, SIGNAL(triggered()), this, SLOT(diffCurrentFile()));
- gitContainer->addAction(command);
- m_commandLocator->appendCommand(command);
-
- m_logAction = new Utils::ParameterAction(tr("Log File"), tr("Log of \"%1\""), Utils::ParameterAction::AlwaysEnabled, this);
- command = actionManager->registerAction(m_logAction, "Git.Log", globalcontext);
- command->setDefaultKeySequence(QKeySequence(tr("Alt+G,Alt+L")));
- command->setAttribute(Core::Command::CA_UpdateText);
- connect(m_logAction, SIGNAL(triggered()), this, SLOT(logFile()));
- gitContainer->addAction(command);
- m_commandLocator->appendCommand(command);
-
- m_blameAction = new Utils::ParameterAction(tr("Blame"), tr("Blame for \"%1\""), Utils::ParameterAction::AlwaysEnabled, this);
- command = actionManager->registerAction(m_blameAction, "Git.Blame", globalcontext);
- command->setDefaultKeySequence(QKeySequence(tr("Alt+G,Alt+B")));
- command->setAttribute(Core::Command::CA_UpdateText);
- connect(m_blameAction, SIGNAL(triggered()), this, SLOT(blameFile()));
- gitContainer->addAction(command);
- m_commandLocator->appendCommand(command);
-
- m_undoFileAction = new Utils::ParameterAction(tr("Undo Changes"), tr("Undo Changes for \"%1\""), Utils::ParameterAction::AlwaysEnabled, this);
- command = actionManager->registerAction(m_undoFileAction, "Git.Undo", globalcontext);
- command->setDefaultKeySequence(QKeySequence(tr("Alt+G,Alt+U")));
- command->setAttribute(Core::Command::CA_UpdateText);
- connect(m_undoFileAction, SIGNAL(triggered()), this, SLOT(undoFileChanges()));
- gitContainer->addAction(command);
- m_commandLocator->appendCommand(command);
-
- m_stageAction = new Utils::ParameterAction(tr("Stage File for Commit"), tr("Stage \"%1\" for Commit"), Utils::ParameterAction::AlwaysEnabled, this);
- command = actionManager->registerAction(m_stageAction, "Git.Stage", globalcontext);
- command->setDefaultKeySequence(QKeySequence(tr("Alt+G,Alt+A")));
- command->setAttribute(Core::Command::CA_UpdateText);
- connect(m_stageAction, SIGNAL(triggered()), this, SLOT(stageFile()));
- gitContainer->addAction(command);
- m_commandLocator->appendCommand(command);
- m_unstageAction = new Utils::ParameterAction(tr("Unstage File from Commit"), tr("Unstage \"%1\" from Commit"), Utils::ParameterAction::AlwaysEnabled, this);
- command = actionManager->registerAction(m_unstageAction, "Git.Unstage", globalcontext);
- command->setAttribute(Core::Command::CA_UpdateText);
- connect(m_unstageAction, SIGNAL(triggered()), this, SLOT(unstageFile()));
- gitContainer->addAction(command);
- m_commandLocator->appendCommand(command);
+ ParameterActionCommandPair parameterActionCommand
+ = createFileAction(actionManager, gitContainer,
+ tr("Diff Current File"), tr("Diff \"%1\""),
+ QLatin1String("Git.Diff"), globalcontext, true,
+ SLOT(diffCurrentFile()));
+ parameterActionCommand.second->setDefaultKeySequence(QKeySequence(tr("Alt+G,Alt+D")));
+
+ parameterActionCommand
+ = createFileAction(actionManager, gitContainer,
+ tr("Log File"), tr("Log of \"%1\""),
+ QLatin1String("Git.Log"), globalcontext, true, SLOT(logFile()));
+ parameterActionCommand.second->setDefaultKeySequence(QKeySequence(tr("Alt+G,Alt+L")));
+
+ parameterActionCommand
+ = createFileAction(actionManager, gitContainer,
+ tr("Blame"), tr("Blame for \"%1\""),
+ QLatin1String("Git.Blame"),
+ globalcontext, true, SLOT(blameFile()));
+ parameterActionCommand.second->setDefaultKeySequence(QKeySequence(tr("Alt+G,Alt+B")));
+
+ parameterActionCommand
+ = createFileAction(actionManager, gitContainer,
+ tr("Undo Changes"), tr("Undo Changes for \"%1\""),
+ QLatin1String("Git.Undo"), globalcontext,
+ true, SLOT(undoFileChanges()));
+ parameterActionCommand.second->setDefaultKeySequence(QKeySequence(tr("Alt+G,Alt+U")));
+
+ parameterActionCommand
+ = createFileAction(actionManager, gitContainer,
+ tr("Stage File for Commit"), tr("Stage \"%1\" for Commit"),
+ QLatin1String("Git.Stage"), globalcontext, true, SLOT(stageFile()));
+ parameterActionCommand.second->setDefaultKeySequence(QKeySequence(tr("Alt+G,Alt+A")));
+
+ parameterActionCommand
+ = createFileAction(actionManager, gitContainer,
+ tr("Unstage File from Commit"), tr("Unstage \"%1\" from Commit"),
+ QLatin1String("Git.Unstage"), globalcontext, true, SLOT(unstageFile()));
gitContainer->addAction(createSeparator(actionManager, globalcontext, QLatin1String("Git.Sep.Project"), this));
- m_diffProjectAction = new Utils::ParameterAction(tr("Diff Current Project"), tr("Diff Project \"%1\""), Utils::ParameterAction::AlwaysEnabled, this);
- command = actionManager->registerAction(m_diffProjectAction, "Git.DiffProject", globalcontext);
- command->setDefaultKeySequence(QKeySequence("Alt+G,Alt+Shift+D"));
- command->setAttribute(Core::Command::CA_UpdateText);
- connect(m_diffProjectAction, SIGNAL(triggered()), this, SLOT(diffCurrentProject()));
- gitContainer->addAction(command);
- m_commandLocator->appendCommand(command);
+ parameterActionCommand
+ = createProjectAction(actionManager, gitContainer,
+ tr("Diff Current Project"), tr("Diff Project \"%1\""),
+ QLatin1String("Git.DiffProject"),
+ globalcontext, true,
+ SLOT(diffCurrentProject()));
+ parameterActionCommand.second->setDefaultKeySequence(QKeySequence("Alt+G,Alt+Shift+D"));
+
+ parameterActionCommand
+ = createProjectAction(actionManager, gitContainer,
+ tr("Log Project"), tr("Log Project \"%1\""),
+ QLatin1String("Git.LogProject"), globalcontext, true,
+ SLOT(logProject()));
+ parameterActionCommand.second->setDefaultKeySequence(QKeySequence(tr("Alt+G,Alt+K")));
+
+ parameterActionCommand
+ = createProjectAction(actionManager, gitContainer,
+ tr("Clean Project..."), tr("Clean Project \"%1\"..."),
+ QLatin1String("Git.CleanProject"), globalcontext,
+ true, SLOT(cleanProject()));
- m_logProjectAction = new Utils::ParameterAction(tr("Log Project"), tr("Log Project \"%1\""), Utils::ParameterAction::AlwaysEnabled, this);
- command = actionManager->registerAction(m_logProjectAction, "Git.LogProject", globalcontext);
- command->setDefaultKeySequence(QKeySequence(tr("Alt+G,Alt+K")));
- command->setAttribute(Core::Command::CA_UpdateText);
- connect(m_logProjectAction, SIGNAL(triggered()), this, SLOT(logProject()));
- gitContainer->addAction(command);
- m_commandLocator->appendCommand(command);
+ gitContainer->addAction(createSeparator(actionManager, globalcontext, QLatin1String("Git.Sep.Repository"), this));
- m_cleanProjectAction = new Utils::ParameterAction(tr("Clean Project..."), tr("Clean Project \"%1\"..."), Utils::ParameterAction::AlwaysEnabled, this);
- command = actionManager->registerAction(m_cleanProjectAction, "Git.CleanProject", globalcontext);
- command->setAttribute(Core::Command::CA_UpdateText);
- connect(m_cleanProjectAction, SIGNAL(triggered()), this, SLOT(cleanProject()));
- gitContainer->addAction(command);
- m_commandLocator->appendCommand(command);
+ createRepositoryAction(actionManager, gitContainer,
+ tr("Diff Repository"), QLatin1String("Git.DiffRepository"),
+ globalcontext, true, SLOT(diffRepository()));
- gitContainer->addAction(createSeparator(actionManager, globalcontext, QLatin1String("Git.Sep.Repository"), this));
+ createRepositoryAction(actionManager, gitContainer,
+ tr("Repository Status"), QLatin1String("Git.StatusRepository"),
+ globalcontext, true, &GitClient::status);
+
+ createRepositoryAction(actionManager, gitContainer,
+ tr("Log Repository"), QLatin1String("Git.LogRepository"),
+ globalcontext, true, &GitClient::graphLog);
- m_diffRepositoryAction = new QAction(tr("Diff Repository"), this);
- command = actionManager->registerAction(m_diffRepositoryAction, "Git.DiffRepository", globalcontext);
- connect(m_diffRepositoryAction, SIGNAL(triggered()), this, SLOT(diffRepository()));
- gitContainer->addAction(command);
- m_commandLocator->appendCommand(command);
-
- m_statusRepositoryAction = new QAction(tr("Repository Status"), this);
- command = actionManager->registerAction(m_statusRepositoryAction, "Git.StatusRepository", globalcontext);
- connect(m_statusRepositoryAction, SIGNAL(triggered()), this, SLOT(statusRepository()));
- gitContainer->addAction(command);
- m_commandLocator->appendCommand(command);
-
- m_logRepositoryAction = new QAction(tr("Log Repository"), this);
- command = actionManager->registerAction(m_logRepositoryAction, "Git.LogRepository", globalcontext);
- connect(m_logRepositoryAction, SIGNAL(triggered()), this, SLOT(logRepository()));
- gitContainer->addAction(command);
- m_commandLocator->appendCommand(command);
-
- m_undoRepositoryAction = new QAction(tr("Undo Repository Changes"), this);
- command = actionManager->registerAction(m_undoRepositoryAction, "Git.UndoRepository", globalcontext);
- connect(m_undoRepositoryAction, SIGNAL(triggered()), this, SLOT(undoRepositoryChanges()));
- gitContainer->addAction(command);
+ createRepositoryAction(actionManager, gitContainer,
+ tr("Undo Repository Changes"), QLatin1String("Git.UndoRepository"),
+ globalcontext, false, SLOT(undoRepositoryChanges()));
m_createRepositoryAction = new QAction(tr("Create Repository..."), this);
- command = actionManager->registerAction(m_createRepositoryAction, "Git.CreateRepository", globalcontext);
+ Core::Command *createRepositoryCommand = actionManager->registerAction(m_createRepositoryAction, "Git.CreateRepository", globalcontext);
connect(m_createRepositoryAction, SIGNAL(triggered()), this, SLOT(createRepository()));
- gitContainer->addAction(command);
+ gitContainer->addAction(createRepositoryCommand);
- m_cleanRepositoryAction = new QAction(tr("Clean Repository..."), this);
- command = actionManager->registerAction(m_cleanRepositoryAction, "Git.CleanRepository", globalcontext);
- connect(m_cleanRepositoryAction, SIGNAL(triggered()), this, SLOT(cleanRepository()));
- gitContainer->addAction(command);
- m_commandLocator->appendCommand(command);
+ createRepositoryAction(actionManager, gitContainer,
+ tr("Clean Repository..."), QLatin1String("Git.CleanRepository"),
+ globalcontext, true, SLOT(cleanRepository()));
gitContainer->addAction(createSeparator(actionManager, globalcontext, QLatin1String("Git.Sep.Global"), this));
- m_stashSnapshotAction = new QAction(tr("Stash snapshot..."), this);
- m_stashSnapshotAction->setToolTip(tr("Saves the current state of your work."));
- command = actionManager->registerAction(m_stashSnapshotAction, "Git.StashSnapshot", globalcontext);
- connect(m_stashSnapshotAction, SIGNAL(triggered()), this, SLOT(stashSnapshot()));
- gitContainer->addAction(command);
- m_commandLocator->appendCommand(command);
-
- m_stashAction = new QAction(tr("Stash"), this);
- m_stashAction->setToolTip(tr("Saves the current state of your work and resets the repository."));
- command = actionManager->registerAction(m_stashAction, "Git.Stash", globalcontext);
- connect(m_stashAction, SIGNAL(triggered()), this, SLOT(stash()));
- gitContainer->addAction(command);
- m_commandLocator->appendCommand(command);
-
- m_pullAction = new QAction(tr("Pull"), this);
- command = actionManager->registerAction(m_pullAction, "Git.Pull", globalcontext);
- connect(m_pullAction, SIGNAL(triggered()), this, SLOT(pull()));
- gitContainer->addAction(command);
- m_commandLocator->appendCommand(command);
-
- m_stashPopAction = new QAction(tr("Stash Pop"), this);
- m_stashAction->setToolTip(tr("Restores changes saved to the stash list using \"Stash\"."));
- command = actionManager->registerAction(m_stashPopAction, "Git.StashPop", globalcontext);
- connect(m_stashPopAction, SIGNAL(triggered()), this, SLOT(stashPop()));
- gitContainer->addAction(command);
- m_commandLocator->appendCommand(command);
-
- m_commitAction = new QAction(tr("Commit..."), this);
- command = actionManager->registerAction(m_commitAction, "Git.Commit", globalcontext);
- command->setDefaultKeySequence(QKeySequence(tr("Alt+G,Alt+C")));
- connect(m_commitAction, SIGNAL(triggered()), this, SLOT(startCommit()));
- gitContainer->addAction(command);
- m_commandLocator->appendCommand(command);
-
- m_pushAction = new QAction(tr("Push"), this);
- command = actionManager->registerAction(m_pushAction, "Git.Push", globalcontext);
- connect(m_pushAction, SIGNAL(triggered()), this, SLOT(push()));
- gitContainer->addAction(command);
- m_commandLocator->appendCommand(command);
+ ActionCommandPair actionCommand =
+ createRepositoryAction(actionManager, gitContainer,
+ tr("Stash snapshot..."), QLatin1String("Git.StashSnapshot"),
+ globalcontext, true, SLOT(stashSnapshot()));
+ actionCommand.first->setToolTip(tr("Saves the current state of your work."));
+
+ actionCommand = createRepositoryAction(actionManager, gitContainer,
+ tr("Stash"), QLatin1String("Git.Stash"),
+ globalcontext, true, SLOT(stash()));
+ actionCommand.first->setToolTip(tr("Saves the current state of your work and resets the repository."));
+
+ createRepositoryAction(actionManager, gitContainer,
+ tr("Pull"), QLatin1String("Git.Pull"),
+ globalcontext, true, SLOT(pull()));
+
+ actionCommand = createRepositoryAction(actionManager, gitContainer,
+ tr("Stash Pop"), QLatin1String("Git.StashPop"),
+ globalcontext, true, &GitClient::stashPop);
+ actionCommand.first->setToolTip(tr("Restores changes saved to the stash list using \"Stash\"."));
+
+ actionCommand = createRepositoryAction(actionManager, gitContainer,
+ tr("Commit..."), QLatin1String("Git.Commit"),
+ globalcontext, true, SLOT(startCommit()));
+ actionCommand.second->setDefaultKeySequence(QKeySequence(tr("Alt+G,Alt+C")));
+
+ actionCommand = createRepositoryAction(actionManager, gitContainer,
+ tr("Push"), QLatin1String("Git.Push"),
+ globalcontext, true, SLOT(push()));
gitContainer->addAction(createSeparator(actionManager, globalcontext, QLatin1String("Git.Sep.Branch"), this));
- m_branchListAction = new QAction(tr("Branches..."), this);
- command = actionManager->registerAction(m_branchListAction, "Git.BranchList", globalcontext);
- connect(m_branchListAction, SIGNAL(triggered()), this, SLOT(branchList()));
- gitContainer->addAction(command);
+ createRepositoryAction(actionManager, gitContainer,
+ tr("Branches..."), QLatin1String("Git.BranchList"),
+ globalcontext, false, SLOT(branchList()));
- m_stashListAction = new QAction(tr("Stashes..."), this);
- command = actionManager->registerAction(m_stashListAction, "Git.StashList", globalcontext);
- connect(m_stashListAction, SIGNAL(triggered()), this, SLOT(stashList()));
- gitContainer->addAction(command);
+ createRepositoryAction(actionManager, gitContainer,
+ tr("Stashes..."), QLatin1String("Git.StashList"),
+ globalcontext, false, SLOT(stashList()));
m_showAction = new QAction(tr("Show Commit..."), this);
- command = actionManager->registerAction(m_showAction, "Git.ShowCommit", globalcontext);
+ Core::Command *showCommitCommand = actionManager->registerAction(m_showAction, "Git.ShowCommit", globalcontext);
connect(m_showAction, SIGNAL(triggered()), this, SLOT(showCommit()));
- gitContainer->addAction(command);
+ gitContainer->addAction(showCommitCommand);
+
+ // Subversion in a submenu.
+ gitContainer->addAction(createSeparator(actionManager, globalcontext, QLatin1String("Git.Sep.Subversion"), this));
+ Core::ActionContainer *subversionMenu = actionManager->createMenu(QLatin1String("Git.Subversion"));
+ subversionMenu->menu()->setTitle(tr("Subversion"));
+ gitContainer->addMenu(subversionMenu);
+
+ createRepositoryAction(actionManager, subversionMenu,
+ tr("Log"), QLatin1String("Git.Subversion.Log"),
+ globalcontext, false, &GitClient::subversionLog);
+
+ createRepositoryAction(actionManager, subversionMenu,
+ tr("Fetch"), QLatin1String("Git.Subversion.Fetch"),
+ globalcontext, false, &GitClient::subversionFetch);
if (0) {
const QList<QAction*> snapShotActions = createSnapShotTestActions();
const int count = snapShotActions.size();
for (int i = 0; i < count; i++) {
- command = actionManager->registerAction(snapShotActions.at(i),
+ Core::Command *tCommand
+ = actionManager->registerAction(snapShotActions.at(i),
QLatin1String("Git.Snapshot.") + QString::number(i),
globalcontext);
- gitContainer->addAction(command);
+ gitContainer->addAction(tCommand);
}
}
@@ -424,7 +475,7 @@ bool GitPlugin::initialize(const QStringList &arguments, QString *errorMessage)
QList<int> submitContext;
submitContext.push_back(m_core->uniqueIDManager()->uniqueIdentifier(QLatin1String(Constants::C_GITSUBMITEDITOR)));
m_submitCurrentAction = new QAction(VCSBase::VCSBaseSubmitEditor::submitIcon(), tr("Commit"), this);
- command = actionManager->registerAction(m_submitCurrentAction, Constants::SUBMIT_CURRENT, submitContext);
+ Core::Command *command = actionManager->registerAction(m_submitCurrentAction, Constants::SUBMIT_CURRENT, submitContext);
connect(m_submitCurrentAction, SIGNAL(triggered()), this, SLOT(submitCurrentLog()));
m_diffSelectedFilesAction = new QAction(VCSBase::VCSBaseSubmitEditor::diffIcon(), tr("Diff Selected Files"), this);
@@ -474,13 +525,6 @@ void GitPlugin::diffRepository()
m_gitClient->diff(state.topLevel(), QStringList(), QStringList());
}
-void GitPlugin::statusRepository()
-{
- const VCSBase::VCSBasePluginState state = currentState();
- QTC_ASSERT(state.hasTopLevel(), return)
- m_gitClient->status(state.topLevel());
-}
-
void GitPlugin::logFile()
{
const VCSBase::VCSBasePluginState state = currentState();
@@ -511,13 +555,6 @@ void GitPlugin::undoFileChanges()
m_gitClient->revert(QStringList(state.currentFile()));
}
-void GitPlugin::logRepository()
-{
- const VCSBase::VCSBasePluginState state = currentState();
- QTC_ASSERT(state.hasTopLevel(), return)
- m_gitClient->graphLog(state.topLevel());
-}
-
void GitPlugin::undoRepositoryChanges()
{
const VCSBase::VCSBasePluginState state = currentState();
@@ -698,6 +735,29 @@ void GitPlugin::push()
m_gitClient->push(state.topLevel());
}
+// Retrieve member function of git client stored as user data of action
+static inline GitClientMemberFunc memberFunctionFromAction(const QObject *o)
+{
+ if (o) {
+ if (const QAction *action = qobject_cast<const QAction *>(o)) {
+ const QVariant v = action->data();
+ if (qVariantCanConvert<GitClientMemberFunc>(v))
+ return qVariantValue<GitClientMemberFunc>(v);
+ }
+ }
+ return 0;
+}
+
+void GitPlugin::gitClientMemberFuncRepositoryAction()
+{
+ const VCSBase::VCSBasePluginState state = currentState();
+ QTC_ASSERT(state.hasTopLevel(), return)
+ // Retrieve member function and invoke on repository
+ GitClientMemberFunc func = memberFunctionFromAction(sender());
+ QTC_ASSERT(func, return);
+ (m_gitClient->*func)(state.topLevel());
+}
+
void GitPlugin::cleanProject()
{
const VCSBase::VCSBasePluginState state = currentState();
@@ -765,13 +825,6 @@ void GitPlugin::stashSnapshot()
m_stashDialog->refresh(state.topLevel(), true);
}
-void GitPlugin::stashPop()
-{
- const VCSBase::VCSBasePluginState state = currentState();
- QTC_ASSERT(state.hasTopLevel(), return)
- m_gitClient->stashPop(state.topLevel());
-}
-
// Create a non-modal dialog with refresh method or raise if it exists
template <class NonModalDialog>
inline void showNonModalDialog(const QString &topLevel,
@@ -811,43 +864,15 @@ void GitPlugin::updateActions(VCSBase::VCSBasePlugin::ActionState as)
// Note: This menu is visible if there is no repository. Only
// 'Create Repository'/'Show' actions should be available.
const QString fileName = currentState().currentFileName();
- m_diffAction->setParameter(fileName);
- m_logAction->setParameter(fileName);
- m_blameAction->setParameter(fileName);
- m_undoFileAction->setParameter(fileName);
- m_stageAction->setParameter(fileName);
- m_unstageAction->setParameter(fileName);
-
- bool fileEnabled = !fileName.isEmpty();
- m_diffAction->setEnabled(fileEnabled);
- m_logAction->setEnabled(fileEnabled);
- m_blameAction->setEnabled(fileEnabled);
- m_undoFileAction->setEnabled(fileEnabled);
- m_stageAction->setEnabled(fileEnabled);
- m_unstageAction->setEnabled(fileEnabled);
+ foreach (Utils::ParameterAction *fileAction, m_fileActions)
+ fileAction->setParameter(fileName);
const QString projectName = currentState().currentProjectName();
- const bool projectEnabled = !projectName.isEmpty();
- m_diffProjectAction->setEnabled(projectEnabled);
- m_diffProjectAction->setParameter(projectName);
- m_logProjectAction->setEnabled(projectEnabled);
- m_logProjectAction->setParameter(projectName);
- m_cleanProjectAction->setParameter(projectName);
- m_cleanProjectAction->setEnabled(projectEnabled);
-
- m_diffRepositoryAction->setEnabled(repositoryEnabled);
- m_statusRepositoryAction->setEnabled(repositoryEnabled);
- m_branchListAction->setEnabled(repositoryEnabled);
- m_stashListAction->setEnabled(repositoryEnabled);
- m_stashAction->setEnabled(repositoryEnabled);
- m_stashSnapshotAction->setEnabled(repositoryEnabled);
- m_pullAction->setEnabled(repositoryEnabled);
- m_commitAction->setEnabled(repositoryEnabled);
- m_stashPopAction->setEnabled(repositoryEnabled);
- m_logRepositoryAction->setEnabled(repositoryEnabled);
- m_undoRepositoryAction->setEnabled(repositoryEnabled);
- m_pushAction->setEnabled(repositoryEnabled);
- m_cleanRepositoryAction->setEnabled(repositoryEnabled);
+ foreach (Utils::ParameterAction *projectAction, m_projectActions)
+ projectAction->setParameter(projectName);
+
+ foreach (QAction *repositoryAction, m_repositoryActions)
+ repositoryAction->setEnabled(repositoryEnabled);
// Prompts for repo.
m_showAction->setEnabled(true);
diff --git a/src/plugins/git/gitplugin.h b/src/plugins/git/gitplugin.h
index c8d5c4d556519fac9e6b5a6a3e8213d3d9fd0361..413f45d3e9f2fb2a4f7fbc7569c76ff4e33c6563 100644
--- a/src/plugins/git/gitplugin.h
+++ b/src/plugins/git/gitplugin.h
@@ -40,6 +40,8 @@
#include <QtCore/QProcess>
#include <QtCore/QStringList>
#include <QtCore/QPointer>
+#include <QtCore/QPair>
+#include <QtCore/QVector>
QT_BEGIN_NAMESPACE
class QFile;
@@ -50,6 +52,9 @@ QT_END_NAMESPACE
namespace Core {
class IEditorFactory;
class ICore;
+class Command;
+class ActionManager;
+class ActionContainer;
}
namespace Utils {
class ParameterAction;
@@ -70,6 +75,11 @@ struct GitSettings;
class StashDialog;
class BranchDialog;
+typedef void (GitClient::*GitClientMemberFunc)(const QString &);
+
+typedef QPair<QAction *, Core::Command* > ActionCommandPair;
+typedef QPair<Utils::ParameterAction *, Core::Command* > ParameterActionCommandPair;
+
class GitPlugin : public VCSBase::VCSBasePlugin
{
Q_OBJECT
@@ -96,23 +106,21 @@ private slots:
void diffRepository();
void submitEditorDiff(const QStringList &unstaged, const QStringList &staged);
void submitCurrentLog();
- void statusRepository();
void logFile();
void blameFile();
void logProject();
void undoFileChanges();
- void logRepository();
void undoRepositoryChanges();
void stageFile();
void unstageFile();
void cleanProject();
void cleanRepository();
+ void gitClientMemberFuncRepositoryAction();
void showCommit();
void startCommit();
void stash();
void stashSnapshot();
- void stashPop();
void branchList();
void stashList();
void pull();
@@ -123,6 +131,41 @@ protected:
virtual bool submitEditorAboutToClose(VCSBase::VCSBaseSubmitEditor *submitEditor);
private:
+ inline ParameterActionCommandPair
+ createParameterAction(Core::ActionManager *am, Core::ActionContainer *ac,
+ const QString &defaultText, const QString ¶meterText,
+ const QString &id, const QList<int> &context, bool addToLocator);
+
+ inline ParameterActionCommandPair
+ createFileAction(Core::ActionManager *am, Core::ActionContainer *ac,
+ const QString &defaultText, const QString ¶meterText,
+ const QString &id, const QList<int> &context, bool addToLocator,
+ const char *pluginSlot);
+
+ inline ParameterActionCommandPair
+ createProjectAction(Core::ActionManager *am, Core::ActionContainer *ac,
+ const QString &defaultText, const QString ¶meterText,
+ const QString &id, const QList<int> &context, bool addToLocator);
+
+ inline ParameterActionCommandPair
+ createProjectAction(Core::ActionManager *am, Core::ActionContainer *ac,
+ const QString &defaultText, const QString ¶meterText,
+ const QString &id, const QList<int> &context, bool addToLocator,
+ const char *pluginSlot);
+
+
+ inline ActionCommandPair createRepositoryAction(Core::ActionManager *am, Core::ActionContainer *ac,
+ const QString &text, const QString &id,
+ const QList<int> &context, bool addToLocator);
+ inline ActionCommandPair createRepositoryAction(Core::ActionManager *am, Core::ActionContainer *ac,
+ const QString &text, const QString &id,
+ const QList<int> &context,
+ bool addToLocator, const char *pluginSlot);
+ inline ActionCommandPair createRepositoryAction(Core::ActionManager *am, Core::ActionContainer *ac,
+ const QString &text, const QString &id,
+ const QList<int> &context,
+ bool addToLocator, GitClientMemberFunc);
+
bool isCommitEditorOpen() const;
Core::IEditor *openSubmitEditor(const QString &fileName, const CommitData &cd);
void cleanCommitMessageFile();
@@ -131,38 +174,20 @@ private:
static GitPlugin *m_instance;
Core::ICore *m_core;
Locator::CommandLocator *m_commandLocator;
- Utils::ParameterAction *m_diffAction;
- Utils::ParameterAction *m_diffProjectAction;
- QAction *m_diffRepositoryAction;
- QAction *m_statusRepositoryAction;
- Utils::ParameterAction *m_logAction;
- Utils::ParameterAction *m_blameAction;
- Utils::ParameterAction *m_logProjectAction;
- Utils::ParameterAction *m_undoFileAction;
- QAction *m_logRepositoryAction;
- QAction *m_undoRepositoryAction;
QAction *m_createRepositoryAction;
QAction *m_showAction;
- Utils::ParameterAction *m_stageAction;
- Utils::ParameterAction *m_unstageAction;
- QAction *m_commitAction;
- QAction *m_pullAction;
- QAction *m_pushAction;
- Utils::ParameterAction *m_cleanProjectAction;
- QAction *m_cleanRepositoryAction;
QAction *m_submitCurrentAction;
QAction *m_diffSelectedFilesAction;
QAction *m_undoAction;
QAction *m_redoAction;
- QAction *m_stashAction;
- QAction *m_stashSnapshotAction;
- QAction *m_stashPopAction;
- QAction *m_stashListAction;
- QAction *m_branchListAction;
QAction *m_menuAction;
+ QVector<Utils::ParameterAction *> m_fileActions;
+ QVector<Utils::ParameterAction *> m_projectActions;
+ QVector<QAction *> m_repositoryActions;
+
GitClient *m_gitClient;
ChangeSelectionDialog *m_changeSelectionDialog;
QPointer<StashDialog> m_stashDialog;
diff --git a/src/plugins/git/gitsettings.cpp b/src/plugins/git/gitsettings.cpp
index b5831f5e10fee3b9b8abf9a046eab2502aa0ff5e..9d67fcb2b7b6b38c13333d5ab0b36b970d189588 100644
--- a/src/plugins/git/gitsettings.cpp
+++ b/src/plugins/git/gitsettings.cpp
@@ -41,13 +41,15 @@ static const char sysEnvKeyC[] = "SysEnv";
static const char pathKeyC[] = "Path";
static const char logCountKeyC[] = "LogCount";
static const char timeoutKeyC[] = "TimeOut";
+static const char pullRebaseKeyC[] = "PullRebase";
static const char promptToSubmitKeyC[] = "PromptForSubmit";
static const char omitAnnotationDateKeyC[] = "OmitAnnotationDate";
static const char spaceIgnorantBlameKeyC[] = "SpaceIgnorantBlame";
static const char diffPatienceKeyC[] = "DiffPatience";
enum {
- defaultLogCount = 100 ,
+ defaultPullRebase = 0,
+ defaultLogCount = 100,
#ifdef Q_OS_WIN
defaultTimeOut = 60
#else
@@ -62,6 +64,7 @@ GitSettings::GitSettings() :
adoptPath(false),
logCount(defaultLogCount),
timeoutSeconds(defaultTimeOut),
+ pullRebase(bool(defaultPullRebase)),
promptToSubmit(true),
omitAnnotationDate(false),
spaceIgnorantBlame(true),
@@ -76,6 +79,7 @@ void GitSettings::fromSettings(QSettings *settings)
path = settings->value(QLatin1String(pathKeyC), QString()).toString();
logCount = settings->value(QLatin1String(logCountKeyC), defaultLogCount).toInt();
timeoutSeconds = settings->value(QLatin1String(timeoutKeyC), defaultTimeOut).toInt();
+ pullRebase = settings->value(QLatin1String(pullRebaseKeyC), bool(defaultPullRebase)).toBool();
promptToSubmit = settings->value(QLatin1String(promptToSubmitKeyC), true).toBool();
omitAnnotationDate = settings->value(QLatin1String(omitAnnotationDateKeyC), false).toBool();
spaceIgnorantBlame = settings->value(QLatin1String(spaceIgnorantBlameKeyC), true).toBool();
@@ -90,6 +94,7 @@ void GitSettings::toSettings(QSettings *settings) const
settings->setValue(QLatin1String(pathKeyC), path);
settings->setValue(QLatin1String(logCountKeyC), logCount);
settings->setValue(QLatin1String(timeoutKeyC), timeoutSeconds);
+ settings->setValue(QLatin1String(pullRebaseKeyC), pullRebase);
settings->setValue(QLatin1String(promptToSubmitKeyC), promptToSubmit);
settings->setValue(QLatin1String(omitAnnotationDateKeyC), omitAnnotationDate);
settings->setValue(QLatin1String(spaceIgnorantBlameKeyC), spaceIgnorantBlame);
@@ -101,6 +106,7 @@ bool GitSettings::equals(const GitSettings &s) const
{
return adoptPath == s.adoptPath && path == s.path && logCount == s.logCount
&& timeoutSeconds == s.timeoutSeconds && promptToSubmit == s.promptToSubmit
+ && pullRebase == s.pullRebase
&& omitAnnotationDate == s.omitAnnotationDate && spaceIgnorantBlame == s.spaceIgnorantBlame
&& diffPatience == s.diffPatience;
}
diff --git a/src/plugins/git/gitsettings.h b/src/plugins/git/gitsettings.h
index e103ae33aee93ca55682318ec0c60e1324150faf..b3c51595ab6483afa9b77db59c01eef746f38eab 100644
--- a/src/plugins/git/gitsettings.h
+++ b/src/plugins/git/gitsettings.h
@@ -55,6 +55,7 @@ struct GitSettings
QString path;
int logCount;
int timeoutSeconds;
+ bool pullRebase;
bool promptToSubmit;
bool omitAnnotationDate;
bool spaceIgnorantBlame;
diff --git a/src/plugins/git/gitversioncontrol.cpp b/src/plugins/git/gitversioncontrol.cpp
index 65308fb17483aae01cdf5455cb3a60cb8901735d..07ff95213432bc45e1d169d28c390808140e89f5 100644
--- a/src/plugins/git/gitversioncontrol.cpp
+++ b/src/plugins/git/gitversioncontrol.cpp
@@ -81,6 +81,9 @@ bool GitVersionControl::supportsOperation(Operation operation) const
case SnapshotOperations:
rc = true;
break;
+ case AnnotateOperation:
+ rc = true;
+ break;
}
return rc;
}
@@ -203,6 +206,13 @@ QString GitVersionControl::findTopLevelForDirectory(const QString &directory) co
return GitClient::findRepositoryForDirectory(directory);
}
+bool GitVersionControl::vcsAnnotate(const QString &file, int line)
+{
+ const QFileInfo fi(file);
+ gitClient()->blame(fi.absolutePath(), fi.fileName(), QString(), line);
+ return true;
+}
+
void GitVersionControl::emitFilesChanged(const QStringList &l)
{
emit filesChanged(l);
diff --git a/src/plugins/git/gitversioncontrol.h b/src/plugins/git/gitversioncontrol.h
index 44e65df84db6231654b670162720c8a843e94de2..c53c1f2ab5cf2af5c47871e37c0f4cc35e36f5fe 100644
--- a/src/plugins/git/gitversioncontrol.h
+++ b/src/plugins/git/gitversioncontrol.h
@@ -59,6 +59,8 @@ public:
virtual bool vcsRestoreSnapshot(const QString &topLevel, const QString &name);
virtual bool vcsRemoveSnapshot(const QString &topLevel, const QString &name);
+ virtual bool vcsAnnotate(const QString &file, int line);
+
void emitFilesChanged(const QStringList &);
void emitRepositoryChanged(const QString &);
diff --git a/src/plugins/git/settingspage.cpp b/src/plugins/git/settingspage.cpp
index 3aa9e6c02eafadc3796eacfa2cdef7b5eedbe44d..11edb065ce37feb3987e2bb180c7ce24dd8bb7cb 100644
--- a/src/plugins/git/settingspage.cpp
+++ b/src/plugins/git/settingspage.cpp
@@ -56,6 +56,7 @@ GitSettings SettingsPageWidget::settings() const
rc.adoptPath = m_ui.environmentGroupBox->isChecked() && !rc.path.isEmpty();
rc.logCount = m_ui.logCountSpinBox->value();
rc.timeoutSeconds = m_ui.timeoutSpinBox->value();
+ rc.pullRebase = m_ui.pullRebaseCheckBox->isChecked();
rc.promptToSubmit = m_ui.promptToSubmitCheckBox->isChecked();
rc.omitAnnotationDate = m_ui.omitAnnotationDataCheckBox->isChecked();
rc.spaceIgnorantBlame = m_ui.spaceIgnorantBlameCheckBox->isChecked();
@@ -69,6 +70,7 @@ void SettingsPageWidget::setSettings(const GitSettings &s)
m_ui.pathLineEdit->setText(s.path);
m_ui.logCountSpinBox->setValue(s.logCount);
m_ui.timeoutSpinBox->setValue(s.timeoutSeconds);
+ m_ui.pullRebaseCheckBox->setChecked(s.pullRebase);
m_ui.promptToSubmitCheckBox->setChecked(s.promptToSubmit);
m_ui.omitAnnotationDataCheckBox->setChecked(s.omitAnnotationDate);
m_ui.spaceIgnorantBlameCheckBox->setChecked(s.spaceIgnorantBlame);
@@ -86,6 +88,7 @@ QString SettingsPageWidget::searchKeywords() const
QTextStream(&rc) << ' ' << m_ui.pathlabel->text() << ' ' << m_ui.logCountLabel->text()
<< ' ' << m_ui.timeoutLabel->text()
<< ' ' << m_ui.promptToSubmitCheckBox->text()
+ << ' ' << m_ui.promptToSubmitCheckBox->text()
<< ' ' << m_ui.omitAnnotationDataCheckBox->text()
<< ' ' << m_ui.environmentGroupBox->title()
<< ' ' << m_ui.spaceIgnorantBlameCheckBox->text();
diff --git a/src/plugins/git/settingspage.ui b/src/plugins/git/settingspage.ui
index 443a9e52b5d02fa9f35d8b00c0bfb5eac6f3f90a..159c3774f3a4a3fc878ec41e42a89d11caa0d504 100644
--- a/src/plugins/git/settingspage.ui
+++ b/src/plugins/git/settingspage.ui
@@ -2,6 +2,14 @@
<ui version="4.0">
<class>Git::Internal::SettingsPage</class>
<widget class="QWidget" name="Git::Internal::SettingsPage">
+ <property name="geometry">
+ <rect>
+ <x>0</x>
+ <y>0</y>
+ <width>409</width>
+ <height>385</height>
+ </rect>
+ </property>
<layout class="QVBoxLayout" name="verticalLayout">
<item>
<widget class="QGroupBox" name="environmentGroupBox">
@@ -113,27 +121,34 @@
</property>
</widget>
</item>
- <item row="4" column="0" colspan="2">
+ <item row="5" column="0" colspan="2">
<widget class="QCheckBox" name="omitAnnotationDataCheckBox">
<property name="text">
<string>Omit date from annotation output</string>
</property>
</widget>
</item>
- <item row="5" column="0" colspan="2">
+ <item row="6" column="0" colspan="2">
<widget class="QCheckBox" name="spaceIgnorantBlameCheckBox">
<property name="text">
<string>Ignore whitespace changes in annotation</string>
</property>
</widget>
</item>
- <item row="3" column="0">
+ <item row="4" column="0">
<widget class="QCheckBox" name="diffPatienceCheckBox">
<property name="text">
<string>Use "patience diff" algorithm</string>
</property>
</widget>
</item>
+ <item row="3" column="0" colspan="2">
+ <widget class="QCheckBox" name="pullRebaseCheckBox">
+ <property name="text">
+ <string>Pull with rebase</string>
+ </property>
+ </widget>
+ </item>
</layout>
</widget>
</item>
diff --git a/src/plugins/locator/locatorwidget.cpp b/src/plugins/locator/locatorwidget.cpp
index 0cd0ddfbd117cd795911e063d6ad17e7f1cdfb70..8f3458b3a5427776870d2ed3c1bb7df88e284b4d 100644
--- a/src/plugins/locator/locatorwidget.cpp
+++ b/src/plugins/locator/locatorwidget.cpp
@@ -102,6 +102,13 @@ public:
void updatePreferredSize();
QSize preferredSize() const { return m_preferredSize; }
+#if defined(Q_OS_WIN)
+ void focusOutEvent (QFocusEvent * event) {
+ if (event->reason() == Qt::ActiveWindowFocusReason)
+ hide();
+ }
+#endif
+
private:
QSize m_preferredSize;
};
@@ -249,7 +256,6 @@ void CompletionList::updatePreferredSize()
//header()->setStretchLastSection(true);
}
-
// =========== LocatorWidget ===========
LocatorWidget::LocatorWidget(LocatorPlugin *qop) :
@@ -344,7 +350,12 @@ bool LocatorWidget::eventFilter(QObject *obj, QEvent *event)
break;
}
} else if (obj == m_fileLineEdit && event->type() == QEvent::FocusOut) {
- m_completionList->hide();
+#if defined(Q_OS_WIN)
+ QFocusEvent *fev = static_cast<QFocusEvent*>(event);
+ if (fev->reason() != Qt::ActiveWindowFocusReason ||
+ (fev->reason() == Qt::ActiveWindowFocusReason && !m_completionList->isActiveWindow()))
+#endif
+ m_completionList->hide();
} else if (obj == m_fileLineEdit && event->type() == QEvent::FocusIn) {
showPopup();
} else if (obj == this && event->type() == QEvent::ShortcutOverride) {
diff --git a/src/plugins/mercurial/mercurialcontrol.cpp b/src/plugins/mercurial/mercurialcontrol.cpp
index a0af2093104df5a5e7bb0c2cdcc6ba9ae0cabc19..1b707b9c8b769253c49a02ccc8bd094f8fa90d6a 100644
--- a/src/plugins/mercurial/mercurialcontrol.cpp
+++ b/src/plugins/mercurial/mercurialcontrol.cpp
@@ -66,6 +66,7 @@ bool MercurialControl::supportsOperation(Operation operation) const
case Core::IVersionControl::AddOperation:
case Core::IVersionControl::DeleteOperation:
case Core::IVersionControl::CreateRepositoryOperation:
+ case Core::IVersionControl::AnnotateOperation:
break;
case Core::IVersionControl::OpenOperation:
case Core::IVersionControl::SnapshotOperations:
@@ -118,6 +119,13 @@ bool MercurialControl::vcsRemoveSnapshot(const QString &, const QString &)
return false;
}
+bool MercurialControl::vcsAnnotate(const QString &file, int line)
+{
+ const QFileInfo fi(file);
+ mercurialClient->annotate(fi.absolutePath(), fi.fileName(), QString(), line);
+ return true;
+}
+
bool MercurialControl::sccManaged(const QString &filename)
{
const QFileInfo fi(filename);
diff --git a/src/plugins/mercurial/mercurialcontrol.h b/src/plugins/mercurial/mercurialcontrol.h
index c82401bad89804cc4baa28b6f5851d3e1da83b16..b6ee396b1c726d9c0841b5347d4cd705415ef084 100644
--- a/src/plugins/mercurial/mercurialcontrol.h
+++ b/src/plugins/mercurial/mercurialcontrol.h
@@ -62,6 +62,7 @@ public:
bool vcsRestoreSnapshot(const QString &topLevel, const QString &name);
bool vcsRemoveSnapshot(const QString &topLevel, const QString &name);
bool sccManaged(const QString &filename);
+ virtual bool vcsAnnotate(const QString &file, int line);
public slots:
// To be connected to the HgTask's success signal to emit the repository/
diff --git a/src/plugins/mercurial/mercurialplugin.cpp b/src/plugins/mercurial/mercurialplugin.cpp
index 0d8fcabda76f280d9918494ee41c0fec01892aba..1e4cc5da2f63c357431018b77828f55dfe97f2c9 100644
--- a/src/plugins/mercurial/mercurialplugin.cpp
+++ b/src/plugins/mercurial/mercurialplugin.cpp
@@ -155,6 +155,7 @@ bool MercurialPlugin::initialize(const QStringList & /* arguments */, QString *
{
typedef VCSBase::VCSEditorFactory<MercurialEditor> MercurialEditorFactory;
+ m_client = new MercurialClient();
VCSBase::VCSBasePlugin::initialize(new MercurialControl(m_client));
core = Core::ICore::instance();
@@ -164,7 +165,6 @@ bool MercurialPlugin::initialize(const QStringList & /* arguments */, QString *
addAutoReleasedObject(optionsPage);
mercurialSettings.readSettings(core->settings());
- m_client = new MercurialClient();
connect(optionsPage, SIGNAL(settingsChanged()), m_client, SLOT(settingsChanged()));
connect(m_client, SIGNAL(changed(QVariant)), versionControl(), SLOT(changed(QVariant)));
diff --git a/src/plugins/perforce/perforceplugin.cpp b/src/plugins/perforce/perforceplugin.cpp
index 287d9bcfe2102f0eebd65792d15a23bccf3bfdce..fe3cbb5a29a8a377d3355a6cceadf2c5b4a9a081 100644
--- a/src/plugins/perforce/perforceplugin.cpp
+++ b/src/plugins/perforce/perforceplugin.cpp
@@ -723,7 +723,7 @@ void PerforcePlugin::annotate()
}
}
-void PerforcePlugin::annotateVersion(const QString &file, const QString &revision, int lineNumber)
+void PerforcePlugin::vcsAnnotate(const QString &file, const QString &revision, int lineNumber)
{
const QFileInfo fi(file);
annotate(fi.absolutePath(), fi.fileName(), revision, lineNumber);
@@ -1175,7 +1175,7 @@ Core::IEditor * PerforcePlugin::showOutputInEditor(const QString& title, const Q
QString s = title;
Core::IEditor *editor = Core::EditorManager::instance()->openEditorWithContents(id, &s, output);
connect(editor, SIGNAL(annotateRevisionRequested(QString,QString,int)),
- this, SLOT(annotateVersion(QString,QString,int)));
+ this, SLOT(vcsAnnotate(QString,QString,int)));
PerforceEditor *e = qobject_cast<PerforceEditor*>(editor->widget());
if (!e)
return 0;
diff --git a/src/plugins/perforce/perforceplugin.h b/src/plugins/perforce/perforceplugin.h
index 2e62b5d5f9522c3981aba7f4838a88940180a6ad..7c88baef1a9ce09ee31db52d47f1f297c974e75d 100644
--- a/src/plugins/perforce/perforceplugin.h
+++ b/src/plugins/perforce/perforceplugin.h
@@ -106,6 +106,7 @@ public:
public slots:
void describe(const QString &source, const QString &n);
+ void vcsAnnotate(const QString &file, const QString &revision /* = QString() */, int lineNumber);
private slots:
void openCurrentFile();
@@ -123,7 +124,6 @@ private slots:
void describeChange();
void annotateCurrentFile();
void annotate();
- void annotateVersion(const QString &file, const QString &revision, int lineNumber);
void filelogCurrentFile();
void filelog();
void logProject();
diff --git a/src/plugins/perforce/perforceversioncontrol.cpp b/src/plugins/perforce/perforceversioncontrol.cpp
index 69602d88113d10bab328dfa60a0ff17a9525d572..ecd75e7bfdfb426ad78550086a0cf0ebc7d6ac67 100644
--- a/src/plugins/perforce/perforceversioncontrol.cpp
+++ b/src/plugins/perforce/perforceversioncontrol.cpp
@@ -54,6 +54,7 @@ bool PerforceVersionControl::supportsOperation(Operation operation) const
case AddOperation:
case DeleteOperation:
case OpenOperation:
+ case AnnotateOperation:
return true;
case CreateRepositoryOperation:
case SnapshotOperations:
@@ -105,6 +106,12 @@ bool PerforceVersionControl::vcsRemoveSnapshot(const QString &, const QString &)
return false;
}
+bool PerforceVersionControl::vcsAnnotate(const QString &file, int line)
+{
+ m_plugin->vcsAnnotate(file, QString(), line);
+ return true;
+}
+
bool PerforceVersionControl::managesDirectory(const QString &directory) const
{
const bool rc = m_plugin->managesDirectory(directory);
diff --git a/src/plugins/perforce/perforceversioncontrol.h b/src/plugins/perforce/perforceversioncontrol.h
index 063a3be77ce77959ad7baed82b3f54f613eaa59b..5be2ac9826bd6027066e37aad5fd3c754dc08482 100644
--- a/src/plugins/perforce/perforceversioncontrol.h
+++ b/src/plugins/perforce/perforceversioncontrol.h
@@ -57,6 +57,7 @@ public:
virtual QStringList vcsSnapshots(const QString &topLevel);
virtual bool vcsRestoreSnapshot(const QString &topLevel, const QString &name);
virtual bool vcsRemoveSnapshot(const QString &topLevel, const QString &name);
+ virtual bool vcsAnnotate(const QString &file, int line);
void emitRepositoryChanged(const QString &s);
void emitFilesChanged(const QStringList &l);
diff --git a/src/plugins/plugins.pro b/src/plugins/plugins.pro
index 8fbb7f4b2fe854b9b7fff6f9f6bc9f7f00c3153c..47c3d586e14c9af806edfb5a657e77cf5194b2cd 100644
--- a/src/plugins/plugins.pro
+++ b/src/plugins/plugins.pro
@@ -195,6 +195,7 @@ plugin_qmlprojectmanager.depends += plugin_debugger
plugin_qmldesigner.subdir = qmldesigner
plugin_qmldesigner.depends = plugin_coreplugin
plugin_qmldesigner.depends += plugin_texteditor
+plugin_qmldesigner.depends += plugin_qmljseditor
plugin_qmlinspector.subdir = qmlinspector
plugin_qmlinspector.depends += plugin_projectexplorer
diff --git a/src/plugins/projectexplorer/baseprojectwizarddialog.cpp b/src/plugins/projectexplorer/baseprojectwizarddialog.cpp
index 166d2eb6222aaeaabcdb4a162f07fa863767ad2d..a23240547093430dfb86e954bea122f9fcdda23c 100644
--- a/src/plugins/projectexplorer/baseprojectwizarddialog.cpp
+++ b/src/plugins/projectexplorer/baseprojectwizarddialog.cpp
@@ -41,13 +41,17 @@ namespace ProjectExplorer {
struct BaseProjectWizardDialogPrivate {
explicit BaseProjectWizardDialogPrivate(Utils::ProjectIntroPage *page, int id = -1);
- const int introId;
+ const int desiredIntroPageId;
Utils::ProjectIntroPage *introPage;
+ int introPageId;
+ int lastId;
};
BaseProjectWizardDialogPrivate::BaseProjectWizardDialogPrivate(Utils::ProjectIntroPage *page, int id) :
- introId(id),
- introPage(page)
+ desiredIntroPageId(id),
+ introPage(page),
+ introPageId(-1),
+ lastId(-1)
{
}
@@ -70,8 +74,14 @@ BaseProjectWizardDialog::BaseProjectWizardDialog(Utils::ProjectIntroPage *introP
void BaseProjectWizardDialog::init()
{
Core::BaseFileWizard::setupWizard(this);
- addPage(d->introPage);
+ if (d->introPageId == -1) {
+ d->introPageId = addPage(d->introPage);
+ } else {
+ d->introPageId = d->desiredIntroPageId;
+ setPage(d->desiredIntroPageId, d->introPage);
+ }
connect(this, SIGNAL(accepted()), this, SLOT(slotAccepted()));
+ connect(this, SIGNAL(currentIdChanged(int)), this, SLOT(slotBaseCurrentIdChanged(int)));
}
BaseProjectWizardDialog::~BaseProjectWizardDialog()
@@ -107,12 +117,21 @@ void BaseProjectWizardDialog::setProjectName(const QString &name)
void BaseProjectWizardDialog::slotAccepted()
{
if (d->introPage->useAsDefaultPath()) {
+ // Store the path as default path for new projects if desired.
Core::FileManager *fm = Core::ICore::instance()->fileManager();
fm->setProjectsDirectory(path());
fm->setUseProjectsDirectory(true);
}
}
+void BaseProjectWizardDialog::slotBaseCurrentIdChanged(int id)
+{
+ if (d->lastId == d->introPageId) {
+ emit introPageLeft(d->introPage->projectName(), d->introPage->path());
+ }
+ d->lastId = id;
+}
+
Utils::ProjectIntroPage *BaseProjectWizardDialog::introPage() const
{
return d->introPage;
diff --git a/src/plugins/projectexplorer/baseprojectwizarddialog.h b/src/plugins/projectexplorer/baseprojectwizarddialog.h
index f4f40c27813ce23bd3188ea4f8d17dfd9f9accc9..a0b669644ae7026eb3b5f0b0624ce6c11196a0ce 100644
--- a/src/plugins/projectexplorer/baseprojectwizarddialog.h
+++ b/src/plugins/projectexplorer/baseprojectwizarddialog.h
@@ -71,11 +71,15 @@ public slots:
void setPath(const QString &path);
void setProjectName(const QString &name);
+signals:
+ void introPageLeft(const QString &projectName, const QString &path);
+
protected:
Utils::ProjectIntroPage *introPage() const;
private slots:
void slotAccepted();
+ void slotBaseCurrentIdChanged(int);
private:
void init();
diff --git a/src/plugins/projectexplorer/buildmanager.cpp b/src/plugins/projectexplorer/buildmanager.cpp
index 3cef5471dbe4b6ebee3df8ee4528196414d7a0bb..9ac96fcde0da1c9c53ee83444105abb8434099bc 100644
--- a/src/plugins/projectexplorer/buildmanager.cpp
+++ b/src/plugins/projectexplorer/buildmanager.cpp
@@ -95,7 +95,7 @@ BuildManager::BuildManager(ProjectExplorerPlugin *parent)
pm->addObject(m_taskWindow);
m_taskWindow->addCategory(Constants::TASK_CATEGORY_COMPILE, tr("Compile", "Category for compiler isses listened under 'Build Issues'"));
- m_taskWindow->addCategory(Constants::TASK_CATEGORY_BUILDSYSTEM, tr("Buildsystem", "Category for build system isses listened under 'Build Issues'"));
+ m_taskWindow->addCategory(Constants::TASK_CATEGORY_BUILDSYSTEM, tr("Build System", "Category for build system isses listened under 'Build Issues'"));
connect(m_taskWindow, SIGNAL(tasksChanged()),
this, SLOT(updateTaskCount()));
@@ -303,11 +303,12 @@ void BuildManager::nextBuildQueue()
bool result = m_watcher.result();
if (!result) {
// Build Failure
- const QString projectName = m_currentBuildStep->buildConfiguration()->target()->displayName();
- addToOutputWindow(tr("<font color=\"#ff0000\">Error while building project %1</font>").arg(projectName));
+ const QString projectName = m_currentBuildStep->buildConfiguration()->target()->project()->displayName();
+ const QString targetName = m_currentBuildStep->buildConfiguration()->target()->displayName();
+ addToOutputWindow(tr("<font color=\"#ff0000\">Error while building project %1 (target: %2)</font>").arg(projectName, targetName));
addToOutputWindow(tr("<font color=\"#ff0000\">When executing build step '%1'</font>").arg(m_currentBuildStep->displayName()));
// NBS TODO fix in qtconcurrent
- m_progressFutureInterface->setProgressValueAndText(m_progress*100, tr("Error while building project %1").arg(projectName));
+ m_progressFutureInterface->setProgressValueAndText(m_progress*100, tr("Error while building project %1 (target: %2)").arg(projectName, targetName));
}
if (result)
@@ -374,7 +375,7 @@ bool BuildManager::buildQueueAppend(QList<BuildStep *> steps)
// print something for the user
const QString projectName = bs->buildConfiguration()->target()->project()->displayName();
const QString targetName = bs->buildConfiguration()->target()->displayName();
- addToOutputWindow(tr("<font color=\"#ff0000\">Error while building project %1 (%2)</font>").arg(projectName, targetName));
+ addToOutputWindow(tr("<font color=\"#ff0000\">Error while building project %1 (target: %2)</font>").arg(projectName, targetName));
addToOutputWindow(tr("<font color=\"#ff0000\">When executing build step '%1'</font>").arg(bs->displayName()));
// disconnect the buildsteps again
diff --git a/src/plugins/projectexplorer/customwizard/customwizard.cpp b/src/plugins/projectexplorer/customwizard/customwizard.cpp
index 0a7e90edb307c4b13bf978178a870df4c22d5899..87dfbb2f2b1e60258726ca0ffdcbbb617d3e1fb9 100644
--- a/src/plugins/projectexplorer/customwizard/customwizard.cpp
+++ b/src/plugins/projectexplorer/customwizard/customwizard.cpp
@@ -34,8 +34,8 @@
#include "baseprojectwizarddialog.h"
#include <coreplugin/icore.h>
-#include <coreplugin/mimedatabase.h>
-#include <cpptools/cpptoolsconstants.h>
+#include <coreplugin/messagemanager.h>
+#include <extensionsystem/pluginmanager.h>
#include <utils/qtcassert.h>
#include <QtCore/QDebug>
@@ -50,7 +50,10 @@ static const char configFileC[] = "wizard.xml";
namespace ProjectExplorer {
struct CustomWizardPrivate {
+ CustomWizardPrivate() : m_context(new Internal::CustomWizardContext) {}
+
QSharedPointer<Internal::CustomWizardParameters> m_parameters;
+ QSharedPointer<Internal::CustomWizardContext> m_context;
static int verbose;
};
@@ -103,7 +106,9 @@ void CustomWizard::initWizardDialog(QWizard *wizard, const QString &defaultPath,
const WizardPageList &extensionPages) const
{
QTC_ASSERT(!parameters().isNull(), return);
- Internal::CustomWizardPage *customPage = new Internal::CustomWizardPage(parameters()->fields);
+
+ d->m_context->reset();
+ Internal::CustomWizardPage *customPage = new Internal::CustomWizardPage(d->m_context, parameters()->fields);
customPage->setPath(defaultPath);
addWizardPage(wizard, customPage, parameters()->firstPageId);
if (!parameters()->fieldPageTitle.isEmpty())
@@ -125,57 +130,6 @@ QWizard *CustomWizard::createWizardDialog(QWidget *parent,
return wizard;
}
-// Replace field values delimited by '%' with special modifiers:
-// %Field% -> simple replacement
-// %Field:l% -> lower case replacement, 'u' for upper case and so on.
-static void replaceFields(const CustomProjectWizard::FieldReplacementMap &fm, QString *s)
-{
- const QChar delimiter = QLatin1Char('%');
- const QChar modifierDelimiter = QLatin1Char(':');
- int pos = 0;
- while (pos < s->size()) {
- pos = s->indexOf(delimiter, pos);
- if (pos < 0)
- break;
- int nextPos = s->indexOf(delimiter, pos + 1);
- if (nextPos == -1)
- break;
- nextPos++; // Point past 2nd delimiter
- if (nextPos == pos + 2) {
- pos = nextPos; // Skip '%%'
- continue;
- }
- // Evaluate field specification for modifiers
- // "%field:l%"
- QString fieldSpec = s->mid(pos + 1, nextPos - pos - 2);
- const int fieldSpecSize = fieldSpec.size();
- char modifier = '\0';
- if (fieldSpecSize >= 3 && fieldSpec.at(fieldSpecSize - 2) == modifierDelimiter) {
- modifier = fieldSpec.at(fieldSpecSize - 1).toLatin1();
- fieldSpec.truncate(fieldSpecSize - 2);
- }
- const CustomProjectWizard::FieldReplacementMap::const_iterator it = fm.constFind(fieldSpec);
- if (it == fm.constEnd()) {
- pos = nextPos; // Not found, skip
- continue;
- }
- // Assign
- QString replacement = it.value();
- switch (modifier) {
- case 'l':
- replacement = it.value().toLower();
- break;
- case 'u':
- replacement = it.value().toUpper();
- break;
- default:
- break;
- }
- s->replace(pos, nextPos - pos, replacement);
- pos += replacement.size();
- }
-}
-
// Read out files and store contents with field contents replaced.
static inline bool createFile(Internal::CustomWizardFile cwFile,
const QString &sourceDirectory,
@@ -186,7 +140,8 @@ static inline bool createFile(Internal::CustomWizardFile cwFile,
{
const QChar slash = QLatin1Char('/');
const QString sourcePath = sourceDirectory + slash + cwFile.source;
- replaceFields(fm, &cwFile.target);
+ // Field replacement on target path
+ Internal::CustomWizardContext::replaceFields(fm, &cwFile.target);
const QString targetPath = QDir::toNativeSeparators(targetDirectory + slash + cwFile.target);
if (CustomWizardPrivate::verbose)
qDebug() << "generating " << targetPath << sourcePath << fm;
@@ -195,9 +150,10 @@ static inline bool createFile(Internal::CustomWizardFile cwFile,
*errorMessage = QString::fromLatin1("Cannot open %1: %2").arg(sourcePath, file.errorString());
return false;
}
+ // Field replacement on contents
QString contents = QString::fromLocal8Bit(file.readAll());
if (!contents.isEmpty() && !fm.isEmpty())
- replaceFields(fm, &contents);
+ Internal::CustomWizardContext::replaceFields(fm, &contents);
Core::GeneratedFile generatedFile;
generatedFile.setContents(contents);
generatedFile.setPath(targetPath);
@@ -221,9 +177,16 @@ Core::GeneratedFiles CustomWizard::generateFiles(const QWizard *dialog, QString
const Internal::CustomWizardPage *cwp = findWizardPage<Internal::CustomWizardPage>(dialog);
QTC_ASSERT(cwp, return Core::GeneratedFiles())
QString path = cwp->path();
- const FieldReplacementMap fieldMap = defaultReplacementMap(dialog);
- if (CustomWizardPrivate::verbose)
- qDebug() << "CustomWizard::generateFiles" << dialog << path << fieldMap;
+ const FieldReplacementMap fieldMap = replacementMap(dialog);
+ if (CustomWizardPrivate::verbose) {
+ QString logText;
+ QTextStream str(&logText);
+ str << "CustomWizard::generateFiles: " << path << '\n';
+ const FieldReplacementMap::const_iterator cend = fieldMap.constEnd();
+ for (FieldReplacementMap::const_iterator it = fieldMap.constBegin(); it != cend; ++it)
+ str << " '" << it.key() << "' -> '" << it.value() << "'\n";
+ qWarning("%s", qPrintable(logText));
+ }
return generateWizardFiles(path, fieldMap, errorMessage);
}
@@ -241,20 +204,14 @@ Core::GeneratedFiles CustomWizard::generateWizardFiles(const QString &targetPath
return rc;
}
-// Create a default replacement map from the wizard dialog via fields
-// and add some useful fields.
-CustomWizard::FieldReplacementMap CustomWizard::defaultReplacementMap(const QWizard *w) const
+// Create a replacement map of static base fields + wizard dialog fields
+CustomWizard::FieldReplacementMap CustomWizard::replacementMap(const QWizard *w) const
{
- FieldReplacementMap fieldReplacementMap;
+ FieldReplacementMap fieldReplacementMap = d->m_context->baseReplacements;
foreach(const Internal::CustomWizardField &field, d->m_parameters->fields) {
const QString value = w->field(field.name).toString();
fieldReplacementMap.insert(field.name, value);
}
- const Core::MimeDatabase *mdb = Core::ICore::instance()->mimeDatabase();
- fieldReplacementMap.insert(QLatin1String("CppSourceSuffix"),
- mdb->preferredSuffixByType(QLatin1String(CppTools::Constants::CPP_SOURCE_MIMETYPE)));
- fieldReplacementMap.insert(QLatin1String("CppHeaderSuffix"),
- mdb->preferredSuffixByType(QLatin1String(CppTools::Constants::CPP_HEADER_MIMETYPE)));
return fieldReplacementMap;
}
@@ -263,6 +220,11 @@ CustomWizard::CustomWizardParametersPtr CustomWizard::parameters() const
return d->m_parameters;
}
+CustomWizard::CustomWizardContextPtr CustomWizard::context() const
+{
+ return d->m_context;
+}
+
// Static factory map
typedef QMap<QString, QSharedPointer<ICustomWizardFactory> > CustomWizardFactoryMap;
Q_GLOBAL_STATIC(CustomWizardFactoryMap, customWizardFactoryMap)
@@ -300,15 +262,47 @@ CustomWizard *CustomWizard::createWizard(const CustomWizardParametersPtr &p, con
return rc;
}
+// Format all wizards for display
+static QString listWizards()
+{
+ typedef QMultiMap<QString, const Core::IWizard *> CategoryWizardMap;
+
+ // Sort by category via multimap
+ QString rc;
+ QTextStream str(&rc);
+ CategoryWizardMap categoryWizardMap;
+ foreach(const Core::IWizard *w, Core::IWizard::allWizards())
+ categoryWizardMap.insert(w->category(), w);
+ str << "### Registered wizards (" << categoryWizardMap.size() << ")\n";
+ // Format
+ QString lastCategory;
+ const CategoryWizardMap::const_iterator cend = categoryWizardMap.constEnd();
+ for (CategoryWizardMap::const_iterator it = categoryWizardMap.constBegin(); it != cend; ++it) {
+ const Core::IWizard *wizard = it.value();
+ if (it.key() != lastCategory) {
+ lastCategory = it.key();
+ str << "\nCategory: '" << lastCategory << "' / '" << wizard->displayCategory() << "'\n";
+ }
+ str << " Id: '" << wizard->id() << "' / '" << wizard->displayName() << "' Kind: "
+ << wizard->kind() << "\n Class: " << wizard->metaObject()->className()
+ << " Description: '" << wizard->description() << "'\n";
+ }
+ return rc;
+}
+
// Scan the subdirectories of the template directory for directories
// containing valid configuration files and parse them into wizards.
QList<CustomWizard*> CustomWizard::createWizards()
{
QList<CustomWizard*> rc;
QString errorMessage;
+ QString verboseLog;
const QString templateDirName = Core::ICore::instance()->resourcePath() +
QLatin1Char('/') + QLatin1String(templatePathC);
+
const QDir templateDir(templateDirName);
+ if (CustomWizardPrivate::verbose)
+ verboseLog = QString::fromLatin1("### CustomWizard: Checking '%1'\n").arg(templateDirName);
if (!templateDir.exists()) {
if (CustomWizardPrivate::verbose)
qWarning("Custom project template path %s does not exist.", qPrintable(templateDir.absolutePath()));
@@ -323,14 +317,14 @@ QList<CustomWizard*> CustomWizard::createWizards()
foreach(const QFileInfo &dirFi, dirs) {
const QDir dir(dirFi.absoluteFilePath());
if (CustomWizardPrivate::verbose)
- qDebug("CustomWizard: Scanning %s", qPrintable(dirFi.absoluteFilePath()));
+ verboseLog += QString::fromLatin1("CustomWizard: Scanning %1\n").arg(dirFi.absoluteFilePath());
if (dir.exists(configFile)) {
CustomWizardParametersPtr parameters(new Internal::CustomWizardParameters);
Core::BaseFileWizardParameters baseFileParameters;
if (parameters->parse(dir.absoluteFilePath(configFile), &baseFileParameters, &errorMessage)) {
parameters->directory = dir.absolutePath();
if (CustomWizardPrivate::verbose)
- qDebug("%s\n", qPrintable(parameters->toString()));
+ verboseLog += parameters->toString();
if (CustomWizard *w = createWizard(parameters, baseFileParameters))
rc.push_back(w);
} else {
@@ -339,9 +333,15 @@ QList<CustomWizard*> CustomWizard::createWizards()
}
} else {
if (CustomWizardPrivate::verbose)
- qDebug("CustomWizard: '%s' not found\n", qPrintable(configFile));
+ if (CustomWizardPrivate::verbose)
+ verboseLog += QString::fromLatin1("CustomWizard: '%1' not found\n").arg(qPrintable(configFile));
}
}
+ if (CustomWizardPrivate::verbose) { // Print to output pane for Windows.
+ verboseLog += listWizards();
+ qWarning("%s", qPrintable(verboseLog));
+ Core::ICore::instance()->messageManager()->printToOutputPanePopup(verboseLog);
+ }
return rc;
}
@@ -367,17 +367,25 @@ void CustomProjectWizard::initProjectWizardDialog(BaseProjectWizardDialog *w,
const QString &defaultPath,
const WizardPageList &extensionPages) const
{
- QTC_ASSERT(!parameters().isNull(), return);
- if (!parameters()->fields.isEmpty()) {
- Internal::CustomWizardFieldPage *cp = new Internal::CustomWizardFieldPage(parameters()->fields);
+ const CustomWizardParametersPtr pa = parameters();
+ QTC_ASSERT(!pa.isNull(), return);
+
+ const CustomWizardContextPtr ctx = context();
+ ctx->reset();
+
+ if (!pa->fields.isEmpty()) {
+ Internal::CustomWizardFieldPage *cp = new Internal::CustomWizardFieldPage(ctx, pa->fields);
addWizardPage(w, cp, parameters()->firstPageId);
- if (!parameters()->fieldPageTitle.isEmpty())
- cp->setTitle(parameters()->fieldPageTitle);
+ if (!pa->fieldPageTitle.isEmpty())
+ cp->setTitle(pa->fieldPageTitle);
}
foreach(QWizardPage *ep, extensionPages)
w->addPage(ep);
w->setPath(defaultPath);
w->setProjectName(BaseProjectWizardDialog::uniqueProjectName(defaultPath));
+
+ connect(w, SIGNAL(introPageLeft(QString,QString)), this, SLOT(introPageLeft(QString,QString)));
+
if (CustomWizardPrivate::verbose)
qDebug() << "initProjectWizardDialog" << w << w->pageIds();
}
@@ -388,7 +396,7 @@ Core::GeneratedFiles CustomProjectWizard::generateFiles(const QWizard *w, QStrin
QTC_ASSERT(dialog, return Core::GeneratedFiles())
const QString targetPath = dialog->path() + QLatin1Char('/') + dialog->projectName();
// Add project name as macro.
- FieldReplacementMap fieldReplacementMap = defaultReplacementMap(dialog);
+ FieldReplacementMap fieldReplacementMap = replacementMap(dialog);
fieldReplacementMap.insert(QLatin1String("ProjectName"), dialog->projectName());
if (CustomWizardPrivate::verbose)
qDebug() << "CustomProjectWizard::generateFiles" << dialog << targetPath << fieldReplacementMap;
@@ -409,4 +417,10 @@ bool CustomProjectWizard::postGenerateFiles(const QWizard *, const Core::Generat
return true;
}
+void CustomProjectWizard::introPageLeft(const QString &project, const QString & /* path */)
+{
+ // Make '%ProjectName%' available in base replacements.
+ context()->baseReplacements.insert(QLatin1String("ProjectName"), project);
+}
+
} // namespace ProjectExplorer
diff --git a/src/plugins/projectexplorer/customwizard/customwizard.h b/src/plugins/projectexplorer/customwizard/customwizard.h
index b294a7bef3d40fc75e94625c8bacc732bc70c353..842afd85f51e064dec10a0cf3579bf02e13c44f6 100644
--- a/src/plugins/projectexplorer/customwizard/customwizard.h
+++ b/src/plugins/projectexplorer/customwizard/customwizard.h
@@ -49,6 +49,7 @@ class BaseProjectWizardDialog;
namespace Internal {
struct CustomWizardParameters;
+ struct CustomWizardContext;
}
// Factory for creating wizard. Can be registered under a name
@@ -105,6 +106,7 @@ public:
protected:
typedef QSharedPointer<Internal::CustomWizardParameters> CustomWizardParametersPtr;
+ typedef QSharedPointer<Internal::CustomWizardContext> CustomWizardContextPtr;
void initWizardDialog(QWizard *w, const QString &defaultPath,
const WizardPageList &extensionPages) const;
@@ -113,10 +115,11 @@ protected:
Core::GeneratedFiles generateWizardFiles(const QString &path,
const FieldReplacementMap &defaultFields,
QString *errorMessage) const;
- // Create replacement map from QWizard fields with additional useful fields.
- FieldReplacementMap defaultReplacementMap(const QWizard *w) const;
+ // Create replacement map as static base fields + QWizard fields
+ FieldReplacementMap replacementMap(const QWizard *w) const;
CustomWizardParametersPtr parameters() const;
+ CustomWizardContextPtr context() const;
private:
void setParameters(const CustomWizardParametersPtr &p);
@@ -128,7 +131,9 @@ private:
// A custom project wizard presenting CustomProjectWizardDialog
// (Project intro page and fields page) for wizards of type "project".
// Overwrites postGenerateFiles() to open the project file which is the
-// last one by convention.
+// last one by convention. Also inserts '%ProjectName%' into the base
+// replacement map once the intro page is left to have it available
+// for QLineEdit-type fields' default text.
class PROJECTEXPLORER_EXPORT CustomProjectWizard : public CustomWizard
{
@@ -150,6 +155,9 @@ protected:
void initProjectWizardDialog(BaseProjectWizardDialog *w, const QString &defaultPath,
const WizardPageList &extensionPages) const;
+
+private slots:
+ void introPageLeft(const QString &project, const QString &path);
};
} // namespace ProjectExplorer
diff --git a/src/plugins/projectexplorer/customwizard/customwizardpage.cpp b/src/plugins/projectexplorer/customwizard/customwizardpage.cpp
index 9aa122e5602c744214a306a695195d1fe5ef71e7..bb33911f04f36e4abc0882ce00888a3fad8138f2 100644
--- a/src/plugins/projectexplorer/customwizard/customwizardpage.cpp
+++ b/src/plugins/projectexplorer/customwizard/customwizardpage.cpp
@@ -63,9 +63,17 @@ void TextFieldComboBox::setText(const QString &s)
}
// --------------- CustomWizardFieldPage
-CustomWizardFieldPage::CustomWizardFieldPage(const FieldList &fields,
+
+CustomWizardFieldPage::LineEditData::LineEditData(QLineEdit* le, const QString &defText) :
+ lineEdit(le), defaultText(defText)
+{
+}
+
+CustomWizardFieldPage::CustomWizardFieldPage(const QSharedPointer<CustomWizardContext> &ctx,
+ const FieldList &fields,
QWidget *parent) :
QWizardPage(parent),
+ m_context(ctx),
m_formLayout(new QFormLayout)
{
if (debug)
@@ -75,6 +83,10 @@ CustomWizardFieldPage::CustomWizardFieldPage(const FieldList &fields,
setLayout(m_formLayout);
}
+CustomWizardFieldPage::~CustomWizardFieldPage()
+{
+}
+
void CustomWizardFieldPage::addRow(const QString &name, QWidget *w)
{
m_formLayout->addRow(name, w);
@@ -82,36 +94,50 @@ void CustomWizardFieldPage::addRow(const QString &name, QWidget *w)
// Create widget a control based on the control attributes map
// and register it with the QWizard.
-QWidget *CustomWizardFieldPage::registerControl(const CustomWizardField &field)
+void CustomWizardFieldPage::addField(const CustomWizardField &field)\
{
- // Register field, Indicate mandatory by '*' (only when registering)
+ // Register field, indicate mandatory by '*' (only when registering)
QString fieldName = field.name;
if (field.mandatory)
fieldName += QLatin1Char('*');
// Check known classes: QComboBox
const QString className = field.controlAttributes.value(QLatin1String("class"));
+ QWidget *fieldWidget = 0;
if (className == QLatin1String("QComboBox")) {
- TextFieldComboBox *combo = new TextFieldComboBox;
- // Set up items
- do {
- const QString choices = field.controlAttributes.value(QLatin1String("combochoices"));
- if (choices.isEmpty())
- break;
- combo->addItems(choices.split(QLatin1Char(',')));
- bool ok;
- const QString currentIndexS = field.controlAttributes.value(QLatin1String("defaultindex"));
- if (currentIndexS.isEmpty())
- break;
- const int currentIndex = currentIndexS.toInt(&ok);
- if (!ok || currentIndex < 0 || currentIndex >= combo->count())
- break;
- combo->setCurrentIndex(currentIndex);
- } while (false);
- registerField(fieldName, combo, "text", SIGNAL(text4Changed(QString)));
- return combo;
- } // QComboBox
- // Default to QLineEdit
+ fieldWidget = registerComboBox(fieldName, field);
+ } else {
+ fieldWidget = registerLineEdit(fieldName, field);
+ }
+ addRow(field.description, fieldWidget);
+}
+
+QWidget *CustomWizardFieldPage::registerComboBox(const QString &fieldName,
+ const CustomWizardField &field)
+{
+ TextFieldComboBox *combo = new TextFieldComboBox;
+ do { // Set up items and current index
+ const QString choices = field.controlAttributes.value(QLatin1String("combochoices"));
+ if (choices.isEmpty())
+ break;
+ combo->addItems(choices.split(QLatin1Char(',')));
+ bool ok;
+ const QString currentIndexS = field.controlAttributes.value(QLatin1String("defaultindex"));
+ if (currentIndexS.isEmpty())
+ break;
+ const int currentIndex = currentIndexS.toInt(&ok);
+ if (!ok || currentIndex < 0 || currentIndex >= combo->count())
+ break;
+ combo->setCurrentIndex(currentIndex);
+ } while (false);
+ registerField(fieldName, combo, "text", SIGNAL(text4Changed(QString)));
+ return combo;
+} // QComboBox
+
+QWidget *CustomWizardFieldPage::registerLineEdit(const QString &fieldName,
+ const CustomWizardField &field)
+{
QLineEdit *lineEdit = new QLineEdit;
+
const QString validationRegExp = field.controlAttributes.value(QLatin1String("validator"));
if (!validationRegExp.isEmpty()) {
QRegExp re(validationRegExp);
@@ -120,39 +146,51 @@ QWidget *CustomWizardFieldPage::registerControl(const CustomWizardField &field)
} else {
qWarning("Invalid custom wizard field validator regular expression %s.", qPrintable(validationRegExp));
}
- m_validatorLineEdits.push_back(lineEdit);
}
- lineEdit->setText(field.controlAttributes.value(QLatin1String("defaulttext")));
registerField(fieldName, lineEdit, "text", SIGNAL(textEdited(QString)));
+
+ const QString defaultText = field.controlAttributes.value(QLatin1String("defaulttext"));
+ m_lineEdits.push_back(LineEditData(lineEdit, defaultText));
return lineEdit;
}
-void CustomWizardFieldPage::addField(const CustomWizardField &field)
+void CustomWizardFieldPage::initializePage()
{
- addRow(field.description, registerControl(field));
+ QWizardPage::initializePage();
+ // Note that the field mechanism will always restore the value
+ // set on it when entering the page, so, there is no point in
+ // trying to preserve user modifications of the text.
+ foreach(const LineEditData &led, m_lineEdits) {
+ if (!led.defaultText.isEmpty()) {
+ QString defaultText = led.defaultText;
+ CustomWizardContext::replaceFields(m_context->baseReplacements, &defaultText);
+ led.lineEdit->setText(defaultText);
+ }
+ }
}
bool CustomWizardFieldPage::validatePage()
{
// Check line edits with validators
- foreach(QLineEdit *le, m_validatorLineEdits) {
- int pos = 0;
- const QValidator *val = le->validator();
- QTC_ASSERT(val, return false);
- QString text = le->text();
- if (val->validate(text, pos) != QValidator::Acceptable) {
- le->setFocus();
- return false;
+ foreach(const LineEditData &led, m_lineEdits) {
+ if (const QValidator *val = led.lineEdit->validator()) {
+ int pos = 0;
+ QString text = led.lineEdit->text();
+ if (val->validate(text, pos) != QValidator::Acceptable) {
+ led.lineEdit->setFocus();
+ return false;
+ }
}
}
- return true;
+ return QWizardPage::validatePage();
}
// --------------- CustomWizardPage
-CustomWizardPage::CustomWizardPage(const FieldList &f,
+CustomWizardPage::CustomWizardPage(const QSharedPointer<CustomWizardContext> &ctx,
+ const FieldList &f,
QWidget *parent) :
- CustomWizardFieldPage(f, parent),
+ CustomWizardFieldPage(ctx, f, parent),
m_pathChooser(new Utils::PathChooser)
{
addRow(tr("Path:"), m_pathChooser);
diff --git a/src/plugins/projectexplorer/customwizard/customwizardpage.h b/src/plugins/projectexplorer/customwizard/customwizardpage.h
index ce1484ab0c31594a6db19efa55606e8638ea2001..fe27a0873f3b470bc6dd40cca8db940957342ce7 100644
--- a/src/plugins/projectexplorer/customwizard/customwizardpage.h
+++ b/src/plugins/projectexplorer/customwizard/customwizardpage.h
@@ -48,6 +48,7 @@ namespace Internal {
struct CustomWizardField;
struct CustomWizardParameters;
+struct CustomWizardContext;
// A non-editable combo for text editing purposes that plays
// with QWizard::registerField (providing a settable text property).
@@ -74,19 +75,33 @@ class CustomWizardFieldPage : public QWizardPage {
public:
typedef QList<CustomWizardField> FieldList;
- explicit CustomWizardFieldPage(const FieldList &f,
+ explicit CustomWizardFieldPage(const QSharedPointer<CustomWizardContext> &ctx,
+ const FieldList &f,
QWidget *parent = 0);
+ virtual ~CustomWizardFieldPage();
+
virtual bool validatePage();
+ virtual void initializePage();
protected:
inline void addRow(const QString &name, QWidget *w);
private:
- QWidget *registerControl(const CustomWizardField &f);
+ struct LineEditData {
+ explicit LineEditData(QLineEdit* le = 0, const QString &defText = QString());
+ QLineEdit* lineEdit;
+ QString defaultText;
+ };
+ typedef QList<LineEditData> LineEditDataList;
+
+ QWidget *registerLineEdit(const QString &fieldName, const CustomWizardField &field);
+ QWidget *registerComboBox(const QString &fieldName, const CustomWizardField &field);
void addField(const CustomWizardField &f);
+
+ const QSharedPointer<CustomWizardContext> m_context;
QFormLayout *m_formLayout;
- QList<QLineEdit*> m_validatorLineEdits;
+ LineEditDataList m_lineEdits;
};
// A custom wizard page presenting the fields to be used and a path chooser
@@ -96,7 +111,8 @@ private:
class CustomWizardPage : public CustomWizardFieldPage {
Q_OBJECT
public:
- explicit CustomWizardPage(const FieldList &f,
+ explicit CustomWizardPage(const QSharedPointer<CustomWizardContext> &ctx,
+ const FieldList &f,
QWidget *parent = 0);
QString path() const;
diff --git a/src/plugins/projectexplorer/customwizard/customwizardparameters.cpp b/src/plugins/projectexplorer/customwizard/customwizardparameters.cpp
index bf89b9fe90287cb42a338c5c73f38dcaf3901440..c64c62c8c15f0775fbe94e89a739ea453d05a686 100644
--- a/src/plugins/projectexplorer/customwizard/customwizardparameters.cpp
+++ b/src/plugins/projectexplorer/customwizard/customwizardparameters.cpp
@@ -29,6 +29,10 @@
#include "customwizardparameters.h"
+#include <coreplugin/mimedatabase.h>
+#include <coreplugin/icore.h>
+#include <cpptools/cpptoolsconstants.h>
+
#include <QtCore/QDebug>
#include <QtCore/QLocale>
#include <QtCore/QFile>
@@ -467,5 +471,75 @@ QString CustomWizardParameters::toString() const
return rc;
}
+// ------------ CustomWizardContext
+
+void CustomWizardContext::replaceFields(const FieldReplacementMap &fm, QString *s)
+{
+ if (debug) {
+ qDebug().nospace() << "CustomWizardContext::replaceFields with " <<
+ fm << *s;
+ }
+ const QChar delimiter = QLatin1Char('%');
+ const QChar modifierDelimiter = QLatin1Char(':');
+ int pos = 0;
+ while (pos < s->size()) {
+ pos = s->indexOf(delimiter, pos);
+ if (pos < 0)
+ break;
+ int nextPos = s->indexOf(delimiter, pos + 1);
+ if (nextPos == -1)
+ break;
+ nextPos++; // Point past 2nd delimiter
+ if (nextPos == pos + 2) {
+ pos = nextPos; // Skip '%%'
+ continue;
+ }
+ // Evaluate field specification for modifiers
+ // "%field:l%"
+ QString fieldSpec = s->mid(pos + 1, nextPos - pos - 2);
+ const int fieldSpecSize = fieldSpec.size();
+ char modifier = '\0';
+ if (fieldSpecSize >= 3 && fieldSpec.at(fieldSpecSize - 2) == modifierDelimiter) {
+ modifier = fieldSpec.at(fieldSpecSize - 1).toLatin1();
+ fieldSpec.truncate(fieldSpecSize - 2);
+ }
+ const FieldReplacementMap::const_iterator it = fm.constFind(fieldSpec);
+ if (it == fm.constEnd()) {
+ pos = nextPos; // Not found, skip
+ continue;
+ }
+ // Assign
+ QString replacement = it.value();
+ switch (modifier) {
+ case 'l':
+ replacement = it.value().toLower();
+ break;
+ case 'u':
+ replacement = it.value().toUpper();
+ break;
+ case 'c': // Capitalize first letter
+ replacement = it.value();
+ if (!replacement.isEmpty())
+ replacement[0] = replacement.at(0).toUpper();
+ break;
+ default:
+ break;
+ }
+ s->replace(pos, nextPos - pos, replacement);
+ pos += replacement.size();
+ }
+}
+
+void CustomWizardContext::reset()
+{
+ // Basic replacement fields: Suffixes.
+ baseReplacements.clear();
+ const Core::MimeDatabase *mdb = Core::ICore::instance()->mimeDatabase();
+ baseReplacements.insert(QLatin1String("CppSourceSuffix"),
+ mdb->preferredSuffixByType(QLatin1String(CppTools::Constants::CPP_SOURCE_MIMETYPE)));
+ baseReplacements.insert(QLatin1String("CppHeaderSuffix"),
+ mdb->preferredSuffixByType(QLatin1String(CppTools::Constants::CPP_HEADER_MIMETYPE)));
+}
+
} // namespace Internal
} // namespace ProjectExplorer
diff --git a/src/plugins/projectexplorer/customwizard/customwizardparameters.h b/src/plugins/projectexplorer/customwizard/customwizardparameters.h
index 3ee6a19b23d9d6d0065247633fab7d1b4ca5fee0..63c6c0adbc153e9e40203d0a90bf691e70ab0d1e 100644
--- a/src/plugins/projectexplorer/customwizard/customwizardparameters.h
+++ b/src/plugins/projectexplorer/customwizard/customwizardparameters.h
@@ -79,6 +79,28 @@ public:
int firstPageId;
};
+// Context used for one wizard run, shared between CustomWizard
+// and the CustomWizardPage as it is used for the QLineEdit-type fields'
+// default texts as well. Contains basic replacement fields
+// like '%CppSourceSuffix%', '%CppHeaderSuffix%' (settings-dependent)
+// reset() should be called before each wizard run to refresh them.
+// CustomProjectWizard additionally inserts '%ProjectName%' from
+// the intro page to have it available for default texts.
+
+struct CustomWizardContext {
+ typedef QMap<QString, QString> FieldReplacementMap;
+
+ void reset();
+
+ // Replace field values delimited by '%' with special modifiers:
+ // %Field% -> simple replacement
+ // %Field:l% -> lower case replacement, 'u' upper case,
+ // 'c' capitalize first letter.
+ static void replaceFields(const FieldReplacementMap &fm, QString *s);
+
+ FieldReplacementMap baseReplacements;
+};
+
} // namespace Internal
} // namespace ProjectExplorer
diff --git a/src/plugins/projectexplorer/gccparser.cpp b/src/plugins/projectexplorer/gccparser.cpp
index 819b8235037f8a319bd6fae9ace818e4eca0823a..24999e3cf423cf38c5eff33858cd734d7ad96145 100644
--- a/src/plugins/projectexplorer/gccparser.cpp
+++ b/src/plugins/projectexplorer/gccparser.cpp
@@ -42,7 +42,7 @@ namespace {
GccParser::GccParser()
{
- m_regExp.setPattern(QString::fromLatin1(FILE_PATTERN) + QLatin1String("(\\d+):(\\d+:)?\\s(#?(warning|error):?\\s)(.+)$"));
+ m_regExp.setPattern(QString::fromLatin1(FILE_PATTERN) + QLatin1String("(\\d+):(\\d+:)?\\s(#?(warning|error|note):?\\s)(.+)$"));
m_regExp.setMinimal(true);
m_regExpIncluded.setPattern("^.*from\\s([^:]+):(\\d+)(,|:)$");
@@ -59,9 +59,26 @@ GccParser::GccParser()
void GccParser::stdError(const QString &line)
{
QString lne = line.trimmed();
- if (lne.startsWith(QLatin1String("collect2:")) ||
+
+ // Blacklist some lines to not handle them:
+ if (lne.startsWith(QLatin1String("TeamBuilder ")) ||
+ lne.startsWith(QLatin1String("distcc["))) {
+ IOutputParser::stdError(line);
+ return;
+ }
+ // Handle linker issues:
+ if (lne.startsWith(QLatin1String("ld: fatal: "))) {
+ QString description = lne.mid(11);
+ emit addTask(Task(Task::Error, description, QString(), -1, Constants::TASK_CATEGORY_COMPILE));
+ return;
+ } else if (lne.startsWith(QLatin1String("ld: warning: "))) {
+ QString description = lne.mid(13);
+ emit addTask(Task(Task::Warning, description, QString(), -1, Constants::TASK_CATEGORY_COMPILE));
+ return;
+ } else if (lne.startsWith(QLatin1String("collect2:")) ||
lne.startsWith(QLatin1String("ERROR:")) ||
lne == QLatin1String("* cpp failed")) {
+ // Handle misc. strange lines:
emit addTask(Task(Task::Error,
lne /* description */,
QString() /* filename */,
@@ -324,6 +341,50 @@ void ProjectExplorerPlugin::testGccOutputParsers_data()
QLatin1String("/home/code/src/creator/src/plugins/projectexplorer/gnumakeparser.cpp"), 264,
Constants::TASK_CATEGORY_COMPILE))
<< QString();
+ QTest::newRow("distcc error(QTCREATORBUG-904)")
+ << QString::fromLatin1("distcc[73168] (dcc_get_hostlist) Warning: no hostlist is set; can't distribute work\n"
+ "distcc[73168] (dcc_build_somewhere) Warning: failed to distribute, running locally instead")
+ << OutputParserTester::STDERR
+ << QString() << QString::fromLatin1("distcc[73168] (dcc_get_hostlist) Warning: no hostlist is set; can't distribute work\n"
+ "distcc[73168] (dcc_build_somewhere) Warning: failed to distribute, running locally instead")
+ << QList<ProjectExplorer::Task>()
+ << QString();
+ QTest::newRow("ld warning (QTCREATORBUG-905)")
+ << QString::fromLatin1("ld: warning: Core::IEditor* QVariant::value<Core::IEditor*>() const has different visibility (hidden) in .obj/debug-shared/openeditorsview.o and (default) in .obj/debug-shared/editormanager.o")
+ << OutputParserTester::STDERR
+ << QString() << QString()
+ << ( QList<ProjectExplorer::Task>()
+ << Task(Task::Warning,
+ QLatin1String("Core::IEditor* QVariant::value<Core::IEditor*>() const has different visibility (hidden) in .obj/debug-shared/openeditorsview.o and (default) in .obj/debug-shared/editormanager.o"),
+ QString(), -1,
+ Constants::TASK_CATEGORY_COMPILE))
+ << QString();
+ QTest::newRow("ld fatal")
+ << QString::fromLatin1("ld: fatal: Symbol referencing errors. No output written to testproject")
+ << OutputParserTester::STDERR
+ << QString() << QString()
+ << ( QList<ProjectExplorer::Task>()
+ << Task(Task::Error,
+ QLatin1String("Symbol referencing errors. No output written to testproject"),
+ QString(), -1,
+ Constants::TASK_CATEGORY_COMPILE))
+ << QString();
+ QTest::newRow("Teambuilder issues")
+ << QString::fromLatin1("TeamBuilder Client:: error: could not find Scheduler, running Job locally...")
+ << OutputParserTester::STDERR
+ << QString() << QString::fromLatin1("TeamBuilder Client:: error: could not find Scheduler, running Job locally...")
+ << QList<ProjectExplorer::Task>()
+ << QString();
+ QTest::newRow("note")
+ << QString::fromLatin1("/home/dev/creator/share/qtcreator/gdbmacros/gdbmacros.cpp:1079: note: initialized from here")
+ << OutputParserTester::STDERR
+ << QString() << QString()
+ << ( QList<ProjectExplorer::Task>()
+ << Task(Task::Unknown,
+ QLatin1String("initialized from here"),
+ QString::fromLatin1("/home/dev/creator/share/qtcreator/gdbmacros/gdbmacros.cpp"), 1079,
+ Constants::TASK_CATEGORY_COMPILE))
+ << QString();
}
void ProjectExplorerPlugin::testGccOutputParsers()
diff --git a/src/plugins/projectexplorer/miniprojecttargetselector.cpp b/src/plugins/projectexplorer/miniprojecttargetselector.cpp
index 6266ab743d54107774ef83d68166a5ad38c1bb5e..da42c6dafbead12f47fabe0572a30271d7d22e8d 100644
--- a/src/plugins/projectexplorer/miniprojecttargetselector.cpp
+++ b/src/plugins/projectexplorer/miniprojecttargetselector.cpp
@@ -550,12 +550,12 @@ void MiniProjectTargetSelector::updateAction()
{
Project *project = ProjectExplorerPlugin::instance()->startupProject();
- QString projectName = tr("No Project");
+ QString projectName;;
QString targetName;
QString targetToolTipText;
- QIcon targetIcon;
QString buildConfig;
QString runConfig;
+ QIcon targetIcon = style()->standardIcon(QStyle::SP_ComputerIcon);
if (project) {
projectName = project->displayName();
diff --git a/src/plugins/projectexplorer/projectexplorer.cpp b/src/plugins/projectexplorer/projectexplorer.cpp
index d3fd611623394434c6ada569e86552cfb6fca99d..34c2216138b5391c0c97bea5ed1b44704563c8eb 100644
--- a/src/plugins/projectexplorer/projectexplorer.cpp
+++ b/src/plugins/projectexplorer/projectexplorer.cpp
@@ -184,8 +184,7 @@ struct ProjectExplorerPluginPrivate {
QString m_projectFilterString;
Internal::MiniProjectTargetSelector * m_targetSelector;
Internal::ProjectExplorerSettings m_projectExplorerSettings;
- Internal::ProjectWelcomePage *m_welcomePlugin;
- Internal::ProjectWelcomePageWidget *m_welcomePage;
+ Internal::ProjectWelcomePage *m_welcomePage;
Core::BaseMode * m_projectsMode;
};
@@ -217,8 +216,8 @@ ProjectExplorerPlugin::ProjectExplorerPlugin()
ProjectExplorerPlugin::~ProjectExplorerPlugin()
{
- removeObject(d->m_welcomePlugin);
- delete d->m_welcomePlugin;
+ removeObject(d->m_welcomePage);
+ delete d->m_welcomePage;
removeObject(this);
delete d;
}
@@ -242,11 +241,9 @@ bool ProjectExplorerPlugin::initialize(const QStringList &arguments, QString *er
Core::ICore *core = Core::ICore::instance();
Core::ActionManager *am = core->actionManager();
- d->m_welcomePlugin = new ProjectWelcomePage;
- d->m_welcomePage = qobject_cast<Internal::ProjectWelcomePageWidget*>(d->m_welcomePlugin->page());
- Q_ASSERT(d->m_welcomePage);
+ d->m_welcomePage = new ProjectWelcomePage;
connect(d->m_welcomePage, SIGNAL(manageSessions()), this, SLOT(showSessionManager()));
- addObject(d->m_welcomePlugin);
+ addObject(d->m_welcomePage);
addObject(this);
connect(core->fileManager(), SIGNAL(currentFileChanged(QString)),
@@ -1127,7 +1124,6 @@ Project *ProjectExplorerPlugin::startupProject() const
return pro;
}
-// update welcome page
void ProjectExplorerPlugin::updateWelcomePage()
{
ProjectWelcomePageWidget::WelcomePageData welcomePageData;
@@ -1135,16 +1131,15 @@ void ProjectExplorerPlugin::updateWelcomePage()
welcomePageData.activeSession = d->m_session->activeSession();
welcomePageData.previousSession = d->m_session->lastSession();
welcomePageData.projectList = d->m_recentProjects;
- d->m_welcomePage->updateWelcomePage(welcomePageData);
+ d->m_welcomePage->setWelcomePageData(welcomePageData);
}
void ProjectExplorerPlugin::currentModeChanged(Core::IMode *mode, Core::IMode *oldMode)
{
if (mode && mode->id() == QLatin1String(Core::Constants::MODE_WELCOME))
updateWelcomePage();
- if (oldMode == d->m_projectsMode) {
+ if (oldMode == d->m_projectsMode)
savePersistentSettings();
- }
}
void ProjectExplorerPlugin::determineSessionToRestoreAtStartup()
diff --git a/src/plugins/projectexplorer/projectwelcomepage.cpp b/src/plugins/projectexplorer/projectwelcomepage.cpp
index c922592151096eadfd02c256763dc7bd023dc8cc..a31ad5c5364bd1516b3a884b17098509da285457 100644
--- a/src/plugins/projectexplorer/projectwelcomepage.cpp
+++ b/src/plugins/projectexplorer/projectwelcomepage.cpp
@@ -34,19 +34,31 @@ namespace ProjectExplorer {
namespace Internal {
ProjectWelcomePage::ProjectWelcomePage()
- : m_page(new ProjectWelcomePageWidget)
+ : m_page(0)
{
-
}
-ProjectWelcomePage::~ProjectWelcomePage()
+QWidget *ProjectWelcomePage::page()
{
+ if (!m_page) {
+ m_page = new ProjectWelcomePageWidget;
+
+ // Forward signals
+ connect(m_page, SIGNAL(requestProject(QString)), this, SIGNAL(requestProject(QString)));
+ connect(m_page, SIGNAL(requestSession(QString)), this, SIGNAL(requestSession(QString)));
+ connect(m_page, SIGNAL(manageSessions()), this, SIGNAL(manageSessions()));
+ m_page->updateWelcomePage(m_welcomePageData);
+ }
+ return m_page;
}
-QWidget* ProjectWelcomePage::page()
+void ProjectWelcomePage::setWelcomePageData(const ProjectWelcomePageWidget::WelcomePageData &welcomePageData)
{
- return m_page;
+ m_welcomePageData = welcomePageData;
+
+ if (m_page)
+ m_page->updateWelcomePage(welcomePageData);
}
} // namespace Internal
diff --git a/src/plugins/projectexplorer/projectwelcomepage.h b/src/plugins/projectexplorer/projectwelcomepage.h
index 16e1fb3dd14be141443fb317b7a223345724cc0e..f809c0882cafb99c16de76713c56c79942986717 100644
--- a/src/plugins/projectexplorer/projectwelcomepage.h
+++ b/src/plugins/projectexplorer/projectwelcomepage.h
@@ -32,25 +32,31 @@
#include <utils/iwelcomepage.h>
+#include "projectwelcomepagewidget.h"
+
namespace ProjectExplorer {
namespace Internal {
-class ProjectWelcomePageWidget;
-
class ProjectWelcomePage : public Utils::IWelcomePage
{
Q_OBJECT
public:
ProjectWelcomePage();
- ~ProjectWelcomePage();
QWidget *page();
QString title() const { return tr("Develop"); }
int priority() const { return 20; }
-private:
- ProjectWelcomePageWidget *m_page;
+ void setWelcomePageData(const ProjectWelcomePageWidget::WelcomePageData &welcomePageData);
+signals:
+ void requestProject(const QString &project);
+ void requestSession(const QString &session);
+ void manageSessions();
+
+private:
+ ProjectWelcomePageWidget *m_page;
+ ProjectWelcomePageWidget::WelcomePageData m_welcomePageData;
};
} // namespace Internal
diff --git a/src/plugins/projectexplorer/projectwelcomepagewidget.cpp b/src/plugins/projectexplorer/projectwelcomepagewidget.cpp
index 1c3da1d348ca0a078a40cecb403ee71ceea19484..f1332e03cbb2090eb245fb7238d8e46c07b27a71 100644
--- a/src/plugins/projectexplorer/projectwelcomepagewidget.cpp
+++ b/src/plugins/projectexplorer/projectwelcomepagewidget.cpp
@@ -84,7 +84,6 @@ ProjectWelcomePageWidget::ProjectWelcomePageWidget(QWidget *parent) :
connect(ui->projTreeWidget, SIGNAL(activated(QString)), SLOT(slotProjectClicked(QString)));
connect(ui->createNewProjectButton, SIGNAL(clicked()), SLOT(slotCreateNewProject()));
connect(ui->manageSessionsButton, SIGNAL(clicked()), SIGNAL(manageSessions()));
-
}
ProjectWelcomePageWidget::~ProjectWelcomePageWidget()
diff --git a/src/plugins/projectexplorer/projectwelcomepagewidget.h b/src/plugins/projectexplorer/projectwelcomepagewidget.h
index b47b72430df0b74fdc35e15a446584d2cd87c66b..67e4d082427a163d83a63c03069cb47f66731e5a 100644
--- a/src/plugins/projectexplorer/projectwelcomepagewidget.h
+++ b/src/plugins/projectexplorer/projectwelcomepagewidget.h
@@ -34,20 +34,21 @@
namespace ProjectExplorer {
- namespace Internal {
+namespace Internal {
namespace Ui {
class ProjectWelcomePageWidget;
}
-class ProjectWelcomePageWidget : public QWidget {
+class ProjectWelcomePageWidget : public QWidget
+{
Q_OBJECT
public:
ProjectWelcomePageWidget(QWidget *parent = 0);
~ProjectWelcomePageWidget();
- struct WelcomePageData{
+ struct WelcomePageData {
bool operator==(const WelcomePageData &rhs) const;
bool operator!=(const WelcomePageData &rhs) const;
@@ -75,7 +76,7 @@ private:
WelcomePageData lastData;
};
-}
-}
+} // namespace Internal
+} // namespace ProjectExplorer
#endif // PROJECTWELCOMEPAGEWIDGET_H
diff --git a/src/plugins/projectexplorer/projectwizardpage.ui b/src/plugins/projectexplorer/projectwizardpage.ui
index 22dc2f3fbe74d7fc5cc7afbb5648b4ea0d2e5e58..91f67bf88e40362073a31a4da63a34e0fd984a3d 100644
--- a/src/plugins/projectexplorer/projectwizardpage.ui
+++ b/src/plugins/projectexplorer/projectwizardpage.ui
@@ -31,11 +31,6 @@
</item>
<item row="0" column="1">
<widget class="QComboBox" name="projectComboBox">
- <item>
- <property name="text">
- <string notr="true">A very long project name indeed</string>
- </property>
- </item>
</widget>
</item>
<item row="1" column="0">
@@ -50,11 +45,6 @@
</item>
<item row="1" column="1">
<widget class="QComboBox" name="addToVersionControlComboBox">
- <item>
- <property name="text">
- <string notr="true">A very long version control system name</string>
- </property>
- </item>
</widget>
</item>
</layout>
diff --git a/src/plugins/projectexplorer/session.cpp b/src/plugins/projectexplorer/session.cpp
index 9203dd5f574bcde7eef02b71ac905352ec829529..2f2c7340f76b75fa18be59afc680cecd42b0f439 100644
--- a/src/plugins/projectexplorer/session.cpp
+++ b/src/plugins/projectexplorer/session.cpp
@@ -89,7 +89,8 @@ public:
bool isReadOnly() const;
bool isSaveAsAllowed() const;
- void modified(Core::IFile::ReloadBehavior *behavior);
+ ReloadBehavior reloadBehavior(ChangeTrigger state, ChangeType type) const;
+ void reload(ReloadFlag flag, ChangeType type);
public slots:
void sessionLoadingProgress();
@@ -320,8 +321,17 @@ bool SessionFile::isSaveAsAllowed() const
return true;
}
-void SessionFile::modified(Core::IFile::ReloadBehavior *)
+Core::IFile::ReloadBehavior SessionFile::reloadBehavior(ChangeTrigger state, ChangeType type) const
{
+ Q_UNUSED(state)
+ Q_UNUSED(type)
+ return BehaviorSilent;
+}
+
+void SessionFile::reload(ReloadFlag flag, ChangeType type)
+{
+ Q_UNUSED(flag)
+ Q_UNUSED(type)
}
QString SessionFile::defaultPath() const
@@ -370,7 +380,8 @@ SessionManager::SessionManager(QObject *parent)
m_core(Core::ICore::instance()),
m_file(new SessionFile),
m_sessionNode(new Internal::SessionNodeImpl(this)),
- m_currentEditor(0)
+ m_currentEditor(0),
+ m_defaultVirginSession(true)
{
// Create qtcreator dir if it doesn't yet exist
QString configDir = QFileInfo(m_core->settings()->fileName()).path();
@@ -424,9 +435,7 @@ SessionManager::~SessionManager()
bool SessionManager::isDefaultVirgin() const
{
- return isDefaultSession(m_sessionName)
- && projects().isEmpty()
- && m_core->editorManager()->openedEditors().isEmpty();
+ return m_defaultVirginSession;
}
bool SessionManager::isDefaultSession(const QString &session) const
@@ -564,6 +573,7 @@ void SessionManager::addProject(Project *project)
void SessionManager::addProjects(const QList<Project*> &projects)
{
+ m_defaultVirginSession = false;
QList<Project*> clearedList;
foreach (Project *pro, projects) {
if (!m_file->m_projects.contains(pro)) {
@@ -594,6 +604,7 @@ void SessionManager::addProjects(const QList<Project*> &projects)
void SessionManager::removeProject(Project *project)
{
+ m_defaultVirginSession = false;
if (project == 0) {
qDebug() << "SessionManager::removeProject(0) ... THIS SHOULD NOT HAPPEN";
return;
@@ -623,6 +634,8 @@ bool SessionManager::createImpl(const QString &fileName)
setStartupProject(defaultStartupProject());
}
+ m_defaultVirginSession = false;
+
if (debug)
qDebug() << "SessionManager - creating new session returns " << success;
@@ -642,7 +655,6 @@ bool SessionManager::loadImpl(const QString &fileName)
bool success = true;
if (!m_file->fileName().isEmpty()) {
-
if (isDefaultVirgin()) {
// do not save initial and virgin default session
} else if (!save() || !clear()) {
@@ -650,6 +662,8 @@ bool SessionManager::loadImpl(const QString &fileName)
}
}
+ m_defaultVirginSession = false;
+
if (success) {
emit aboutToUnloadSession();
delete m_file;
@@ -1008,7 +1022,7 @@ void SessionManager::setValue(const QString &name, const QVariant &value)
if (m_file->m_values.value(name) == value)
return;
m_file->m_values.insert(name, value);
- markSessionFileDirty();
+ markSessionFileDirty(false);
}
QVariant SessionManager::value(const QString &name)
@@ -1135,10 +1149,12 @@ void SessionManager::reportProjectLoadingProgress()
m_file->sessionLoadingProgress();
}
-void SessionManager::markSessionFileDirty()
+void SessionManager::markSessionFileDirty(bool makeDefaultVirginDirty)
{
if (m_file && !m_file->fileName().isEmpty())
m_autoSaveSessionTimer->start();
+ if (makeDefaultVirginDirty)
+ m_defaultVirginSession = false;
}
#include "session.moc"
diff --git a/src/plugins/projectexplorer/session.h b/src/plugins/projectexplorer/session.h
index c0d7f76750730e16ca8aec78cd8f5b9c5dd1ca5b..f7b5d246d6834d866b3bdc58b6fa99de2cbec2d6 100644
--- a/src/plugins/projectexplorer/session.h
+++ b/src/plugins/projectexplorer/session.h
@@ -173,7 +173,7 @@ private slots:
void handleCurrentEditorChange(Core::IEditor *editor);
void updateWindowTitle();
- void markSessionFileDirty();
+ void markSessionFileDirty(bool makeDefaultVirginDirty = true);
private:
bool loadImpl(const QString &fileName);
@@ -195,6 +195,7 @@ private:
QPointer<Core::IEditor> m_currentEditor;
QString m_displayName;
QString m_sessionName;
+ bool m_defaultVirginSession;
mutable QStringList m_sessions;
diff --git a/src/plugins/projectexplorer/taskwindow.cpp b/src/plugins/projectexplorer/taskwindow.cpp
index 6b7a446e1f078932b08135f62416b924c10be179..a569fd5f21c7b3024566c9f585ef0c4cb15f5f93 100644
--- a/src/plugins/projectexplorer/taskwindow.cpp
+++ b/src/plugins/projectexplorer/taskwindow.cpp
@@ -31,6 +31,8 @@
#include <coreplugin/actionmanager/actionmanager.h>
#include <coreplugin/coreconstants.h>
+#include <coreplugin/vcsmanager.h>
+#include <coreplugin/iversioncontrol.h>
#include <coreplugin/editormanager/editormanager.h>
#include <coreplugin/icore.h>
#include <coreplugin/uniqueidmanager.h>
@@ -40,6 +42,7 @@
#include <QtCore/QDir>
#include <QtCore/QFileInfo>
+#include <QtCore/QDebug>
#include <QtGui/QApplication>
#include <QtGui/QClipboard>
#include <QtGui/QKeyEvent>
@@ -464,16 +467,25 @@ TaskWindow::TaskWindow()
Core::Command *command = core->actionManager()->
registerAction(m_copyAction, Core::Constants::COPY, m_taskWindowContext->context());
m_listview->addAction(command->action());
+ connect(m_copyAction, SIGNAL(triggered()), SLOT(copy()));
- connect(m_listview->selectionModel(), SIGNAL(currentChanged(const QModelIndex &, const QModelIndex &)),
- tld, SLOT(currentChanged(const QModelIndex &, const QModelIndex &)));
+ // Annotate using VCS: Make visible in all contexts
+ m_vcsAnnotateAction = new QAction(tr("&Annotate"), this);
+ m_vcsAnnotateAction->setToolTip("Annotate using version control system");
+ QList<int> annotateContext = m_taskWindowContext->context();
+ annotateContext << Core::ICore::instance()->uniqueIDManager()->uniqueIdentifier(QLatin1String(Core::Constants::C_GLOBAL));
+ command = core->actionManager()->
+ registerAction(m_vcsAnnotateAction, QLatin1String("ProjectExplorer.Task.VCS_Annotate"), annotateContext);
+ m_listview->addAction(command->action());
+ connect(m_vcsAnnotateAction, SIGNAL(triggered()), SLOT(vcsAnnotate()));
- connect(m_listview, SIGNAL(activated(const QModelIndex &)),
- this, SLOT(showTaskInFile(const QModelIndex &)));
- connect(m_listview, SIGNAL(clicked(const QModelIndex &)),
- this, SLOT(showTaskInFile(const QModelIndex &)));
+ connect(m_listview->selectionModel(), SIGNAL(currentChanged(QModelIndex,QModelIndex)),
+ tld, SLOT(currentChanged(QModelIndex,QModelIndex)));
- connect(m_copyAction, SIGNAL(triggered()), SLOT(copy()));
+ connect(m_listview, SIGNAL(activated(QModelIndex)),
+ this, SLOT(showTaskInFile(QModelIndex)));
+ connect(m_listview, SIGNAL(clicked(QModelIndex)),
+ this, SLOT(showTaskInFile(QModelIndex)));
m_filterWarningsButton = createFilterButton(Task::Warning,
tr("Show Warnings"), m_model,
@@ -563,12 +575,29 @@ void TaskWindow::showTaskInFile(const QModelIndex &index)
m_listview->selectionModel()->select(index, QItemSelectionModel::ClearAndSelect);
}
+// Right-click VCS annotate: Find version control and point it to line
+void TaskWindow::vcsAnnotate()
+{
+ const QModelIndex index = m_listview->selectionModel()->currentIndex();
+ if (!index.isValid())
+ return;
+ const QString file = index.data(TaskModel::File).toString();
+ const int line = index.data(TaskModel::Line).toInt();
+ const QFileInfo fi(file);
+ if (fi.exists())
+ if (Core::IVersionControl *vc = Core::ICore::instance()->vcsManager()->findVersionControlForDirectory(fi.absolutePath()))
+ if (vc->supportsOperation(Core::IVersionControl::AnnotateOperation))
+ vc->vcsAnnotate(fi.absoluteFilePath(), line);
+}
+
void TaskWindow::copy()
{
- QModelIndex index = m_listview->selectionModel()->currentIndex();
- QString file = index.data(TaskModel::File).toString();
- QString line = index.data(TaskModel::Line).toString();
- QString description = index.data(TaskModel::Description).toString();
+ const QModelIndex index = m_listview->selectionModel()->currentIndex();
+ if (!index.isValid())
+ return;
+ const QString file = index.data(TaskModel::File).toString();
+ const QString line = index.data(TaskModel::Line).toString();
+ const QString description = index.data(TaskModel::Description).toString();
QString type;
switch (index.data(TaskModel::Type).toInt()) {
case Task::Error:
diff --git a/src/plugins/projectexplorer/taskwindow.h b/src/plugins/projectexplorer/taskwindow.h
index 3592591f400bafaf430d02c8687f7fc62dbe56c7..e2f02245933e11c83b25c3723ce04d92307ffa3b 100644
--- a/src/plugins/projectexplorer/taskwindow.h
+++ b/src/plugins/projectexplorer/taskwindow.h
@@ -119,6 +119,7 @@ signals:
private slots:
void showTaskInFile(const QModelIndex &index);
void copy();
+ void vcsAnnotate();
void setShowWarnings(bool);
void updateCategoriesMenu();
void filterCategoryTriggered(QAction *action);
@@ -132,6 +133,7 @@ private:
Internal::TaskView *m_listview;
Internal::TaskWindowContext *m_taskWindowContext;
QAction *m_copyAction;
+ QAction *m_vcsAnnotateAction;
QToolButton *m_filterWarningsButton;
QToolButton *m_categoriesButton;
QMenu *m_categoriesMenu;
diff --git a/src/plugins/qmldesigner/QmlDesigner.pluginspec b/src/plugins/qmldesigner/QmlDesigner.pluginspec
index 916d7b8229fddbb4afd959d4424fcb59a7fa8439..bb2ed107848474f10f783688182f796c621becdd 100644
--- a/src/plugins/qmldesigner/QmlDesigner.pluginspec
+++ b/src/plugins/qmldesigner/QmlDesigner.pluginspec
@@ -22,5 +22,6 @@ will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.</license>
<dependencyList>
<dependency name="Core" version="1.3.82"/>
<dependency name="TextEditor" version="1.3.82"/>
+ <dependency name="QmlJSEditor" version="1.3.82"/>
</dependencyList>
</plugin>
diff --git a/src/plugins/qmldesigner/components/itemlibrary/itemlibrary.cpp b/src/plugins/qmldesigner/components/itemlibrary/itemlibrary.cpp
index 6bfaf1f6f2f26bbcb4900d731e9fc590c76d1b34..ae3cb1c787ffa530c20beb5da211ecef9c731774 100644
--- a/src/plugins/qmldesigner/components/itemlibrary/itemlibrary.cpp
+++ b/src/plugins/qmldesigner/components/itemlibrary/itemlibrary.cpp
@@ -127,7 +127,6 @@ ItemLibrary::ItemLibrary(QWidget *parent) :
/* create Items view and its model */
m_d->m_itemsView = new QDeclarativeView(this);
- m_d->m_itemsView->setSource(QUrl("qrc:/ItemLibrary/qml/ItemsView.qml"));
m_d->m_itemsView->setAttribute(Qt::WA_OpaquePaintEvent);
m_d->m_itemsView->setAttribute(Qt::WA_NoSystemBackground);
m_d->m_itemsView->setAcceptDrops(false);
@@ -146,6 +145,9 @@ ItemLibrary::ItemLibrary(QWidget *parent) :
highlightColor.setHsvF(highlightColor.hsvHueF(),0.1 + highlightColor.saturationF()*2.0, highlightColor.valueF());
m_d->m_itemsView->rootContext()->setContextProperty(QLatin1String("highlightColor"), highlightColor);
+ // loading the qml has to come after all needed context properties are set
+ m_d->m_itemsView->setSource(QUrl("qrc:/ItemLibrary/qml/ItemsView.qml"));
+
QDeclarativeItem *rootItem = qobject_cast<QDeclarativeItem*>(m_d->m_itemsView->rootObject());
connect(rootItem, SIGNAL(itemSelected(int)), this, SLOT(showItemInfo(int)));
connect(rootItem, SIGNAL(itemDragged(int)), this, SLOT(startDragAndDrop(int)));
@@ -217,6 +219,9 @@ ItemLibrary::ItemLibrary(QWidget *parent) :
ItemLibrary::~ItemLibrary()
{
+ /* workaround: delete the items view before the model is deleted.
+ This prevents qml warnings when the item library is destructed. */
+ delete m_d->m_itemsView;
delete m_d;
}
diff --git a/src/plugins/qmldesigner/components/itemlibrary/qml/ItemView.qml b/src/plugins/qmldesigner/components/itemlibrary/qml/ItemView.qml
index 2be2d56c640ec1fdb5b3a6118c6c9701bf67f438..9acb95d186bd856057c07db598c29ae84e392ee5 100644
--- a/src/plugins/qmldesigner/components/itemlibrary/qml/ItemView.qml
+++ b/src/plugins/qmldesigner/components/itemlibrary/qml/ItemView.qml
@@ -101,13 +101,13 @@ Item {
Text {
id: text
- elide: ElideMiddle
+ elide: Text.ElideMiddle
anchors.top: itemIcon.bottom
anchors.topMargin: style.cellVerticalSpacing
anchors.left: parent.left
- anchors.leftMargin: style.cellHorizontalMargin
- anchors.right: parent.right
- anchors.rightMargin: style.cellHorizontalMargin
+ anchors.leftMargin: style.cellHorizontalMargin
+ anchors.right: parent.right
+ anchors.rightMargin: style.cellHorizontalMargin
width: style.textWidth
height: style.textHeight
diff --git a/src/plugins/qmldesigner/components/itemlibrary/qml/ItemsView.qml b/src/plugins/qmldesigner/components/itemlibrary/qml/ItemsView.qml
index f78a3028d528156a6fb2dad151719351655afcf1..dd1832460356d50b25440860cc549a055c332450 100644
--- a/src/plugins/qmldesigner/components/itemlibrary/qml/ItemsView.qml
+++ b/src/plugins/qmldesigner/components/itemlibrary/qml/ItemsView.qml
@@ -31,28 +31,28 @@ import Qt 4.6
/* The view displaying the item grid.
- The following Qml context properties have to be set:
- - listmodel itemLibraryModel
- - int itemLibraryIconWidth
- - int itemLibraryIconHeight
-
- itemLibraryModel has to have the following structure:
-
- ListModel {
- ListElement {
- int sectionLibId
- string sectionName
- list sectionEntries: [
- ListElement {
- int itemLibId
- string itemName
- pixmap itemPixmap
- },
- ...
- ]
- }
- ...
- }
+The following Qml context properties have to be set:
+- listmodel itemLibraryModel
+- int itemLibraryIconWidth
+- int itemLibraryIconHeight
+
+itemLibraryModel has to have the following structure:
+
+ListModel {
+ListElement {
+int sectionLibId
+string sectionName
+list sectionEntries: [
+ListElement {
+int itemLibId
+string itemName
+pixmap itemPixmap
+},
+...
+]
+}
+...
+}
*/
Rectangle {
@@ -79,149 +79,149 @@ Rectangle {
color: style.backgroundColor
/* workaround: without this, a completed drag and drop operation would
- result in the drag being continued when QmlView re-gains
- focus */
+result in the drag being continued when QmlView re-gains
+focus */
MouseArea {
anchors.fill: parent
hoverEnabled: true
onEntered: {
- if (!pressed)
- stopDragAndDrop()
- }
- }
-
- signal selectionUpdated(int itemSectionIndex)
-
- property int selectedItemLibId: -1
- property int selectionSectionLibId: -1
-
- function setSelection(itemLibId) {
- selectedItemLibId = itemLibId
- selectionSectionLibId = itemLibraryModel.getSectionLibId(itemLibId)
- selectionUpdated(itemLibraryModel.getItemSectionIndex(itemLibId))
- }
-
- function unsetSelection() {
- selectedItemLibId = -1
- selectionSectionLibId = -1
- selectionUpdated(-1)
- }
-
- Connections {
- target: itemLibraryModel
- onVisibilityChanged: {
- if (itemLibraryModel.isItemVisible(selectedItemLibId))
- setSelection(selectedItemLibId)
- else
- unsetSelection()
- }
- }
-
- /* the following 3 properties are calculated here for performance
- reasons and then passed to the section views */
- property int entriesPerRow: Math.max(1, Math.floor((itemsFlickable.width - 2) / style.cellWidth))
- property int cellWidth: Math.floor((itemsFlickable.width - 2) / entriesPerRow)
- property int cellHeight: style.cellHeight
-
- Component {
- id: sectionDelegate
-
- SectionView {
- id: section
-
- entriesPerRow: itemsView.entriesPerRow
- cellWidth: itemsView.cellWidth
- cellHeight: itemsView.cellHeight
-
- width: itemsFlickable.width
- itemHighlight: selector
-
- property bool containsSelection: (selectionSectionLibId == sectionLibId)
-
- onItemSelected: {
- itemsView.setSelection(itemLibId)
- itemsView.itemSelected(itemLibId)
- }
- onItemDragged: {
- section.itemSelected(itemLibId)
- itemsView.itemDragged(itemLibId)
- }
-
- Connections {
- target: itemsView
- onExpandAllEntries: section.expand()
- onSelectionUpdated: {
- if (containsSelection) {
- section.setSelection(itemSectionIndex)
- section.focusSelection(itemsFlickable)
- } else
- section.unsetSelection()
- }
- }
-
- Component {
- id: selector
-
- Selector {
- x: containsSelection? section.currentItem.x:0
- y: containsSelection? section.currentItem.y:0
- width: itemsView.cellWidth
- height: itemsView.cellHeight
-
- visible: containsSelection
- }
- }
- }
- }
-
- Flickable {
- id: itemsFlickable
-
- anchors.top: parent.top
- anchors.topMargin: 3
- anchors.bottom: parent.bottom
- anchors.left: parent.left
- anchors.right: scrollbar.left
- overShoot: false
-
- interactive: false
- contentHeight: col.height
-
- /* Limit the content position. Without this, resizing would get the
- content position out of scope regarding the scrollbar. */
- function limitContentPos() {
- if (contentY < 0)
- contentY = 0;
- else {
- var maxContentY = Math.max(0, contentHeight - height)
- if (contentY > maxContentY)
- contentY = maxContentY;
- }
- }
- onHeightChanged: limitContentPos()
- onContentHeightChanged: limitContentPos()
-
- Column {
- id: col
-
- Repeater {
- model: itemLibraryModel // to be set in Qml context
- delegate: sectionDelegate
+ if (!pressed)
+ stopDragAndDrop()
+ }
}
- }
- }
-
- Scrollbar {
- id: scrollbar
-
- anchors.top: parent.top
- anchors.topMargin: 2
- anchors.bottom: parent.bottom
- anchors.bottomMargin: 2
- anchors.left: parent.right
- anchors.leftMargin: -10
- anchors.right: parent.right
- flickable: itemsFlickable
- }
-}
+ signal selectionUpdated(int itemSectionIndex)
+
+ property int selectedItemLibId: -1
+ property int selectionSectionLibId: -1
+
+ function setSelection(itemLibId) {
+ selectedItemLibId = itemLibId
+ selectionSectionLibId = itemLibraryModel.getSectionLibId(itemLibId)
+ selectionUpdated(itemLibraryModel.getItemSectionIndex(itemLibId))
+ }
+
+ function unsetSelection() {
+ selectedItemLibId = -1
+ selectionSectionLibId = -1
+ selectionUpdated(-1)
+ }
+
+ Connections {
+ target: itemLibraryModel
+ onVisibilityChanged: {
+ if (itemLibraryModel.isItemVisible(selectedItemLibId))
+ setSelection(selectedItemLibId)
+ else
+ unsetSelection()
+ }
+ }
+
+ /* the following 3 properties are calculated here for performance
+reasons and then passed to the section views */
+ property int entriesPerRow: Math.max(1, Math.floor((itemsFlickable.width - 2) / style.cellWidth))
+ property int cellWidth: Math.floor((itemsFlickable.width - 2) / entriesPerRow)
+ property int cellHeight: style.cellHeight
+
+ Component {
+ id: sectionDelegate
+
+ SectionView {
+ id: section
+
+ entriesPerRow: itemsView.entriesPerRow
+ cellWidth: itemsView.cellWidth
+ cellHeight: itemsView.cellHeight
+
+ width: itemsFlickable.width
+ itemHighlight: selector
+
+ property bool containsSelection: (selectionSectionLibId == sectionLibId)
+
+ onItemSelected: {
+ itemsView.setSelection(itemLibId)
+ itemsView.itemSelected(itemLibId)
+ }
+ onItemDragged: {
+ section.itemSelected(itemLibId)
+ itemsView.itemDragged(itemLibId)
+ }
+
+ Connections {
+ target: itemsView
+ onExpandAllEntries: section.expand()
+ onSelectionUpdated: {
+ if (containsSelection) {
+ section.setSelection(itemSectionIndex)
+ section.focusSelection(itemsFlickable)
+ } else
+ section.unsetSelection()
+ }
+ }
+
+ Component {
+ id: selector
+
+ Selector {
+ x: containsSelection? section.currentItem.x:0
+ y: containsSelection? section.currentItem.y:0
+ width: itemsView.cellWidth
+ height: itemsView.cellHeight
+
+ visible: containsSelection
+ }
+ }
+ }
+ }
+
+ Flickable {
+ id: itemsFlickable
+
+ anchors.top: parent.top
+ anchors.topMargin: 3
+ anchors.bottom: parent.bottom
+ anchors.left: parent.left
+ anchors.right: scrollbar.left
+ overShoot: false
+
+ interactive: false
+ contentHeight: col.height
+
+ /* Limit the content position. Without this, resizing would get the
+content position out of scope regarding the scrollbar. */
+ function limitContentPos() {
+ if (contentY < 0)
+ contentY = 0;
+ else {
+ var maxContentY = Math.max(0, contentHeight - height)
+ if (contentY > maxContentY)
+ contentY = maxContentY;
+ }
+ }
+ onHeightChanged: limitContentPos()
+ onContentHeightChanged: limitContentPos()
+
+ Column {
+ id: col
+
+ Repeater {
+ model: itemLibraryModel // to be set in Qml context
+ delegate: sectionDelegate
+ }
+ }
+ }
+
+ Scrollbar {
+ id: scrollbar
+
+ anchors.top: parent.top
+ anchors.topMargin: 2
+ anchors.bottom: parent.bottom
+ anchors.bottomMargin: 2
+ anchors.left: parent.right
+ anchors.leftMargin: -10
+ anchors.right: parent.right
+
+ flickable: itemsFlickable
+ }
+ }
diff --git a/src/plugins/qmldesigner/components/itemlibrary/qml/ItemsViewStyle.qml b/src/plugins/qmldesigner/components/itemlibrary/qml/ItemsViewStyle.qml
index a2ba71393a254340b2ff69f032c662235034b002..80a76b2e80d4087b3404bf7449a33c52dfc7ab0d 100644
--- a/src/plugins/qmldesigner/components/itemlibrary/qml/ItemsViewStyle.qml
+++ b/src/plugins/qmldesigner/components/itemlibrary/qml/ItemsViewStyle.qml
@@ -65,6 +65,6 @@ Item {
// the following depend on the actual shape of the item delegate
property int cellWidth: textWidth + 2 * cellHorizontalMargin
property int cellHeight: itemLibraryIconHeight + textHeight +
- 2 * cellVerticalMargin + cellVerticalSpacing
+ 2 * cellVerticalMargin + cellVerticalSpacing
}
diff --git a/src/plugins/qmldesigner/components/itemlibrary/qml/Scrollbar.qml b/src/plugins/qmldesigner/components/itemlibrary/qml/Scrollbar.qml
index ec8705c3237fbe2944b0a0577f1c4d0a1e4ba60d..5821c00c5a287f9283366809e3aac38fffb5147d 100644
--- a/src/plugins/qmldesigner/components/itemlibrary/qml/Scrollbar.qml
+++ b/src/plugins/qmldesigner/components/itemlibrary/qml/Scrollbar.qml
@@ -39,7 +39,7 @@ Item {
property var flickable
function reset() {
- handle.y = 0
+ handle.y = 0
}
// internal
@@ -60,16 +60,16 @@ Item {
}
function updateHandle() {
- handle.updateFlickable = false
+ handle.updateFlickable = false
- if (flickable)
- handle.y = scrollHeight * Math.min(
- flickable.contentY / (flickable.contentHeight - flickable.height),
- 1)
- else
- handle.y = 0
+ if (flickable)
+ handle.y = scrollHeight * Math.min(
+ flickable.contentY / (flickable.contentHeight - flickable.height),
+ 1)
+ else
+ handle.y = 0
- handle.updateFlickable = true
+ handle.updateFlickable = true
}
onHeightChanged: updateHandle()
@@ -103,38 +103,38 @@ Item {
anchors.left: parent.left
anchors.leftMargin: 1
anchors.right: parent.right
-// anchors.rightMargin: 1
- height: Math.max(width, bar.height * Math.min(1, flickable.height / flickable.contentHeight))
+ // anchors.rightMargin: 1
+ height: Math.max(width, bar.height * Math.min(1, flickable.height / flickable.contentHeight))
- property bool updateFlickable: true
+ property bool updateFlickable: true
- onYChanged: {
- if (updateFlickable)
- flickable.contentY = Math.max(0, flickable.contentHeight * y / bar.height)
- }
-
- Rectangle {
- width: parent.height - 1
- height: parent.width
- y: 1 - height
-
- rotation: 90
- transformOrigin: Item.BottomLeft
+ onYChanged: {
+ if (updateFlickable)
+ flickable.contentY = Math.max(0, flickable.contentHeight * y / bar.height)
+ }
- gradient: Gradient {
- GradientStop { position: 0.0; color: style.scrollbarGradientStartColor }
- GradientStop { position: 1.0; color: style.scrollbarGradientEndColor }
+ Rectangle {
+ width: parent.height - 1
+ height: parent.width
+ y: 1 - height
+
+ rotation: 90
+ transformOrigin: Item.BottomLeft
+
+ gradient: Gradient {
+ GradientStop { position: 0.0; color: style.scrollbarGradientStartColor }
+ GradientStop { position: 1.0; color: style.scrollbarGradientEndColor }
+ }
+ }
+
+ MouseArea {
+ anchors.fill: parent
+ drag.target: parent
+ drag.axis: "YAxis"
+ drag.minimumY: 0
+ drag.maximumY: scrollHeight
+ }
}
- }
-
- MouseArea {
- anchors.fill: parent
- drag.target: parent
- drag.axis: "YAxis"
- drag.minimumY: 0
- drag.maximumY: scrollHeight
- }
- }
MouseArea {
anchors.left: parent.left
diff --git a/src/plugins/qmldesigner/components/itemlibrary/qml/SectionView.qml b/src/plugins/qmldesigner/components/itemlibrary/qml/SectionView.qml
index 7edfd62c6db43948302008961f9e8a1453eb5f65..07a0856caf896b0156905a359e41f7c5c92f3435 100644
--- a/src/plugins/qmldesigner/components/itemlibrary/qml/SectionView.qml
+++ b/src/plugins/qmldesigner/components/itemlibrary/qml/SectionView.qml
@@ -53,34 +53,34 @@ Column {
function setSelection(itemSectionIndex)
{
- gridView.currentIndex = itemSectionIndex
+ gridView.currentIndex = itemSectionIndex
}
function unsetSelection()
{
- gridView.currentIndex = -1
+ gridView.currentIndex = -1
}
function focusSelection(flickable) {
- var pos = -1;
+ var pos = -1;
- if (!gridView.currentItem)
- return;
+ if (!gridView.currentItem)
+ return;
- var currentItemX = sectionView.x + gridFrame.x + gridView.x + gridView.currentItem.x;
- var currentItemY = sectionView.y + gridFrame.y + gridView.y + gridView.currentItem.y
- - gridView.contentY; // workaround: GridView reports wrong contentY
+ var currentItemX = sectionView.x + gridFrame.x + gridView.x + gridView.currentItem.x;
+ var currentItemY = sectionView.y + gridFrame.y + gridView.y + gridView.currentItem.y
+ - gridView.contentY; // workaround: GridView reports wrong contentY
- if (currentItemY < flickable.contentY)
- pos = Math.max(0, currentItemY)
+ if (currentItemY < flickable.contentY)
+ pos = Math.max(0, currentItemY)
- else if ((currentItemY + gridView.currentItem.height) >
- (flickable.contentY + flickable.height - 1))
- pos = Math.min(Math.max(0, flickable.contentHeight - flickable.height),
- currentItemY + gridView.currentItem.height - flickable.height + 1)
+ else if ((currentItemY + gridView.currentItem.height) >
+ (flickable.contentY + flickable.height - 1))
+ pos = Math.min(Math.max(0, flickable.contentHeight - flickable.height),
+ currentItemY + gridView.currentItem.height - flickable.height + 1)
- if (pos >= 0)
- flickable.contentY = pos
+ if (pos >= 0)
+ flickable.contentY = pos
}
// internal
@@ -93,8 +93,8 @@ Column {
ItemView {
id: item
- width: cellWidth
- height: cellHeight
+ width: cellWidth
+ height: cellHeight
onItemPressed: sectionView.itemSelected(itemLibId)
onItemDragged: sectionView.itemDragged(itemLibId)
@@ -134,7 +134,7 @@ Column {
text: sectionName // to be set by model
color: style.sectionTitleTextColor
- elide: Text.ElideMiddle
+ elide: Text.ElideMiddle
}
MouseArea {
anchors.fill: parent
@@ -162,11 +162,11 @@ Column {
Connections {
target: itemLibraryModel // to be set in Qml context
onSectionVisibilityChanged: {
- /* workaround: reset model in order to get the grid view
- updated properly under all conditions */
- if (changedSectionLibId == sectionLibId)
- gridView.model = sectionEntries
- }
+ /* workaround: reset model in order to get the grid view
+updated properly under all conditions */
+ if (changedSectionLibId == sectionLibId)
+ gridView.model = sectionEntries
+ }
}
anchors.fill: parent
@@ -177,24 +177,24 @@ Column {
cellHeight: sectionView.cellHeight
model: sectionEntries // to be set by model
delegate: itemDelegate
- highlight: itemHighlight
+ highlight: itemHighlight
interactive: false
highlightFollowsCurrentItem: false
}
states: [
- State {
- name: "shrunk"
- PropertyChanges {
- target: gridFrame
- height: 0
- opacity: 0
- }
- PropertyChanges {
- target: arrow
- rotation: -90
- }
+ State {
+ name: "shrunk"
+ PropertyChanges {
+ target: gridFrame
+ height: 0
+ opacity: 0
}
+ PropertyChanges {
+ target: arrow
+ rotation: -90
+ }
+ }
]
}
diff --git a/src/plugins/qmldesigner/components/propertyeditor/basicwidgets.cpp b/src/plugins/qmldesigner/components/propertyeditor/basicwidgets.cpp
index fdc17c1483e68cd811ab8b4f44f27e4f2021d760..ae9dd3c4f5833f71a862862a5c724f26500a7655 100644
--- a/src/plugins/qmldesigner/components/propertyeditor/basicwidgets.cpp
+++ b/src/plugins/qmldesigner/components/propertyeditor/basicwidgets.cpp
@@ -976,7 +976,7 @@ void WidgetLoader::setSource(const QUrl &source)
}
QDeclarativeContext *ctxt = new QDeclarativeContext(qmlContext(this));
- ctxt->addDefaultObject(this);
+ ctxt->setContextObject(this);
QObject *obj = m_component->create(ctxt);
if (obj) {
QWidget *widget = qobject_cast<QWidget *>(obj);
diff --git a/src/plugins/qmldesigner/components/propertyeditor/siblingcombobox.cpp b/src/plugins/qmldesigner/components/propertyeditor/siblingcombobox.cpp
index 5c677348cf478f95954ee0f960f9d044c782f38c..1309adea5e271b7b82b5f224ce47d41fc10206f6 100644
--- a/src/plugins/qmldesigner/components/propertyeditor/siblingcombobox.cpp
+++ b/src/plugins/qmldesigner/components/propertyeditor/siblingcombobox.cpp
@@ -87,19 +87,20 @@ void SiblingComboBox::setup()
}
QmlItemNode parent(m_itemNode.instanceParent().toQmlItemNode());
- m_itemList.prepend(parent);
- QString parentString("Parent (");
- if (parent.id().isEmpty())
- parentString += parent.simplfiedTypeName();
- else
- parentString += parent.id();
- parentString += ")";
- insertItem(0, parentString);
+ if (parent.isValid()) {
+ m_itemList.prepend(parent);
+ QString parentString("Parent (");
+ if (parent.id().isEmpty())
+ parentString += parent.simplfiedTypeName();
+ else
+ parentString += parent.id();
+ parentString += ")";
+ insertItem(0, parentString);
+ }
setCurrentIndex(m_itemList.indexOf(m_selectedItemNode));
connect(this, SIGNAL(currentIndexChanged (int)), this, SLOT(changeSelection(int)));
-
}
diff --git a/src/plugins/qmldesigner/components/resources/stylesheet.css b/src/plugins/qmldesigner/components/resources/stylesheet.css
index fdff4e9addd948937d186ce084ab1ca2721f95bd..b89d2525f5b11e4e3ed6aff68cfa04aca117ff50 100644
--- a/src/plugins/qmldesigner/components/resources/stylesheet.css
+++ b/src/plugins/qmldesigner/components/resources/stylesheet.css
@@ -46,6 +46,18 @@ QLineEdit
selection-background-color: darkgray;
}
+QLineEdit#itemLibrarySearchInput {
+ color: black;
+ border: 2px solid #0F0F0F;
+ border-radius: 6px;
+ border-width: 1;
+ max-height: 20px;
+ min-height: 20px;
+ background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,
+ stop: 0 #e0e0e0, stop: 1 #f0f0f0);
+}
+
+
QTreeView {
color: white;
selection-color: white
@@ -101,3 +113,30 @@ QTreeView::branch:has-siblings:!adjoins-item {
selection-color: #404040;
}
+QTabBar::tab {
+ border-image: none;
+ width: 11ex;
+ height: 22px;
+ margin: 0px 0 0px 0;
+ background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,
+ stop: 0 #3c3c3c, stop: 1 #444444);
+
+ color: #EEEEEE;
+}
+
+QTabBar::tab:hover {
+ background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,
+ stop: 0 #3c3c3c, stop: 1 #666666);
+}
+
+QTabBar::tab:selected {
+ border: none; /* no border for a flat push button */
+ background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,
+ stop: 0 #EFEFEF, stop: 1 #EEEEEE);
+ color: #3c3c3c;
+}
+
+QWidget#itemLibrarySearchInputFrame {
+ background-color: #eeeeee;
+}
+
diff --git a/src/plugins/qmldesigner/core/filemanager/addpropertyvisitor.cpp b/src/plugins/qmldesigner/core/filemanager/addpropertyvisitor.cpp
index 98ef915a0ec7df993cb22de7dea7704f80c30525..52687f34f9c2cf8f778c19d6d1c912aef6ffdea6 100644
--- a/src/plugins/qmldesigner/core/filemanager/addpropertyvisitor.cpp
+++ b/src/plugins/qmldesigner/core/filemanager/addpropertyvisitor.cpp
@@ -105,6 +105,25 @@ void AddPropertyVisitor::addInMembers(QmlJS::AST::UiObjectInitializer *initializ
depth = calculateIndentDepth(endOfPreviousMember);
}
+ const bool isOneLiner = endOfPreviousMember.startLine == startOfNextMember.startLine;
+ bool needsPreceedingSemicolon = false;
+ bool needsTrailingSemicolon = false;
+
+ if (isOneLiner) {
+ if (insertAfter == 0) { // we're inserting after an lbrace
+ if (initializer->members) { // we're inserting before a member (and not the rbrace)
+ needsTrailingSemicolon = true;
+ }
+ } else { // we're inserting after a member, not after the lbrace
+ if (endOfPreviousMember.isValid()) { // there already is a semicolon after the previous member
+ if (insertAfter->next && insertAfter->next->member) { // and the after us there is a member, not an rbrace, so:
+ needsTrailingSemicolon = true;
+ }
+ } else { // there is no semicolon after the previous member (probably because there is an rbrace after us/it, so:
+ needsPreceedingSemicolon = true;
+ }
+ }
+ }
QString newPropertyTemplate;
switch (m_propertyType) {
@@ -125,12 +144,19 @@ void AddPropertyVisitor::addInMembers(QmlJS::AST::UiObjectInitializer *initializ
Q_ASSERT(!"unknown property type");
}
- const bool isOneLiner = endOfPreviousMember.startLine == startOfNextMember.startLine;
- if (isOneLiner)
- newPropertyTemplate += QLatin1Char('\n');
+ if (isOneLiner) {
+ if (needsPreceedingSemicolon)
+ newPropertyTemplate.prepend(QLatin1Char(';'));
+ newPropertyTemplate.prepend(QLatin1Char(' '));
+ if (needsTrailingSemicolon)
+ newPropertyTemplate.append(QLatin1Char(';'));
+ depth = 0;
+ } else {
+ newPropertyTemplate.prepend(QLatin1Char('\n'));
+ }
const QString newPropertyText = addIndentation(newPropertyTemplate.arg(m_name, m_value), depth);
- replace(endOfPreviousMember.end(), 0, QLatin1Char('\n') + newPropertyText);
+ replace(endOfPreviousMember.end(), 0, newPropertyText);
setDidRewriting(true);
}
diff --git a/src/plugins/qmldesigner/core/filemanager/qmlrewriter.cpp b/src/plugins/qmldesigner/core/filemanager/qmlrewriter.cpp
index 1a150fd245a66f513b26299849d1ac97a7d8aa53..e148c80cca595279a50bf260a0b5c51d32505085 100644
--- a/src/plugins/qmldesigner/core/filemanager/qmlrewriter.cpp
+++ b/src/plugins/qmldesigner/core/filemanager/qmlrewriter.cpp
@@ -98,6 +98,9 @@ unsigned QMLRewriter::calculateIndentDepth(const SourceLocation &position) const
QString QMLRewriter::addIndentation(const QString &text, unsigned depth)
{
+ if (depth == 0)
+ return text;
+
const QString indentation(depth, QLatin1Char(' '));
if (text.isEmpty())
diff --git a/src/plugins/qmldesigner/core/include/basetexteditmodifier.h b/src/plugins/qmldesigner/core/include/basetexteditmodifier.h
index b2d50a3c3da9b062cff1b892ad344a883d4004fa..7c0f05de4c592f14925cd975829e799b4a3cc04f 100644
--- a/src/plugins/qmldesigner/core/include/basetexteditmodifier.h
+++ b/src/plugins/qmldesigner/core/include/basetexteditmodifier.h
@@ -36,6 +36,12 @@
#include <texteditor/basetexteditor.h>
+#include <QtCore/QStringList>
+
+namespace QmlJS {
+class Snapshot;
+} // namespace QmlJS
+
namespace QmlDesigner {
class CORESHARED_EXPORT BaseTextEditModifier: public PlainTextEditModifier
@@ -46,6 +52,9 @@ public:
virtual void indent(int offset, int length);
virtual int indentDepth() const;
+
+ virtual QmlJS::Snapshot getSnapshot() const;
+ virtual QStringList importPaths() const;
};
} // namespace QmlDesigner
diff --git a/src/plugins/qmldesigner/core/include/componenttextmodifier.h b/src/plugins/qmldesigner/core/include/componenttextmodifier.h
index 57d968078d938634a3a8c6aa9508aa0f9a9cd574..4188007a6d669781183a2a22bdc6d45017aa80b9 100644
--- a/src/plugins/qmldesigner/core/include/componenttextmodifier.h
+++ b/src/plugins/qmldesigner/core/include/componenttextmodifier.h
@@ -58,6 +58,9 @@ public:
virtual void deactivateChangeSignals();
virtual void reactivateChangeSignals();
+ virtual QmlJS::Snapshot getSnapshot() const;
+ virtual QStringList importPaths() const;
+
public slots:
void contentsChange(int position, int charsRemoved, int charsAdded);
diff --git a/src/plugins/qmldesigner/core/include/plaintexteditmodifier.h b/src/plugins/qmldesigner/core/include/plaintexteditmodifier.h
index 335152fac398f0454ca9a0a0a0305a841d650886..2d64599c15173397b9815374d45d93823663643d 100644
--- a/src/plugins/qmldesigner/core/include/plaintexteditmodifier.h
+++ b/src/plugins/qmldesigner/core/include/plaintexteditmodifier.h
@@ -75,6 +75,9 @@ public:
virtual void deactivateChangeSignals();
virtual void reactivateChangeSignals();
+ virtual QmlJS::Snapshot getSnapshot() const = 0;
+ virtual QStringList importPaths() const = 0;
+
protected:
QPlainTextEdit *plainTextEdit() const
{ return m_textEdit; }
@@ -105,6 +108,12 @@ public:
virtual int indentDepth() const
{ return 0; }
+
+ virtual QmlJS::Snapshot getSnapshot() const
+ { return QmlJS::Snapshot(); }
+
+ virtual QStringList importPaths() const
+ { return QStringList(); }
};
}
diff --git a/src/plugins/qmldesigner/core/include/rewriterview.h b/src/plugins/qmldesigner/core/include/rewriterview.h
index 570dd1f649b5102de69e992fec13824006cf3cf2..a365cf3113d00f3b22f8fa66bb9f31c0925ffbe4 100644
--- a/src/plugins/qmldesigner/core/include/rewriterview.h
+++ b/src/plugins/qmldesigner/core/include/rewriterview.h
@@ -72,13 +72,19 @@ public:
enum Type {
NoError = 0,
InternalError = 1,
- ParseError = 2
+ ParseError = 2,
+ EngineError = 3
};
public:
Error();
Error(const QDeclarativeError &qmlError);
Error(Exception *exception);
+ Error(const QUrl &url,
+ const QString &description,
+ int line = -1,
+ int column = -1,
+ Type type = EngineError);
Type type() const
{ return m_type; }
diff --git a/src/plugins/qmldesigner/core/include/textmodifier.h b/src/plugins/qmldesigner/core/include/textmodifier.h
index c7c16928f61f123c6fb25a5b56eb9c451ec6df42..affbaa4b29838dba3930eaf00bdf2ac10cf3befa 100644
--- a/src/plugins/qmldesigner/core/include/textmodifier.h
+++ b/src/plugins/qmldesigner/core/include/textmodifier.h
@@ -30,13 +30,14 @@
#ifndef TEXTMODIFIER_H
#define TEXTMODIFIER_H
-#include <QtCore/QByteArray>
-#include <QtCore/QObject>
+#include "corelib_global.h"
-#include <QTextCursor>
-#include <QTextDocument>
+#include <qmljs/qmljsdocument.h>
-#include "corelib_global.h"
+#include <QtCore/QByteArray>
+#include <QtCore/QObject>
+#include <QtGui/QTextCursor>
+#include <QtGui/QTextDocument>
namespace QmlDesigner {
@@ -83,6 +84,9 @@ public:
virtual void deactivateChangeSignals() = 0;
virtual void reactivateChangeSignals() = 0;
+ virtual QmlJS::Snapshot getSnapshot() const = 0;
+ virtual QStringList importPaths() const = 0;
+
signals:
void textChanged();
diff --git a/src/plugins/qmldesigner/core/instances/nodeinstancemetaobject.cpp b/src/plugins/qmldesigner/core/instances/nodeinstancemetaobject.cpp
index ffcaf89eae180c917552ed3ac4ad09eaa4ac47b4..a99742dc7788111dfda68b0a561118e4152235c2 100644
--- a/src/plugins/qmldesigner/core/instances/nodeinstancemetaobject.cpp
+++ b/src/plugins/qmldesigner/core/instances/nodeinstancemetaobject.cpp
@@ -2,6 +2,7 @@
#include "objectnodeinstance.h"
#include <QSharedPointer>
+#include <QMetaProperty>
#include <qnumeric.h>
namespace QmlDesigner {
diff --git a/src/plugins/qmldesigner/core/instances/nodeinstancemetaobject.h b/src/plugins/qmldesigner/core/instances/nodeinstancemetaobject.h
index fdefd1ee05a9132341263f8d87efb1e54e2915bc..9a877f2322bcc24190301e556a4fafa286cf7fd6 100644
--- a/src/plugins/qmldesigner/core/instances/nodeinstancemetaobject.h
+++ b/src/plugins/qmldesigner/core/instances/nodeinstancemetaobject.h
@@ -1,8 +1,8 @@
#ifndef NODEINSTANCEMETAOBJECT_H
#define NODEINSTANCEMETAOBJECT_H
+#include <QDeclarativeContext>
#include <private/qdeclarativeopenmetaobject_p.h>
-#include <private/qdeclarativecontext_p.h>
namespace QmlDesigner {
namespace Internal {
diff --git a/src/plugins/qmldesigner/core/instances/nodeinstancesignalspy.cpp b/src/plugins/qmldesigner/core/instances/nodeinstancesignalspy.cpp
index 670a6d206510c790a586083069b202661f70b322..31b1f43b6a79a859c1f200f5f931c6d6297d3b7a 100644
--- a/src/plugins/qmldesigner/core/instances/nodeinstancesignalspy.cpp
+++ b/src/plugins/qmldesigner/core/instances/nodeinstancesignalspy.cpp
@@ -1,12 +1,11 @@
#include "nodeinstancesignalspy.h"
-
+#include "objectnodeinstance.h"
#include <QMetaProperty>
#include <QMetaObject>
#include <QtDebug>
-
-#include "objectnodeinstance.h"
#include <QSharedPointer>
+#include <private/qdeclarativemetatype_p.h>
namespace QmlDesigner {
namespace Internal {
diff --git a/src/plugins/qmldesigner/core/instances/nodeinstanceview.cpp b/src/plugins/qmldesigner/core/instances/nodeinstanceview.cpp
index 2f50d777e6ed51df97aed9c85f4d32e8eed7a772..f79e01c78ab739e0dbcf77838948336cf5483edb 100644
--- a/src/plugins/qmldesigner/core/instances/nodeinstanceview.cpp
+++ b/src/plugins/qmldesigner/core/instances/nodeinstanceview.cpp
@@ -31,6 +31,7 @@
#include <QDeclarativeEngine>
#include <QDeclarativeContext>
+#include <private/qdeclarativeengine_p.h>
#include <QtDebug>
#include <QUrl>
diff --git a/src/plugins/qmldesigner/core/instances/objectnodeinstance.cpp b/src/plugins/qmldesigner/core/instances/objectnodeinstance.cpp
index 70e6f26dbf94e1c3b83556ad337137f8328250d8..d6ede39ccdf3352393a7dde1855246c9f175bbca 100644
--- a/src/plugins/qmldesigner/core/instances/objectnodeinstance.cpp
+++ b/src/plugins/qmldesigner/core/instances/objectnodeinstance.cpp
@@ -57,6 +57,8 @@
#include <QSharedPointer>
#include <private/qdeclarativebinding_p.h>
+#include <private/qdeclarativemetatype_p.h>
+#include <private/qdeclarativevaluetype_p.h>
namespace QmlDesigner {
namespace Internal {
@@ -406,7 +408,8 @@ void ObjectNodeInstance::setPropertyBinding(const QString &name, const QString &
binding->setTarget(metaProperty);
binding->setNotifyOnValueChanged(true);
QDeclarativeAbstractBinding *oldBinding = QDeclarativePropertyPrivate::setBinding(metaProperty, binding);
- delete oldBinding;
+ if (oldBinding)
+ oldBinding->destroy();
binding->update();
} else {
qWarning() << "Cannot set binding for property" << name << ": property is unknown for type"
@@ -458,7 +461,7 @@ void ObjectNodeInstance::resetProperty(QObject *object, const QString &propertyN
QDeclarativeAbstractBinding *binding = QDeclarativePropertyPrivate::binding(qmlProperty);
if (binding) {
binding->setEnabled(false, 0);
- delete binding;
+ binding->destroy();
}
if (metaProperty.isResettable()) {
@@ -687,7 +690,9 @@ void ObjectNodeInstance::createDynamicProperty(const QString &name, const QStrin
void ObjectNodeInstance::refreshBindings(QDeclarativeContext *context)
{
// TODO: Maybe do this via a timer to prevent update flooding
- QDeclarativeContextPrivate::get(context)->refreshExpressions();
+
+ static int i = 0;
+ context->setContextProperty(QString("__dummy_%1").arg(i++), true);
}
}
diff --git a/src/plugins/qmldesigner/core/instances/proxywidgetnodeinstance.cpp b/src/plugins/qmldesigner/core/instances/proxywidgetnodeinstance.cpp
index d403ef891908a9ba0485c605454aaad397f1ce1e..e3d178a3e494261f83420eb5aa9ed268ea43569b 100644
--- a/src/plugins/qmldesigner/core/instances/proxywidgetnodeinstance.cpp
+++ b/src/plugins/qmldesigner/core/instances/proxywidgetnodeinstance.cpp
@@ -30,6 +30,7 @@
#include "proxywidgetnodeinstance.h"
#include <QGraphicsProxyWidget>
+#include <private/qdeclarativemetatype_p.h>
namespace QmlDesigner {
namespace Internal {
diff --git a/src/plugins/qmldesigner/core/instances/qmlgraphicsitemnodeinstance.cpp b/src/plugins/qmldesigner/core/instances/qmlgraphicsitemnodeinstance.cpp
index 6416efbcd1483b85d1f3f5e3e6b0efcd64ff0f65..eb9ad087de2ef7be68a150bb794fc00037be420e 100644
--- a/src/plugins/qmldesigner/core/instances/qmlgraphicsitemnodeinstance.cpp
+++ b/src/plugins/qmldesigner/core/instances/qmlgraphicsitemnodeinstance.cpp
@@ -42,6 +42,7 @@
#include <private/qdeclarativeanchors_p.h>
#include <private/qdeclarativeanchors_p_p.h>
+#include <private/qdeclarativeproperty_p.h>
#include <private/qdeclarativerectangle_p.h>
#include <cmath>
@@ -97,7 +98,8 @@ QSizeF QmlGraphicsItemNodeInstance::size() const
double implicitWidth = qmlGraphicsItem()->implicitWidth();
if (!m_hasWidth
&& implicitWidth // WORKAROUND
- && implicitWidth != qmlGraphicsItem()->width()) {
+ && implicitWidth != qmlGraphicsItem()->width()
+ && !modelNode().hasBindingProperty("width")) {
qmlGraphicsItem()->blockSignals(true);
qmlGraphicsItem()->setWidth(implicitWidth);
qmlGraphicsItem()->blockSignals(false);
@@ -106,7 +108,8 @@ QSizeF QmlGraphicsItemNodeInstance::size() const
double implicitHeight = qmlGraphicsItem()->implicitHeight();
if (!m_hasHeight
&& implicitWidth // WORKAROUND
- && implicitHeight != qmlGraphicsItem()->height()) {
+ && implicitHeight != qmlGraphicsItem()->height()
+ && !modelNode().hasBindingProperty("height")) {
qmlGraphicsItem()->blockSignals(true);
qmlGraphicsItem()->setHeight(implicitHeight);
qmlGraphicsItem()->blockSignals(false);
@@ -137,7 +140,8 @@ QRectF QmlGraphicsItemNodeInstance::boundingRect() const
double implicitWidth = qmlGraphicsItem()->implicitWidth();
if (!m_hasWidth
&& implicitWidth // WORKAROUND
- && implicitWidth != qmlGraphicsItem()->width()) {
+ && implicitWidth != qmlGraphicsItem()->width()
+ && !modelNode().hasBindingProperty("width")) {
qmlGraphicsItem()->blockSignals(true);
qmlGraphicsItem()->setWidth(implicitWidth);
qmlGraphicsItem()->blockSignals(false);
@@ -146,7 +150,8 @@ QRectF QmlGraphicsItemNodeInstance::boundingRect() const
double implicitHeight = qmlGraphicsItem()->implicitHeight();
if (!m_hasHeight
&& implicitWidth // WORKAROUND
- && implicitHeight != qmlGraphicsItem()->height()) {
+ && implicitHeight != qmlGraphicsItem()->height()
+ && !modelNode().hasBindingProperty("height")) {
qmlGraphicsItem()->blockSignals(true);
qmlGraphicsItem()->setHeight(implicitHeight);
qmlGraphicsItem()->blockSignals(false);
@@ -214,7 +219,7 @@ void QmlGraphicsItemNodeInstance::setPropertyBinding(const QString &name, const
QVariant QmlGraphicsItemNodeInstance::property(const QString &name) const
{
- if (name == "width" && modelNode().isValid()) {
+ if (name == "width" && modelNode().isValid() && !modelNode().hasBindingProperty("width")) {
double implicitWidth = qmlGraphicsItem()->implicitWidth();
if (!m_hasWidth
&& implicitWidth // WORKAROUND
@@ -222,7 +227,7 @@ QVariant QmlGraphicsItemNodeInstance::property(const QString &name) const
qmlGraphicsItem()->setWidth(implicitWidth);
}
- if (name == "height" && modelNode().isValid()) {
+ if (name == "height" && modelNode().isValid() && !modelNode().hasBindingProperty("height")) {
double implicitHeight = qmlGraphicsItem()->implicitHeight();
if (!m_hasHeight
&& implicitHeight // WORKAROUND
diff --git a/src/plugins/qmldesigner/core/metainfo/metainfo.cpp b/src/plugins/qmldesigner/core/metainfo/metainfo.cpp
index 7a1a0f5c98c2d5eaec57dca597b9debaab345582..a550c351f3a442691cc6985b0a67e94dd310b98a 100644
--- a/src/plugins/qmldesigner/core/metainfo/metainfo.cpp
+++ b/src/plugins/qmldesigner/core/metainfo/metainfo.cpp
@@ -570,7 +570,9 @@ MetaInfo MetaInfo::global()
*/
void MetaInfo::clearGlobal()
{
- MetaInfo::global().m_p->clear();
+ if (s_global.m_p->m_isInitialized) {
+ s_global.m_p->clear();
+ }
}
void MetaInfo::setPluginPaths(const QStringList &paths)
diff --git a/src/plugins/qmldesigner/core/model/basetexteditmodifier.cpp b/src/plugins/qmldesigner/core/model/basetexteditmodifier.cpp
index 4e22eb6835246ab69ee02a656f4be93796b823f7..a7ce641efa75892abaa6a49c46908cc06030540f 100644
--- a/src/plugins/qmldesigner/core/model/basetexteditmodifier.cpp
+++ b/src/plugins/qmldesigner/core/model/basetexteditmodifier.cpp
@@ -29,9 +29,13 @@
#include "basetexteditmodifier.h"
+#include <extensionsystem/pluginmanager.h>
+#include <qmljs/qmljsdocument.h>
+#include <qmljseditor/qmljsmodelmanagerinterface.h>
#include <texteditor/tabsettings.h>
using namespace QmlDesigner;
+using namespace QmlJSEditor;
BaseTextEditModifier::BaseTextEditModifier(TextEditor::BaseTextEditor *textEdit):
PlainTextEditModifier(textEdit)
@@ -63,3 +67,29 @@ int BaseTextEditModifier::indentDepth() const
return 0;
}
}
+
+namespace {
+static inline QmlJSEditor::ModelManagerInterface *getModelManager()
+{
+ ExtensionSystem::PluginManager *pluginManager = ExtensionSystem::PluginManager::instance();
+ return pluginManager->getObject<QmlJSEditor::ModelManagerInterface>();
+}
+}
+
+QmlJS::Snapshot BaseTextEditModifier::getSnapshot() const
+{
+ QmlJSEditor::ModelManagerInterface *modelManager = getModelManager();
+ if (modelManager)
+ return modelManager->snapshot();
+ else
+ return QmlJS::Snapshot();
+}
+
+QStringList BaseTextEditModifier::importPaths() const
+{
+ QmlJSEditor::ModelManagerInterface *modelManager = getModelManager();
+ if (modelManager)
+ return modelManager->importPaths();
+ else
+ return QStringList();
+}
diff --git a/src/plugins/qmldesigner/core/model/componenttextmodifier.cpp b/src/plugins/qmldesigner/core/model/componenttextmodifier.cpp
index 5eff700cd5d409171099df07fe55d3a0c2987b4f..804b2cb03d67374cf3e2ddbd2ecaff7846dde5be 100644
--- a/src/plugins/qmldesigner/core/model/componenttextmodifier.cpp
+++ b/src/plugins/qmldesigner/core/model/componenttextmodifier.cpp
@@ -29,8 +29,7 @@
#include "componenttextmodifier.h"
-namespace QmlDesigner {
-
+using namespace QmlDesigner;
ComponentTextModifier::ComponentTextModifier(TextModifier *originalModifier, int componentStartOffset, int componentEndOffset, int rootStartOffset) :
m_originalModifier(originalModifier),
m_componentStartOffset(componentStartOffset),
@@ -134,4 +133,8 @@ void ComponentTextModifier::contentsChange(int position, int charsRemoved, int c
}
}
-} // namespace QmlDesigner
+QmlJS::Snapshot ComponentTextModifier::getSnapshot() const
+{ return m_originalModifier->getSnapshot(); }
+
+QStringList ComponentTextModifier::importPaths() const
+{ return m_originalModifier->importPaths(); }
diff --git a/src/plugins/qmldesigner/core/model/rewriterview.cpp b/src/plugins/qmldesigner/core/model/rewriterview.cpp
index afb57334a9059fa13098562dfa1598ba7f357a9e..361e459bb3d5b5e1bdb7873327ec0a0f199c8267 100644
--- a/src/plugins/qmldesigner/core/model/rewriterview.cpp
+++ b/src/plugins/qmldesigner/core/model/rewriterview.cpp
@@ -71,6 +71,15 @@ RewriterView::Error::Error(const QDeclarativeError &qmlError):
{
}
+RewriterView::Error::Error(const QUrl &url, const QString &description, int line,
+ int column, Type type):
+ m_type(type),
+ m_line(line),
+ m_column(column),
+ m_description(description),
+ m_url(url)
+{}
+
QString RewriterView::Error::toString() const
{
QString str;
diff --git a/src/plugins/qmldesigner/core/model/texttomodelmerger.cpp b/src/plugins/qmldesigner/core/model/texttomodelmerger.cpp
index 173d43d444a989e52da4cb24ccd3b67e65b7c8e6..0d5d808277f2cbdc636ae6e2a3c4c0cf5bd4198b 100644
--- a/src/plugins/qmldesigner/core/model/texttomodelmerger.cpp
+++ b/src/plugins/qmldesigner/core/model/texttomodelmerger.cpp
@@ -34,17 +34,157 @@
#include "nodemetainfo.h"
#include "nodeproperty.h"
#include "propertymetainfo.h"
+#include "textmodifier.h"
#include "texttomodelmerger.h"
#include "rewriterview.h"
#include "variantproperty.h"
+#include <qmljs/qmljsinterpreter.h>
+#include <qmljs/parser/qmljsast_p.h>
+
+#include <QtDeclarative/QDeclarativeComponent>
+#include <QtDeclarative/QDeclarativeEngine>
+#include <QtCore/QSet>
+
+using namespace QmlJS;
+using namespace QmlJS::AST;
+
+namespace QmlDesigner {
+namespace Internal {
+
+struct ReadingContext {
+ ReadingContext(const Snapshot &snapshot, const Document::Ptr &doc,
+ const QStringList importPaths)
+ : snapshot(snapshot)
+ , doc(doc)
+ , engine(new Interpreter::Engine)
+ , ctxt(new Interpreter::Context(engine))
+ {
+ ctxt->build(QList<Node *>(), doc, snapshot, importPaths);
+ }
+
+ ~ReadingContext()
+ { delete ctxt; delete engine; }
+
+ void lookup(UiQualifiedId *astTypeNode, QString &typeName, int &majorVersion, int &minorVersion)
+ {
+ const Interpreter::ObjectValue *value = ctxt->lookupType(doc.data(), astTypeNode);
+ if (const Interpreter::QmlObjectValue * qmlValue = dynamic_cast<const Interpreter::QmlObjectValue *>(value)) {
+ typeName = qmlValue->packageName() + QLatin1String("/") + qmlValue->className();
+ majorVersion = qmlValue->majorVersion();
+ minorVersion = qmlValue->minorVersion();
+ } else if (value) {
+ for (UiQualifiedId *iter = astTypeNode; iter; iter = iter->next)
+ if (!iter->next && iter->name)
+ typeName = iter->name->asString();
+ majorVersion = Interpreter::QmlObjectValue::NoVersion;
+ minorVersion = Interpreter::QmlObjectValue::NoVersion;
+ }
+ }
+
+ Snapshot snapshot;
+ Document::Ptr doc;
+ Interpreter::Engine *engine;
+ Interpreter::Context *ctxt;
+};
-#include <QDeclarativeEngine>
-#include <QSet>
-#include <private/qdeclarativedom_p.h>
+} // namespace Internal
+} // namespace QmlDesigner
using namespace QmlDesigner;
using namespace QmlDesigner::Internal;
+namespace {
+
+static inline QString stripQuotes(const QString &str)
+{
+ if ((str.startsWith(QLatin1Char('"')) && str.endsWith(QLatin1Char('"')))
+ || (str.startsWith(QLatin1Char('\'')) && str.endsWith(QLatin1Char('\''))))
+ return str.mid(1, str.length() - 2);
+
+ return str;
+}
+
+static inline bool isSignalPropertyName(const QString &signalName)
+{
+ // see QmlCompiler::isSignalPropertyName
+ return signalName.length() >= 3 && signalName.startsWith(QLatin1String("on")) &&
+ signalName.at(2).isLetter();
+}
+
+static QString flatten(UiQualifiedId *qualifiedId)
+{
+ QString result;
+
+ for (UiQualifiedId *iter = qualifiedId; iter; iter = iter->next) {
+ if (!iter->name)
+ continue;
+
+ if (!result.isEmpty())
+ result.append(QLatin1Char('.'));
+
+ result.append(iter->name->asString());
+ }
+
+ return result;
+}
+
+static bool isLiteralValue(ExpressionNode *expr)
+{
+ if (cast<NumericLiteral*>(expr))
+ return true;
+ else if (cast<StringLiteral*>(expr))
+ return true;
+ else if (UnaryPlusExpression *plusExpr = cast<UnaryPlusExpression*>(expr))
+ return isLiteralValue(plusExpr->expression);
+ else if (UnaryMinusExpression *minusExpr = cast<UnaryMinusExpression*>(expr))
+ return isLiteralValue(minusExpr->expression);
+ else if (cast<TrueLiteral*>(expr))
+ return true;
+ else if (cast<FalseLiteral*>(expr))
+ return true;
+ else
+ return false;
+}
+
+static inline bool isLiteralValue(UiScriptBinding *script)
+{
+ if (!script || !script->statement)
+ return false;
+
+ return isLiteralValue((cast<ExpressionStatement *>(script->statement))->expression);
+}
+
+static inline bool isValidPropertyForNode(const ModelNode &modelNode,
+ const QString &propertyName)
+{
+ return modelNode.metaInfo().hasProperty(propertyName, true)
+ || modelNode.type() == QLatin1String("Qt/PropertyChanges");
+}
+
+static inline int propertyType(const QString &typeName)
+{
+ if (typeName == QLatin1String("bool"))
+ return QMetaType::type("bool");
+ else if (typeName == QLatin1String("color"))
+ return QMetaType::type("QColor");
+ else if (typeName == QLatin1String("date"))
+ return QMetaType::type("QDate");
+ else if (typeName == QLatin1String("int"))
+ return QMetaType::type("int");
+ else if (typeName == QLatin1String("real"))
+ return QMetaType::type("double");
+ else if (typeName == QLatin1String("string"))
+ return QMetaType::type("QString");
+ else if (typeName == QLatin1String("url"))
+ return QMetaType::type("QUrl");
+ else if (typeName == QLatin1String("var") || typeName == QLatin1String("variant"))
+ return QMetaType::type("QVariant");
+ else
+ return -1;
+}
+
+} // anonymous namespace
+
static inline bool equals(const QVariant &a, const QVariant &b)
{
if (a.type() == QVariant::Double && b.type() == QVariant::Double)
@@ -70,26 +210,36 @@ bool TextToModelMerger::isActive() const
return m_isActive;
}
-void TextToModelMerger::setupImports(QDeclarativeDomDocument &doc,
+void TextToModelMerger::setupImports(const Document::Ptr &doc,
DifferenceHandler &differenceHandler)
{
QSet<Import> existingImports = m_rewriterView->model()->imports();
- foreach (const QDeclarativeDomImport &qmlImport, doc.imports()) {
- if (qmlImport.type() == QDeclarativeDomImport::Library) {
- Import import(Import::createLibraryImport(qmlImport.uri(),
- qmlImport.version(),
- qmlImport.qualifier()));
-
- if (!existingImports.remove(import))
- differenceHandler.modelMissesImport(import);
- } else if (qmlImport.type() == QDeclarativeDomImport::File) {
- Import import(Import:: createFileImport(qmlImport.uri(),
- qmlImport.version(),
- qmlImport.qualifier()));
-
- if (!existingImports.remove(import))
- differenceHandler.modelMissesImport(import);
+ for (UiImportList *iter = doc->qmlProgram()->imports; iter; iter = iter->next) {
+ UiImport *import = iter->import;
+ if (!import)
+ continue;
+
+ QString version;
+ if (import->versionToken.isValid())
+ version = textAt(doc, import->versionToken);
+ QString as;
+ if (import->importId)
+ as = import->importId->asString();
+
+ if (import->fileName) {
+ const QString strippedFileName = stripQuotes(import->fileName->asString());
+ Import newImport(Import::createFileImport(strippedFileName,
+ version, as));
+
+ if (!existingImports.remove(newImport))
+ differenceHandler.modelMissesImport(newImport);
+ } else {
+ Import newImport(Import::createLibraryImport(flatten(import->importUri),
+ as, version));
+
+ if (!existingImports.remove(newImport))
+ differenceHandler.modelMissesImport(newImport);
}
}
@@ -99,31 +249,55 @@ void TextToModelMerger::setupImports(QDeclarativeDomDocument &doc,
bool TextToModelMerger::load(const QByteArray &data, DifferenceHandler &differenceHandler)
{
+ const QUrl url = m_rewriterView->model()->fileUrl();
+ const QStringList importPaths = m_rewriterView->textModifier()->importPaths();
setActive(true);
- try {
+ { // Have the QML engine check if the document is valid:
QDeclarativeEngine engine;
- QDeclarativeDomDocument doc;
- const QUrl url = m_rewriterView->model()->fileUrl();
- const bool success = doc.load(&engine, data, url);
-
- if (success) {
- setupImports(doc, differenceHandler);
-
- const QDeclarativeDomObject rootDomObject = doc.rootObject();
- ModelNode modelRootNode = m_rewriterView->rootModelNode();
- syncNode(modelRootNode, rootDomObject, differenceHandler);
- m_rewriterView->positionStorage()->cleanupInvalidOffsets();
- m_rewriterView->clearErrors();
- } else {
+ foreach (const QString &importPath, importPaths)
+ engine.addImportPath(importPath);
+ QDeclarativeComponent comp(&engine);
+ comp.setData(data, url);
+ if (comp.status() == QDeclarativeComponent::Error) {
+ QList<RewriterView::Error> errors;
+ foreach (const QDeclarativeError &error, comp.errors())
+ errors.append(RewriterView::Error(error));
+ m_rewriterView->setErrors(errors);
+ setActive(false);
+ return false;
+ } else if (comp.status() == QDeclarativeComponent::Loading) {
+ // Probably loading remote components. Previous DOM behaviour was:
QList<RewriterView::Error> errors;
- foreach (const QDeclarativeError &qmlError, doc.errors())
- errors.append(RewriterView::Error(qmlError));
+ errors.append(RewriterView::Error());
m_rewriterView->setErrors(errors);
+ setActive(false);
+ return false;
}
+ }
+
+ try {
+ Snapshot snapshot = m_rewriterView->textModifier()->getSnapshot();
+ const QString fileName = url.toLocalFile();
+ Document::Ptr doc = Document::create(fileName);
+ doc->setSource(QString::fromUtf8(data.constData()));
+ doc->parseQml();
+ snapshot.insert(doc);
+ ReadingContext ctxt(snapshot, doc, importPaths);
+
+ setupImports(doc, differenceHandler);
+
+ UiObjectMember *astRootNode = 0;
+ if (UiProgram *program = doc->qmlProgram())
+ if (program->members)
+ astRootNode = program->members->member;
+ ModelNode modelRootNode = m_rewriterView->rootModelNode();
+ syncNode(modelRootNode, astRootNode, &ctxt, differenceHandler);
+ m_rewriterView->positionStorage()->cleanupInvalidOffsets();
+ m_rewriterView->clearErrors();
setActive(false);
- return success;
+ return true;
} catch (Exception &e) {
RewriterView::Error error(&e);
// Somehow, the error below gets eaten in upper levels, so printing the
@@ -139,207 +313,292 @@ bool TextToModelMerger::load(const QByteArray &data, DifferenceHandler &differen
}
void TextToModelMerger::syncNode(ModelNode &modelNode,
- const QDeclarativeDomObject &domObject,
+ UiObjectMember *astNode,
+ ReadingContext *context,
DifferenceHandler &differenceHandler)
{
- m_rewriterView->positionStorage()->setNodeOffset(modelNode, domObject.position());
+ UiQualifiedId *astObjectType = 0;
+ UiObjectInitializer *astInitializer = 0;
+ if (UiObjectDefinition *def = cast<UiObjectDefinition *>(astNode)) {
+ astObjectType = def->qualifiedTypeNameId;
+ astInitializer = def->initializer;
+ } else if (UiObjectBinding *bin = cast<UiObjectBinding *>(astNode)) {
+ astObjectType = bin->qualifiedTypeNameId;
+ astInitializer = bin->initializer;
+ }
+
+ if (!astObjectType || !astInitializer)
+ return;
+
+ m_rewriterView->positionStorage()->setNodeOffset(modelNode, astNode->firstSourceLocation().offset);
+
+ QString typeName;
+ int majorVersion;
+ int minorVersion;
+ context->lookup(astObjectType, typeName, majorVersion, minorVersion);
+
+ if (typeName.isEmpty()) {
+ qWarning() << "Skipping node with unknown type" << flatten(astObjectType);
+ return;
+ }
- if (modelNode.type() != domObject.objectType()
- || modelNode.majorVersion() != domObject.objectTypeMajorVersion()
- || modelNode.minorVersion() != domObject.objectTypeMinorVersion()) {
+ if (modelNode.type() != typeName
+ /*|| modelNode.majorVersion() != domObject.objectTypeMajorVersion()
+ || modelNode.minorVersion() != domObject.objectTypeMinorVersion()*/) {
const bool isRootNode = m_rewriterView->rootModelNode() == modelNode;
- differenceHandler.typeDiffers(isRootNode, modelNode, domObject);
+ differenceHandler.typeDiffers(isRootNode, modelNode, typeName,
+ majorVersion, minorVersion,
+ astNode, context);
if (!isRootNode)
return; // the difference handler will create a new node, so we're done.
}
- {
- QString domObjectId = domObject.objectId();
- const QDeclarativeDomProperty domIdProperty = domObject.property("id");
- if (domObjectId.isEmpty() && domIdProperty.value().isLiteral())
- domObjectId = domIdProperty.value().toLiteral().literal();
-
- if (domObjectId.isEmpty()) {
- if (!modelNode.id().isEmpty()) {
- ModelNode existingNodeWithId = m_rewriterView->modelNodeForId(domObjectId);
- if (existingNodeWithId.isValid())
- existingNodeWithId.setId(QString());
- differenceHandler.idsDiffer(modelNode, domObjectId);
- }
- } else {
- if (modelNode.id() != domObjectId) {
- ModelNode existingNodeWithId = m_rewriterView->modelNodeForId(domObjectId);
- if (existingNodeWithId.isValid())
- existingNodeWithId.setId(QString());
- differenceHandler.idsDiffer(modelNode, domObjectId);
- }
- }
- }
-
QSet<QString> modelPropertyNames = QSet<QString>::fromList(modelNode.propertyNames());
+ QList<UiObjectMember *> defaultPropertyItems;
- foreach (const QDeclarativeDomProperty &domProperty, domObject.properties()) {
- const QString domPropertyName = domProperty.propertyName();
-
- if (isSignalPropertyName(domPropertyName.toUtf8()))
+ for (UiObjectMemberList *iter = astInitializer->members; iter; iter = iter->next) {
+ UiObjectMember *member = iter->member;
+ if (!member)
continue;
- if (domPropertyName == QLatin1String("id")) {
- // already done before
- continue;
- } else if (domPropertyName.isEmpty()) {
- qWarning() << "QML DOM returned an empty property name";
- continue;
- } else if (domPropertyName.at(0).isUpper() && domPropertyName.contains('.')) {
- // An attached property, which we currently don't handle.
- // So, skipping it.
- modelPropertyNames.remove(domPropertyName);
- continue;
- } else {
- const QDeclarativeDomDynamicProperty dynamicProperty = domObject.dynamicProperty(domProperty.propertyName());
- if (dynamicProperty.isValid() || modelNode.metaInfo().hasProperty(domPropertyName, true) || modelNode.type() == QLatin1String("Qt/PropertyChanges")) {
- AbstractProperty modelProperty = modelNode.property(domPropertyName);
- syncProperty(modelProperty, domProperty, dynamicProperty, differenceHandler);
- modelPropertyNames.remove(domPropertyName);
+ if (UiArrayBinding *array = cast<UiArrayBinding *>(member)) {
+ const QString astPropertyName = flatten(array->qualifiedId);
+ if (isValidPropertyForNode(modelNode, astPropertyName)) {
+ AbstractProperty modelProperty = modelNode.property(astPropertyName);
+ syncArrayProperty(modelProperty, array, context, differenceHandler);
+ modelPropertyNames.remove(astPropertyName);
+ } else {
+ qWarning() << "Skipping invalid array property" << astPropertyName
+ << "for node type" << modelNode.type();
+ }
+ } else if (cast<UiObjectDefinition *>(member)) {
+ defaultPropertyItems.append(member);
+ } else if (UiObjectBinding *binding = cast<UiObjectBinding *>(member)) {
+ const QString astPropertyName = flatten(binding->qualifiedId);
+ if (binding->hasOnToken) {
+ // skip value sources
+ } else {
+ if (isValidPropertyForNode(modelNode, astPropertyName)) {
+ AbstractProperty modelProperty = modelNode.property(astPropertyName);
+ syncNodeProperty(modelProperty, binding, context, differenceHandler);
+ modelPropertyNames.remove(astPropertyName);
+ } else {
+ qWarning() << "Skipping invalid node property" << astPropertyName
+ << "for node type" << modelNode.type();
+ }
+ }
+ } else if (UiScriptBinding *script = cast<UiScriptBinding *>(member)) {
+ const QString astPropertyName = flatten(script->qualifiedId);
+ QString astValue;
+ if (script->statement) {
+ astValue = textAt(context->doc,
+ script->statement->firstSourceLocation(),
+ script->statement->lastSourceLocation());
+ astValue = astValue.trimmed();
+ if (astValue.endsWith(QLatin1Char(';')))
+ astValue = astValue.left(astValue.length() - 1);
+ }
+
+ if (astPropertyName == QLatin1String("id")) {
+ syncNodeId(modelNode, astValue, differenceHandler);
+ } else if (isSignalPropertyName(astPropertyName)) {
+ // skip signals
+ } else if (isLiteralValue(script)) {
+ if (isValidPropertyForNode(modelNode, astPropertyName)) {
+ AbstractProperty modelProperty = modelNode.property(astPropertyName);
+ syncVariantProperty(modelProperty, astPropertyName, astValue, QString(), differenceHandler);
+ modelPropertyNames.remove(astPropertyName);
+ } else {
+ qWarning() << "Skipping invalid variant property" << astPropertyName
+ << "for node type" << modelNode.type();
+ }
+ } else {
+ if (isValidPropertyForNode(modelNode, astPropertyName)) {
+ AbstractProperty modelProperty = modelNode.property(astPropertyName);
+ syncExpressionProperty(modelProperty, astValue, differenceHandler);
+ modelPropertyNames.remove(astPropertyName);
+ } else {
+ qWarning() << "Skipping invalid expression property" << astPropertyName
+ << "for node type" << modelNode.type();
+ }
}
+ } else if (UiPublicMember *property = cast<UiPublicMember *>(member)) {
+ const QString astName = property->name->asString();
+ QString astValue;
+ if (property->expression)
+ astValue = textAt(context->doc,
+ property->expression->firstSourceLocation(),
+ property->expression->lastSourceLocation());
+ const QString astType = property->memberType->asString();
+ AbstractProperty modelProperty = modelNode.property(astName);
+ if (!property->expression || isLiteralValue(property->expression))
+ syncVariantProperty(modelProperty, astName, astValue, astType, differenceHandler);
+ else
+ syncExpressionProperty(modelProperty, astValue, differenceHandler);
+ modelPropertyNames.remove(astName);
+ } else {
+ qWarning() << "Found an unknown QML value.";
}
}
- { // for new dynamic properties which have no property definitions:
- foreach (const QDeclarativeDomDynamicProperty &dynamicDomProperty, domObject.dynamicProperties()) {
- const QByteArray propertyName = dynamicDomProperty.propertyName();
- if (domObject.property(propertyName).isValid())
- continue;
-
- if (dynamicDomProperty.isAlias())
- continue; // we don't handle alias properties yet.
-
- AbstractProperty modelProperty = modelNode.property(propertyName);
- const QString dynamicTypeName = QMetaType::typeName(dynamicDomProperty.propertyType());
-
- // a dynamic property definition without a value
- if (modelProperty.isValid() && modelProperty.isVariantProperty()) {
- VariantProperty modelVariantProperty = modelProperty.toVariantProperty();
- if (modelVariantProperty.value() != QVariant())
- differenceHandler.variantValuesDiffer(modelVariantProperty, QVariant(), dynamicTypeName);
+ if (!defaultPropertyItems.isEmpty()) {
+ QString defaultPropertyName = modelNode.metaInfo().defaultProperty();
+ if (defaultPropertyName.isEmpty()) {
+ qWarning() << "No default property for node type" << modelNode.type() << ", ignoring child items.";
+ } else {
+ AbstractProperty modelProperty = modelNode.property(defaultPropertyName);
+ if (modelProperty.isNodeListProperty()) {
+ NodeListProperty nodeListProperty = modelProperty.toNodeListProperty();
+ syncNodeListProperty(nodeListProperty, defaultPropertyItems, context,
+ differenceHandler);
} else {
- differenceHandler.shouldBeVariantProperty(modelProperty, QVariant(), dynamicTypeName);
+ differenceHandler.shouldBeNodeListProperty(modelProperty,
+ defaultPropertyItems,
+ context);
}
+ modelPropertyNames.remove(defaultPropertyName);
}
}
foreach (const QString &modelPropertyName, modelPropertyNames) {
AbstractProperty modelProperty = modelNode.property(modelPropertyName);
- const QDeclarativeDomDynamicProperty dynamicDomProperty = domObject.dynamicProperty(modelPropertyName.toUtf8());
- if (dynamicDomProperty.isValid()) {
- const QString dynamicTypeName = QMetaType::typeName(dynamicDomProperty.propertyType());
+ // property deleted.
+ differenceHandler.propertyAbsentFromQml(modelProperty);
+ }
+}
- // a dynamic property definition without a value
- if (modelProperty.isValid() && modelProperty.isVariantProperty()) {
- VariantProperty modelVariantProperty = modelProperty.toVariantProperty();
- if (modelVariantProperty.value() != QVariant())
- differenceHandler.variantValuesDiffer(modelVariantProperty, QVariant(), dynamicTypeName);
- } else {
- differenceHandler.shouldBeVariantProperty(modelProperty, QVariant(), dynamicTypeName);
- }
- } else {
- // property deleted.
- differenceHandler.propertyAbsentFromQml(modelProperty);
+void TextToModelMerger::syncNodeId(ModelNode &modelNode, const QString &astObjectId,
+ DifferenceHandler &differenceHandler)
+{
+ if (astObjectId.isEmpty()) {
+ if (!modelNode.id().isEmpty()) {
+ ModelNode existingNodeWithId = m_rewriterView->modelNodeForId(astObjectId);
+ if (existingNodeWithId.isValid())
+ existingNodeWithId.setId(QString());
+ differenceHandler.idsDiffer(modelNode, astObjectId);
+ }
+ } else {
+ if (modelNode.id() != astObjectId) {
+ ModelNode existingNodeWithId = m_rewriterView->modelNodeForId(astObjectId);
+ if (existingNodeWithId.isValid())
+ existingNodeWithId.setId(QString());
+ differenceHandler.idsDiffer(modelNode, astObjectId);
}
}
}
-void TextToModelMerger::syncProperty(AbstractProperty &modelProperty,
- const QDeclarativeDomProperty &qmlProperty,
- const QDeclarativeDomDynamicProperty &qmlDynamicProperty,
- DifferenceHandler &differenceHandler)
+void TextToModelMerger::syncNodeProperty(AbstractProperty &modelProperty,
+ UiObjectBinding *binding,
+ ReadingContext *context,
+ DifferenceHandler &differenceHandler)
{
- Q_ASSERT(modelProperty.name() == qmlProperty.propertyName());
+ QString typeName;
+ int majorVersion;
+ int minorVersion;
+ context->lookup(binding->qualifiedTypeNameId, typeName, majorVersion, minorVersion);
- const QDeclarativeDomValue qmlValue = qmlProperty.value();
+ if (typeName.isEmpty()) {
+ qWarning() << "Skipping node with unknown type" << flatten(binding->qualifiedTypeNameId);
+ return;
+ }
- if (qmlValue.isBinding()) {
- const QString QDeclarativeBinding = qmlValue.toBinding().binding();
- if (modelProperty.isBindingProperty()) {
- BindingProperty bindingProperty = modelProperty.toBindingProperty();
- if (bindingProperty.expression() != QDeclarativeBinding) {
- differenceHandler.bindingExpressionsDiffer(bindingProperty, QDeclarativeBinding);
- }
- } else {
- differenceHandler.shouldBeBindingProperty(modelProperty, QDeclarativeBinding);
- }
- } else if (qmlValue.isList()) {
- if (modelProperty.isNodeListProperty()) {
- NodeListProperty nodeListProperty = modelProperty.toNodeListProperty();
- syncNodeListProperty(nodeListProperty, qmlValue.toList(), differenceHandler);
- } else {
- differenceHandler.shouldBeNodeListProperty(modelProperty, qmlValue.toList());
- }
- } else if (qmlValue.isLiteral()) {
- const QVariant qmlVariantValue = convertToVariant(modelProperty.parentModelNode(), qmlProperty, qmlDynamicProperty);
- QString dynamicTypeName;
- if (qmlDynamicProperty.isValid())
- dynamicTypeName = QMetaType::typeName(qmlDynamicProperty.propertyType());
-
- if (modelProperty.isVariantProperty()) {
- VariantProperty modelVariantProperty = modelProperty.toVariantProperty();
-
- if (!equals(modelVariantProperty.value(), qmlVariantValue)
- || qmlDynamicProperty.isValid() != modelVariantProperty.isDynamic()
- || dynamicTypeName != modelVariantProperty.dynamicTypeName()) {
- differenceHandler.variantValuesDiffer(modelVariantProperty, qmlVariantValue, dynamicTypeName);
- }
- } else {
- differenceHandler.shouldBeVariantProperty(modelProperty, qmlVariantValue, dynamicTypeName);
- }
- } else if (qmlValue.isObject()) {
- if (modelProperty.isNodeProperty()) {
- ModelNode nodePropertyNode = modelProperty.toNodeProperty().modelNode();
- syncNode(nodePropertyNode, qmlValue.toObject(), differenceHandler);
- } else {
- differenceHandler.shouldBeNodeProperty(modelProperty, qmlValue.toObject());
+ if (modelProperty.isNodeProperty()) {
+ ModelNode nodePropertyNode = modelProperty.toNodeProperty().modelNode();
+ syncNode(nodePropertyNode, binding, context, differenceHandler);
+ } else {
+ differenceHandler.shouldBeNodeProperty(modelProperty,
+ typeName,
+ majorVersion,
+ minorVersion,
+ binding, context);
+ }
+}
+
+void TextToModelMerger::syncExpressionProperty(AbstractProperty &modelProperty,
+ const QString &javascript,
+ DifferenceHandler &differenceHandler)
+{
+ if (modelProperty.isBindingProperty()) {
+ BindingProperty bindingProperty = modelProperty.toBindingProperty();
+ if (bindingProperty.expression() != javascript) {
+ differenceHandler.bindingExpressionsDiffer(bindingProperty, javascript);
}
- } else if (qmlValue.isValueSource()) {
- if (modelProperty.isNodeProperty()) {
- ModelNode nodePropertyNode = modelProperty.toNodeProperty().modelNode();
- syncNode(nodePropertyNode, qmlValue.toValueSource().object(), differenceHandler);
- } else {
- differenceHandler.shouldBeNodeProperty(modelProperty, qmlValue.toValueSource().object());
+ } else {
+ differenceHandler.shouldBeBindingProperty(modelProperty, javascript);
+ }
+}
+
+void TextToModelMerger::syncArrayProperty(AbstractProperty &modelProperty,
+ UiArrayBinding *array,
+ ReadingContext *context,
+ DifferenceHandler &differenceHandler)
+{
+ QList<UiObjectMember *> arrayMembers;
+ for (UiArrayMemberList *iter = array->members; iter; iter = iter->next)
+ if (UiObjectMember *member = iter->member)
+ arrayMembers.append(member);
+
+ if (modelProperty.isNodeListProperty()) {
+ NodeListProperty nodeListProperty = modelProperty.toNodeListProperty();
+ syncNodeListProperty(nodeListProperty, arrayMembers, context, differenceHandler);
+ } else {
+ differenceHandler.shouldBeNodeListProperty(modelProperty,
+ arrayMembers,
+ context);
+ }
+}
+
+void TextToModelMerger::syncVariantProperty(AbstractProperty &modelProperty,
+ const QString &astName,
+ const QString &astValue,
+ const QString &astType,
+ DifferenceHandler &differenceHandler)
+{
+ const QVariant astVariantValue = convertToVariant(modelProperty.parentModelNode(),
+ astName,
+ astValue,
+ astType);
+
+ if (modelProperty.isVariantProperty()) {
+ VariantProperty modelVariantProperty = modelProperty.toVariantProperty();
+
+ if (!equals(modelVariantProperty.value(), astVariantValue)
+ || !astType.isEmpty() != modelVariantProperty.isDynamic()
+ || astType != modelVariantProperty.dynamicTypeName()) {
+ differenceHandler.variantValuesDiffer(modelVariantProperty,
+ astVariantValue,
+ astType);
}
- } else if (qmlValue.isInvalid()) {
- // skip these nodes
} else {
- qWarning() << "Found an unknown qml value!";
+ differenceHandler.shouldBeVariantProperty(modelProperty,
+ astVariantValue,
+ astType);
}
}
-void TextToModelMerger::syncNodeListProperty(NodeListProperty &modelListProperty, const QDeclarativeDomList &domList, DifferenceHandler &differenceHandler)
+void TextToModelMerger::syncNodeListProperty(NodeListProperty &modelListProperty,
+ const QList<UiObjectMember *> arrayMembers,
+ ReadingContext *context,
+ DifferenceHandler &differenceHandler)
{
QList<ModelNode> modelNodes = modelListProperty.toModelNodeList();
- QList<QDeclarativeDomValue> domValues = domList.values();
int i = 0;
- for (; i < modelNodes.size() && i < domValues.size(); ++i) {
- QDeclarativeDomValue value = domValues.at(i);
- if (value.isObject()) {
- ModelNode modelNode = modelNodes.at(i);
- syncNode(modelNode, value.toObject(), differenceHandler);
- } else {
- qDebug() << "*** Oops, we got a non-object item in the list!";
- }
+ for (; i < modelNodes.size() && i < arrayMembers.size(); ++i) {
+ ModelNode modelNode = modelNodes.at(i);
+ syncNode(modelNode, arrayMembers.at(i), context, differenceHandler);
}
- for (int j = i; j < domValues.size(); ++j) {
+ for (int j = i; j < arrayMembers.size(); ++j) {
// more elements in the dom-list, so add them to the model
- QDeclarativeDomValue value = domValues.at(j);
- if (value.isObject()) {
- const QDeclarativeDomObject qmlObject = value.toObject();
- const ModelNode newNode = differenceHandler.listPropertyMissingModelNode(modelListProperty, qmlObject);
- if (QString::fromUtf8(qmlObject.objectType()) == QLatin1String("Qt/Component"))
- setupComponent(newNode);
- } else {
- qDebug() << "*** Oops, we got a non-object item in the list!";
- }
+ UiObjectMember *arrayMember = arrayMembers.at(j);
+ const ModelNode newNode = differenceHandler.listPropertyMissingModelNode(modelListProperty, context, arrayMember);
+ QString name;
+ if (UiObjectDefinition *definition = cast<UiObjectDefinition *>(arrayMember))
+ name = flatten(definition->qualifiedTypeNameId);
+ // TODO: resolve name here!
+ if (name == QLatin1String("Qt/Component"))
+ setupComponent(newNode);
}
for (int j = i; j < modelNodes.size(); ++j) {
@@ -349,20 +608,30 @@ void TextToModelMerger::syncNodeListProperty(NodeListProperty &modelListProperty
}
}
-ModelNode TextToModelMerger::createModelNode(const QDeclarativeDomObject &domObject, DifferenceHandler &differenceHandler)
+ModelNode TextToModelMerger::createModelNode(const QString &typeName,
+ int majorVersion,
+ int minorVersion,
+ UiObjectMember *astNode,
+ ReadingContext *context,
+ DifferenceHandler &differenceHandler)
{
- ModelNode newNode = m_rewriterView->createModelNode(domObject.objectType(), domObject.objectTypeMajorVersion(), domObject.objectTypeMinorVersion());
- syncNode(newNode, domObject, differenceHandler);
+ ModelNode newNode = m_rewriterView->createModelNode(typeName,
+ majorVersion,
+ minorVersion);
+ syncNode(newNode, astNode, context, differenceHandler);
return newNode;
}
-QVariant TextToModelMerger::convertToVariant(const ModelNode &node, const QDeclarativeDomProperty &qmlProperty, const QDeclarativeDomDynamicProperty &qmlDynamicProperty)
+QVariant TextToModelMerger::convertToVariant(const ModelNode &node,
+ const QString &astName,
+ const QString &astValue,
+ const QString &astType)
{
- QString stringValue = qmlProperty.value().toLiteral().literal();
+ const QString cleanedValue = stripQuotes(astValue.trimmed());
- if (qmlDynamicProperty.isValid()) {
- const int type = qmlDynamicProperty.propertyType();
- QVariant value(stringValue);
+ if (!astType.isEmpty()) {
+ const int type = propertyType(astType);
+ QVariant value(cleanedValue);
value.convert(static_cast<QVariant::Type>(type));
return value;
}
@@ -370,23 +639,30 @@ QVariant TextToModelMerger::convertToVariant(const ModelNode &node, const QDecla
const NodeMetaInfo nodeMetaInfo = node.metaInfo();
if (nodeMetaInfo.isValid()) {
- const PropertyMetaInfo propertyMetaInfo = nodeMetaInfo.property(qmlProperty.propertyName(), true);
+ const PropertyMetaInfo propertyMetaInfo = nodeMetaInfo.property(astName, true);
if (propertyMetaInfo.isValid()) {
- QVariant castedValue = propertyMetaInfo.castedValue(stringValue);
+ QVariant castedValue = propertyMetaInfo.castedValue(cleanedValue);
if (!castedValue.isValid())
- qWarning() << "Casting the value" << stringValue << "of property" << propertyMetaInfo.name() << "to the property type" << propertyMetaInfo.type() << "failed";
+ qWarning() << "Casting the value" << cleanedValue
+ << "of property" << astName
+ << "to the property type" << propertyMetaInfo.type()
+ << "failed";
return castedValue;
} else if (node.type() == QLatin1String("Qt/PropertyChanges")) {
// In the future, we should do the type resolving in a second pass, or delay setting properties until the full file has been parsed.
- return QVariant(stringValue);
+ return QVariant(cleanedValue);
} else {
- qWarning() << "Unknown property" << qmlProperty.propertyName() << "in node" << node.type() << "with value" << stringValue;
+ qWarning() << "Unknown property" << astName
+ << "in node" << node.type()
+ << "with value" << cleanedValue;
return QVariant();
}
} else {
- qWarning() << "Unknown property" << qmlProperty.propertyName() << "in node" << node.type() << "with value" << stringValue;
- return QVariant::fromValue(stringValue);
+ qWarning() << "Unknown property" << astName
+ << "in node" << node.type()
+ << "with value" << cleanedValue;
+ return QVariant::fromValue(cleanedValue);
}
}
@@ -400,19 +676,23 @@ void ModelValidator::importAbsentInQMl(const Import &import)
Q_ASSERT(! m_merger->view()->model()->imports().contains(import));
}
-void ModelValidator::bindingExpressionsDiffer(BindingProperty &modelProperty, const QString &QDeclarativeBinding)
+void ModelValidator::bindingExpressionsDiffer(BindingProperty &modelProperty,
+ const QString &javascript)
{
- Q_ASSERT(modelProperty.expression() == QDeclarativeBinding);
+ Q_ASSERT(modelProperty.expression() == javascript);
Q_ASSERT(0);
}
-void ModelValidator::shouldBeBindingProperty(AbstractProperty &modelProperty, const QString &/*QDeclarativeBinding*/)
+void ModelValidator::shouldBeBindingProperty(AbstractProperty &modelProperty,
+ const QString &/*javascript*/)
{
Q_ASSERT(modelProperty.isBindingProperty());
Q_ASSERT(0);
}
-void ModelValidator::shouldBeNodeListProperty(AbstractProperty &modelProperty, const QDeclarativeDomList &/*domList*/)
+void ModelValidator::shouldBeNodeListProperty(AbstractProperty &modelProperty,
+ const QList<UiObjectMember *> /*arrayMembers*/,
+ ReadingContext * /*context*/)
{
Q_ASSERT(modelProperty.isNodeListProperty());
Q_ASSERT(0);
@@ -435,7 +715,12 @@ void ModelValidator::shouldBeVariantProperty(AbstractProperty &modelProperty, co
Q_ASSERT(0);
}
-void ModelValidator::shouldBeNodeProperty(AbstractProperty &modelProperty, const QDeclarativeDomObject &/*qmlObject*/)
+void ModelValidator::shouldBeNodeProperty(AbstractProperty &modelProperty,
+ const QString &/*typeName*/,
+ int /*majorVersion*/,
+ int /*minorVersion*/,
+ UiObjectMember * /*astNode*/,
+ ReadingContext * /*context*/)
{
Q_ASSERT(modelProperty.isNodeProperty());
Q_ASSERT(0);
@@ -447,17 +732,25 @@ void ModelValidator::modelNodeAbsentFromQml(ModelNode &modelNode)
Q_ASSERT(0);
}
-ModelNode ModelValidator::listPropertyMissingModelNode(NodeListProperty &/*modelProperty*/, const QDeclarativeDomObject &/*qmlObject*/)
+ModelNode ModelValidator::listPropertyMissingModelNode(NodeListProperty &/*modelProperty*/,
+ ReadingContext * /*context*/,
+ UiObjectMember * /*arrayMember*/)
{
Q_ASSERT(0);
return ModelNode();
}
-void ModelValidator::typeDiffers(bool /*isRootNode*/, ModelNode &modelNode, const QDeclarativeDomObject &domObject)
+void ModelValidator::typeDiffers(bool /*isRootNode*/,
+ ModelNode &modelNode,
+ const QString &typeName,
+ int majorVersion,
+ int minorVersion,
+ QmlJS::AST::UiObjectMember * /*astNode*/,
+ ReadingContext * /*context*/)
{
- Q_ASSERT(modelNode.type() == domObject.objectType());
- Q_ASSERT(modelNode.majorVersion() == domObject.objectTypeMajorVersion());
- Q_ASSERT(modelNode.minorVersion() == domObject.objectTypeMinorVersion());
+ Q_ASSERT(modelNode.type() == typeName);
+ Q_ASSERT(modelNode.majorVersion() == majorVersion);
+ Q_ASSERT(modelNode.minorVersion() == minorVersion);
Q_ASSERT(0);
}
@@ -483,23 +776,30 @@ void ModelAmender::importAbsentInQMl(const Import &import)
m_merger->view()->model()->removeImport(import);
}
-void ModelAmender::bindingExpressionsDiffer(BindingProperty &modelProperty, const QString &QDeclarativeBinding)
+void ModelAmender::bindingExpressionsDiffer(BindingProperty &modelProperty,
+ const QString &javascript)
{
- modelProperty.toBindingProperty().setExpression(QDeclarativeBinding);
+ modelProperty.toBindingProperty().setExpression(javascript);
}
-void ModelAmender::shouldBeBindingProperty(AbstractProperty &modelProperty, const QString &QDeclarativeBinding)
+void ModelAmender::shouldBeBindingProperty(AbstractProperty &modelProperty,
+ const QString &javascript)
{
ModelNode theNode = modelProperty.parentModelNode();
BindingProperty newModelProperty = theNode.bindingProperty(modelProperty.name());
- newModelProperty.setExpression(QDeclarativeBinding);
+ newModelProperty.setExpression(javascript);
}
-void ModelAmender::shouldBeNodeListProperty(AbstractProperty &modelProperty, const QDeclarativeDomList &domList)
+void ModelAmender::shouldBeNodeListProperty(AbstractProperty &modelProperty,
+ const QList<UiObjectMember *> arrayMembers,
+ ReadingContext *context)
{
ModelNode theNode = modelProperty.parentModelNode();
NodeListProperty newNodeListProperty = theNode.nodeListProperty(modelProperty.name());
- m_merger->syncNodeListProperty(newNodeListProperty, domList, *this);
+ m_merger->syncNodeListProperty(newNodeListProperty,
+ arrayMembers,
+ context,
+ *this);
}
void ModelAmender::variantValuesDiffer(VariantProperty &modelProperty, const QVariant &qmlVariantValue, const QString &dynamicType)
@@ -512,7 +812,6 @@ void ModelAmender::variantValuesDiffer(VariantProperty &modelProperty, const QVa
void ModelAmender::shouldBeVariantProperty(AbstractProperty &modelProperty, const QVariant &qmlVariantValue, const QString &dynamicTypeName)
{
-// qDebug() << "property" << modelProperty.name() << "in node" << modelProperty.parentModelNode().id();
ModelNode theNode = modelProperty.parentModelNode();
VariantProperty newModelProperty = theNode.variantProperty(modelProperty.name());
@@ -522,11 +821,21 @@ void ModelAmender::shouldBeVariantProperty(AbstractProperty &modelProperty, cons
newModelProperty.setDynamicTypeNameAndValue(dynamicTypeName, qmlVariantValue);
}
-void ModelAmender::shouldBeNodeProperty(AbstractProperty &modelProperty, const QDeclarativeDomObject &qmlObject)
+void ModelAmender::shouldBeNodeProperty(AbstractProperty &modelProperty,
+ const QString &typeName,
+ int majorVersion,
+ int minorVersion,
+ UiObjectMember *astNode,
+ ReadingContext *context)
{
ModelNode theNode = modelProperty.parentModelNode();
NodeProperty newNodeProperty = theNode.nodeProperty(modelProperty.name());
- newNodeProperty.setModelNode(m_merger->createModelNode(qmlObject, *this));
+ newNodeProperty.setModelNode(m_merger->createModelNode(typeName,
+ majorVersion,
+ minorVersion,
+ astNode,
+ context,
+ *this));
}
void ModelAmender::modelNodeAbsentFromQml(ModelNode &modelNode)
@@ -534,17 +843,53 @@ void ModelAmender::modelNodeAbsentFromQml(ModelNode &modelNode)
modelNode.destroy();
}
-ModelNode ModelAmender::listPropertyMissingModelNode(NodeListProperty &modelProperty, const QDeclarativeDomObject &qmlObject)
+ModelNode ModelAmender::listPropertyMissingModelNode(NodeListProperty &modelProperty,
+ ReadingContext *context,
+ UiObjectMember *arrayMember)
{
- const ModelNode &newNode = m_merger->createModelNode(qmlObject, *this);
+ UiQualifiedId *astObjectType = 0;
+ UiObjectInitializer *astInitializer = 0;
+ if (UiObjectDefinition *def = cast<UiObjectDefinition *>(arrayMember)) {
+ astObjectType = def->qualifiedTypeNameId;
+ astInitializer = def->initializer;
+ } else if (UiObjectBinding *bin = cast<UiObjectBinding *>(arrayMember)) {
+ astObjectType = bin->qualifiedTypeNameId;
+ astInitializer = bin->initializer;
+ }
+
+ if (!astObjectType || !astInitializer)
+ return ModelNode();
+
+ QString typeName;
+ int majorVersion;
+ int minorVersion;
+ context->lookup(astObjectType, typeName, majorVersion, minorVersion);
+
+ if (typeName.isEmpty()) {
+ qWarning() << "Skipping node with unknown type" << flatten(astObjectType);
+ return ModelNode();
+ }
+
+ const ModelNode &newNode = m_merger->createModelNode(typeName,
+ majorVersion,
+ minorVersion,
+ arrayMember,
+ context,
+ *this);
modelProperty.reparentHere(newNode);
return newNode;
}
-void ModelAmender::typeDiffers(bool isRootNode, ModelNode &modelNode, const QDeclarativeDomObject &domObject)
+void ModelAmender::typeDiffers(bool isRootNode,
+ ModelNode &modelNode,
+ const QString &typeName,
+ int majorVersion,
+ int minorVersion,
+ QmlJS::AST::UiObjectMember *astNode,
+ ReadingContext *context)
{
if (isRootNode) {
- modelNode.view()->changeRootNodeType(domObject.objectType(), domObject.objectTypeMajorVersion(), domObject.objectTypeMinorVersion());
+ modelNode.view()->changeRootNodeType(typeName, majorVersion, minorVersion);
} else {
NodeAbstractProperty parentProperty = modelNode.parentProperty();
int nodeIndex = -1;
@@ -555,7 +900,12 @@ void ModelAmender::typeDiffers(bool isRootNode, ModelNode &modelNode, const QDec
modelNode.destroy();
- const ModelNode &newNode = m_merger->createModelNode(domObject, *this);
+ const ModelNode &newNode = m_merger->createModelNode(typeName,
+ majorVersion,
+ minorVersion,
+ astNode,
+ context,
+ *this);
parentProperty.reparentHere(newNode);
if (nodeIndex >= 0) {
int currentIndex = parentProperty.toNodeListProperty().toModelNodeList().indexOf(newNode);
@@ -575,13 +925,6 @@ void ModelAmender::idsDiffer(ModelNode &modelNode, const QString &qmlId)
modelNode.setId(qmlId);
}
-bool TextToModelMerger::isSignalPropertyName(const QString &signalName)
-{
- // see QmlCompiler::isSignalPropertyName
- return signalName.length() >= 3 && signalName.startsWith(QLatin1String("on")) &&
- signalName.at(2).isLetter();
-}
-
void TextToModelMerger::setupComponent(const ModelNode &node)
{
Q_ASSERT(node.type() == QLatin1String("Qt/Component"));
@@ -605,3 +948,16 @@ void TextToModelMerger::setupComponent(const ModelNode &node)
node.variantProperty("__component_data") = result;
}
+
+QString TextToModelMerger::textAt(const Document::Ptr &doc,
+ const SourceLocation &location)
+{
+ return doc->source().mid(location.offset, location.length);
+}
+
+QString TextToModelMerger::textAt(const Document::Ptr &doc,
+ const SourceLocation &from,
+ const SourceLocation &to)
+{
+ return doc->source().mid(from.offset, to.end() - from.begin());
+}
diff --git a/src/plugins/qmldesigner/core/model/texttomodelmerger.h b/src/plugins/qmldesigner/core/model/texttomodelmerger.h
index 0ac60b2ba1b41f767b56c68cd840a19d8d2a4f70..8933e0866fa6ac2c09fc2464ce12d69c442c501a 100644
--- a/src/plugins/qmldesigner/core/model/texttomodelmerger.h
+++ b/src/plugins/qmldesigner/core/model/texttomodelmerger.h
@@ -34,8 +34,7 @@
#include "import.h"
#include "nodelistproperty.h"
#include "modelnode.h"
-
-#include <private/qdeclarativedom_p.h>
+#include <qmljs/qmljsdocument.h>
namespace QmlDesigner {
@@ -43,6 +42,7 @@ class CORESHARED_EXPORT RewriterView;
namespace Internal {
+struct ReadingContext;
class DifferenceHandler;
class TextToModelMerger
@@ -54,7 +54,7 @@ public:
TextToModelMerger(RewriterView *reWriterView);
bool isActive() const;
- void setupImports(QDeclarativeDomDocument &doc, DifferenceHandler &differenceHandler);
+ void setupImports(const QmlJS::Document::Ptr &doc, DifferenceHandler &differenceHandler);
bool load(const QByteArray &data, DifferenceHandler &differenceHandler);
RewriterView *view() const
@@ -65,25 +65,51 @@ protected:
public:
void syncNode(ModelNode &modelNode,
- const QDeclarativeDomObject &qmlObject,
+ QmlJS::AST::UiObjectMember *astNode,
+ ReadingContext *context,
DifferenceHandler &differenceHandler);
- void syncProperty(AbstractProperty &modelProperty,
- const QDeclarativeDomProperty &qmlProperty,
- const QDeclarativeDomDynamicProperty &qmlDynamicProperty,
- DifferenceHandler &differenceHandler);
+ void syncNodeId(ModelNode &modelNode, const QString &astObjectId,
+ DifferenceHandler &differenceHandler);
+ void syncNodeProperty(AbstractProperty &modelProperty,
+ QmlJS::AST::UiObjectBinding *binding,
+ ReadingContext *context,
+ DifferenceHandler &differenceHandler);
+ void syncExpressionProperty(AbstractProperty &modelProperty,
+ const QString &javascript,
+ DifferenceHandler &differenceHandler);
+ void syncArrayProperty(AbstractProperty &modelProperty,
+ QmlJS::AST::UiArrayBinding *array,
+ ReadingContext *context,
+ DifferenceHandler &differenceHandler);
+ void syncVariantProperty(AbstractProperty &modelProperty,
+ const QString &astName,
+ const QString &astValue,
+ const QString &astType,
+ DifferenceHandler &differenceHandler);
void syncNodeListProperty(NodeListProperty &modelListProperty,
- const QDeclarativeDomList &domList,
+ const QList<QmlJS::AST::UiObjectMember *> arrayMembers,
+ ReadingContext *context,
DifferenceHandler &differenceHandler);
- ModelNode createModelNode(const QDeclarativeDomObject &domObject,
+ ModelNode createModelNode(const QString &typeName,
+ int majorVersion,
+ int minorVersion,
+ QmlJS::AST::UiObjectMember *astNode,
+ ReadingContext *context,
DifferenceHandler &differenceHandler);
static QVariant convertToVariant(const ModelNode &node,
- const QDeclarativeDomProperty &qmlProperty,
- const QDeclarativeDomDynamicProperty &qmlDynamicProperty);
+ const QString &astName,
+ const QString &astValue,
+ const QString &astType);
private:
- static bool isSignalPropertyName(const QString &signalName);
void setupComponent(const ModelNode &node);
+ static QString textAt(const QmlJS::Document::Ptr &doc,
+ const QmlJS::AST::SourceLocation &location);
+ static QString textAt(const QmlJS::Document::Ptr &doc,
+ const QmlJS::AST::SourceLocation &from,
+ const QmlJS::AST::SourceLocation &to);
+
private:
RewriterView *m_rewriterView;
bool m_isActive;
@@ -100,15 +126,32 @@ public:
virtual void modelMissesImport(const Import &import) = 0;
virtual void importAbsentInQMl(const Import &import) = 0;
- virtual void bindingExpressionsDiffer(BindingProperty &modelProperty, const QString &QDeclarativeBinding) = 0;
- virtual void shouldBeBindingProperty(AbstractProperty &modelProperty, const QString &QDeclarativeBinding) = 0;
- virtual void shouldBeNodeListProperty(AbstractProperty &modelProperty, const QDeclarativeDomList &domList) = 0;
+ virtual void bindingExpressionsDiffer(BindingProperty &modelProperty,
+ const QString &javascript) = 0;
+ virtual void shouldBeBindingProperty(AbstractProperty &modelProperty,
+ const QString &javascript) = 0;
+ virtual void shouldBeNodeListProperty(AbstractProperty &modelProperty,
+ const QList<QmlJS::AST::UiObjectMember *> arrayMembers,
+ ReadingContext *context) = 0;
virtual void variantValuesDiffer(VariantProperty &modelProperty, const QVariant &qmlVariantValue, const QString &dynamicTypeName) = 0;
virtual void shouldBeVariantProperty(AbstractProperty &modelProperty, const QVariant &qmlVariantValue, const QString &dynamicTypeName) = 0;
- virtual void shouldBeNodeProperty(AbstractProperty &modelProperty, const QDeclarativeDomObject &qmlObject) = 0;
+ virtual void shouldBeNodeProperty(AbstractProperty &modelProperty,
+ const QString &typeName,
+ int majorVersion,
+ int minorVersion,
+ QmlJS::AST::UiObjectMember *astNode,
+ ReadingContext *context) = 0;
virtual void modelNodeAbsentFromQml(ModelNode &modelNode) = 0;
- virtual ModelNode listPropertyMissingModelNode(NodeListProperty &modelProperty, const QDeclarativeDomObject &qmlObject) = 0;
- virtual void typeDiffers(bool isRootNode, ModelNode &modelNode, const QDeclarativeDomObject &domObject) = 0;
+ virtual ModelNode listPropertyMissingModelNode(NodeListProperty &modelProperty,
+ ReadingContext *context,
+ QmlJS::AST::UiObjectMember *arrayMember) = 0;
+ virtual void typeDiffers(bool isRootNode,
+ ModelNode &modelNode,
+ const QString &typeName,
+ int majorVersion,
+ int minorVersion,
+ QmlJS::AST::UiObjectMember *astNode,
+ ReadingContext *context) = 0;
virtual void propertyAbsentFromQml(AbstractProperty &modelProperty) = 0;
virtual void idsDiffer(ModelNode &modelNode, const QString &qmlId) = 0;
@@ -127,15 +170,32 @@ public:
virtual void modelMissesImport(const Import &import);
virtual void importAbsentInQMl(const Import &import);
- virtual void bindingExpressionsDiffer(BindingProperty &modelProperty, const QString &QDeclarativeBinding);
- virtual void shouldBeBindingProperty(AbstractProperty &modelProperty, const QString &QDeclarativeBinding);
- virtual void shouldBeNodeListProperty(AbstractProperty &modelProperty, const QDeclarativeDomList &domList);
+ virtual void bindingExpressionsDiffer(BindingProperty &modelProperty,
+ const QString &javascript);
+ virtual void shouldBeBindingProperty(AbstractProperty &modelProperty,
+ const QString &javascript);
+ virtual void shouldBeNodeListProperty(AbstractProperty &modelProperty,
+ const QList<QmlJS::AST::UiObjectMember *> arrayMembers,
+ ReadingContext *context);
virtual void variantValuesDiffer(VariantProperty &modelProperty, const QVariant &qmlVariantValue, const QString &dynamicTypeName);
virtual void shouldBeVariantProperty(AbstractProperty &modelProperty, const QVariant &qmlVariantValue, const QString &dynamicTypeName);
- virtual void shouldBeNodeProperty(AbstractProperty &modelProperty, const QDeclarativeDomObject &qmlObject);
+ virtual void shouldBeNodeProperty(AbstractProperty &modelProperty,
+ const QString &typeName,
+ int majorVersion,
+ int minorVersion,
+ QmlJS::AST::UiObjectMember *astNode,
+ ReadingContext *context);
virtual void modelNodeAbsentFromQml(ModelNode &modelNode);
- virtual ModelNode listPropertyMissingModelNode(NodeListProperty &modelProperty, const QDeclarativeDomObject &qmlObject);
- virtual void typeDiffers(bool isRootNode, ModelNode &modelNode, const QDeclarativeDomObject &domObject);
+ virtual ModelNode listPropertyMissingModelNode(NodeListProperty &modelProperty,
+ ReadingContext *context,
+ QmlJS::AST::UiObjectMember *arrayMember);
+ virtual void typeDiffers(bool isRootNode,
+ ModelNode &modelNode,
+ const QString &typeName,
+ int majorVersion,
+ int minorVersion,
+ QmlJS::AST::UiObjectMember *astNode,
+ ReadingContext *context);
virtual void propertyAbsentFromQml(AbstractProperty &modelProperty);
virtual void idsDiffer(ModelNode &modelNode, const QString &qmlId);
};
@@ -151,15 +211,32 @@ public:
virtual void modelMissesImport(const Import &import);
virtual void importAbsentInQMl(const Import &import);
- virtual void bindingExpressionsDiffer(BindingProperty &modelProperty, const QString &QDeclarativeBinding);
- virtual void shouldBeBindingProperty(AbstractProperty &modelProperty, const QString &QDeclarativeBinding);
- virtual void shouldBeNodeListProperty(AbstractProperty &modelProperty, const QDeclarativeDomList &domList);
+ virtual void bindingExpressionsDiffer(BindingProperty &modelProperty,
+ const QString &javascript);
+ virtual void shouldBeBindingProperty(AbstractProperty &modelProperty,
+ const QString &javascript);
+ virtual void shouldBeNodeListProperty(AbstractProperty &modelProperty,
+ const QList<QmlJS::AST::UiObjectMember *> arrayMembers,
+ ReadingContext *context);
virtual void variantValuesDiffer(VariantProperty &modelProperty, const QVariant &qmlVariantValue, const QString &dynamicType);
virtual void shouldBeVariantProperty(AbstractProperty &modelProperty, const QVariant &qmlVariantValue, const QString &dynamicTypeName);
- virtual void shouldBeNodeProperty(AbstractProperty &modelProperty, const QDeclarativeDomObject &qmlObject);
+ virtual void shouldBeNodeProperty(AbstractProperty &modelProperty,
+ const QString &typeName,
+ int majorVersion,
+ int minorVersion,
+ QmlJS::AST::UiObjectMember *astNode,
+ ReadingContext *context);
virtual void modelNodeAbsentFromQml(ModelNode &modelNode);
- virtual ModelNode listPropertyMissingModelNode(NodeListProperty &modelProperty, const QDeclarativeDomObject &qmlObject);
- virtual void typeDiffers(bool isRootNode, ModelNode &modelNode, const QDeclarativeDomObject &domObject);
+ virtual ModelNode listPropertyMissingModelNode(NodeListProperty &modelProperty,
+ ReadingContext *context,
+ QmlJS::AST::UiObjectMember *arrayMember);
+ virtual void typeDiffers(bool isRootNode,
+ ModelNode &modelNode,
+ const QString &typeName,
+ int majorVersion,
+ int minorVersion,
+ QmlJS::AST::UiObjectMember *astNode,
+ ReadingContext *context);
virtual void propertyAbsentFromQml(AbstractProperty &modelProperty);
virtual void idsDiffer(ModelNode &modelNode, const QString &qmlId);
};
diff --git a/src/plugins/qmldesigner/fxplugin/fx.metainfo b/src/plugins/qmldesigner/fxplugin/fx.metainfo
index 6c19dbf5589d805a43431061727b3ee0f17f8a17..e3d587b1c2f0ff5f165f8f46ca36d1ebc1e340d4 100644
--- a/src/plugins/qmldesigner/fxplugin/fx.metainfo
+++ b/src/plugins/qmldesigner/fxplugin/fx.metainfo
@@ -8,7 +8,7 @@
</itemlibraryrepresentation>
</node>
<node name="Qt/Rectangle" showInItemLibrary="true" category="Qt - Basic" isContainer="true" icon=":/fxplugin/images/rect-icon.png">
- <itemlibraryrepresentation name="Rectangle" icon=":/fxplugin/images/rect-icon.png">
+ <itemlibraryrepresentation name="Rectangle" icon=":/fxplugin/images/rectangle-icon.png">
<property name="width" type="int" value="100"/>
<property name="height" type="int" value="100"/>
<property name="color" type="QColor" value="#ffffff"/>
diff --git a/src/plugins/qmldesigner/fxplugin/fxplugin.qrc b/src/plugins/qmldesigner/fxplugin/fxplugin.qrc
index 5c2087f57b15cdccdcbe513744d56612a800766b..65b47e6848fa559434bb0bc7849ae784890d6d77 100644
--- a/src/plugins/qmldesigner/fxplugin/fxplugin.qrc
+++ b/src/plugins/qmldesigner/fxplugin/fxplugin.qrc
@@ -1,22 +1,23 @@
<RCC>
<qresource prefix="/fxplugin" >
- <file>images/blended-image-icon.png</file>
- <file>images/image-icon.png</file>
+ <file>fx.metainfo</file>
<file>images/item-icon.png</file>
- <file>images/mouse-area-icon.png</file>
<file>images/rect-icon.png</file>
- <file>images/text-edit-icon.png</file>
<file>images/text-icon.png</file>
- <file>images/list-icon.png</file>
- <file>images/template_image.png</file>
- <file>fx.metainfo</file>
- <file>images/webview-icon.png</file>
- <file>images/row-icon.png</file>
- <file>images/column-icon.png</file>
- <file>images/grid-icon.png</file>
- <file>images/gridview-icon.png</file>
+ <file>images/text-edit-icon.png</file>
+ <file>images/text-input-icon.png</file>
+ <file>images/mouse-area-icon.png</file>
+ <file>images/image-icon.png</file>
+ <file>images/border-image-icon.png</file>
<file>images/flickable-icon.png</file>
<file>images/flipable-icon.png</file>
+ <file>images/gridview-icon.png</file>
+ <file>images/listview-icon.png</file>
+ <file>images/pathview-icon.png</file>
<file>images/focusscope-icon.png</file>
+ <file>images/row-icon.png</file>
+ <file>images/column-icon.png</file>
+ <file>images/grid-icon.png</file>
+ <file>images/webview-icon.png</file>
</qresource>
</RCC>
diff --git a/src/plugins/qmldesigner/fxplugin/images/border-image-icon.png b/src/plugins/qmldesigner/fxplugin/images/border-image-icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..4dfcae7d472d50acfc50098e28788edec8adee0d
Binary files /dev/null and b/src/plugins/qmldesigner/fxplugin/images/border-image-icon.png differ
diff --git a/src/plugins/qmldesigner/fxplugin/images/gridview-icon.png b/src/plugins/qmldesigner/fxplugin/images/gridview-icon.png
index 113e14c00a05aa7e0e13e65ce2b01226dacb6406..75846176fd1608592daa34cc001e8a9b09f0f508 100644
Binary files a/src/plugins/qmldesigner/fxplugin/images/gridview-icon.png and b/src/plugins/qmldesigner/fxplugin/images/gridview-icon.png differ
diff --git a/src/plugins/qmldesigner/fxplugin/images/listview-icon.png b/src/plugins/qmldesigner/fxplugin/images/listview-icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..9c96743f0e4f3fd22a160864382f2dbf05c6de0d
Binary files /dev/null and b/src/plugins/qmldesigner/fxplugin/images/listview-icon.png differ
diff --git a/src/plugins/qmldesigner/fxplugin/images/pathview-icon.png b/src/plugins/qmldesigner/fxplugin/images/pathview-icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..9c96743f0e4f3fd22a160864382f2dbf05c6de0d
Binary files /dev/null and b/src/plugins/qmldesigner/fxplugin/images/pathview-icon.png differ
diff --git a/src/plugins/qmldesigner/fxplugin/images/text-input-icon.png b/src/plugins/qmldesigner/fxplugin/images/text-input-icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..6a064ab07c1fb301161797f48b611106f371fc9c
Binary files /dev/null and b/src/plugins/qmldesigner/fxplugin/images/text-input-icon.png differ
diff --git a/src/plugins/qmldesigner/fxplugin/images/widget.png b/src/plugins/qmldesigner/fxplugin/images/widget.png
deleted file mode 100644
index 1cf960e61befdb4657cbf3f0b6646f09d9bcd926..0000000000000000000000000000000000000000
Binary files a/src/plugins/qmldesigner/fxplugin/images/widget.png and /dev/null differ
diff --git a/src/plugins/qmldesigner/qmldesignerplugin.cpp b/src/plugins/qmldesigner/qmldesignerplugin.cpp
index e7cd5fb2175f9d8e663f037a407bcc4eba1afab1..99cf54933bcdc75174c638d1485bd92a7a95dd41 100644
--- a/src/plugins/qmldesigner/qmldesignerplugin.cpp
+++ b/src/plugins/qmldesigner/qmldesignerplugin.cpp
@@ -303,7 +303,7 @@ void BauhausPlugin::extensionsInitialized()
m_mimeTypes << "application/x-qml" << "application/javascript"
<< "application/x-javascript" << "text/javascript";
- m_designMode->registerDesignWidget(m_mainWidget, m_mimeTypes);
+ m_designMode->registerDesignWidget(m_mainWidget, m_mimeTypes, m_context->context());
connect(m_designMode, SIGNAL(actionsUpdated(Core::IEditor*)), SLOT(updateActions(Core::IEditor*)));
}
diff --git a/src/plugins/qmldesigner/qmldesignerplugin.pro b/src/plugins/qmldesigner/qmldesignerplugin.pro
index 508e5c26bb3cf8dc1fc823999574ebacee35619e..a20079903e07c7a7a83a461bc2971dbc43507e61 100644
--- a/src/plugins/qmldesigner/qmldesignerplugin.pro
+++ b/src/plugins/qmldesigner/qmldesignerplugin.pro
@@ -4,6 +4,7 @@ TARGET = QmlDesigner
include(../../qtcreatorplugin.pri)
include(../private_headers.pri)
include(qmldesigner_dependencies.pri)
+include(../qmljseditor/qmljseditor.pri)
include(core/core.pri)
include(components/integration/integration.pri)
diff --git a/src/plugins/qmlinspector/components/canvasframerate.cpp b/src/plugins/qmlinspector/components/canvasframerate.cpp
index 0cd3cab01bc79a558343082712da7ac39d517090..d3f6179d8f7a36e25016704606d042da4d638453 100644
--- a/src/plugins/qmlinspector/components/canvasframerate.cpp
+++ b/src/plugins/qmlinspector/components/canvasframerate.cpp
@@ -48,7 +48,8 @@
#include <QtGui/qevent.h>
-QT_BEGIN_NAMESPACE
+namespace Qml {
+namespace Internal {
class QLineGraph : public QWidget
{
@@ -562,6 +563,7 @@ void CanvasFrameRate::enabledToggled(bool checked)
static_cast<QDeclarativeDebugClient *>(m_plugin)->setEnabled(checked);
}
-QT_END_NAMESPACE
+}
+}
#include "canvasframerate.moc"
diff --git a/src/plugins/qmlinspector/components/canvasframerate.h b/src/plugins/qmlinspector/components/canvasframerate.h
index b067374e8973610774e8ba2c4d9e8382a57842aa..d65ebc71e645fd1d4ad978d17faf49b1b8a05c3e 100644
--- a/src/plugins/qmlinspector/components/canvasframerate.h
+++ b/src/plugins/qmlinspector/components/canvasframerate.h
@@ -34,15 +34,19 @@
#include <QtCore/qpointer.h>
#include <QtGui/qwidget.h>
-
QT_BEGIN_NAMESPACE
-
class QTabWidget;
class QSlider;
class QGroupBox;
class QLabel;
class QSpinBox;
class QPushButton;
+QT_END_NAMESPACE
+
+
+namespace Qml {
+namespace Internal {
+
class CanvasFrameRatePlugin;
@@ -57,6 +61,9 @@ public:
void setSizeHint(const QSize &);
virtual QSize sizeHint() const;
+signals:
+ void contextHelpIdChanged(const QString &helpId);
+
private slots:
void clearGraph();
void newTab();
@@ -74,7 +81,8 @@ private:
QSize m_sizeHint;
};
-QT_END_NAMESPACE
+} // Internal
+} // Qml
#endif // CANVASFRAMERATE_H
diff --git a/src/plugins/qmlinspector/components/expressionquerywidget.cpp b/src/plugins/qmlinspector/components/expressionquerywidget.cpp
index 2a9c5d242c207dbd4198f4c59bd1c748e691066a..c57e914952c9329c1f456199239d6ce7fde245b3 100644
--- a/src/plugins/qmlinspector/components/expressionquerywidget.cpp
+++ b/src/plugins/qmlinspector/components/expressionquerywidget.cpp
@@ -28,13 +28,16 @@
**************************************************************************/
#include "expressionquerywidget.h"
#include "qmlinspectorconstants.h"
+#include "inspectorcontext.h"
-#include <utils/fancylineedit.h>
+#include <utils/styledbar.h>
+#include <utils/filterlineedit.h>
#include <texteditor/texteditorconstants.h>
#include <texteditor/texteditorsettings.h>
#include <texteditor/fontsettings.h>
#include <qmljseditor/qmljshighlighter.h>
#include <coreplugin/icore.h>
+#include <coreplugin/coreconstants.h>
#include <coreplugin/actionmanager/actionmanager.h>
#include <coreplugin/actionmanager/command.h>
@@ -44,7 +47,7 @@
#include <QtGui/QLabel>
#include <QtGui/QTextEdit>
#include <QtGui/QLineEdit>
-#include <QtGui/QPushButton>
+#include <QtGui/QToolButton>
#include <QtGui/QGroupBox>
#include <QtGui/QTextObject>
#include <QtGui/QLayout>
@@ -52,6 +55,10 @@
#include <QtCore/QDebug>
+namespace Qml {
+namespace Internal {
+
+
ExpressionQueryWidget::ExpressionQueryWidget(Mode mode, QDeclarativeEngineDebug *client, QWidget *parent)
: QWidget(parent),
m_mode(mode),
@@ -74,16 +81,26 @@ ExpressionQueryWidget::ExpressionQueryWidget(Mode mode, QDeclarativeEngineDebug
m_highlighter->setParent(m_textEdit->document());
if (m_mode == SeparateEntryMode) {
- m_lineEdit = new QLineEdit;
+ Utils::StyledBar *bar = new Utils::StyledBar;
+ m_lineEdit = new Utils::FilterLineEdit;
m_lineEdit->setPlaceholderText(tr("<Expression>"));
+ m_lineEdit->setToolTip(tr("Write and evaluate QtScript expressions."));
+
+ m_clearButton = new QToolButton();
+ m_clearButton->setIcon(QIcon(QLatin1String(":/utils/images/reset.png")));
+ m_clearButton->setToolTip(tr("Clear Output"));
+ m_clearButton->setIcon(QIcon(Core::Constants::ICON_CLEAN_PANE));
+ connect(m_clearButton, SIGNAL(clicked()), this, SLOT(clearTextEditor()));
+ connect(m_lineEdit, SIGNAL(textChanged(QString)), SLOT(changeContextHelpId(QString)));
+
connect(m_lineEdit, SIGNAL(returnPressed()), SLOT(executeExpression()));
- QHBoxLayout *hbox = new QHBoxLayout;
+ QHBoxLayout *hbox = new QHBoxLayout(bar);
hbox->setMargin(1);
hbox->setSpacing(1);
- //hbox->addWidget(new QLabel(tr("Expression:")));
hbox->addWidget(m_lineEdit);
- layout->addLayout(hbox);
+ hbox->addWidget(m_clearButton);
+ layout->addWidget(bar);
m_textEdit->setReadOnly(true);
m_lineEdit->installEventFilter(this);
@@ -92,6 +109,18 @@ ExpressionQueryWidget::ExpressionQueryWidget(Mode mode, QDeclarativeEngineDebug
appendPrompt();
}
setFontSettings();
+ clear();
+}
+
+void ExpressionQueryWidget::changeContextHelpId(const QString &)
+{
+ emit contextHelpIdChanged(InspectorContext::contextHelpIdForItem(m_lineEdit->text()));
+}
+
+void ExpressionQueryWidget::clearTextEditor()
+{
+ m_textEdit->clear();
+ m_textEdit->appendPlainText(tr("Debug Console\n"));
}
void ExpressionQueryWidget::setFontSettings()
@@ -147,7 +176,8 @@ void ExpressionQueryWidget::setEngineDebug(QDeclarativeEngineDebug *client)
void ExpressionQueryWidget::clear()
{
- m_textEdit->clear();
+ clearTextEditor();
+
if (m_lineEdit)
m_lineEdit->clear();
if (m_mode == ShellMode)
@@ -320,3 +350,6 @@ bool ExpressionQueryWidget::eventFilter(QObject *obj, QEvent *event)
}
return QWidget::eventFilter(obj, event);
}
+
+} // Internal
+} // Qml
diff --git a/src/plugins/qmlinspector/components/expressionquerywidget.h b/src/plugins/qmlinspector/components/expressionquerywidget.h
index 41a8dc155ef4b64d38f5b0a33369a8e765ae88d8..50ec058b8ecba7acc657f6757b4c639b6cb03156 100644
--- a/src/plugins/qmlinspector/components/expressionquerywidget.h
+++ b/src/plugins/qmlinspector/components/expressionquerywidget.h
@@ -33,16 +33,19 @@
#include <QtGui/qwidget.h>
-
QT_BEGIN_NAMESPACE
class QGroupBox;
class QPlainTextEdit;
class QLineEdit;
-class QPushButton;
+class QToolButton;
QT_END_NAMESPACE
+namespace Utils {
+ class FancyLineEdit;
+}
+
namespace Core {
class IContext;
}
@@ -51,6 +54,9 @@ namespace QmlJSEditor {
class Highlighter;
}
+namespace Qml {
+namespace Internal {
+
class ExpressionQueryWidget : public QWidget
{
Q_OBJECT
@@ -66,6 +72,9 @@ public:
void setEngineDebug(QDeclarativeEngineDebug *client);
void clear();
+signals:
+ void contextHelpIdChanged(const QString &contextHelpId);
+
protected:
bool eventFilter(QObject *obj, QEvent *event);
@@ -73,9 +82,11 @@ public slots:
void setCurrentObject(const QDeclarativeDebugObjectReference &obj);
private slots:
+ void clearTextEditor();
void executeExpression();
void showResult();
void invokeCompletion();
+ void changeContextHelpId(const QString &text);
private:
void setFontSettings();
@@ -89,8 +100,9 @@ private:
QDeclarativeEngineDebug *m_client;
QDeclarativeDebugExpressionQuery *m_query;
QPlainTextEdit *m_textEdit;
- QLineEdit *m_lineEdit;
- QPushButton *m_button;
+ Utils::FancyLineEdit *m_lineEdit;
+
+ QToolButton *m_clearButton;
QString m_prompt;
QString m_expr;
QString m_lastExpr;
@@ -102,5 +114,8 @@ private:
QDeclarativeDebugObjectReference m_objectAtLastFocus;
};
+} // Internal
+} // Qml
+
#endif
diff --git a/src/plugins/qmlinspector/components/objectpropertiesview.cpp b/src/plugins/qmlinspector/components/objectpropertiesview.cpp
index 3420601483fa825a64292a806cf9e018b75f86b9..ace3432a825999bd852c992c49169c1eb0209438 100644
--- a/src/plugins/qmlinspector/components/objectpropertiesview.cpp
+++ b/src/plugins/qmlinspector/components/objectpropertiesview.cpp
@@ -27,16 +27,17 @@
**
**************************************************************************/
#include "objectpropertiesview.h"
+#include "inspectorcontext.h"
-#include <QtCore/qdebug.h>
+#include <QtCore/QDebug>
-#include <QtGui/qtreewidget.h>
-#include <QtGui/qlayout.h>
-#include <QtGui/qheaderview.h>
+#include <QtGui/QTreeWidget>
+#include <QtGui/QLayout>
+#include <QtGui/QHeaderView>
+namespace Qml {
+namespace Internal {
-QT_BEGIN_NAMESPACE
-
class PropertiesViewItem : public QObject, public QTreeWidgetItem
{
Q_OBJECT
@@ -78,10 +79,12 @@ ObjectPropertiesView::ObjectPropertiesView(QDeclarativeEngineDebug *client, QWid
m_tree->setFrameStyle(QFrame::NoFrame);
m_tree->setAlternatingRowColors(true);
m_tree->setExpandsOnDoubleClick(false);
+ m_tree->setRootIsDecorated(false);
m_tree->setHeaderLabels(QStringList()
<< tr("Name") << tr("Value") << tr("Type"));
QObject::connect(m_tree, SIGNAL(itemActivated(QTreeWidgetItem *, int)),
this, SLOT(itemActivated(QTreeWidgetItem *)));
+ connect(m_tree, SIGNAL(itemSelectionChanged()), SLOT(changeItemSelection()));
m_tree->setColumnCount(3);
m_tree->header()->setDefaultSectionSize(150);
@@ -89,6 +92,16 @@ ObjectPropertiesView::ObjectPropertiesView(QDeclarativeEngineDebug *client, QWid
layout->addWidget(m_tree);
}
+void ObjectPropertiesView::changeItemSelection()
+{
+ if (m_tree->selectedItems().isEmpty())
+ return;
+
+ QString item = m_object.className();
+ QString prop = m_tree->selectedItems().first()->text(0);
+ emit contextHelpIdChanged(InspectorContext::contextHelpIdForProperty(item, prop));
+}
+
void ObjectPropertiesView::setEngineDebug(QDeclarativeEngineDebug *client)
{
m_client = client;
@@ -255,6 +268,7 @@ void ObjectPropertiesView::itemActivated(QTreeWidgetItem *i)
emit activated(m_object, item->property);
}
-QT_END_NAMESPACE
+}
+}
#include "objectpropertiesview.moc"
diff --git a/src/plugins/qmlinspector/components/objectpropertiesview.h b/src/plugins/qmlinspector/components/objectpropertiesview.h
index e889403105d337b5fc764e4642b8cbe04ab8bb42..8cd3a7decd69f1d11307ce76ab86de44d40bdf4e 100644
--- a/src/plugins/qmlinspector/components/objectpropertiesview.h
+++ b/src/plugins/qmlinspector/components/objectpropertiesview.h
@@ -38,6 +38,12 @@ QT_BEGIN_NAMESPACE
class QTreeWidget;
class QTreeWidgetItem;
class QDeclarativeDebugConnection;
+
+QT_END_NAMESPACE
+
+namespace Qml {
+namespace Internal {
+
class PropertiesViewItem;
class ObjectPropertiesView : public QWidget
@@ -51,12 +57,14 @@ public:
signals:
void activated(const QDeclarativeDebugObjectReference &, const QDeclarativeDebugPropertyReference &);
+ void contextHelpIdChanged(const QString &contextHelpId);
public slots:
void reload(const QDeclarativeDebugObjectReference &);
void watchCreated(QDeclarativeDebugWatch *);
private slots:
+ void changeItemSelection();
void queryFinished();
void watchStateChanged();
void valueChanged(const QByteArray &name, const QVariant &value);
@@ -75,7 +83,8 @@ private:
QDeclarativeDebugObjectReference m_object;
};
+} // Internal
+} // Qml
-QT_END_NAMESPACE
#endif
diff --git a/src/plugins/qmlinspector/components/objecttree.cpp b/src/plugins/qmlinspector/components/objecttree.cpp
index c65da984b19b479d4a3bb367e539bae9a1e81369..e4c187bbf688827fee7042fe863432beefeb19a0 100644
--- a/src/plugins/qmlinspector/components/objecttree.cpp
+++ b/src/plugins/qmlinspector/components/objecttree.cpp
@@ -37,8 +37,10 @@
#include <private/qdeclarativedebug_p.h>
#include "objecttree.h"
+#include "inspectorcontext.h"
-//Q_DECLARE_METATYPE(QDeclarativeDebugObjectReference)
+namespace Qml {
+namespace Internal {
ObjectTree::ObjectTree(QDeclarativeEngineDebug *client, QWidget *parent)
: QTreeWidget(parent),
@@ -54,6 +56,7 @@ ObjectTree::ObjectTree(QDeclarativeEngineDebug *client, QWidget *parent)
SLOT(currentItemChanged(QTreeWidgetItem *)));
connect(this, SIGNAL(itemActivated(QTreeWidgetItem *, int)),
SLOT(activated(QTreeWidgetItem *)));
+ connect(this, SIGNAL(itemSelectionChanged()), SLOT(selectionChanged()));
}
void ObjectTree::setEngineDebug(QDeclarativeEngineDebug *client)
@@ -61,6 +64,16 @@ void ObjectTree::setEngineDebug(QDeclarativeEngineDebug *client)
m_client = client;
}
+void ObjectTree::selectionChanged()
+{
+ if (selectedItems().isEmpty())
+ return;
+
+ QTreeWidgetItem *item = selectedItems().first();
+ if (item)
+ emit contextHelpIdChanged(InspectorContext::contextHelpIdForItem(item->text(0)));
+}
+
void ObjectTree::reload(int objectDebugId)
{
if (!m_client)
@@ -87,6 +100,8 @@ void ObjectTree::setCurrentObject(int debugId)
scrollToItem(item);
item->setExpanded(true);
}
+
+
}
void ObjectTree::objectFetched()
@@ -218,3 +233,6 @@ void ObjectTree::mousePressEvent(QMouseEvent *me)
}
}
}
+
+}
+}
diff --git a/src/plugins/qmlinspector/components/objecttree.h b/src/plugins/qmlinspector/components/objecttree.h
index fed55390c6248780e7744f747e0e829955f12d7b..8e800209f53b6a4b5c7ef6faaecbd1635b2b9411 100644
--- a/src/plugins/qmlinspector/components/objecttree.h
+++ b/src/plugins/qmlinspector/components/objecttree.h
@@ -41,6 +41,11 @@ class QDeclarativeDebugObjectQuery;
class QDeclarativeDebugContextReference;
class QDeclarativeDebugConnection;
+QT_END_NAMESPACE
+
+namespace Qml {
+namespace Internal {
+
class ObjectTree : public QTreeWidget
{
@@ -54,6 +59,7 @@ signals:
void currentObjectChanged(const QDeclarativeDebugObjectReference &);
void activated(const QDeclarativeDebugObjectReference &);
void expressionWatchRequested(const QDeclarativeDebugObjectReference &, const QString &);
+ void contextHelpIdChanged(const QString &contextHelpId);
public slots:
void reload(int objectDebugId); // set the root object
@@ -66,6 +72,7 @@ private slots:
void objectFetched();
void currentItemChanged(QTreeWidgetItem *);
void activated(QTreeWidgetItem *);
+ void selectionChanged();
private:
QTreeWidgetItem *findItemByObjectId(int debugId) const;
@@ -78,7 +85,7 @@ private:
QDeclarativeDebugObjectQuery *m_query;
};
-QT_END_NAMESPACE
-
+} // Internal
+} // Qml
#endif
diff --git a/src/plugins/qmlinspector/components/watchtable.cpp b/src/plugins/qmlinspector/components/watchtable.cpp
index 0f7a269007514c949142a922c5789064a06a52a1..4712f901998be715c700dae4ace2fc71b45f96ee 100644
--- a/src/plugins/qmlinspector/components/watchtable.cpp
+++ b/src/plugins/qmlinspector/components/watchtable.cpp
@@ -36,7 +36,8 @@
#include <private/qdeclarativedebug_p.h>
#include <private/qdeclarativemetatype_p.h>
-QT_BEGIN_NAMESPACE
+namespace Qml {
+namespace Internal {
const int C_NAME = 0;
const int C_VALUE = 1;
@@ -153,7 +154,7 @@ QVariant WatchTableModel::data(const QModelIndex &idx, int role) const
return QVariant(m_entities.at(idx.row()).title);
} else if (idx.column() == C_VALUE) {
- if (role == Qt::DisplayRole) {
+ if (role == Qt::DisplayRole || role == Qt::EditRole) {
return QVariant(m_entities.at(idx.row()).value);
} else if(role == Qt::BackgroundRole) {
@@ -164,6 +165,24 @@ QVariant WatchTableModel::data(const QModelIndex &idx, int role) const
return QVariant();
}
+bool WatchTableModel::setData ( const QModelIndex & index, const QVariant & value, int role)
+{
+ Q_UNUSED(index);
+ Q_UNUSED(value);
+ if (role == Qt::EditRole) {
+ return true;
+ }
+ return true;
+}
+
+Qt::ItemFlags WatchTableModel::flags ( const QModelIndex & index ) const
+{
+ if (index.column() == C_VALUE)
+ return Qt::ItemIsSelectable | Qt::ItemIsEditable | Qt::ItemIsEnabled;
+
+ return Qt::ItemIsSelectable | Qt::ItemIsEnabled;
+}
+
void WatchTableModel::watchStateChanged()
{
QDeclarativeDebugWatch *watch = qobject_cast<QDeclarativeDebugWatch*>(sender());
@@ -200,9 +219,8 @@ void WatchTableModel::togglePropertyWatch(const QDeclarativeDebugObjectReference
delete watch;
watch = 0;
} else {
- QString desc = (object.name().isEmpty() ? QLatin1String("<unnamed object>") : object.name())
- + QLatin1String(".") + property.name()
- + object.className();
+ QString desc = (object.name().isEmpty() ? QLatin1String("<") + object.className() + QLatin1String(">") : object.name())
+ + QLatin1String(".") + property.name();
addWatch(watch, desc);
emit watchCreated(watch);
@@ -278,6 +296,13 @@ WatchTableView::WatchTableView(WatchTableModel *model, QWidget *parent)
{
setFrameStyle(QFrame::NoFrame);
setAlternatingRowColors(true);
+ setSelectionMode(QAbstractItemView::SingleSelection);
+ setSelectionBehavior(QAbstractItemView::SelectItems);
+ setShowGrid(false);
+ setVerticalHeader(0);
+ setEditTriggers(QAbstractItemView::DoubleClicked | QAbstractItemView::EditKeyPressed);
+ setFrameStyle(QFrame::NoFrame);
+
connect(model, SIGNAL(watchCreated(QDeclarativeDebugWatch*)), SLOT(watchCreated(QDeclarativeDebugWatch*)));
connect(this, SIGNAL(activated(QModelIndex)), SLOT(indexActivated(QModelIndex)));
@@ -292,8 +317,9 @@ void WatchTableView::indexActivated(const QModelIndex &index)
void WatchTableView::watchCreated(QDeclarativeDebugWatch *watch)
{
- int column = m_model->rowForWatch(watch);
- resizeColumnToContents(column);
+ int row = m_model->rowForWatch(watch);
+ resizeRowToContents(row);
+ resizeColumnToContents(C_NAME);
}
void WatchTableView::mousePressEvent(QMouseEvent *me)
@@ -312,4 +338,6 @@ void WatchTableView::mousePressEvent(QMouseEvent *me)
}
}
-QT_END_NAMESPACE
+
+} // Internal
+} // Qml
diff --git a/src/plugins/qmlinspector/components/watchtable.h b/src/plugins/qmlinspector/components/watchtable.h
index 7a488dd6d63683b62d6936518daaa5b7113fb710..e38f89c3e92a51a22a677d4268d7d885e1dfdfd3 100644
--- a/src/plugins/qmlinspector/components/watchtable.h
+++ b/src/plugins/qmlinspector/components/watchtable.h
@@ -45,6 +45,11 @@ class QDeclarativeDebugConnection;
class QDeclarativeDebugPropertyReference;
class QDeclarativeDebugObjectReference;
+QT_END_NAMESPACE
+
+namespace Qml {
+namespace Internal {
+
class WatchTableModel : public QAbstractTableModel
{
Q_OBJECT
@@ -60,10 +65,12 @@ public:
void removeWatchAt(int row);
void removeAllWatches();
+ Qt::ItemFlags flags (const QModelIndex & index) const;
int rowCount(const QModelIndex &parent = QModelIndex()) const;
int columnCount(const QModelIndex &parent = QModelIndex()) const;
QVariant headerData(int section, Qt::Orientation orientation, int role) const;
QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const;
+ bool setData (const QModelIndex & index, const QVariant & value, int role = Qt::EditRole);
signals:
void watchCreated(QDeclarativeDebugWatch *watch);
@@ -115,6 +122,7 @@ public:
signals:
void objectActivated(int objectDebugId);
+ void contextHelpIdChanged(const QString &contextHelpId);
protected:
void mousePressEvent(QMouseEvent *me);
@@ -128,6 +136,7 @@ private:
};
-QT_END_NAMESPACE
+} // Internal
+} // Qml
#endif // WATCHTABLEMODEL_H
diff --git a/src/plugins/qmlinspector/inspectorcontext.cpp b/src/plugins/qmlinspector/inspectorcontext.cpp
index 11a3d2637826253c269686743e14a31d5f938c71..c735e44d3f2b20c912d156da93fc3394ff900490 100644
--- a/src/plugins/qmlinspector/inspectorcontext.cpp
+++ b/src/plugins/qmlinspector/inspectorcontext.cpp
@@ -30,8 +30,15 @@
#include "inspectorcontext.h"
#include "qmlinspectorconstants.h"
+#include "components/objectpropertiesview.h"
+#include "components/objecttree.h"
+#include <coreplugin/icore.h>
+
#include <coreplugin/uniqueidmanager.h>
+
#include <QWidget>
+#include <QDebug>
+
namespace Qml {
namespace Internal {
@@ -57,9 +64,26 @@ QWidget *InspectorContext::widget()
return m_widget;
}
+void InspectorContext::setContextHelpId(const QString &helpId)
+{
+ m_contextHelpId = helpId;
+}
+
QString InspectorContext::contextHelpId() const
{
- return QString();
+ return m_contextHelpId;
+}
+
+QString InspectorContext::contextHelpIdForProperty(const QString &itemName, const QString &propName)
+{
+ // TODO this functionality is not supported yet as we don't have help id's for
+ // properties.
+ return QString("QML.").append(itemName).append(".").append(propName);
+}
+
+QString InspectorContext::contextHelpIdForItem(const QString &itemName)
+{
+ return QString("QML.").append(itemName);
}
}
diff --git a/src/plugins/qmlinspector/inspectorcontext.h b/src/plugins/qmlinspector/inspectorcontext.h
index a3e626db3b204212cab62ff8aa6db8ca8d4fc7b4..e73b3e4f2354e8c0969593eec431583a50950c75 100644
--- a/src/plugins/qmlinspector/inspectorcontext.h
+++ b/src/plugins/qmlinspector/inspectorcontext.h
@@ -40,6 +40,8 @@ QT_END_NAMESPACE
namespace Qml {
namespace Internal {
+class ObjectPropertiesView;
+class ObjectTree;
class DesignModeWidget;
/**
@@ -47,6 +49,8 @@ class DesignModeWidget;
*/
class InspectorContext : public Core::IContext
{
+ Q_OBJECT
+
public:
InspectorContext(QWidget *widget);
~InspectorContext();
@@ -56,12 +60,20 @@ public:
QString contextHelpId() const;
+ static QString contextHelpIdForProperty(const QString &itemName, const QString &propName);
+ static QString contextHelpIdForItem(const QString &itemName);
+
+public slots:
+ void setContextHelpId(const QString &helpId);
+
private:
QList<int> m_context;
QWidget *m_widget;
+ QString m_contextHelpId;
+
};
-}
-}
+} // Internal
+} // Qml
#endif // DESIGNMODECONTEXT_H
diff --git a/src/plugins/qmlinspector/qmlinspector.cpp b/src/plugins/qmlinspector/qmlinspector.cpp
index 4cd0efe196f3cbebc3a16075a419e150fa95513f..b208cb42f4186fe89e52f7cd207ec319da7b5ba1 100644
--- a/src/plugins/qmlinspector/qmlinspector.cpp
+++ b/src/plugins/qmlinspector/qmlinspector.cpp
@@ -26,19 +26,20 @@
** contact the sales department at http://qt.nokia.com/contact.
**
**************************************************************************/
+
#include "qmlinspectorconstants.h"
#include "qmlinspector.h"
-#include "debugger/debuggermainwindow.h"
#include "inspectoroutputwidget.h"
#include "inspectorcontext.h"
-#include <debugger/debuggeruiswitcher.h>
-
-#include "components/objectpropertiesview.h"
#include "components/objecttree.h"
#include "components/watchtable.h"
#include "components/canvasframerate.h"
#include "components/expressionquerywidget.h"
+#include "components/objectpropertiesview.h"
+
+#include <debugger/debuggermainwindow.h>
+#include <debugger/debuggeruiswitcher.h>
#include <utils/styledbar.h>
#include <utils/fancymainwindow.h>
@@ -66,21 +67,20 @@
#include <qmlprojectmanager/qmlprojectrunconfiguration.h>
+#include <QtCore/QDebug>
#include <QtCore/QStringList>
-#include <QtCore/QtPlugin>
#include <QtCore/QTimer>
+#include <QtCore/QtPlugin>
-#include <QtCore/QDebug>
-
-#include <QtGui/qtoolbutton.h>
-#include <QtGui/qtoolbar.h>
-#include <QtGui/qboxlayout.h>
-#include <QtGui/qlabel.h>
-#include <QtGui/qdockwidget.h>
-#include <QtGui/qaction.h>
-#include <QtGui/qlineedit.h>
-#include <QtGui/qlabel.h>
-#include <QtGui/qspinbox.h>
+#include <QtGui/QToolButton>
+#include <QtGui/QToolBar>
+#include <QtGui/QBoxLayout>
+#include <QtGui/QLabel>
+#include <QtGui/QDockWidget>
+#include <QtGui/QAction>
+#include <QtGui/QLineEdit>
+#include <QtGui/QLabel>
+#include <QtGui/QSpinBox>
#include <QtNetwork/QHostAddress>
@@ -88,6 +88,7 @@ using namespace Qml;
namespace Qml {
+namespace Internal {
class EngineSpinBox : public QSpinBox
{
Q_OBJECT
@@ -111,8 +112,6 @@ private:
QList<EngineInfo> m_engines;
};
-}
-
EngineSpinBox::EngineSpinBox(QWidget *parent)
: QSpinBox(parent)
{
@@ -157,6 +156,8 @@ int EngineSpinBox::valueFromText(const QString &text) const
return -1;
}
+} // Internal
+
QmlInspector::QmlInspector(QObject *parent)
: QObject(parent),
@@ -169,9 +170,13 @@ QmlInspector::QmlInspector(QObject *parent)
m_propertyWatcherDock(0),
m_inspectorOutputDock(0)
{
- m_watchTableModel = new WatchTableModel(0, this);
+ m_watchTableModel = new Internal::WatchTableModel(0, this);
- initWidgets();
+ m_objectTreeWidget = new Internal::ObjectTree;
+ m_propertiesWidget = new Internal::ObjectPropertiesView;
+ m_watchTableView = new Internal::WatchTableView(m_watchTableModel);
+ m_frameRateWidget = new Internal::CanvasFrameRate;
+ m_expressionWidget = new Internal::ExpressionQueryWidget(Internal::ExpressionQueryWidget::SeparateEntryMode);
}
bool QmlInspector::connectToViewer()
@@ -234,6 +239,9 @@ void QmlInspector::connectionStateChanged()
m_engineQuery = 0;
delete m_contextQuery;
m_contextQuery = 0;
+
+ resetViews();
+
break;
}
case QAbstractSocket::HostLookupState:
@@ -254,10 +262,7 @@ void QmlInspector::connectionStateChanged()
m_expressionWidget->setEngineDebug(m_client);
}
- m_objectTreeWidget->clear();
- m_propertiesWidget->clear();
- m_expressionWidget->clear();
- m_watchTableModel->removeAllWatches();
+ resetViews();
m_frameRateWidget->reset(m_conn);
reloadEngines();
@@ -272,6 +277,14 @@ void QmlInspector::connectionStateChanged()
}
}
+void QmlInspector::resetViews()
+{
+ m_objectTreeWidget->clear();
+ m_propertiesWidget->clear();
+ m_expressionWidget->clear();
+ m_watchTableModel->removeAllWatches();
+}
+
Core::IContext *QmlInspector::context() const
{
return m_context;
@@ -283,18 +296,10 @@ void QmlInspector::connectionError()
.arg(m_conn->error()).arg(m_conn->errorString()));
}
-void QmlInspector::initWidgets()
+void QmlInspector::createDockWidgets()
{
- m_objectTreeWidget = new ObjectTree;
- m_propertiesWidget = new ObjectPropertiesView;
- m_watchTableView = new WatchTableView(m_watchTableModel);
- m_frameRateWidget = new CanvasFrameRate;
- m_expressionWidget = new ExpressionQueryWidget(ExpressionQueryWidget::SeparateEntryMode);
- m_context = new Internal::InspectorContext(m_expressionWidget);
- m_expressionWidget->createCommands(m_context);
-
- m_engineSpinBox = new EngineSpinBox;
+ m_engineSpinBox = new Internal::EngineSpinBox;
m_engineSpinBox->setEnabled(false);
connect(m_engineSpinBox, SIGNAL(valueChanged(int)),
SLOT(queryEngineContext(int)));
@@ -318,7 +323,7 @@ void QmlInspector::initWidgets()
treeWindowLayout->addWidget(m_objectTreeWidget);
m_watchTableView->setModel(m_watchTableModel);
- WatchTableHeaderView *header = new WatchTableHeaderView(m_watchTableModel);
+ Internal::WatchTableHeaderView *header = new Internal::WatchTableHeaderView(m_watchTableModel);
m_watchTableView->setHorizontalHeader(header);
connect(m_objectTreeWidget, SIGNAL(activated(QDeclarativeDebugObjectReference)),
@@ -360,6 +365,7 @@ void QmlInspector::initWidgets()
propSplitter->setWindowTitle(tr("Properties and Watchers"));
+
InspectorOutputWidget *inspectorOutput = new InspectorOutputWidget();
connect(this, SIGNAL(statusMessage(QString)),
inspectorOutput, SLOT(addInspectorStatus(QString)));
@@ -372,7 +378,31 @@ void QmlInspector::initWidgets()
propSplitter, Qt::BottomDockWidgetArea);
m_inspectorOutputDock = Debugger::DebuggerUISwitcher::instance()->createDockWidget(Qml::Constants::LANG_QML,
inspectorOutput, Qt::BottomDockWidgetArea);
+
+ m_objectTreeDock->setToolTip(tr("Contents of the scene."));
+ m_frameRateDock->setToolTip(tr("Frame rate graph for analyzing performance."));
+ m_propertyWatcherDock->setToolTip(tr("Properties of the selected item."));
+ m_inspectorOutputDock->setToolTip(tr("Output of the QML inspector, such as information on connecting to the server."));
+
m_dockWidgets << m_objectTreeDock << m_frameRateDock << m_propertyWatcherDock << m_inspectorOutputDock;
+
+ m_context = new Internal::InspectorContext(m_objectTreeDock);
+ m_propWatcherContext = new Internal::InspectorContext(m_propertyWatcherDock);
+
+ Core::ICore *core = Core::ICore::instance();
+ core->addContextObject(m_propWatcherContext);
+ core->addContextObject(m_context);
+
+ m_expressionWidget->createCommands(m_context);
+
+ connect(m_objectTreeWidget, SIGNAL(contextHelpIdChanged(QString)), m_context,
+ SLOT(setContextHelpId(QString)));
+ connect(m_watchTableView, SIGNAL(contextHelpIdChanged(QString)), m_propWatcherContext,
+ SLOT(setContextHelpId(QString)));
+ connect(m_propertiesWidget, SIGNAL(contextHelpIdChanged(QString)), m_propWatcherContext,
+ SLOT(setContextHelpId(QString)));
+ connect(m_expressionWidget, SIGNAL(contextHelpIdChanged(QString)), m_propWatcherContext,
+ SLOT(setContextHelpId(QString)));
}
void QmlInspector::setSimpleDockWidgetArrangement()
@@ -401,7 +431,9 @@ void QmlInspector::setSimpleDockWidgetArrangement()
}
mainWindow->tabifyDockWidget(m_frameRateDock, m_propertyWatcherDock);
- mainWindow->tabifyDockWidget(m_frameRateDock, m_inspectorOutputDock);
+ mainWindow->tabifyDockWidget(m_propertyWatcherDock, m_inspectorOutputDock);
+
+ m_inspectorOutputDock->setVisible(false);
mainWindow->setTrackingEnabled(true);
}
@@ -481,13 +513,16 @@ void QmlInspector::treeObjectActivated(const QDeclarativeDebugObjectReference &o
return;
Core::EditorManager *editorManager = Core::EditorManager::instance();
- TextEditor::ITextEditor *editor = qobject_cast<TextEditor::ITextEditor*>(editorManager->openEditor(fileName));
- if (editor) {
- editorManager->ensureEditorManagerVisible();
+ Core::IEditor *editor = editorManager->openEditor(fileName, QString(), Core::EditorManager::NoModeSwitch);
+ TextEditor::ITextEditor *textEditor = qobject_cast<TextEditor::ITextEditor*>(editor);
+
+ if (textEditor) {
editorManager->addCurrentPositionToNavigationHistory();
- editor->gotoLine(source.lineNumber());
- editor->widget()->setFocus();
+ textEditor->gotoLine(source.lineNumber());
+ textEditor->widget()->setFocus();
}
}
+} // Qml
+
#include "qmlinspector.moc"
diff --git a/src/plugins/qmlinspector/qmlinspector.h b/src/plugins/qmlinspector/qmlinspector.h
index cadfabe16207b402d54c0c63ed2ad7eec6412803..3b6270eda347094e35199f62a3f8bf8a08f744ff 100644
--- a/src/plugins/qmlinspector/qmlinspector.h
+++ b/src/plugins/qmlinspector/qmlinspector.h
@@ -48,24 +48,26 @@ class QDeclarativeDebugConnection;
class QDeclarativeDebugEnginesQuery;
class QDeclarativeDebugRootContextQuery;
class QDeclarativeDebugObjectReference;
-class ObjectTree;
-class WatchTableModel;
-class WatchTableView;
-class ObjectPropertiesView;
-class CanvasFrameRate;
QT_END_NAMESPACE
-class ExpressionQueryWidget;
+
namespace Core {
class IContext;
}
namespace Qml {
- class EngineSpinBox;
namespace Internal {
+ class EngineSpinBox;
class InspectorContext;
+ class ObjectTree;
+ class ObjectPropertiesView;
+ class WatchTableModel;
+ class WatchTableView;
+ class CanvasFrameRate;
+ class ExpressionQueryWidget;
+ class EngineSpinBox;
}
class QMLINSPECTOR_EXPORT QmlInspector : public QObject
@@ -75,6 +77,7 @@ class QMLINSPECTOR_EXPORT QmlInspector : public QObject
public:
QmlInspector(QObject *parent = 0);
+ void createDockWidgets();
bool connectToViewer(); // using host, port from widgets
Core::IContext *context() const;
@@ -95,8 +98,7 @@ private slots:
void treeObjectActivated(const QDeclarativeDebugObjectReference &obj);
private:
-
- void initWidgets();
+ void resetViews();
QDeclarativeDebugConnection *m_conn;
QDeclarativeEngineDebug *m_client;
@@ -104,14 +106,14 @@ private:
QDeclarativeDebugEnginesQuery *m_engineQuery;
QDeclarativeDebugRootContextQuery *m_contextQuery;
- ObjectTree *m_objectTreeWidget;
- ObjectPropertiesView *m_propertiesWidget;
- WatchTableModel *m_watchTableModel;
- WatchTableView *m_watchTableView;
- CanvasFrameRate *m_frameRateWidget;
- ExpressionQueryWidget *m_expressionWidget;
+ Internal::ObjectTree *m_objectTreeWidget;
+ Internal::ObjectPropertiesView *m_propertiesWidget;
+ Internal::WatchTableModel *m_watchTableModel;
+ Internal::WatchTableView *m_watchTableView;
+ Internal::CanvasFrameRate *m_frameRateWidget;
+ Internal::ExpressionQueryWidget *m_expressionWidget;
- EngineSpinBox *m_engineSpinBox;
+ Internal::EngineSpinBox *m_engineSpinBox;
QDockWidget *m_objectTreeDock;
QDockWidget *m_frameRateDock;
@@ -120,6 +122,7 @@ private:
QList<QDockWidget*> m_dockWidgets;
Internal::InspectorContext *m_context;
+ Internal::InspectorContext *m_propWatcherContext;
};
diff --git a/src/plugins/qmlinspector/qmlinspectorplugin.cpp b/src/plugins/qmlinspector/qmlinspectorplugin.cpp
index 58f789f7ba6cb96e4a5b4882777857a3642c2190..02bab91ae6dd948a6cbed498ec1350624f4a406a 100644
--- a/src/plugins/qmlinspector/qmlinspectorplugin.cpp
+++ b/src/plugins/qmlinspector/qmlinspectorplugin.cpp
@@ -60,6 +60,7 @@
#include <QtGui/QHBoxLayout>
#include <QtGui/QToolButton>
+#include <QtGui/QMessageBox>
#include <QtCore/QDebug>
@@ -96,17 +97,18 @@ bool QmlInspectorPlugin::initialize(const QStringList &arguments, QString *error
{
Q_UNUSED(arguments);
Q_UNUSED(errorString);
-
+ Core::ICore *core = Core::ICore::instance();
connect(Core::ModeManager::instance(), SIGNAL(currentModeChanged(Core::IMode*)),
SLOT(prepareDebugger(Core::IMode*)));
ExtensionSystem::PluginManager *pluginManager = ExtensionSystem::PluginManager::instance();
Debugger::DebuggerUISwitcher *uiSwitcher = pluginManager->getObject<Debugger::DebuggerUISwitcher>();
- uiSwitcher->addLanguage(Qml::Constants::LANG_QML);
+ uiSwitcher->addLanguage(Qml::Constants::LANG_QML,
+ QList<int>() << core->uniqueIDManager()->uniqueIdentifier(Constants::C_INSPECTOR));
m_inspector = new QmlInspector;
+ m_inspector->createDockWidgets();
addObject(m_inspector);
- Core::ICore::instance()->addContextObject(m_inspector->context());
connect(m_connectionTimer, SIGNAL(timeout()), SLOT(pollInspector()));
@@ -162,9 +164,16 @@ void QmlInspectorPlugin::activateDebuggerForProject(ProjectExplorer::Project *pr
void QmlInspectorPlugin::pollInspector()
{
++m_connectionAttempts;
- if (m_inspector->connectToViewer() || m_connectionAttempts == MaxConnectionAttempts) {
+ if (m_inspector->connectToViewer()) {
m_connectionTimer->stop();
m_connectionAttempts = 0;
+ } else if (m_connectionAttempts == MaxConnectionAttempts) {
+ m_connectionTimer->stop();
+ m_connectionAttempts = 0;
+
+ QMessageBox::critical(0,
+ tr("Failed to connect to debugger"),
+ tr("Could not connect to debugger server. Please check your settings from Projects pane.") );
}
}
diff --git a/src/plugins/qmljseditor/qmljseditor.cpp b/src/plugins/qmljseditor/qmljseditor.cpp
index e2a99d338bb8e9f4c548f5d826de1eb3af09529d..ce557ffbdf0390d411493e73859974c4b20e4894 100644
--- a/src/plugins/qmljseditor/qmljseditor.cpp
+++ b/src/plugins/qmljseditor/qmljseditor.cpp
@@ -650,6 +650,8 @@ QmlJSTextEditor::QmlJSTextEditor(QWidget *parent) :
connect(m_semanticHighlighter, SIGNAL(changed(QmlJSEditor::Internal::SemanticInfo)),
this, SLOT(updateSemanticInfo(QmlJSEditor::Internal::SemanticInfo)));
+
+ setRequestMarkEnabled(false);
}
QmlJSTextEditor::~QmlJSTextEditor()
@@ -1369,7 +1371,7 @@ SemanticInfo SemanticHighlighter::semanticInfo(const Source &source)
return semanticInfo;
}
-void SemanticHighlighter::setModelManager(ModelManagerInterface *modelManager)
+void SemanticHighlighter::setModelManager(QmlJSEditor::ModelManagerInterface *modelManager)
{
m_modelManager = modelManager;
}
diff --git a/src/plugins/qmljseditor/qmljsmodelmanager.cpp b/src/plugins/qmljseditor/qmljsmodelmanager.cpp
index e765b5fa3770204221d04c14204a78e73b938abf..52a781efdd83d2a9f28b8320c5a8f6e5d1971bf6 100644
--- a/src/plugins/qmljseditor/qmljsmodelmanager.cpp
+++ b/src/plugins/qmljseditor/qmljsmodelmanager.cpp
@@ -36,6 +36,7 @@
#include <coreplugin/progressmanager/progressmanager.h>
#include <coreplugin/mimedatabase.h>
#include <qmljs/qmljsinterpreter.h>
+#include <qmljs/parser/qmldirparser_p.h>
#include <texteditor/itexteditor.h>
#include <QDir>
@@ -62,9 +63,12 @@ ModelManager::ModelManager(QObject *parent):
m_synchronizer.setCancelOnWait(true);
qRegisterMetaType<QmlJS::Document::Ptr>("QmlJS::Document::Ptr");
+ qRegisterMetaType<QmlJS::LibraryInfo>("QmlJS::LibraryInfo");
connect(this, SIGNAL(documentUpdated(QmlJS::Document::Ptr)),
this, SLOT(onDocumentUpdated(QmlJS::Document::Ptr)));
+ connect(this, SIGNAL(libraryInfoUpdated(QString,QmlJS::LibraryInfo)),
+ this, SLOT(onLibraryInfoUpdated(QString,QmlJS::LibraryInfo)));
loadQmlTypeDescriptions();
@@ -197,6 +201,16 @@ void ModelManager::onDocumentUpdated(Document::Ptr doc)
_snapshot.insert(doc);
}
+void ModelManager::emitLibraryInfoUpdated(const QString &path, const LibraryInfo &info)
+{ emit libraryInfoUpdated(path, info); }
+
+void ModelManager::onLibraryInfoUpdated(const QString &path, const LibraryInfo &info)
+{
+ QMutexLocker locker(&m_mutex);
+
+ _snapshot.insertLibraryInfo(path, info);
+}
+
void ModelManager::parse(QFutureInterface<void> &future,
QMap<QString, WorkingCopy> workingCopy,
QStringList files,
@@ -270,13 +284,33 @@ void ModelManager::parseDirectories(QFutureInterface<void> &future,
pattern << glob.pattern();
foreach (const QRegExp &glob, qmlSourceTy.globPatterns())
pattern << glob.pattern();
+ pattern << QLatin1String("qmldir");
QStringList importedFiles;
+ QStringList qmldirFiles;
foreach (const QString &path, directories) {
QDirIterator fileIterator(path, pattern, QDir::Files,
QDirIterator::Subdirectories | QDirIterator::FollowSymlinks);
- while (fileIterator.hasNext())
- importedFiles << fileIterator.next();
+ while (fileIterator.hasNext()) {
+ fileIterator.next();
+ if (fileIterator.fileName() == QLatin1String("qmldir"))
+ qmldirFiles << fileIterator.filePath();
+ else
+ importedFiles << fileIterator.filePath();
+ }
+ }
+
+ foreach (const QString &qmldirFilePath, qmldirFiles) {
+ QFile qmldirFile(qmldirFilePath);
+ qmldirFile.open(QFile::ReadOnly);
+ QString qmldirData = QString::fromUtf8(qmldirFile.readAll());
+
+ QmlDirParser qmldirParser;
+ qmldirParser.setSource(qmldirData);
+ qmldirParser.parse();
+
+ modelManager->emitLibraryInfoUpdated(QFileInfo(qmldirFilePath).path(),
+ LibraryInfo(qmldirParser));
}
parse(future, workingCopy, importedFiles, modelManager);
diff --git a/src/plugins/qmljseditor/qmljsmodelmanager.h b/src/plugins/qmljseditor/qmljsmodelmanager.h
index aafdc2a89f5ca0b0b58e54509305c5ff53e5d1d2..8ca17240196f19a9e86a89062fc9ca938f738bd7 100644
--- a/src/plugins/qmljseditor/qmljsmodelmanager.h
+++ b/src/plugins/qmljseditor/qmljsmodelmanager.h
@@ -58,6 +58,7 @@ public:
virtual void updateSourceDirectories(const QStringList &directories);
void emitDocumentUpdated(QmlJS::Document::Ptr doc);
+ void emitLibraryInfoUpdated(const QString &path, const QmlJS::LibraryInfo &info);
virtual void setProjectImportPaths(const QStringList &importPaths);
virtual QStringList importPaths() const;
@@ -65,10 +66,12 @@ public:
Q_SIGNALS:
void projectPathChanged(const QString &projectPath);
void aboutToRemoveFiles(const QStringList &files);
+ void libraryInfoUpdated(const QString &path, const QmlJS::LibraryInfo &info);
private Q_SLOTS:
// this should be executed in the GUI thread.
void onDocumentUpdated(QmlJS::Document::Ptr doc);
+ void onLibraryInfoUpdated(const QString &path, const QmlJS::LibraryInfo &info);
protected:
struct WorkingCopy
diff --git a/src/plugins/qmlprojectmanager/QmlProjectManager.pluginspec b/src/plugins/qmlprojectmanager/QmlProjectManager.pluginspec
index ac1a03c772b19119768df70e30f7f0532bced006..cb36d169b7523694c0cc07c35c9ec660d7ecbe10 100644
--- a/src/plugins/qmlprojectmanager/QmlProjectManager.pluginspec
+++ b/src/plugins/qmlprojectmanager/QmlProjectManager.pluginspec
@@ -18,5 +18,6 @@ Alternatively, this plugin may be used under the terms of the GNU Lesser General
<dependency name="TextEditor" version="1.3.82"/>
<dependency name="QmlJSEditor" version="1.3.82"/>
<dependency name="Help" version="1.3.82"/>
+ <dependency name="Debugger" version="1.3.82" />
</dependencyList>
</plugin>
diff --git a/src/plugins/qmlprojectmanager/fileformat/filefilteritems.cpp b/src/plugins/qmlprojectmanager/fileformat/filefilteritems.cpp
index d2726f9872ddb84c18e0bf0b9ea0afdd5759c895..5a595cf2751f5324dbba834417589bb6da529079 100644
--- a/src/plugins/qmlprojectmanager/fileformat/filefilteritems.cpp
+++ b/src/plugins/qmlprojectmanager/fileformat/filefilteritems.cpp
@@ -6,7 +6,7 @@ namespace QmlProjectManager {
FileFilterBaseItem::FileFilterBaseItem(QObject *parent) :
QmlProjectContentItem(parent),
- m_recursive(false)
+ m_recurse(RecurseDefault)
{
connect(&m_fsWatcher, SIGNAL(directoryChanged(QString)), this, SLOT(updateFileList()));
connect(&m_fsWatcher, SIGNAL(fileChanged(QString)), this, SLOT(updateFileList()));
@@ -58,15 +58,33 @@ void FileFilterBaseItem::setFilter(const QString &filter)
bool FileFilterBaseItem::recursive() const
{
- return m_recursive;
+ bool recursive;
+ if (m_recurse == Recurse) {
+ recursive = true;
+ } else if (m_recurse == DoNotRecurse) {
+ recursive = false;
+ } else { // RecurseDefault
+ if (m_explicitFiles.isEmpty()) {
+ recursive = true;
+ } else {
+ recursive = false;
+ }
+ }
+ return recursive;
}
-void FileFilterBaseItem::setRecursive(bool recursive)
+void FileFilterBaseItem::setRecursive(bool recurse)
{
- if (recursive == m_recursive)
- return;
- m_recursive = recursive;
- updateFileList();
+ bool oldRecursive = recursive();
+
+ if (recurse) {
+ m_recurse = Recurse;
+ } else {
+ m_recurse = DoNotRecurse;
+ }
+
+ if (recurse != oldRecursive)
+ updateFileList();
}
QStringList FileFilterBaseItem::pathsProperty() const
@@ -194,7 +212,7 @@ QSet<QString> FileFilterBaseItem::filesInSubTree(const QDir &rootDir, const QDir
}
}
- if (m_recursive) {
+ if (recursive()) {
foreach (const QFileInfo &subDir, dir.entryInfoList(QDir::Dirs | QDir::NoDotAndDotDot)) {
fileSet += filesInSubTree(rootDir, QDir(subDir.absoluteFilePath()), parsedDirs);
}
diff --git a/src/plugins/qmlprojectmanager/fileformat/filefilteritems.h b/src/plugins/qmlprojectmanager/fileformat/filefilteritems.h
index ef85d58b8546999083e4dd74522f2634f3825aa6..dc27c3d563fb92142d45c9d619fba9539db30290 100644
--- a/src/plugins/qmlprojectmanager/fileformat/filefilteritems.h
+++ b/src/plugins/qmlprojectmanager/fileformat/filefilteritems.h
@@ -61,7 +61,15 @@ private:
QString m_filter;
QList<QRegExp> m_regExpList;
- bool m_recursive;
+
+ enum RecursiveOption {
+ Recurse,
+ DoNotRecurse,
+ RecurseDefault // not set explicitly
+ };
+
+ RecursiveOption m_recurse;
+
QStringList m_explicitFiles;
QFileSystemWatcher m_fsWatcher;
diff --git a/src/plugins/qmlprojectmanager/fileformat/qmlprojectitem.cpp b/src/plugins/qmlprojectmanager/fileformat/qmlprojectitem.cpp
index ee2c94c0f1bce121f2ce1a6cd75ada4e7fde3131..0be5f30f98cd3d477e5ea050086d653aa6cc6e51 100644
--- a/src/plugins/qmlprojectmanager/fileformat/qmlprojectitem.cpp
+++ b/src/plugins/qmlprojectmanager/fileformat/qmlprojectitem.cpp
@@ -9,7 +9,7 @@ class QmlProjectItemPrivate : public QObject {
public:
QString sourceDirectory;
- QStringList libraryPaths;
+ QStringList importPaths;
QList<QmlFileFilterItem*> qmlFileFilters() const;
@@ -79,21 +79,21 @@ void QmlProjectItem::setSourceDirectory(const QString &directoryPath)
emit sourceDirectoryChanged();
}
-QStringList QmlProjectItem::libraryPaths() const
+QStringList QmlProjectItem::importPaths() const
{
Q_D(const QmlProjectItem);
- return d->libraryPaths;
+ return d->importPaths;
}
-void QmlProjectItem::setLibraryPaths(const QStringList &libraryPaths)
+void QmlProjectItem::setImportPaths(const QStringList &importPaths)
{
Q_D(QmlProjectItem);
- if (d->libraryPaths == libraryPaths)
+ if (d->importPaths == importPaths)
return;
- d->libraryPaths = libraryPaths;
- emit libraryPathsChanged();
+ d->importPaths = importPaths;
+ emit importPathsChanged();
}
/* Returns list of absolute paths */
diff --git a/src/plugins/qmlprojectmanager/fileformat/qmlprojectitem.h b/src/plugins/qmlprojectmanager/fileformat/qmlprojectitem.h
index e68b58ab8b628660d2487382cc2ee2ba98f4f9f8..1271146aaaf5f8f331442a34818fbbbdaf6d02bd 100644
--- a/src/plugins/qmlprojectmanager/fileformat/qmlprojectitem.h
+++ b/src/plugins/qmlprojectmanager/fileformat/qmlprojectitem.h
@@ -24,7 +24,7 @@ class QmlProjectItem : public QObject {
Q_PROPERTY(QDeclarativeListProperty<QmlProjectManager::QmlProjectContentItem> content READ content DESIGNABLE false)
Q_PROPERTY(QString sourceDirectory READ sourceDirectory NOTIFY sourceDirectoryChanged)
- Q_PROPERTY(QStringList libraryPaths READ libraryPaths WRITE setLibraryPaths NOTIFY libraryPathsChanged)
+ Q_PROPERTY(QStringList importPaths READ importPaths WRITE setImportPaths NOTIFY importPathsChanged)
Q_CLASSINFO("DefaultProperty", "content");
@@ -37,8 +37,8 @@ public:
QString sourceDirectory() const;
void setSourceDirectory(const QString &directoryPath);
- QStringList libraryPaths() const;
- void setLibraryPaths(const QStringList &paths);
+ QStringList importPaths() const;
+ void setImportPaths(const QStringList &paths);
QStringList files() const;
bool matchesFile(const QString &filePath) const;
@@ -46,7 +46,7 @@ public:
signals:
void qmlFilesChanged();
void sourceDirectoryChanged();
- void libraryPathsChanged();
+ void importPathsChanged();
protected:
QmlProjectItemPrivate *d_ptr;
diff --git a/src/plugins/qmlprojectmanager/qmlproject.cpp b/src/plugins/qmlprojectmanager/qmlproject.cpp
index ccbb81e6c004c30648ce988b72aa46a6be1aa159..89aeba3d6ca1d2f955bb76216131ad29508a199b 100644
--- a/src/plugins/qmlprojectmanager/qmlproject.cpp
+++ b/src/plugins/qmlprojectmanager/qmlproject.cpp
@@ -95,7 +95,7 @@ void QmlProject::parseProject(RefreshOptions options)
&& qobject_cast<QmlProjectItem*>(component->create())) {
m_projectItem = qobject_cast<QmlProjectItem*>(component->create());
connect(m_projectItem.data(), SIGNAL(qmlFilesChanged()), this, SLOT(refreshFiles()));
- connect(m_projectItem.data(), SIGNAL(libraryPathsChanged()), this, SLOT(refreshImportPaths()));
+ connect(m_projectItem.data(), SIGNAL(importPathsChanged()), this, SLOT(refreshImportPaths()));
refreshImportPaths();
} else {
Core::MessageManager *messageManager = Core::ICore::instance()->messageManager();
@@ -165,12 +165,12 @@ bool QmlProject::validProjectFile() const
return !m_projectItem.isNull();
}
-QStringList QmlProject::libraryPaths() const
+QStringList QmlProject::importPaths() const
{
- QStringList libraryPaths;
+ QStringList importPaths;
if (m_projectItem)
- libraryPaths = m_projectItem.data()->libraryPaths();
- return libraryPaths;
+ importPaths = m_projectItem.data()->importPaths();
+ return importPaths;
}
bool QmlProject::addFiles(const QStringList &filePaths)
@@ -195,7 +195,7 @@ void QmlProject::refreshFiles()
void QmlProject::refreshImportPaths()
{
- m_modelManager->setProjectImportPaths(libraryPaths());
+ m_modelManager->setProjectImportPaths(importPaths());
}
QString QmlProject::displayName() const
diff --git a/src/plugins/qmlprojectmanager/qmlproject.h b/src/plugins/qmlprojectmanager/qmlproject.h
index 6639a109c1197a5dd39169e256337698f09f3e2f..2df755c46a8dd098f99a12627142466994d10326 100644
--- a/src/plugins/qmlprojectmanager/qmlproject.h
+++ b/src/plugins/qmlprojectmanager/qmlproject.h
@@ -99,7 +99,7 @@ public:
QDir projectDir() const;
QStringList files() const;
- QStringList libraryPaths() const;
+ QStringList importPaths() const;
bool addFiles(const QStringList &filePaths);
diff --git a/src/plugins/qmlprojectmanager/qmlprojectapplicationwizard.cpp b/src/plugins/qmlprojectmanager/qmlprojectapplicationwizard.cpp
index 59e4bfdd88caa0e55fc8962f22ec22e2b01e1d48..8ba918c7fe7eb6c28b66807029a227bc65353de6 100644
--- a/src/plugins/qmlprojectmanager/qmlprojectapplicationwizard.cpp
+++ b/src/plugins/qmlprojectmanager/qmlprojectapplicationwizard.cpp
@@ -127,13 +127,13 @@ Core::GeneratedFiles QmlProjectApplicationWizard::generateFiles(const QWizard *w
out
//: Comment added to generated .qmlproject file
- << "// " << tr("File generated by QtCreator", "qmlproject Template") << endl
+ << "/* " << tr("File generated by QtCreator", "qmlproject Template") << " */" << endl
<< endl
<< "import QmlProject 1.0" << endl
<< endl
<< "Project {" << endl
//: Comment added to generated .qmlproject file
- << " // " << tr("Scan current directory for .qml, .js, and image files", "qmlproject Template") << endl
+ << " /* " << tr("Include .qml, .js, and image files from current directory and subdirectories", "qmlproject Template") << " */" << endl
<< " QmlFiles {" << endl
<< " directory: \".\"" << endl
<< " }" << endl
@@ -143,10 +143,12 @@ Core::GeneratedFiles QmlProjectApplicationWizard::generateFiles(const QWizard *w
<< " ImageFiles {" << endl
<< " directory: \".\"" << endl
<< " }" << endl
+ //: Comment added to generated .qmlproject file
+ << " /* " << tr("List of plugin directories passed to QML runtime", "qmlproject Template") << " */" << endl
+ << " // importPaths: [ \" ../exampleplugin \" ]" << endl
<< "}" << endl;
}
Core::GeneratedFile generatedCreatorFile(creatorFileName);
-
generatedCreatorFile.setContents(projectContents);
Core::GeneratedFiles files;
diff --git a/src/plugins/qmlprojectmanager/qmlprojectfile.cpp b/src/plugins/qmlprojectmanager/qmlprojectfile.cpp
index 17c8681a0dd70ad14d263bea4fd7eb7516c04ebe..3bc827879f23f5c543e54a29534e9b006699aa10 100644
--- a/src/plugins/qmlprojectmanager/qmlprojectfile.cpp
+++ b/src/plugins/qmlprojectmanager/qmlprojectfile.cpp
@@ -83,8 +83,17 @@ bool QmlProjectFile::isSaveAsAllowed() const
return false;
}
-void QmlProjectFile::modified(ReloadBehavior *)
+Core::IFile::ReloadBehavior QmlProjectFile::reloadBehavior(ChangeTrigger state, ChangeType type) const
{
+ Q_UNUSED(state)
+ Q_UNUSED(type)
+ return BehaviorSilent;
+}
+
+void QmlProjectFile::reload(ReloadFlag flag, ChangeType type)
+{
+ Q_UNUSED(flag)
+ Q_UNUSED(type)
}
} // namespace Internal
diff --git a/src/plugins/qmlprojectmanager/qmlprojectfile.h b/src/plugins/qmlprojectmanager/qmlprojectfile.h
index 81a54c89cb045703700ccc42b37d893875cd4052..b01c4f76bd84b5848fe82b6f89d024024fde82c7 100644
--- a/src/plugins/qmlprojectmanager/qmlprojectfile.h
+++ b/src/plugins/qmlprojectmanager/qmlprojectfile.h
@@ -57,7 +57,8 @@ public:
virtual bool isReadOnly() const;
virtual bool isSaveAsAllowed() const;
- virtual void modified(ReloadBehavior *behavior);
+ ReloadBehavior reloadBehavior(ChangeTrigger state, ChangeType type) const;
+ void reload(ReloadFlag flag, ChangeType type);
private:
QmlProject *m_project;
diff --git a/src/plugins/qmlprojectmanager/qmlprojectimportwizard.cpp b/src/plugins/qmlprojectmanager/qmlprojectimportwizard.cpp
index 01526cc4aef879827dfcd7043ea61035d28fb700..8b927dc744b66cac8a3f8f15f17aa3d11305a229 100644
--- a/src/plugins/qmlprojectmanager/qmlprojectimportwizard.cpp
+++ b/src/plugins/qmlprojectmanager/qmlprojectimportwizard.cpp
@@ -142,24 +142,25 @@ Core::GeneratedFiles QmlProjectImportWizard::generateFiles(const QWizard *w,
out
//: Comment added to generated .qmlproject file
- << "// " << tr("File generated by QtCreator", "qmlproject Template") << endl
+ << "/* " << tr("File generated by QtCreator", "qmlproject Template") << " */" << endl
<< endl
<< "import QmlProject 1.0" << endl
<< endl
<< "Project {" << endl
- << " // " << tr("Scan current directory and subdirectories for .qml, .js, and image files", "qmlproject Template") << endl
+ //: Comment added to generated .qmlproject file
+ << " /* " << tr("Include .qml, .js, and image files from current directory and subdirectories", "qmlproject Template") << " */" << endl
<< " QmlFiles {" << endl
<< " directory: \".\"" << endl
- << " recursive: true" << endl
<< " }" << endl
<< " JavaScriptFiles {" << endl
<< " directory: \".\"" << endl
- << " recursive: true" << endl
<< " }" << endl
<< " ImageFiles {" << endl
<< " directory: \".\"" << endl
- << " recursive: true" << endl
<< " }" << endl
+ //: Comment added to generated .qmlproject file
+ << " /* " << tr("List of plugin directories passed to QML runtime", "qmlproject Template") << " */" << endl
+ << " // importPaths: [ \" ../exampleplugin \" ]" << endl
<< "}" << endl;
}
Core::GeneratedFile generatedCreatorFile(creatorFileName);
diff --git a/src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp b/src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp
index 1093eb1546824f260fc5b6ba174a722be3cdcc57..4d24791a5360cc3557e5f343a7acab85cbf7af21 100644
--- a/src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp
+++ b/src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp
@@ -129,9 +129,9 @@ QStringList QmlProjectRunConfiguration::viewerArguments() const
args.append(m_qmlViewerArgs);
// arguments from .qmlproject file
- foreach (const QString &libraryPath, qmlTarget()->qmlProject()->libraryPaths()) {
+ foreach (const QString &importPath, qmlTarget()->qmlProject()->importPaths()) {
args.append(QLatin1String("-L"));
- args.append(libraryPath);
+ args.append(importPath);
}
const QString s = mainScript();
diff --git a/src/plugins/qmlprojectmanager/qmlprojectruncontrol.cpp b/src/plugins/qmlprojectmanager/qmlprojectruncontrol.cpp
index 5bd72da88fafe9f98feb782f05b7c4d48f2cd37f..6b5ba178ad227da23babb334f00bf13688f770da 100644
--- a/src/plugins/qmlprojectmanager/qmlprojectruncontrol.cpp
+++ b/src/plugins/qmlprojectmanager/qmlprojectruncontrol.cpp
@@ -83,6 +83,8 @@ void QmlRunControl::start()
m_applicationLauncher.start(ProjectExplorer::ApplicationLauncher::Gui, m_executable,
m_commandLineArguments);
+ // FIXME this line should be refactored out in order to remove the dependency between
+ // debugger and qmlprojectmanager, because debugger also relies on cpptools.
Debugger::DebuggerUISwitcher::instance()->setActiveLanguage(Qml::Constants::LANG_QML);
emit started();
diff --git a/src/plugins/qt4projectmanager/gettingstartedwelcomepage.cpp b/src/plugins/qt4projectmanager/gettingstartedwelcomepage.cpp
index 1083d3373251b6ba1a0b32e9b5977edac1ae072b..d5beb69eb6dfd0f38353275fe92b416c58cecdf3 100644
--- a/src/plugins/qt4projectmanager/gettingstartedwelcomepage.cpp
+++ b/src/plugins/qt4projectmanager/gettingstartedwelcomepage.cpp
@@ -34,14 +34,24 @@ namespace Qt4ProjectManager {
namespace Internal {
GettingStartedWelcomePage::GettingStartedWelcomePage()
- : m_page(new GettingStartedWelcomePageWidget)
+ : m_page(0)
{
}
-QWidget* GettingStartedWelcomePage::page()
+QWidget *GettingStartedWelcomePage::page()
{
+ if (!m_page)
+ m_page = new GettingStartedWelcomePageWidget;
return m_page;
}
+void GettingStartedWelcomePage::updateExamples(const QString &examplePath,
+ const QString &demosPath,
+ const QString &sourcePath)
+{
+ if (m_page)
+ m_page->updateExamples(examplePath, demosPath, sourcePath);
+}
+
} // namespace Internal
} // namespace Qt4ProjectManager
diff --git a/src/plugins/qt4projectmanager/gettingstartedwelcomepage.h b/src/plugins/qt4projectmanager/gettingstartedwelcomepage.h
index ea0efcccf901c3d3e8a9fbdf5428ca4c391d0d9f..cf3c14f364473fc8d5d88d6b6168364dde9a4625 100644
--- a/src/plugins/qt4projectmanager/gettingstartedwelcomepage.h
+++ b/src/plugins/qt4projectmanager/gettingstartedwelcomepage.h
@@ -47,6 +47,11 @@ public:
QString title() const { return tr("Getting Started");}
int priority() const { return 10; }
+public slots:
+ void updateExamples(const QString &examplePath,
+ const QString &demosPath,
+ const QString &sourcePath);
+
private:
GettingStartedWelcomePageWidget *m_page;
};
diff --git a/src/plugins/qt4projectmanager/gettingstartedwelcomepagewidget.cpp b/src/plugins/qt4projectmanager/gettingstartedwelcomepagewidget.cpp
index 1055262ec9ea4cc1d83f6d88ca50c6aef3569a99..80ffdc4fc830f9e449ea25ec60560a4ea3f8303f 100644
--- a/src/plugins/qt4projectmanager/gettingstartedwelcomepagewidget.cpp
+++ b/src/plugins/qt4projectmanager/gettingstartedwelcomepagewidget.cpp
@@ -99,7 +99,9 @@ GettingStartedWelcomePageWidget::~GettingStartedWelcomePageWidget()
delete ui;
}
-void GettingStartedWelcomePageWidget::updateExamples(const QString& examplePath, const QString& demosPath, const QString &sourcePath)
+void GettingStartedWelcomePageWidget::updateExamples(const QString &examplePath,
+ const QString &demosPath,
+ const QString &sourcePath)
{
QString demoxml = demosPath + "/qtdemo/xml/examples.xml";
if (!QFile::exists(demoxml)) {
diff --git a/src/plugins/qt4projectmanager/gettingstartedwelcomepagewidget.h b/src/plugins/qt4projectmanager/gettingstartedwelcomepagewidget.h
index f5145f7f02676d391fd0bbc5bd3fd889595d1e34..21cceb1cc8b3608a40040a58c4c355c0c2d55efb 100644
--- a/src/plugins/qt4projectmanager/gettingstartedwelcomepagewidget.h
+++ b/src/plugins/qt4projectmanager/gettingstartedwelcomepagewidget.h
@@ -39,18 +39,21 @@ namespace Ui {
class GettingStartedWelcomePageWidget;
}
-class GettingStartedWelcomePageWidget : public QWidget {
+class GettingStartedWelcomePageWidget : public QWidget
+{
Q_OBJECT
public:
GettingStartedWelcomePageWidget(QWidget *parent = 0);
~GettingStartedWelcomePageWidget();
- public slots:
- void updateExamples(const QString& examplePath, const QString& demosPath, const QString &sourcePath);
+public slots:
+ void updateExamples(const QString &examplePath,
+ const QString &demosPath,
+ const QString &sourcePath);
private slots:
- void slotOpenHelpPage(const QString& url);
- void slotOpenContextHelpPage(const QString& url);
+ void slotOpenHelpPage(const QString &url);
+ void slotOpenContextHelpPage(const QString &url);
void slotEnableExampleButton(int);
void slotOpenExample();
void slotNextTip();
@@ -63,7 +66,7 @@ private:
int m_currentTip;
};
-
} // namespace Internal
} // namespace Qt4ProjectManager
+
#endif // GETTINGSTARTEDWELCOMEPAGEWIDGET_H
diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemoconfigtestdialog.cpp b/src/plugins/qt4projectmanager/qt-maemo/maemoconfigtestdialog.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..1a8568723c1ef0525e9a77b959721e9dfdade340
--- /dev/null
+++ b/src/plugins/qt4projectmanager/qt-maemo/maemoconfigtestdialog.cpp
@@ -0,0 +1,183 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of Qt Creator.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights. These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "maemoconfigtestdialog.h"
+#include "ui_maemoconfigtestdialog.h"
+
+#include "maemosshthread.h"
+
+#include <QtGui/QPushButton>
+
+namespace {
+
+/**
+ * Class that waits until a thread is finished and then deletes it, and then
+ * schedules itself to be deleted.
+ */
+class SafeThreadDeleter : public QThread
+{
+public:
+ SafeThreadDeleter(QThread *thread) : m_thread(thread) {}
+ ~SafeThreadDeleter() { wait(); }
+
+protected:
+ void run()
+ {
+ // Wait for m_thread to finish and then delete it
+ m_thread->wait();
+ delete m_thread;
+
+ // Schedule this thread for deletion
+ deleteLater();
+ }
+
+private:
+ QThread *m_thread;
+};
+
+} // anonymous namespace
+
+namespace Qt4ProjectManager {
+namespace Internal {
+
+MaemoConfigTestDialog::MaemoConfigTestDialog(const MaemoDeviceConfig &config, QWidget *parent)
+ : QDialog(parent)
+ , m_ui(new Ui_MaemoConfigTestDialog)
+ , m_config(config)
+ , m_deviceTester(0)
+{
+ setAttribute(Qt::WA_DeleteOnClose);
+
+ m_ui->setupUi(this);
+ m_closeButton = m_ui->buttonBox->button(QDialogButtonBox::Close);
+
+ connect(m_closeButton, SIGNAL(clicked()), SLOT(stopConfigTest()));
+
+ startConfigTest();
+}
+
+MaemoConfigTestDialog::~MaemoConfigTestDialog()
+{
+ stopConfigTest();
+}
+
+void MaemoConfigTestDialog::startConfigTest()
+{
+ if (m_deviceTester)
+ return;
+
+ m_ui->testResultEdit->setPlainText(tr("Testing configuration..."));
+ m_closeButton->setText(tr("Stop Test"));
+
+ QLatin1String sysInfoCmd("uname -rsm");
+ QLatin1String qtInfoCmd("dpkg -l |grep libqt "
+ "|sed 's/[[:space:]][[:space:]]*/ /g' "
+ "|cut -d ' ' -f 2,3 |sed 's/~.*//g'");
+ QString command(sysInfoCmd + " && " + qtInfoCmd);
+ m_deviceTester = new MaemoSshRunner(m_config, command);
+ connect(m_deviceTester, SIGNAL(remoteOutput(QString)),
+ this, SLOT(processSshOutput(QString)));
+ connect(m_deviceTester, SIGNAL(finished()),
+ this, SLOT(handleTestThreadFinished()));
+
+ m_deviceTester->start();
+}
+
+void MaemoConfigTestDialog::handleTestThreadFinished()
+{
+ if (!m_deviceTester)
+ return;
+
+ QString output;
+ if (m_deviceTester->hasError()) {
+ output = tr("Device configuration test failed:\n%1").arg(m_deviceTester->error());
+ if (m_config.type == MaemoDeviceConfig::Simulator)
+ output.append(tr("\nDid you start Qemu?"));
+ } else {
+ output = parseTestOutput();
+ }
+ m_ui->testResultEdit->setPlainText(output);
+ stopConfigTest();
+}
+
+void MaemoConfigTestDialog::stopConfigTest()
+{
+ if (m_deviceTester) {
+ m_deviceTester->disconnect(); // Disconnect signals
+ m_deviceTester->stop();
+
+ SafeThreadDeleter *deleter = new SafeThreadDeleter(m_deviceTester);
+ deleter->start();
+
+ m_deviceTester = 0;
+ m_deviceTestOutput.clear();
+ m_closeButton->setText(tr("Close"));
+ }
+}
+
+void MaemoConfigTestDialog::processSshOutput(const QString &data)
+{
+ m_deviceTestOutput.append(data);
+}
+
+QString MaemoConfigTestDialog::parseTestOutput()
+{
+ QString output;
+ const QRegExp unamePattern(QLatin1String("Linux (\\S+)\\s(\\S+)"));
+ int index = unamePattern.indexIn(m_deviceTestOutput);
+ if (index == -1) {
+ output = tr("Device configuration test failed: Unexpected output:\n%1").arg(m_deviceTestOutput);
+ return output;
+ }
+
+ output = tr("Hardware architecture: %1\n").arg(unamePattern.cap(2));
+ output.append(tr("Kernel version: %1\n").arg(unamePattern.cap(1)));
+ output.prepend(tr("Device configuration successful.\n"));
+ const QRegExp dkpgPattern(QLatin1String("libqt\\S+ \\d\\.\\d\\.\\d"));
+ index = dkpgPattern.indexIn(m_deviceTestOutput);
+ if (index == -1) {
+ output.append("No Qt packages installed.");
+ return output;
+ }
+ output.append("List of installed Qt packages:\n");
+ do {
+ output.append(QLatin1String("\t") + dkpgPattern.cap(0)
+ + QLatin1String("\n"));
+ index = dkpgPattern.indexIn(m_deviceTestOutput, index + 1);
+ } while (index != -1);
+ return output;
+}
+
+} // namespace Internal
+} // namespace Qt4ProjectManager
diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemoconfigtestdialog.h b/src/plugins/qt4projectmanager/qt-maemo/maemoconfigtestdialog.h
new file mode 100644
index 0000000000000000000000000000000000000000..200578d73ece7b0b65cb8751bf8df0873ac53e79
--- /dev/null
+++ b/src/plugins/qt4projectmanager/qt-maemo/maemoconfigtestdialog.h
@@ -0,0 +1,81 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of Qt Creator.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights. These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef MAEMOCONFIGTESTDIALOG_H
+#define MAEMOCONFIGTESTDIALOG_H
+
+#include <QDialog>
+
+QT_BEGIN_NAMESPACE
+class QPushButton;
+class Ui_MaemoConfigTestDialog;
+QT_END_NAMESPACE
+
+namespace Qt4ProjectManager {
+namespace Internal {
+
+class MaemoDeviceConfig;
+class MaemoSshRunner;
+
+/**
+ * A dialog that runs a test of a device configuration.
+ */
+class MaemoConfigTestDialog : public QDialog
+{
+ Q_OBJECT
+public:
+ explicit MaemoConfigTestDialog(const MaemoDeviceConfig &config, QWidget *parent = 0);
+ ~MaemoConfigTestDialog();
+
+private slots:
+ void stopConfigTest();
+ void processSshOutput(const QString &data);
+ void handleTestThreadFinished();
+
+private:
+ void startConfigTest();
+ QString parseTestOutput();
+
+ Ui_MaemoConfigTestDialog *m_ui;
+ QPushButton *m_closeButton;
+
+ const MaemoDeviceConfig &m_config;
+ MaemoSshRunner *m_deviceTester;
+ QString m_deviceTestOutput;
+};
+
+} // namespace Internal
+} // namespace Qt4ProjectManager
+
+#endif // MAEMOCONFIGTESTDIALOG_H
diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemoconfigtestdialog.ui b/src/plugins/qt4projectmanager/qt-maemo/maemoconfigtestdialog.ui
new file mode 100644
index 0000000000000000000000000000000000000000..2320a0fe9bd34c897cbcf6dc37f27167b391a490
--- /dev/null
+++ b/src/plugins/qt4projectmanager/qt-maemo/maemoconfigtestdialog.ui
@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>MaemoConfigTestDialog</class>
+ <widget class="QDialog" name="MaemoConfigTestDialog">
+ <property name="geometry">
+ <rect>
+ <x>0</x>
+ <y>0</y>
+ <width>395</width>
+ <height>190</height>
+ </rect>
+ </property>
+ <property name="windowTitle">
+ <string>Device Configuration Test</string>
+ </property>
+ <layout class="QVBoxLayout" name="verticalLayout">
+ <item>
+ <widget class="QPlainTextEdit" name="testResultEdit">
+ <property name="readOnly">
+ <bool>true</bool>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QDialogButtonBox" name="buttonBox">
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="standardButtons">
+ <set>QDialogButtonBox::Close</set>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </widget>
+ <resources/>
+ <connections>
+ <connection>
+ <sender>buttonBox</sender>
+ <signal>accepted()</signal>
+ <receiver>MaemoConfigTestDialog</receiver>
+ <slot>accept()</slot>
+ <hints>
+ <hint type="sourcelabel">
+ <x>248</x>
+ <y>254</y>
+ </hint>
+ <hint type="destinationlabel">
+ <x>157</x>
+ <y>274</y>
+ </hint>
+ </hints>
+ </connection>
+ <connection>
+ <sender>buttonBox</sender>
+ <signal>rejected()</signal>
+ <receiver>MaemoConfigTestDialog</receiver>
+ <slot>reject()</slot>
+ <hints>
+ <hint type="sourcelabel">
+ <x>316</x>
+ <y>260</y>
+ </hint>
+ <hint type="destinationlabel">
+ <x>286</x>
+ <y>274</y>
+ </hint>
+ </hints>
+ </connection>
+ </connections>
+</ui>
diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemosettingswidget.cpp b/src/plugins/qt4projectmanager/qt-maemo/maemosettingswidget.cpp
index 29e98808f182c783ee3787b055d3e8a2dfab4e15..498d2a93ef9a4a68c702ada2935bbdebdd7a9f92 100644
--- a/src/plugins/qt4projectmanager/qt-maemo/maemosettingswidget.cpp
+++ b/src/plugins/qt4projectmanager/qt-maemo/maemosettingswidget.cpp
@@ -36,12 +36,14 @@
#include "ui_maemosettingswidget.h"
+#include "maemoconfigtestdialog.h"
#include "maemodeviceconfigurations.h"
#include "maemosshthread.h"
#include <QtCore/QRegExp>
-#include <QtGui/QFileDialog>
#include <QtCore/QFileInfo>
+#include <QtGui/QFileDialog>
+#include <QtGui/QMessageBox>
#include <QtGui/QIntValidator>
#include <algorithm>
@@ -109,13 +111,12 @@ private:
MaemoSettingsWidget::MaemoSettingsWidget(QWidget *parent)
: QWidget(parent),
- m_ui(new Ui_maemoSettingsWidget),
+ m_ui(new Ui_MaemoSettingsWidget),
m_devConfs(MaemoDeviceConfigurations::instance().devConfigs()),
m_nameValidator(new NameValidator(m_devConfs)),
m_sshPortValidator(new PortAndTimeoutValidator),
m_gdbServerPortValidator(new PortAndTimeoutValidator),
m_timeoutValidator(new PortAndTimeoutValidator),
- m_deviceTester(0),
m_keyDeployer(0)
{
@@ -134,9 +135,8 @@ void MaemoSettingsWidget::initGui()
m_ui->gdbServerPortLineEdit->setValidator(m_gdbServerPortValidator);
m_ui->timeoutLineEdit->setValidator(m_timeoutValidator);
m_ui->keyFileLineEdit->setExpectedKind(Utils::PathChooser::File);
- foreach(const MaemoDeviceConfig &devConf, m_devConfs)
+ foreach (const MaemoDeviceConfig &devConf, m_devConfs)
m_ui->configListWidget->addItem(devConf.name);
- m_defaultTestOutput = m_ui->testResultEdit->toPlainText();
if (m_devConfs.count() == 1)
m_ui->configListWidget->setCurrentRow(0, QItemSelectionModel::Select);
}
@@ -314,93 +314,8 @@ void MaemoSettingsWidget::keyFileEditingFinished()
void MaemoSettingsWidget::testConfig()
{
- if (m_deviceTester)
- return;
-
- m_ui->testConfigButton->disconnect();
- m_ui->testResultEdit->setPlainText(m_defaultTestOutput);
- QLatin1String sysInfoCmd("uname -rsm");
- QLatin1String qtInfoCmd("dpkg -l |grep libqt "
- "|sed 's/[[:space:]][[:space:]]*/ /g' "
- "|cut -d ' ' -f 2,3 |sed 's/~.*//g'");
- QString command(sysInfoCmd + " && " + qtInfoCmd);
- m_deviceTester = new MaemoSshRunner(currentConfig(), command);
- connect(m_deviceTester, SIGNAL(remoteOutput(QString)),
- this, SLOT(processSshOutput(QString)));
- connect(m_deviceTester, SIGNAL(finished()),
- this, SLOT(handleTestThreadFinished()));
- m_ui->testConfigButton->setText(tr("Stop test"));
- connect(m_ui->testConfigButton, SIGNAL(clicked()),
- this, SLOT(stopConfigTest()));
- m_deviceTester->start();
-}
-
-void MaemoSettingsWidget::processSshOutput(const QString &data)
-{
- qDebug("%s", qPrintable(data));
- m_deviceTestOutput.append(data);
-}
-
-void MaemoSettingsWidget::handleTestThreadFinished()
-{
- if (!m_deviceTester)
- return;
-
- QString output;
- if (m_deviceTester->hasError()) {
- output = tr("Device configuration test failed:\n%1").arg(m_deviceTester->error());
- if (currentConfig().type == MaemoDeviceConfig::Simulator)
- output.append(tr("\nDid you start Qemu?"));
- } else {
- output = parseTestOutput();
- }
- m_ui->testResultEdit->setPlainText(output);
- stopConfigTest();
-}
-
-void MaemoSettingsWidget::stopConfigTest()
-{
- if (m_deviceTester) {
- m_ui->testConfigButton->disconnect();
- const bool buttonWasEnabled = m_ui->testConfigButton->isEnabled();
- m_deviceTester->disconnect();
- m_deviceTester->stop();
- delete m_deviceTester;
- m_deviceTester = 0;
- m_deviceTestOutput.clear();
- m_ui->testConfigButton->setText(tr("Test"));
- connect(m_ui->testConfigButton, SIGNAL(clicked()),
- this, SLOT(testConfig()));
- m_ui->testConfigButton->setEnabled(buttonWasEnabled);
- }
-}
-
-QString MaemoSettingsWidget::parseTestOutput()
-{
- QString output;
- const QRegExp unamePattern(QLatin1String("Linux (\\S+)\\s(\\S+)"));
- int index = unamePattern.indexIn(m_deviceTestOutput);
- if (index == -1) {
- output = tr("Device configuration test failed: Unexpected output:\n%1").arg(m_deviceTestOutput);
- return output;
- }
-
- output = tr("Hardware architecture: %1\n").arg(unamePattern.cap(2));
- output.append(tr("Kernel version: %1\n").arg(unamePattern.cap(1)));
- output.prepend(tr("Device configuration successful.\n"));
- const QRegExp dkpgPattern(QLatin1String("libqt\\S+ \\d\\.\\d\\.\\d"));
- index = dkpgPattern.indexIn(m_deviceTestOutput);
- if (index == -1) {
- output.append("No Qt packages installed.");
- return output;
- }
- output.append("List of installed Qt packages:\n");
- do {
- output.append(QLatin1String("\t") + dkpgPattern.cap(0)
- + QLatin1String("\n"));
- index = dkpgPattern.indexIn(m_deviceTestOutput, index + 1);
- } while (index != -1);
- return output;
+ QDialog *dialog = new MaemoConfigTestDialog(currentConfig(), this);
+ dialog->open();
}
void MaemoSettingsWidget::deployKey()
@@ -434,13 +349,11 @@ void MaemoSettingsWidget::handleDeployThreadFinished()
if (!m_keyDeployer)
return;
- QString output;
- if (m_keyDeployer->hasError()) {
- output = tr("Key deployment failed: %1").arg(m_keyDeployer->error());
- } else {
- output = tr("Key was successfully deployed.");
- }
- m_ui->testResultEdit->setPlainText(output);
+ if (m_keyDeployer->hasError())
+ QMessageBox::critical(this, tr("Deployment Failed"), tr("Key deployment failed: %1").arg(m_keyDeployer->error()));
+ else
+ QMessageBox::information(this, tr("Deployment Succeeded"), tr("Key was successfully deployed."));
+
stopDeploying();
}
@@ -465,9 +378,7 @@ void MaemoSettingsWidget::selectionChanged()
const QList<QListWidgetItem *> &selectedItems =
m_ui->configListWidget->selectedItems();
Q_ASSERT(selectedItems.count() <= 1);
- stopConfigTest();
stopDeploying();
- m_ui->testResultEdit->setPlainText(m_defaultTestOutput);
if (selectedItems.isEmpty()) {
m_ui->removeConfigButton->setEnabled(false);
m_ui->testConfigButton->setEnabled(false);
diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemosettingswidget.h b/src/plugins/qt4projectmanager/qt-maemo/maemosettingswidget.h
index af69024f6b05c9e7c5dd7ee05a92000bc2a121bd..009a19501d80b998b23039928b6a3119c569cbf1 100644
--- a/src/plugins/qt4projectmanager/qt-maemo/maemosettingswidget.h
+++ b/src/plugins/qt4projectmanager/qt-maemo/maemosettingswidget.h
@@ -44,13 +44,12 @@
QT_BEGIN_NAMESPACE
class QLineEdit;
-class Ui_maemoSettingsWidget;
+class Ui_MaemoSettingsWidget;
QT_END_NAMESPACE
namespace Qt4ProjectManager {
namespace Internal {
-class MaemoSshRunner;
class MaemoSshDeployer;
class NameValidator;
class PortAndTimeoutValidator;
@@ -79,9 +78,6 @@ private slots:
// For configuration testing.
void testConfig();
- void processSshOutput(const QString &data);
- void handleTestThreadFinished();
- void stopConfigTest();
// For key deploying.
void deployKey();
@@ -97,16 +93,13 @@ private:
void clearDetails();
QString parseTestOutput();
- Ui_maemoSettingsWidget *m_ui;
+ Ui_MaemoSettingsWidget *m_ui;
QList<MaemoDeviceConfig> m_devConfs;
NameValidator * const m_nameValidator;
PortAndTimeoutValidator * const m_sshPortValidator;
PortAndTimeoutValidator * const m_gdbServerPortValidator;
PortAndTimeoutValidator * const m_timeoutValidator;
- MaemoSshRunner *m_deviceTester;
MaemoSshDeployer *m_keyDeployer;
- QString m_deviceTestOutput;
- QString m_defaultTestOutput;
};
} // namespace Internal
diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemosettingswidget.ui b/src/plugins/qt4projectmanager/qt-maemo/maemosettingswidget.ui
index f1a02e651dea8f727c13dfe67063b2cb7552538f..758472dc234f0e3b74d2824df8641fc788cddf67 100644
--- a/src/plugins/qt4projectmanager/qt-maemo/maemosettingswidget.ui
+++ b/src/plugins/qt4projectmanager/qt-maemo/maemosettingswidget.ui
@@ -1,13 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
- <class>maemoSettingsWidget</class>
- <widget class="QWidget" name="maemoSettingsWidget">
+ <class>MaemoSettingsWidget</class>
+ <widget class="QWidget" name="MaemoSettingsWidget">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
- <width>526</width>
- <height>514</height>
+ <width>566</width>
+ <height>439</height>
</rect>
</property>
<property name="windowTitle">
@@ -188,20 +188,6 @@
</layout>
</widget>
</item>
- <item>
- <widget class="QTextEdit" name="testResultEdit">
- <property name="readOnly">
- <bool>true</bool>
- </property>
- <property name="html">
- <string><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
-<html><head><meta name="qrichtext" content="1" /><style type="text/css">
-p, li { white-space: pre-wrap; }
-</style></head><body style=" font-family:'DejaVu Sans'; font-size:9pt; font-weight:400; font-style:normal;">
-<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Sans Serif';">No current test results available.</span></p></body></html></string>
- </property>
- </widget>
- </item>
</layout>
</widget>
</item>
@@ -278,7 +264,7 @@ p, li { white-space: pre-wrap; }
<connection>
<sender>nameLineEdit</sender>
<signal>editingFinished()</signal>
- <receiver>maemoSettingsWidget</receiver>
+ <receiver>MaemoSettingsWidget</receiver>
<slot>configNameEditingFinished()</slot>
<hints>
<hint type="sourcelabel">
@@ -294,7 +280,7 @@ p, li { white-space: pre-wrap; }
<connection>
<sender>deviceButton</sender>
<signal>toggled(bool)</signal>
- <receiver>maemoSettingsWidget</receiver>
+ <receiver>MaemoSettingsWidget</receiver>
<slot>deviceTypeChanged()</slot>
<hints>
<hint type="sourcelabel">
@@ -310,7 +296,7 @@ p, li { white-space: pre-wrap; }
<connection>
<sender>hostLineEdit</sender>
<signal>editingFinished()</signal>
- <receiver>maemoSettingsWidget</receiver>
+ <receiver>MaemoSettingsWidget</receiver>
<slot>hostNameEditingFinished()</slot>
<hints>
<hint type="sourcelabel">
@@ -326,7 +312,7 @@ p, li { white-space: pre-wrap; }
<connection>
<sender>sshPortLineEdit</sender>
<signal>editingFinished()</signal>
- <receiver>maemoSettingsWidget</receiver>
+ <receiver>MaemoSettingsWidget</receiver>
<slot>sshPortEditingFinished()</slot>
<hints>
<hint type="sourcelabel">
@@ -342,7 +328,7 @@ p, li { white-space: pre-wrap; }
<connection>
<sender>timeoutLineEdit</sender>
<signal>editingFinished()</signal>
- <receiver>maemoSettingsWidget</receiver>
+ <receiver>MaemoSettingsWidget</receiver>
<slot>timeoutEditingFinished()</slot>
<hints>
<hint type="sourcelabel">
@@ -358,7 +344,7 @@ p, li { white-space: pre-wrap; }
<connection>
<sender>userLineEdit</sender>
<signal>editingFinished()</signal>
- <receiver>maemoSettingsWidget</receiver>
+ <receiver>MaemoSettingsWidget</receiver>
<slot>userNameEditingFinished()</slot>
<hints>
<hint type="sourcelabel">
@@ -374,7 +360,7 @@ p, li { white-space: pre-wrap; }
<connection>
<sender>pwdLineEdit</sender>
<signal>editingFinished()</signal>
- <receiver>maemoSettingsWidget</receiver>
+ <receiver>MaemoSettingsWidget</receiver>
<slot>passwordEditingFinished()</slot>
<hints>
<hint type="sourcelabel">
@@ -390,7 +376,7 @@ p, li { white-space: pre-wrap; }
<connection>
<sender>simulatorButton</sender>
<signal>toggled(bool)</signal>
- <receiver>maemoSettingsWidget</receiver>
+ <receiver>MaemoSettingsWidget</receiver>
<slot>deviceTypeChanged()</slot>
<hints>
<hint type="sourcelabel">
@@ -406,7 +392,7 @@ p, li { white-space: pre-wrap; }
<connection>
<sender>addConfigButton</sender>
<signal>clicked()</signal>
- <receiver>maemoSettingsWidget</receiver>
+ <receiver>MaemoSettingsWidget</receiver>
<slot>addConfig()</slot>
<hints>
<hint type="sourcelabel">
@@ -422,7 +408,7 @@ p, li { white-space: pre-wrap; }
<connection>
<sender>configListWidget</sender>
<signal>itemSelectionChanged()</signal>
- <receiver>maemoSettingsWidget</receiver>
+ <receiver>MaemoSettingsWidget</receiver>
<slot>selectionChanged()</slot>
<hints>
<hint type="sourcelabel">
@@ -438,7 +424,7 @@ p, li { white-space: pre-wrap; }
<connection>
<sender>removeConfigButton</sender>
<signal>clicked()</signal>
- <receiver>maemoSettingsWidget</receiver>
+ <receiver>MaemoSettingsWidget</receiver>
<slot>deleteConfig()</slot>
<hints>
<hint type="sourcelabel">
@@ -454,7 +440,7 @@ p, li { white-space: pre-wrap; }
<connection>
<sender>passwordButton</sender>
<signal>toggled(bool)</signal>
- <receiver>maemoSettingsWidget</receiver>
+ <receiver>MaemoSettingsWidget</receiver>
<slot>authenticationTypeChanged()</slot>
<hints>
<hint type="sourcelabel">
@@ -470,7 +456,7 @@ p, li { white-space: pre-wrap; }
<connection>
<sender>keyFileLineEdit</sender>
<signal>editingFinished()</signal>
- <receiver>maemoSettingsWidget</receiver>
+ <receiver>MaemoSettingsWidget</receiver>
<slot>keyFileEditingFinished()</slot>
<hints>
<hint type="sourcelabel">
@@ -486,7 +472,7 @@ p, li { white-space: pre-wrap; }
<connection>
<sender>keyFileLineEdit</sender>
<signal>browsingFinished()</signal>
- <receiver>maemoSettingsWidget</receiver>
+ <receiver>MaemoSettingsWidget</receiver>
<slot>keyFileEditingFinished()</slot>
<hints>
<hint type="sourcelabel">
@@ -502,7 +488,7 @@ p, li { white-space: pre-wrap; }
<connection>
<sender>testConfigButton</sender>
<signal>clicked()</signal>
- <receiver>maemoSettingsWidget</receiver>
+ <receiver>MaemoSettingsWidget</receiver>
<slot>testConfig()</slot>
<hints>
<hint type="sourcelabel">
@@ -518,7 +504,7 @@ p, li { white-space: pre-wrap; }
<connection>
<sender>deployKeyButton</sender>
<signal>clicked()</signal>
- <receiver>maemoSettingsWidget</receiver>
+ <receiver>MaemoSettingsWidget</receiver>
<slot>deployKey()</slot>
<hints>
<hint type="sourcelabel">
@@ -534,7 +520,7 @@ p, li { white-space: pre-wrap; }
<connection>
<sender>gdbServerPortLineEdit</sender>
<signal>editingFinished()</signal>
- <receiver>maemoSettingsWidget</receiver>
+ <receiver>MaemoSettingsWidget</receiver>
<slot>gdbServerPortEditingFinished()</slot>
<hints>
<hint type="sourcelabel">
@@ -550,7 +536,7 @@ p, li { white-space: pre-wrap; }
<connection>
<sender>keyButton</sender>
<signal>toggled(bool)</signal>
- <receiver>maemoSettingsWidget</receiver>
+ <receiver>MaemoSettingsWidget</receiver>
<slot>authenticationTypeChanged()</slot>
<hints>
<hint type="sourcelabel">
diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemosshthread.h b/src/plugins/qt4projectmanager/qt-maemo/maemosshthread.h
index b048d1f1ffafa49081feb4c009b65d00113935a3..80bd2f90a781bbab67bb9c84b2449d780497b489 100644
--- a/src/plugins/qt4projectmanager/qt-maemo/maemosshthread.h
+++ b/src/plugins/qt4projectmanager/qt-maemo/maemosshthread.h
@@ -69,7 +69,7 @@ protected:
bool stopRequested() const { return m_stopRequested; }
private:
- virtual void runInternal()=0;
+ virtual void runInternal() = 0;
bool m_stopRequested;
QString m_error;
diff --git a/src/plugins/qt4projectmanager/qt-maemo/qt-maemo.pri b/src/plugins/qt4projectmanager/qt-maemo/qt-maemo.pri
index 46c13a3fd63529e7c1018ab92ae314940eb1d0e2..d3eb15dd292f2e1c2e7754532f2a99ee00db3c46 100644
--- a/src/plugins/qt4projectmanager/qt-maemo/qt-maemo.pri
+++ b/src/plugins/qt4projectmanager/qt-maemo/qt-maemo.pri
@@ -12,7 +12,8 @@ HEADERS += $$PWD/maemorunconfiguration.h \
$$PWD/maemoruncontrol.h \
$$PWD/maemorunconfigurationwidget.h \
$$PWD/maemorunfactories.h \
- $$PWD/maemoconstants.h
+ $$PWD/maemoconstants.h \
+ $$PWD/maemoconfigtestdialog.h
SOURCES += $$PWD/maemorunconfiguration.cpp \
$$PWD/maemomanager.cpp \
@@ -24,7 +25,9 @@ SOURCES += $$PWD/maemorunconfiguration.cpp \
$$PWD/maemosshthread.cpp \
$$PWD/maemoruncontrol.cpp \
$$PWD/maemorunconfigurationwidget.cpp \
- $$PWD/maemorunfactories.cpp
+ $$PWD/maemorunfactories.cpp \
+ $$PWD/maemoconfigtestdialog.cpp
-FORMS += $$PWD/maemosettingswidget.ui
+FORMS += $$PWD/maemosettingswidget.ui \
+ $$PWD/maemoconfigtestdialog.ui
RESOURCES += $$PWD/qt-maemo.qrc
diff --git a/src/plugins/qt4projectmanager/qt4nodes.cpp b/src/plugins/qt4projectmanager/qt4nodes.cpp
index c13141e2bc0705513be22a608c57c4cdfa47d5f5..fc705baeaed1eb33acbc2f5d35aff838a1d3f779 100644
--- a/src/plugins/qt4projectmanager/qt4nodes.cpp
+++ b/src/plugins/qt4projectmanager/qt4nodes.cpp
@@ -207,12 +207,21 @@ bool Qt4PriFile::isSaveAsAllowed() const
return false;
}
-void Qt4PriFile::modified(Core::IFile::ReloadBehavior *behavior)
+Core::IFile::ReloadBehavior Qt4PriFile::reloadBehavior(ChangeTrigger state, ChangeType type) const
{
- Q_UNUSED(behavior);
- m_priFile->scheduleUpdate();
+ Q_UNUSED(state)
+ Q_UNUSED(type)
+ return BehaviorSilent;
}
+void Qt4PriFile::reload(ReloadFlag flag, ChangeType type)
+{
+ Q_UNUSED(flag)
+ Q_UNUSED(type)
+ if (type == TypePermissions)
+ return;
+ m_priFile->scheduleUpdate();
+}
/*!
\class Qt4PriFileNode
@@ -725,8 +734,7 @@ void Qt4PriFileNode::changeFiles(const FileType fileType,
// (The .pro files are notified by the file system watcher)
foreach (Core::IEditor *editor, Core::ICore::instance()->editorManager()->editorsForFileName(m_projectFilePath)) {
if (Core::IFile *editorFile = editor->file()) {
- Core::IFile::ReloadBehavior b = Core::IFile::ReloadUnmodified;
- editorFile->modified(&b);
+ editorFile->reload(Core::IFile::FlagReload, Core::IFile::TypeContents);
}
}
diff --git a/src/plugins/qt4projectmanager/qt4nodes.h b/src/plugins/qt4projectmanager/qt4nodes.h
index ea9216a617d5804df1e0b916f2c09c5404ee14cc..c48de9d0c7c20f39ef4c3dce3fa928233086ecc7 100644
--- a/src/plugins/qt4projectmanager/qt4nodes.h
+++ b/src/plugins/qt4projectmanager/qt4nodes.h
@@ -113,7 +113,8 @@ public:
virtual bool isReadOnly() const;
virtual bool isSaveAsAllowed() const;
- virtual void modified(Core::IFile::ReloadBehavior *behavior);
+ ReloadBehavior reloadBehavior(ChangeTrigger state, ChangeType type) const;
+ void reload(ReloadFlag flag, ChangeType type);
private:
Qt4PriFileNode *m_priFile;
diff --git a/src/plugins/qt4projectmanager/qt4project.cpp b/src/plugins/qt4projectmanager/qt4project.cpp
index ae7ea1e62c82f124af80f6ecaa6538b8244d7680..536080086f5ab0f9d92802ad7bcf303a30560245 100644
--- a/src/plugins/qt4projectmanager/qt4project.cpp
+++ b/src/plugins/qt4projectmanager/qt4project.cpp
@@ -216,8 +216,17 @@ bool Qt4ProjectFile::isSaveAsAllowed() const
return false;
}
-void Qt4ProjectFile::modified(Core::IFile::ReloadBehavior *)
+Core::IFile::ReloadBehavior Qt4ProjectFile::reloadBehavior(ChangeTrigger state, ChangeType type) const
{
+ Q_UNUSED(state)
+ Q_UNUSED(type)
+ return BehaviorSilent;
+}
+
+void Qt4ProjectFile::reload(ReloadFlag flag, ChangeType type)
+{
+ Q_UNUSED(flag)
+ Q_UNUSED(type)
}
/*!
diff --git a/src/plugins/qt4projectmanager/qt4project.h b/src/plugins/qt4projectmanager/qt4project.h
index 02f540bfaa5756068857242c9675a362b56314a1..0d85df229204f02d526cfcab1a955cc9c2692095 100644
--- a/src/plugins/qt4projectmanager/qt4project.h
+++ b/src/plugins/qt4projectmanager/qt4project.h
@@ -97,7 +97,8 @@ public:
bool isReadOnly() const;
bool isSaveAsAllowed() const;
- void modified(Core::IFile::ReloadBehavior *behavior);
+ ReloadBehavior reloadBehavior(ChangeTrigger state, ChangeType type) const;
+ void reload(ReloadFlag flag, ChangeType type);
private:
const QString m_mimeType;
diff --git a/src/plugins/qt4projectmanager/qt4projectmanagerplugin.cpp b/src/plugins/qt4projectmanager/qt4projectmanagerplugin.cpp
index a3b8b4c5a1bf0e1f68aa1ab3588bf94150b9221d..ad9c6e4fff3b15cb5fd2cc67e9af192b90cf9b9e 100644
--- a/src/plugins/qt4projectmanager/qt4projectmanagerplugin.cpp
+++ b/src/plugins/qt4projectmanager/qt4projectmanagerplugin.cpp
@@ -47,7 +47,6 @@
#include "qtoptionspage.h"
#include "externaleditors.h"
#include "gettingstartedwelcomepage.h"
-#include "gettingstartedwelcomepagewidget.h"
#include "qt-maemo/maemomanager.h"
#include "qt-s60/s60manager.h"
@@ -103,16 +102,14 @@ bool Qt4ProjectManagerPlugin::initialize(const QStringList &arguments, QString *
m_projectExplorer = ProjectExplorer::ProjectExplorerPlugin::instance();
Core::ActionManager *am = core->actionManager();
- QtVersionManager *mgr = new QtVersionManager();
+ QtVersionManager *mgr = new QtVersionManager;
addAutoReleasedObject(mgr);
- addAutoReleasedObject(new QtOptionsPage());
+ addAutoReleasedObject(new QtOptionsPage);
m_welcomePage = new GettingStartedWelcomePage;
addObject(m_welcomePage);
- GettingStartedWelcomePageWidget *gswp =
- static_cast<GettingStartedWelcomePageWidget*>(m_welcomePage->page());
connect(mgr, SIGNAL(updateExamples(QString,QString,QString)),
- gswp, SLOT(updateExamples(QString,QString,QString)));
+ m_welcomePage, SLOT(updateExamples(QString,QString,QString)));
//create and register objects
m_qt4ProjectManager = new Qt4Manager(this);
diff --git a/src/plugins/qt4projectmanager/qtoptionspage.cpp b/src/plugins/qt4projectmanager/qtoptionspage.cpp
index 05e1f68188382a574e4073c91951839654bec7bb..b620910c5f23cabf1afa0396ecfb80d4de7f6dce 100644
--- a/src/plugins/qt4projectmanager/qtoptionspage.cpp
+++ b/src/plugins/qt4projectmanager/qtoptionspage.cpp
@@ -320,7 +320,7 @@ void QtOptionsPageWidget::showDebuggingBuildLog()
if (currentItemIndex < 0)
return;
// Show and scroll to bottom
- QDialog dlg;
+ QDialog dlg(this);
Ui_ShowBuildLog ui;
ui.setupUi(&dlg);
ui.log->setPlainText(currentItem->data(2, Qt::UserRole).toString());
diff --git a/src/plugins/qt4projectmanager/qtversionmanager.cpp b/src/plugins/qt4projectmanager/qtversionmanager.cpp
index 07ccf19766edc0a27ac3b691dac44479519eaebb..ba3183fe417571081603aee34822ac8046348aca 100644
--- a/src/plugins/qt4projectmanager/qtversionmanager.cpp
+++ b/src/plugins/qt4projectmanager/qtversionmanager.cpp
@@ -227,7 +227,6 @@ void QtVersionManager::updateExamples()
versions.append(m_versions);
QString examplesPath;
- QString docPath;
QString demosPath;
QtVersion *version = 0;
// try to find a version which has both, demos and examples
@@ -953,6 +952,7 @@ void QtVersion::updateVersionInfo() const
m_notInstalled = false;
m_hasExamples = false;
m_hasDocumentation = false;
+ m_hasDebuggingHelper = false;
QFileInfo qmake(qmakeCommand());
if (qmake.exists() && qmake.isExecutable()) {
@@ -968,7 +968,8 @@ void QtVersion::updateVersionInfo() const
"QT_INSTALL_PLUGINS",
"QT_INSTALL_BINS",
"QT_INSTALL_DOCS",
- "QT_INSTALL_PREFIX"
+ "QT_INSTALL_PREFIX",
+ "QMAKEFEATURES"
};
QStringList args;
for (uint i = 0; i < sizeof variables / sizeof variables[0]; ++i)
@@ -981,8 +982,11 @@ void QtVersion::updateVersionInfo() const
while (!stream.atEnd()) {
const QString line = stream.readLine();
const int index = line.indexOf(QLatin1Char(':'));
- if (index != -1)
- m_versionInfo.insert(line.left(index), QDir::fromNativeSeparators(line.mid(index+1)));
+ if (index != -1) {
+ QString value = QDir::fromNativeSeparators(line.mid(index+1));
+ if (value != "**Unknown**")
+ m_versionInfo.insert(line.left(index), value);
+ }
}
}
@@ -990,10 +994,8 @@ void QtVersion::updateVersionInfo() const
QString qtInstallData = m_versionInfo.value("QT_INSTALL_DATA");
m_versionInfo.insert("QMAKE_MKSPECS", QDir::cleanPath(qtInstallData+"/mkspecs"));
- if (qtInstallData.isEmpty())
- m_hasDebuggingHelper = false;
- else
- m_hasDebuggingHelper = DebuggingHelperLibrary::debuggingHelperLibraryByInstallData(qtInstallData).isEmpty();
+ if (!qtInstallData.isEmpty())
+ m_hasDebuggingHelper = !DebuggingHelperLibrary::debuggingHelperLibraryByInstallData(qtInstallData).isEmpty();
}
// Now check for a qt that is configured with a prefix but not installed
diff --git a/src/plugins/resourceeditor/resourceeditorw.cpp b/src/plugins/resourceeditor/resourceeditorw.cpp
index df993a58fa7794c3f2ef69ba675f80fec64aceff..7fde0e20aeffb758f20e50da437b3ba7fd24e86e 100644
--- a/src/plugins/resourceeditor/resourceeditorw.cpp
+++ b/src/plugins/resourceeditor/resourceeditorw.cpp
@@ -185,42 +185,26 @@ bool ResourceEditorFile::isSaveAsAllowed() const
return true;
}
-void ResourceEditorFile::modified(Core::IFile::ReloadBehavior *behavior)
+Core::IFile::ReloadBehavior ResourceEditorFile::reloadBehavior(ChangeTrigger state, ChangeType type) const
{
- const QString fileName = m_parent->m_resourceEditor->fileName();
+ if (type == TypePermissions)
+ return BehaviorSilent;
+ if (type == TypeContents) {
+ if (state == TriggerInternal && !isModified())
+ return BehaviorSilent;
+ return BehaviorAsk;
+ }
+ return BehaviorAsk;
+}
- switch (*behavior) {
- case Core::IFile::ReloadNone:
- return;
- case Core::IFile::ReloadUnmodified:
- if (!isModified()) {
- m_parent->open(fileName);
- return;
- }
- break;
- case Core::IFile::ReloadAll:
- m_parent->open(fileName);
+void ResourceEditorFile::reload(ReloadFlag flag, ChangeType type)
+{
+ if (flag == FlagIgnore)
return;
- case Core::IFile::ReloadPermissions:
+ if (type == TypePermissions) {
emit changed();
- return;
- case Core::IFile::AskForReload:
- break;
- }
-
- switch (Utils::reloadPrompt(fileName, isModified(), Core::ICore::instance()->mainWindow())) {
- case Utils::ReloadCurrent:
- m_parent->open(fileName);
- break;
- case Utils::ReloadAll:
- m_parent->open(fileName);
- *behavior = Core::IFile::ReloadAll;
- break;
- case Utils::ReloadSkipCurrent:
- break;
- case Utils::ReloadNone:
- *behavior = Core::IFile::ReloadNone;
- break;
+ } else {
+ m_parent->open(m_parent->m_resourceEditor->fileName());
}
}
diff --git a/src/plugins/resourceeditor/resourceeditorw.h b/src/plugins/resourceeditor/resourceeditorw.h
index f8b275d6ef0b7e789eb5d19dc4dd6af8b3aa8705..e0a2e5f7b24562c1aaf09362781ca4c232a77895 100644
--- a/src/plugins/resourceeditor/resourceeditorw.h
+++ b/src/plugins/resourceeditor/resourceeditorw.h
@@ -62,7 +62,8 @@ public:
bool isModified() const;
bool isReadOnly() const;
bool isSaveAsAllowed() const;
- void modified(Core::IFile::ReloadBehavior *behavior);
+ ReloadBehavior reloadBehavior(ChangeTrigger state, ChangeType type) const;
+ void reload(ReloadFlag flag, ChangeType type);
QString defaultPath() const;
QString suggestedFileName() const;
virtual QString mimeType() const;
diff --git a/src/plugins/subversion/subversioncontrol.cpp b/src/plugins/subversion/subversioncontrol.cpp
index ef6a5677fc7718b8628ed764b61d94f82c600ae3..c58159ff60b358a75dc1d6598944fad29b969cf7 100644
--- a/src/plugins/subversion/subversioncontrol.cpp
+++ b/src/plugins/subversion/subversioncontrol.cpp
@@ -52,6 +52,7 @@ bool SubversionControl::supportsOperation(Operation operation) const
switch (operation) {
case AddOperation:
case DeleteOperation:
+ case AnnotateOperation:
break;
case OpenOperation:
case CreateRepositoryOperation:
@@ -115,6 +116,13 @@ QString SubversionControl::findTopLevelForDirectory(const QString &directory) co
return m_plugin->findTopLevelForDirectory(directory);
}
+bool SubversionControl::vcsAnnotate(const QString &file, int line)
+{
+ const QFileInfo fi(file);
+ m_plugin->vcsAnnotate(fi.absolutePath(), fi.fileName(), QString(), line);
+ return true;
+}
+
void SubversionControl::emitRepositoryChanged(const QString &s)
{
emit repositoryChanged(s);
diff --git a/src/plugins/subversion/subversioncontrol.h b/src/plugins/subversion/subversioncontrol.h
index 43e803ace9b47b1522fbb2d07253739602d65283..132aca4d8ec95b237a31520eac47256989b79642 100644
--- a/src/plugins/subversion/subversioncontrol.h
+++ b/src/plugins/subversion/subversioncontrol.h
@@ -59,6 +59,8 @@ public:
virtual bool vcsRestoreSnapshot(const QString &topLevel, const QString &name);
virtual bool vcsRemoveSnapshot(const QString &topLevel, const QString &name);
+ virtual bool vcsAnnotate(const QString &file, int line);
+
void emitRepositoryChanged(const QString &);
void emitFilesChanged(const QStringList &);
diff --git a/src/plugins/subversion/subversionplugin.cpp b/src/plugins/subversion/subversionplugin.cpp
index ee1a116964158e6e9d8af644a25a5d63ea163308..bcc249ef5f84c624a8e5c32d053a806f3febc64a 100644
--- a/src/plugins/subversion/subversionplugin.cpp
+++ b/src/plugins/subversion/subversionplugin.cpp
@@ -799,7 +799,7 @@ void SubversionPlugin::annotateCurrentFile()
{
const VCSBase::VCSBasePluginState state = currentState();
QTC_ASSERT(state.hasFile(), return);
- annotate(state.currentFileTopLevel(), state.relativeCurrentFile());
+ vcsAnnotate(state.currentFileTopLevel(), state.relativeCurrentFile());
}
void SubversionPlugin::annotateVersion(const QString &file,
@@ -807,10 +807,10 @@ void SubversionPlugin::annotateVersion(const QString &file,
int lineNr)
{
const QFileInfo fi(file);
- annotate(fi.absolutePath(), fi.fileName(), revision, lineNr);
+ vcsAnnotate(fi.absolutePath(), fi.fileName(), revision, lineNr);
}
-void SubversionPlugin::annotate(const QString &workingDir, const QString &file,
+void SubversionPlugin::vcsAnnotate(const QString &workingDir, const QString &file,
const QString &revision /* = QString() */,
int lineNumber /* = -1 */)
{
diff --git a/src/plugins/subversion/subversionplugin.h b/src/plugins/subversion/subversionplugin.h
index 9acf0926b2aa6e6550354ba7fb40c4c906b8e7e6..2a9283da2fa0d903a097a0ccca5ecee282fd2b09 100644
--- a/src/plugins/subversion/subversionplugin.h
+++ b/src/plugins/subversion/subversionplugin.h
@@ -100,6 +100,10 @@ public:
static SubversionPlugin *subversionPluginInstance();
+public slots:
+ void vcsAnnotate(const QString &workingDir, const QString &file,
+ const QString &revision = QString(), int lineNumber = -1);
+
private slots:
void addCurrentFile();
void revertCurrentFile();
@@ -132,8 +136,6 @@ private:
SubversionResponse runSvn(const QString &workingDir,
const QStringList &arguments, int timeOut,
bool showStdOutInOutputWindow, QTextCodec *outputCodec = 0);
- void annotate(const QString &workingDir, const QString &file,
- const QString &revision = QString(), int lineNumber = -1);
void filelog(const QString &workingDir,
const QStringList &file = QStringList(),
bool enableAnnotationContextMenu = false);
diff --git a/src/plugins/texteditor/basetextdocument.cpp b/src/plugins/texteditor/basetextdocument.cpp
index 70997f5b024ee8ff8b5b1740ad71160eee123238..e03776774079e0603649e6017bcd66bc2a8caed4 100644
--- a/src/plugins/texteditor/basetextdocument.cpp
+++ b/src/plugins/texteditor/basetextdocument.cpp
@@ -248,40 +248,26 @@ void BaseTextDocument::reload()
emit reloaded();
}
-void BaseTextDocument::modified(Core::IFile::ReloadBehavior *behavior)
+Core::IFile::ReloadBehavior BaseTextDocument::reloadBehavior(ChangeTrigger state, ChangeType type) const
{
- switch (*behavior) {
- case Core::IFile::ReloadNone:
- return;
- case Core::IFile::ReloadUnmodified:
- if (!isModified()) {
- reload();
- return;
- }
- break;
- case Core::IFile::ReloadAll:
- reload();
- return;
- case Core::IFile::ReloadPermissions:
- emit changed();
- return;
- case Core::IFile::AskForReload:
- break;
+ if (type == TypePermissions)
+ return BehaviorSilent;
+ if (type == TypeContents) {
+ if (state == TriggerInternal && !isModified())
+ return BehaviorSilent;
+ return BehaviorAsk;
}
+ return BehaviorAsk;
+}
- switch (Utils::reloadPrompt(m_fileName, isModified(), QApplication::activeWindow())) {
- case Utils::ReloadCurrent:
- reload();
- break;
- case Utils::ReloadAll:
+void BaseTextDocument::reload(ReloadFlag flag, ChangeType type)
+{
+ if (flag == FlagIgnore)
+ return;
+ if (type == TypePermissions) {
+ emit changed();
+ } else {
reload();
- *behavior = Core::IFile::ReloadAll;
- break;
- case Utils::ReloadSkipCurrent:
- break;
- case Utils::ReloadNone:
- *behavior = Core::IFile::ReloadNone;
- break;
}
}
diff --git a/src/plugins/texteditor/basetextdocument.h b/src/plugins/texteditor/basetextdocument.h
index 2b7852991d321872e69ca97b815ed632d4208747..2958fc3805b3e89c6acaa89ed121668e5436eec5 100644
--- a/src/plugins/texteditor/basetextdocument.h
+++ b/src/plugins/texteditor/basetextdocument.h
@@ -85,7 +85,8 @@ public:
virtual bool isModified() const;
virtual bool isSaveAsAllowed() const { return true; }
virtual void checkPermissions();
- virtual void modified(Core::IFile::ReloadBehavior *behavior);
+ ReloadBehavior reloadBehavior(ChangeTrigger state, ChangeType type) const;
+ void reload(ReloadFlag flag, ChangeType type);
virtual QString mimeType() const;
void setMimeType(const QString &mt);
diff --git a/src/plugins/texteditor/basetexteditor.cpp b/src/plugins/texteditor/basetexteditor.cpp
index 5ec6f11ffadcef4592db6d79483b9e088087c2fd..a3537d03af7b27f7bc0a39e64315a2889514e54f 100644
--- a/src/plugins/texteditor/basetexteditor.cpp
+++ b/src/plugins/texteditor/basetexteditor.cpp
@@ -3389,6 +3389,20 @@ void BaseTextEditor::mouseMoveEvent(QMouseEvent *e)
viewport()->setCursor(Qt::IBeamCursor);
}
+static bool handleForwardBackwardMouseButtons(QMouseEvent *e)
+{
+ if (e->button() == Qt::XButton1) {
+ Core::EditorManager::instance()->goBackInNavigationHistory();
+ return true;
+ }
+ if (e->button() == Qt::XButton2) {
+ Core::EditorManager::instance()->goForwardInNavigationHistory();
+ return true;
+ }
+
+ return false;
+}
+
void BaseTextEditor::mousePressEvent(QMouseEvent *e)
{
if (e->button() == Qt::LeftButton) {
@@ -3405,6 +3419,12 @@ void BaseTextEditor::mousePressEvent(QMouseEvent *e)
if (d->m_currentLink.isValid())
d->m_linkPressed = true;
}
+
+#ifdef Q_OS_LINUX
+ if (handleForwardBackwardMouseButtons(e))
+ return;
+#endif
+
QPlainTextEdit::mousePressEvent(e);
}
@@ -3423,6 +3443,11 @@ void BaseTextEditor::mouseReleaseEvent(QMouseEvent *e)
}
}
+#ifndef Q_OS_LINUX
+ if (handleForwardBackwardMouseButtons(e))
+ return;
+#endif
+
QPlainTextEdit::mouseReleaseEvent(e);
}
diff --git a/src/plugins/texteditor/fontsettings.h b/src/plugins/texteditor/fontsettings.h
index def4dc63a91fad59f024c35ff75e02c1ae076de1..70b78343dd8cdf15f04119902123498ce8c68b6c 100644
--- a/src/plugins/texteditor/fontsettings.h
+++ b/src/plugins/texteditor/fontsettings.h
@@ -102,9 +102,9 @@ public:
static QString defaultFixedFontFamily();
static int defaultFontSize();
-private:
static QString defaultSchemeFileName(const QString &fileName = QString());
+private:
QString m_family;
QString m_schemeFileName;
int m_fontSize;
diff --git a/src/plugins/texteditor/fontsettingspage.cpp b/src/plugins/texteditor/fontsettingspage.cpp
index 624732eb97f85962d0a7338c015f2f17524207b9..1ae5df7f5237172bc5f95ff316ab90d0e4d616a1 100644
--- a/src/plugins/texteditor/fontsettingspage.cpp
+++ b/src/plugins/texteditor/fontsettingspage.cpp
@@ -562,7 +562,11 @@ void FontSettingsPage::refreshColorSchemeList()
int selected = 0;
- foreach (const QString &file, styleDir.entryList()) {
+ QStringList schemeList = styleDir.entryList();
+ QString defaultScheme = QFileInfo(FontSettings::defaultSchemeFileName()).fileName();
+ if (schemeList.removeAll(defaultScheme))
+ schemeList.prepend(defaultScheme);
+ foreach (const QString &file, schemeList) {
const QString fileName = styleDir.absoluteFilePath(file);
if (d_ptr->m_value.colorSchemeFileName() == fileName)
selected = colorSchemes.size();
diff --git a/src/plugins/texteditor/texteditorplugin.cpp b/src/plugins/texteditor/texteditorplugin.cpp
index 3b47ef04942ea293bc8114dc420412a43af53e02..69bfd073e9f1914dcfbbd2fe8f8fa10edbc0e01f 100644
--- a/src/plugins/texteditor/texteditorplugin.cpp
+++ b/src/plugins/texteditor/texteditorplugin.cpp
@@ -127,7 +127,7 @@ bool TextEditorPlugin::initialize(const QStringList &arguments, QString *errorMe
#ifndef Q_WS_MAC
command->setDefaultKeySequence(QKeySequence(tr("Ctrl+Space")));
#else
- command->setDefaultKeySequence(QKeySequence(tr("Alt+Space")));
+ command->setDefaultKeySequence(QKeySequence(tr("Meta+Space")));
#endif
connect(completionShortcut, SIGNAL(activated()), this, SLOT(invokeCompletion()));
diff --git a/src/plugins/vcsbase/submiteditorfile.cpp b/src/plugins/vcsbase/submiteditorfile.cpp
index a181256a39c0b7b5ddda3c63e3f10e0663730149..949e30c0d933c5eba6a73befe92ef55c6024a70f 100644
--- a/src/plugins/vcsbase/submiteditorfile.cpp
+++ b/src/plugins/vcsbase/submiteditorfile.cpp
@@ -64,3 +64,16 @@ QString SubmitEditorFile::mimeType() const
{
return m_mimeType;
}
+
+Core::IFile::ReloadBehavior SubmitEditorFile::reloadBehavior(ChangeTrigger state, ChangeType type) const
+{
+ Q_UNUSED(state)
+ Q_UNUSED(type)
+ return BehaviorSilent;
+}
+
+void SubmitEditorFile::reload(ReloadFlag flag, ChangeType type)
+{
+ Q_UNUSED(flag)
+ Q_UNUSED(type)
+}
diff --git a/src/plugins/vcsbase/submiteditorfile.h b/src/plugins/vcsbase/submiteditorfile.h
index 5e89ff533713f83b93a9ad2d4d9366befad70cc9..e5c489c8b535772a35828ba20e07969368d918af 100644
--- a/src/plugins/vcsbase/submiteditorfile.h
+++ b/src/plugins/vcsbase/submiteditorfile.h
@@ -52,7 +52,9 @@ public:
bool isReadOnly() const { return false; }
bool isSaveAsAllowed() const { return false; }
bool save(const QString &fileName);
- void modified(ReloadBehavior * /*behavior*/) { return; }
+ ReloadBehavior reloadBehavior(ChangeTrigger state, ChangeType type) const;
+ void reload(ReloadFlag flag, ChangeType type);
+
void setFileName(const QString name);
void setModified(bool modified = true);
diff --git a/src/plugins/welcome/communitywelcomepage.cpp b/src/plugins/welcome/communitywelcomepage.cpp
index 8d86de77e939d8dde3874f4e391e5b82b4b8b288..e53d03b6d877eb3d5b60d779e462d05b206625c5 100644
--- a/src/plugins/welcome/communitywelcomepage.cpp
+++ b/src/plugins/welcome/communitywelcomepage.cpp
@@ -35,12 +35,14 @@ namespace Welcome {
namespace Internal {
CommunityWelcomePage::CommunityWelcomePage()
- : m_page(new CommunityWelcomePageWidget)
+ : m_page(0)
{
}
-QWidget* CommunityWelcomePage::page()
+QWidget *CommunityWelcomePage::page()
{
+ if (!m_page)
+ m_page = new CommunityWelcomePageWidget;
return m_page;
}
diff --git a/src/plugins/welcome/communitywelcomepage.h b/src/plugins/welcome/communitywelcomepage.h
index 8f4afb1a4797401ac36de2ffcfc97b76078d3173..ab0cb8b8f57c05633c533c03597522917dd01ca3 100644
--- a/src/plugins/welcome/communitywelcomepage.h
+++ b/src/plugins/welcome/communitywelcomepage.h
@@ -51,7 +51,6 @@ public:
private:
CommunityWelcomePageWidget *m_page;
-
};
} // namespace Internal
diff --git a/src/plugins/welcome/welcomemode.cpp b/src/plugins/welcome/welcomemode.cpp
index 0ad4d14dc966a2d438b7b89ffffe7245783f1b19..3831ea9e2a49bfa606fb30c2a605086dab7f4eca 100644
--- a/src/plugins/welcome/welcomemode.cpp
+++ b/src/plugins/welcome/welcomemode.cpp
@@ -156,8 +156,8 @@ void WelcomeMode::initPlugins()
delete m_d->ui.stackedWidget->currentWidget();
QList<IWelcomePage*> plugins = PluginManager::instance()->getObjects<IWelcomePage>();
qSort(plugins.begin(), plugins.end(), &sortFunction);
- foreach (IWelcomePage* plugin, plugins) {
- QToolButton * btn = new QToolButton;
+ foreach (IWelcomePage *plugin, plugins) {
+ QToolButton *btn = new QToolButton;
btn->setCheckable(true);
btn->setText(plugin->title());
btn->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Preferred);
diff --git a/src/shared/cplusplus/AST.cpp b/src/shared/cplusplus/AST.cpp
index 752a383a33014ba2a3480908fd19930ca2a4f4b4..785b8178d44f744479551e40f77fe5675a212cad 100644
--- a/src/shared/cplusplus/AST.cpp
+++ b/src/shared/cplusplus/AST.cpp
@@ -436,8 +436,8 @@ unsigned CompoundExpressionAST::lastToken() const
{
if (rparen_token)
return rparen_token + 1;
- else if (compoundStatement)
- return compoundStatement->lastToken();
+ else if (statement)
+ return statement->lastToken();
else
return lparen_token + 1;
}
@@ -559,6 +559,9 @@ unsigned ClassSpecifierAST::lastToken() const
else if (lbrace_token)
return lbrace_token + 1;
+ else if (dot_dot_dot_token)
+ return dot_dot_dot_token + 1;
+
else if (base_clause_list)
return base_clause_list->lastToken();
@@ -694,7 +697,9 @@ unsigned CtorInitializerAST::firstToken() const
unsigned CtorInitializerAST::lastToken() const
{
- if (member_initializer_list)
+ if (dot_dot_dot_token)
+ return dot_dot_dot_token + 1;
+ else if (member_initializer_list)
return member_initializer_list->lastToken();
return colon_token + 1;
}
@@ -829,6 +834,8 @@ unsigned ElaboratedTypeSpecifierAST::lastToken() const
{
if (name)
return name->lastToken();
+ if (attribute_list)
+ return attribute_list->lastToken();
return classkey_token + 1;
}
@@ -1513,12 +1520,12 @@ unsigned QualifiedNameAST::lastToken() const
unsigned ReferenceAST::firstToken() const
{
- return amp_token;
+ return reference_token;
}
unsigned ReferenceAST::lastToken() const
{
- return amp_token + 1;
+ return reference_token + 1;
}
@@ -1722,6 +1729,9 @@ unsigned TemplateTypeParameterAST::lastToken() const
else if (name)
return name->lastToken();
+ else if (dot_dot_dot_token)
+ return dot_dot_dot_token + 1;
+
else if (class_token)
return class_token + 1;
@@ -1890,6 +1900,8 @@ unsigned TypenameTypeParameterAST::lastToken() const
return equal_token + 1;
else if (name)
return name->lastToken();
+ else if (dot_dot_dot_token)
+ return dot_dot_dot_token + 1;
return classkey_token + 1;
}
diff --git a/src/shared/cplusplus/AST.h b/src/shared/cplusplus/AST.h
index 85040258e268300ce2a08bacfbd66859c63d8a57..11f038db5a68b683e8f470e524f63e3a01d71a5d 100644
--- a/src/shared/cplusplus/AST.h
+++ b/src/shared/cplusplus/AST.h
@@ -301,6 +301,9 @@ protected:
class CPLUSPLUS_EXPORT StatementAST: public AST
{
public:
+ StatementAST()
+ {}
+
virtual StatementAST *asStatement() { return this; }
virtual StatementAST *clone(MemoryPool *pool) const = 0;
@@ -309,6 +312,9 @@ public:
class CPLUSPLUS_EXPORT ExpressionAST: public AST
{
public:
+ ExpressionAST()
+ {}
+
virtual ExpressionAST *asExpression() { return this; }
virtual ExpressionAST *clone(MemoryPool *pool) const = 0;
@@ -317,6 +323,9 @@ public:
class CPLUSPLUS_EXPORT DeclarationAST: public AST
{
public:
+ DeclarationAST()
+ {}
+
virtual DeclarationAST *asDeclaration() { return this; }
virtual DeclarationAST *clone(MemoryPool *pool) const = 0;
@@ -328,6 +337,10 @@ public: // annotations
const Name *name;
public:
+ NameAST()
+ : name(0)
+ {}
+
virtual NameAST *asName() { return this; }
virtual NameAST *clone(MemoryPool *pool) const = 0;
@@ -336,6 +349,9 @@ public:
class CPLUSPLUS_EXPORT SpecifierAST: public AST
{
public:
+ SpecifierAST()
+ {}
+
virtual SpecifierAST *asSpecifier() { return this; }
virtual SpecifierAST *clone(MemoryPool *pool) const = 0;
@@ -344,6 +360,9 @@ public:
class CPLUSPLUS_EXPORT PtrOperatorAST: public AST
{
public:
+ PtrOperatorAST()
+ {}
+
virtual PtrOperatorAST *asPtrOperator() { return this; }
virtual PtrOperatorAST *clone(MemoryPool *pool) const = 0;
@@ -352,6 +371,9 @@ public:
class CPLUSPLUS_EXPORT PostfixAST: public AST
{
public:
+ PostfixAST()
+ {}
+
virtual PostfixAST *asPostfix() { return this; }
virtual PostfixAST *clone(MemoryPool *pool) const = 0;
@@ -360,6 +382,9 @@ public:
class CPLUSPLUS_EXPORT CoreDeclaratorAST: public AST
{
public:
+ CoreDeclaratorAST()
+ {}
+
virtual CoreDeclaratorAST *asCoreDeclarator() { return this; }
virtual CoreDeclaratorAST *clone(MemoryPool *pool) const = 0;
@@ -368,6 +393,9 @@ public:
class CPLUSPLUS_EXPORT PostfixDeclaratorAST: public AST
{
public:
+ PostfixDeclaratorAST()
+ {}
+
virtual PostfixDeclaratorAST *asPostfixDeclarator() { return this; }
virtual PostfixDeclaratorAST *clone(MemoryPool *pool) const = 0;
@@ -380,6 +408,11 @@ public:
unsigned colon_token;
public:
+ ObjCSelectorArgumentAST()
+ : name_token(0)
+ , colon_token(0)
+ {}
+
virtual ObjCSelectorArgumentAST *asObjCSelectorArgument() { return this; }
virtual unsigned firstToken() const;
@@ -398,6 +431,10 @@ public:
ObjCSelectorArgumentListAST *selector_argument_list;
public:
+ ObjCSelectorAST()
+ : selector_argument_list(0)
+ {}
+
virtual ObjCSelectorAST *asObjCSelector() { return this; }
virtual unsigned firstToken() const;
@@ -416,6 +453,10 @@ public:
unsigned specifier_token;
public:
+ SimpleSpecifierAST()
+ : specifier_token(0)
+ {}
+
virtual SimpleSpecifierAST *asSimpleSpecifier() { return this; }
virtual unsigned firstToken() const;
@@ -439,6 +480,15 @@ public:
unsigned second_rparen_token;
public:
+ AttributeSpecifierAST()
+ : attribute_token(0)
+ , first_lparen_token(0)
+ , second_lparen_token(0)
+ , attribute_list(0)
+ , first_rparen_token(0)
+ , second_rparen_token(0)
+ {}
+
virtual AttributeSpecifierAST *asAttributeSpecifier() { return this; }
virtual unsigned firstToken() const;
@@ -461,6 +511,14 @@ public:
unsigned rparen_token;
public:
+ AttributeAST()
+ : identifier_token(0)
+ , lparen_token(0)
+ , tag_token(0)
+ , expression_list(0)
+ , rparen_token(0)
+ {}
+
virtual AttributeAST *asAttribute() { return this; }
virtual unsigned firstToken() const;
@@ -482,6 +540,13 @@ public:
unsigned rparen_token;
public:
+ TypeofSpecifierAST()
+ : typeof_token(0)
+ , lparen_token(0)
+ , expression(0)
+ , rparen_token(0)
+ {}
+
virtual TypeofSpecifierAST *asTypeofSpecifier() { return this; }
virtual unsigned firstToken() const;
@@ -506,6 +571,16 @@ public:
ExpressionAST *initializer;
public:
+ DeclaratorAST()
+ : attribute_list(0)
+ , ptr_operator_list(0)
+ , core_declarator(0)
+ , postfix_declarator_list(0)
+ , post_attribute_list(0)
+ , equals_token(0)
+ , initializer(0)
+ {}
+
virtual DeclaratorAST *asDeclarator() { return this; }
virtual unsigned firstToken() const;
@@ -530,6 +605,14 @@ public:
List<Declaration *> *symbols;
public:
+ SimpleDeclarationAST()
+ : qt_invokable_token(0)
+ , decl_specifier_list(0)
+ , declarator_list(0)
+ , semicolon_token(0)
+ , symbols(0)
+ {}
+
virtual SimpleDeclarationAST *asSimpleDeclaration() { return this; }
virtual unsigned firstToken() const;
@@ -548,6 +631,10 @@ public:
unsigned semicolon_token;
public:
+ EmptyDeclarationAST()
+ : semicolon_token(0)
+ {}
+
virtual EmptyDeclarationAST *asEmptyDeclaration() { return this; }
virtual unsigned firstToken() const;
@@ -568,6 +655,12 @@ public:
unsigned colon_token;
public:
+ AccessDeclarationAST()
+ : access_specifier_token(0)
+ , slots_token(0)
+ , colon_token(0)
+ {}
+
virtual AccessDeclarationAST *asAccessDeclaration() { return this; }
virtual unsigned firstToken() const;
@@ -586,6 +679,10 @@ public:
unsigned q_object_token;
public:
+ QtObjectTagAST()
+ : q_object_token(0)
+ {}
+
virtual QtObjectTagAST *asQtObjectTag() { return this; }
virtual unsigned firstToken() const;
@@ -612,6 +709,18 @@ public:
unsigned rparen_token;
public:
+ QtPrivateSlotAST()
+ : q_private_slot_token(0)
+ , lparen_token(0)
+ , dptr_token(0)
+ , dptr_lparen_token(0)
+ , dptr_rparen_token(0)
+ , comma_token(0)
+ , type_specifiers(0)
+ , declarator(0)
+ , rparen_token(0)
+ {}
+
virtual QtPrivateSlotAST *asQtPrivateSlot() { return this; }
virtual unsigned firstToken() const;
@@ -631,6 +740,11 @@ public:
ExpressionAST *expression;
public:
+ QtPropertyDeclarationItemAST()
+ : item_name_token(0)
+ , expression(0)
+ {}
+
virtual QtPropertyDeclarationItemAST *asQtPropertyDeclarationItem() { return this; }
virtual unsigned firstToken() const;
@@ -654,6 +768,15 @@ public:
unsigned rparen_token;
public:
+ QtPropertyDeclarationAST()
+ : property_specifier_token(0)
+ , lparen_token(0)
+ , type_id(0)
+ , property_name(0)
+ , property_declaration_items(0)
+ , rparen_token(0)
+ {}
+
virtual QtPropertyDeclarationAST *asQtPropertyDeclaration() { return this; }
virtual unsigned firstToken() const;
@@ -675,6 +798,13 @@ public:
unsigned rparen_token;
public:
+ QtEnumDeclarationAST()
+ : enum_specifier_token(0)
+ , lparen_token(0)
+ , enumerator_list(0)
+ , rparen_token(0)
+ {}
+
virtual QtEnumDeclarationAST *asQtEnumDeclaration() { return this; }
virtual unsigned firstToken() const;
@@ -696,6 +826,13 @@ public:
unsigned rparen_token;
public:
+ QtFlagsDeclarationAST()
+ : flags_specifier_token(0)
+ , lparen_token(0)
+ , flag_enums_list(0)
+ , rparen_token(0)
+ {}
+
virtual QtFlagsDeclarationAST *asQtFlagsDeclaration() { return this; }
virtual unsigned firstToken() const;
@@ -715,6 +852,11 @@ public:
NameListAST *constraint_list;
public:
+ QtInterfaceNameAST()
+ : interface_name(0)
+ , constraint_list(0)
+ {}
+
virtual QtInterfaceNameAST *asQtInterfaceName() { return this; }
virtual unsigned firstToken() const;
@@ -736,6 +878,13 @@ public:
unsigned rparen_token;
public:
+ QtInterfacesDeclarationAST()
+ : interfaces_token(0)
+ , lparen_token(0)
+ , interface_name_list(0)
+ , rparen_token(0)
+ {}
+
virtual QtInterfacesDeclarationAST *asQtInterfacesDeclaration() { return this; }
virtual unsigned firstToken() const;
@@ -760,6 +909,14 @@ public:
unsigned semicolon_token;
public:
+ AsmDefinitionAST()
+ : asm_token(0)
+ , volatile_token(0)
+ , lparen_token(0)
+ , rparen_token(0)
+ , semicolon_token(0)
+ {}
+
virtual AsmDefinitionAST *asAsmDefinition() { return this; }
virtual unsigned firstToken() const;
@@ -783,6 +940,13 @@ public: // annotations
BaseClass *symbol;
public:
+ BaseSpecifierAST()
+ : virtual_token(0)
+ , access_specifier_token(0)
+ , name(0)
+ , symbol(0)
+ {}
+
virtual BaseSpecifierAST *asBaseSpecifier() { return this; }
virtual unsigned firstToken() const;
@@ -799,10 +963,16 @@ class CPLUSPLUS_EXPORT CompoundExpressionAST: public ExpressionAST
{
public:
unsigned lparen_token;
- CompoundStatementAST *compoundStatement;
+ CompoundStatementAST *statement;
unsigned rparen_token;
public:
+ CompoundExpressionAST()
+ : lparen_token(0)
+ , statement(0)
+ , rparen_token(0)
+ {}
+
virtual CompoundExpressionAST *asCompoundExpression() { return this; }
virtual unsigned firstToken() const;
@@ -824,6 +994,13 @@ public:
ExpressionAST *initializer;
public:
+ CompoundLiteralAST()
+ : lparen_token(0)
+ , type_id(0)
+ , rparen_token(0)
+ , initializer(0)
+ {}
+
virtual CompoundLiteralAST *asCompoundLiteral() { return this; }
virtual unsigned firstToken() const;
@@ -845,6 +1022,13 @@ public:
unsigned rparen_token;
public:
+ QtMethodAST()
+ : method_token(0)
+ , lparen_token(0)
+ , declarator(0)
+ , rparen_token(0)
+ {}
+
virtual QtMethodAST *asQtMethod() { return this; }
virtual unsigned firstToken() const;
@@ -866,6 +1050,13 @@ public:
unsigned rparen_token;
public:
+ QtMemberDeclarationAST()
+ : q_token(0)
+ , lparen_token(0)
+ , type_id(0)
+ , rparen_token(0)
+ {}
+
virtual QtMemberDeclarationAST *asQtMemberDeclaration() { return this; }
virtual unsigned firstToken() const;
@@ -886,6 +1077,12 @@ public:
ExpressionAST *right_expression;
public:
+ BinaryExpressionAST()
+ : left_expression(0)
+ , binary_op_token(0)
+ , right_expression(0)
+ {}
+
virtual BinaryExpressionAST *asBinaryExpression() { return this; }
virtual unsigned firstToken() const;
@@ -907,6 +1104,13 @@ public:
ExpressionAST *expression;
public:
+ CastExpressionAST()
+ : lparen_token(0)
+ , type_id(0)
+ , rparen_token(0)
+ , expression(0)
+ {}
+
virtual CastExpressionAST *asCastExpression() { return this; }
virtual unsigned firstToken() const;
@@ -927,6 +1131,7 @@ public:
NameAST *name;
unsigned colon_token;
BaseSpecifierListAST *base_clause_list;
+ unsigned dot_dot_dot_token;
unsigned lbrace_token;
DeclarationListAST *member_specifier_list;
unsigned rbrace_token;
@@ -935,6 +1140,19 @@ public: // annotations
Class *symbol;
public:
+ ClassSpecifierAST()
+ : classkey_token(0)
+ , attribute_list(0)
+ , name(0)
+ , colon_token(0)
+ , base_clause_list(0)
+ , dot_dot_dot_token(0)
+ , lbrace_token(0)
+ , member_specifier_list(0)
+ , rbrace_token(0)
+ , symbol(0)
+ {}
+
virtual ClassSpecifierAST *asClassSpecifier() { return this; }
virtual unsigned firstToken() const;
@@ -956,6 +1174,13 @@ public:
StatementAST *statement;
public:
+ CaseStatementAST()
+ : case_token(0)
+ , expression(0)
+ , colon_token(0)
+ , statement(0)
+ {}
+
virtual CaseStatementAST *asCaseStatement() { return this; }
virtual unsigned firstToken() const;
@@ -979,6 +1204,13 @@ public: // annotations
Block *symbol;
public:
+ CompoundStatementAST()
+ : lbrace_token(0)
+ , statement_list(0)
+ , rbrace_token(0)
+ , symbol(0)
+ {}
+
virtual CompoundStatementAST *asCompoundStatement() { return this; }
virtual unsigned firstToken() const;
@@ -998,6 +1230,11 @@ public:
DeclaratorAST *declarator;
public:
+ ConditionAST()
+ : type_specifier_list(0)
+ , declarator(0)
+ {}
+
virtual ConditionAST *asCondition() { return this; }
virtual unsigned firstToken() const;
@@ -1020,6 +1257,14 @@ public:
ExpressionAST *right_expression;
public:
+ ConditionalExpressionAST()
+ : condition(0)
+ , question_token(0)
+ , left_expression(0)
+ , colon_token(0)
+ , right_expression(0)
+ {}
+
virtual ConditionalExpressionAST *asConditionalExpression() { return this; }
virtual unsigned firstToken() const;
@@ -1044,6 +1289,16 @@ public:
unsigned rparen_token;
public:
+ CppCastExpressionAST()
+ : cast_token(0)
+ , less_token(0)
+ , type_id(0)
+ , greater_token(0)
+ , lparen_token(0)
+ , expression(0)
+ , rparen_token(0)
+ {}
+
virtual CppCastExpressionAST *asCppCastExpression() { return this; }
virtual unsigned firstToken() const;
@@ -1061,8 +1316,15 @@ class CPLUSPLUS_EXPORT CtorInitializerAST: public AST
public:
unsigned colon_token;
MemInitializerListAST *member_initializer_list;
+ unsigned dot_dot_dot_token;
public:
+ CtorInitializerAST()
+ : colon_token(0)
+ , member_initializer_list(0)
+ , dot_dot_dot_token(0)
+ {}
+
virtual CtorInitializerAST *asCtorInitializer() { return this; }
virtual unsigned firstToken() const;
@@ -1081,6 +1343,10 @@ public:
DeclarationAST *declaration;
public:
+ DeclarationStatementAST()
+ : declaration(0)
+ {}
+
virtual DeclarationStatementAST *asDeclarationStatement() { return this; }
virtual unsigned firstToken() const;
@@ -1099,6 +1365,10 @@ public:
NameAST *name;
public:
+ DeclaratorIdAST()
+ : name(0)
+ {}
+
virtual DeclaratorIdAST *asDeclaratorId() { return this; }
virtual unsigned firstToken() const;
@@ -1119,6 +1389,12 @@ public:
unsigned rparen_token;
public:
+ NestedDeclaratorAST()
+ : lparen_token(0)
+ , declarator(0)
+ , rparen_token(0)
+ {}
+
virtual NestedDeclaratorAST *asNestedDeclarator() { return this; }
virtual unsigned firstToken() const;
@@ -1145,6 +1421,16 @@ public: // annotations
Function *symbol;
public:
+ FunctionDeclaratorAST()
+ : lparen_token(0)
+ , parameters(0)
+ , rparen_token(0)
+ , cv_qualifier_list(0)
+ , exception_specification(0)
+ , as_cpp_initializer(0)
+ , symbol(0)
+ {}
+
virtual FunctionDeclaratorAST *asFunctionDeclarator() { return this; }
virtual unsigned firstToken() const;
@@ -1165,6 +1451,12 @@ public:
unsigned rbracket_token;
public:
+ ArrayDeclaratorAST()
+ : lbracket_token(0)
+ , expression(0)
+ , rbracket_token(0)
+ {}
+
virtual ArrayDeclaratorAST *asArrayDeclarator() { return this; }
virtual unsigned firstToken() const;
@@ -1187,6 +1479,14 @@ public:
ExpressionAST *expression;
public:
+ DeleteExpressionAST()
+ : scope_token(0)
+ , delete_token(0)
+ , lbracket_token(0)
+ , rbracket_token(0)
+ , expression(0)
+ {}
+
virtual DeleteExpressionAST *asDeleteExpression() { return this; }
virtual unsigned firstToken() const;
@@ -1211,6 +1511,16 @@ public:
unsigned semicolon_token;
public:
+ DoStatementAST()
+ : do_token(0)
+ , statement(0)
+ , while_token(0)
+ , lparen_token(0)
+ , expression(0)
+ , rparen_token(0)
+ , semicolon_token(0)
+ {}
+
virtual DoStatementAST *asDoStatement() { return this; }
virtual unsigned firstToken() const;
@@ -1229,6 +1539,10 @@ public:
NameAST *name;
public:
+ NamedTypeSpecifierAST()
+ : name(0)
+ {}
+
virtual NamedTypeSpecifierAST *asNamedTypeSpecifier() { return this; }
virtual unsigned firstToken() const;
@@ -1245,9 +1559,16 @@ class CPLUSPLUS_EXPORT ElaboratedTypeSpecifierAST: public SpecifierAST
{
public:
unsigned classkey_token;
+ SpecifierListAST *attribute_list;
NameAST *name;
public:
+ ElaboratedTypeSpecifierAST()
+ : classkey_token(0)
+ , attribute_list(0)
+ , name(0)
+ {}
+
virtual ElaboratedTypeSpecifierAST *asElaboratedTypeSpecifier() { return this; }
virtual unsigned firstToken() const;
@@ -1270,6 +1591,14 @@ public:
unsigned rbrace_token;
public:
+ EnumSpecifierAST()
+ : enum_token(0)
+ , name(0)
+ , lbrace_token(0)
+ , enumerator_list(0)
+ , rbrace_token(0)
+ {}
+
virtual EnumSpecifierAST *asEnumSpecifier() { return this; }
virtual unsigned firstToken() const;
@@ -1290,6 +1619,12 @@ public:
ExpressionAST *expression;
public:
+ EnumeratorAST()
+ : identifier_token(0)
+ , equal_token(0)
+ , expression(0)
+ {}
+
virtual EnumeratorAST *asEnumerator() { return this; }
virtual unsigned firstToken() const;
@@ -1310,6 +1645,12 @@ public:
unsigned dot_dot_dot_token;
public:
+ ExceptionDeclarationAST()
+ : type_specifier_list(0)
+ , declarator(0)
+ , dot_dot_dot_token(0)
+ {}
+
virtual ExceptionDeclarationAST *asExceptionDeclaration() { return this; }
virtual unsigned firstToken() const;
@@ -1332,6 +1673,14 @@ public:
unsigned rparen_token;
public:
+ ExceptionSpecificationAST()
+ : throw_token(0)
+ , lparen_token(0)
+ , dot_dot_dot_token(0)
+ , type_id_list(0)
+ , rparen_token(0)
+ {}
+
virtual ExceptionSpecificationAST *asExceptionSpecification() { return this; }
virtual unsigned firstToken() const;
@@ -1351,6 +1700,11 @@ public:
StatementAST *declaration;
public:
+ ExpressionOrDeclarationStatementAST()
+ : expression(0)
+ , declaration(0)
+ {}
+
virtual ExpressionOrDeclarationStatementAST *asExpressionOrDeclarationStatement() { return this; }
virtual unsigned firstToken() const;
@@ -1370,6 +1724,11 @@ public:
unsigned semicolon_token;
public:
+ ExpressionStatementAST()
+ : expression(0)
+ , semicolon_token(0)
+ {}
+
virtual ExpressionStatementAST *asExpressionStatement() { return this; }
virtual unsigned firstToken() const;
@@ -1395,6 +1754,15 @@ public: // annotations
Function *symbol;
public:
+ FunctionDefinitionAST()
+ : qt_invokable_token(0)
+ , decl_specifier_list(0)
+ , declarator(0)
+ , ctor_initializer(0)
+ , function_body(0)
+ , symbol(0)
+ {}
+
virtual FunctionDefinitionAST *asFunctionDefinition() { return this; }
virtual unsigned firstToken() const;
@@ -1426,6 +1794,19 @@ public: // annotations
Block *symbol;
public:
+ ForeachStatementAST()
+ : foreach_token(0)
+ , lparen_token(0)
+ , type_specifier_list(0)
+ , declarator(0)
+ , initializer(0)
+ , comma_token(0)
+ , expression(0)
+ , rparen_token(0)
+ , statement(0)
+ , symbol(0)
+ {}
+
virtual ForeachStatementAST *asForeachStatement() { return this; }
virtual unsigned firstToken() const;
@@ -1454,6 +1835,18 @@ public: // annotations
Block *symbol;
public:
+ ForStatementAST()
+ : for_token(0)
+ , lparen_token(0)
+ , initializer(0)
+ , condition(0)
+ , semicolon_token(0)
+ , expression(0)
+ , rparen_token(0)
+ , statement(0)
+ , symbol(0)
+ {}
+
virtual ForStatementAST *asForStatement() { return this; }
virtual unsigned firstToken() const;
@@ -1481,6 +1874,17 @@ public: // annotations
Block *symbol;
public:
+ IfStatementAST()
+ : if_token(0)
+ , lparen_token(0)
+ , condition(0)
+ , rparen_token(0)
+ , statement(0)
+ , else_token(0)
+ , else_statement(0)
+ , symbol(0)
+ {}
+
virtual IfStatementAST *asIfStatement() { return this; }
virtual unsigned firstToken() const;
@@ -1501,6 +1905,12 @@ public:
unsigned rbrace_token;
public:
+ ArrayInitializerAST()
+ : lbrace_token(0)
+ , expression_list(0)
+ , rbrace_token(0)
+ {}
+
virtual ArrayInitializerAST *asArrayInitializer() { return this; }
virtual unsigned firstToken() const;
@@ -1521,6 +1931,12 @@ public:
StatementAST *statement;
public:
+ LabeledStatementAST()
+ : label_token(0)
+ , colon_token(0)
+ , statement(0)
+ {}
+
virtual LabeledStatementAST *asLabeledStatement() { return this; }
virtual unsigned firstToken() const;
@@ -1541,6 +1957,12 @@ public:
unsigned rbrace_token;
public:
+ LinkageBodyAST()
+ : lbrace_token(0)
+ , declaration_list(0)
+ , rbrace_token(0)
+ {}
+
virtual LinkageBodyAST *asLinkageBody() { return this; }
virtual unsigned firstToken() const;
virtual unsigned lastToken() const;
@@ -1560,6 +1982,12 @@ public:
DeclarationAST *declaration;
public:
+ LinkageSpecificationAST()
+ : extern_token(0)
+ , extern_type_token(0)
+ , declaration(0)
+ {}
+
virtual LinkageSpecificationAST *asLinkageSpecification() { return this; }
virtual unsigned firstToken() const;
@@ -1581,6 +2009,13 @@ public:
unsigned rparen_token;
public:
+ MemInitializerAST()
+ : name(0)
+ , lparen_token(0)
+ , expression_list(0)
+ , rparen_token(0)
+ {}
+
virtual MemInitializerAST *asMemInitializer() { return this; }
virtual unsigned firstToken() const;
@@ -1600,6 +2035,11 @@ public:
unsigned scope_token;
public:
+ NestedNameSpecifierAST()
+ : class_or_namespace_name(0)
+ , scope_token(0)
+ {}
+
virtual NestedNameSpecifierAST *asNestedNameSpecifier() { return this; }
virtual unsigned firstToken() const;
@@ -1620,6 +2060,12 @@ public:
NameAST *unqualified_name;
public:
+ QualifiedNameAST()
+ : global_scope_token(0)
+ , nested_name_specifier_list(0)
+ , unqualified_name(0)
+ {}
+
virtual QualifiedNameAST *asQualifiedName() { return this; }
virtual unsigned firstToken() const;
@@ -1639,6 +2085,11 @@ public:
OperatorAST *op;
public:
+ OperatorFunctionIdAST()
+ : operator_token(0)
+ , op(0)
+ {}
+
virtual OperatorFunctionIdAST *asOperatorFunctionId() { return this; }
virtual unsigned firstToken() const;
@@ -1659,6 +2110,12 @@ public:
PtrOperatorListAST *ptr_operator_list;
public:
+ ConversionFunctionIdAST()
+ : operator_token(0)
+ , type_specifier_list(0)
+ , ptr_operator_list(0)
+ {}
+
virtual ConversionFunctionIdAST *asConversionFunctionId() { return this; }
virtual unsigned firstToken() const;
@@ -1677,6 +2134,10 @@ public:
unsigned identifier_token;
public:
+ SimpleNameAST()
+ : identifier_token(0)
+ {}
+
virtual SimpleNameAST *asSimpleName() { return this; }
virtual unsigned firstToken() const;
@@ -1696,6 +2157,11 @@ public:
unsigned identifier_token;
public:
+ DestructorNameAST()
+ : tilde_token(0)
+ , identifier_token(0)
+ {}
+
virtual DestructorNameAST *asDestructorName() { return this; }
virtual unsigned firstToken() const;
@@ -1717,6 +2183,13 @@ public:
unsigned greater_token;
public:
+ TemplateIdAST()
+ : identifier_token(0)
+ , less_token(0)
+ , template_argument_list(0)
+ , greater_token(0)
+ {}
+
virtual TemplateIdAST *asTemplateId() { return this; }
virtual unsigned firstToken() const;
@@ -1741,6 +2214,14 @@ public: // annotations
Namespace *symbol;
public:
+ NamespaceAST()
+ : namespace_token(0)
+ , identifier_token(0)
+ , attribute_list(0)
+ , linkage_body(0)
+ , symbol(0)
+ {}
+
virtual NamespaceAST *asNamespace() { return this; }
virtual unsigned firstToken() const;
@@ -1763,6 +2244,14 @@ public:
unsigned semicolon_token;
public:
+ NamespaceAliasDefinitionAST()
+ : namespace_token(0)
+ , namespace_name_token(0)
+ , equal_token(0)
+ , name(0)
+ , semicolon_token(0)
+ {}
+
virtual NamespaceAliasDefinitionAST *asNamespaceAliasDefinition() { return this; }
virtual unsigned firstToken() const;
@@ -1783,6 +2272,12 @@ public:
unsigned rparen_token;
public:
+ NewPlacementAST()
+ : lparen_token(0)
+ , expression_list(0)
+ , rparen_token(0)
+ {}
+
virtual NewPlacementAST *asNewPlacement() { return this; }
virtual unsigned firstToken() const;
@@ -1803,6 +2298,12 @@ public:
unsigned rbracket_token;
public:
+ NewArrayDeclaratorAST()
+ : lbracket_token(0)
+ , expression(0)
+ , rbracket_token(0)
+ {}
+
virtual NewArrayDeclaratorAST *asNewArrayDeclarator() { return this; }
virtual unsigned firstToken() const;
@@ -1831,6 +2332,17 @@ public:
NewInitializerAST *new_initializer;
public:
+ NewExpressionAST()
+ : scope_token(0)
+ , new_token(0)
+ , new_placement(0)
+ , lparen_token(0)
+ , type_id(0)
+ , rparen_token(0)
+ , new_type_id(0)
+ , new_initializer(0)
+ {}
+
virtual NewExpressionAST *asNewExpression() { return this; }
virtual unsigned firstToken() const;
@@ -1851,6 +2363,12 @@ public:
unsigned rparen_token;
public:
+ NewInitializerAST()
+ : lparen_token(0)
+ , expression(0)
+ , rparen_token(0)
+ {}
+
virtual NewInitializerAST *asNewInitializer() { return this; }
virtual unsigned firstToken() const;
@@ -1871,6 +2389,12 @@ public:
NewArrayDeclaratorListAST *new_array_declarator_list;
public:
+ NewTypeIdAST()
+ : type_specifier_list(0)
+ , ptr_operator_list(0)
+ , new_array_declarator_list(0)
+ {}
+
virtual NewTypeIdAST *asNewTypeId() { return this; }
virtual unsigned firstToken() const;
@@ -1891,6 +2415,12 @@ public:
unsigned close_token;
public:
+ OperatorAST()
+ : op_token(0)
+ , open_token(0)
+ , close_token(0)
+ {}
+
virtual OperatorAST *asOperator() { return this; }
virtual unsigned firstToken() const;
@@ -1915,6 +2445,14 @@ public: // annotations
Argument *symbol;
public:
+ ParameterDeclarationAST()
+ : type_specifier_list(0)
+ , declarator(0)
+ , equal_token(0)
+ , expression(0)
+ , symbol(0)
+ {}
+
virtual ParameterDeclarationAST *asParameterDeclaration() { return this; }
virtual unsigned firstToken() const;
@@ -1934,6 +2472,11 @@ public:
unsigned dot_dot_dot_token;
public:
+ ParameterDeclarationClauseAST()
+ : parameter_declaration_list(0)
+ , dot_dot_dot_token(0)
+ {}
+
virtual ParameterDeclarationClauseAST *asParameterDeclarationClause() { return this; }
virtual unsigned firstToken() const;
@@ -1954,6 +2497,12 @@ public:
unsigned rparen_token;
public:
+ CallAST()
+ : lparen_token(0)
+ , expression_list(0)
+ , rparen_token(0)
+ {}
+
virtual CallAST *asCall() { return this; }
virtual unsigned firstToken() const;
@@ -1974,6 +2523,12 @@ public:
unsigned rbracket_token;
public:
+ ArrayAccessAST()
+ : lbracket_token(0)
+ , expression(0)
+ , rbracket_token(0)
+ {}
+
virtual ArrayAccessAST *asArrayAccess() { return this; }
virtual unsigned firstToken() const;
@@ -1992,6 +2547,10 @@ public:
unsigned incr_decr_token;
public:
+ PostIncrDecrAST()
+ : incr_decr_token(0)
+ {}
+
virtual PostIncrDecrAST *asPostIncrDecr() { return this; }
virtual unsigned firstToken() const;
@@ -2012,6 +2571,12 @@ public:
NameAST *member_name;
public:
+ MemberAccessAST()
+ : access_token(0)
+ , template_token(0)
+ , member_name(0)
+ {}
+
virtual MemberAccessAST *asMemberAccess() { return this; }
virtual unsigned firstToken() const;
@@ -2033,6 +2598,13 @@ public:
unsigned rparen_token;
public:
+ TypeidExpressionAST()
+ : typeid_token(0)
+ , lparen_token(0)
+ , expression(0)
+ , rparen_token(0)
+ {}
+
virtual TypeidExpressionAST *asTypeidExpression() { return this; }
virtual unsigned firstToken() const;
@@ -2055,6 +2627,14 @@ public:
unsigned rparen_token;
public:
+ TypenameCallExpressionAST()
+ : typename_token(0)
+ , name(0)
+ , lparen_token(0)
+ , expression_list(0)
+ , rparen_token(0)
+ {}
+
virtual TypenameCallExpressionAST *asTypenameCallExpression() { return this; }
virtual unsigned firstToken() const;
@@ -2076,6 +2656,13 @@ public:
unsigned rparen_token;
public:
+ TypeConstructorCallAST()
+ : type_specifier_list(0)
+ , lparen_token(0)
+ , expression_list(0)
+ , rparen_token(0)
+ {}
+
virtual TypeConstructorCallAST *asTypeConstructorCall() { return this; }
virtual unsigned firstToken() const;
@@ -2095,6 +2682,11 @@ public:
PostfixListAST *postfix_expression_list;
public:
+ PostfixExpressionAST()
+ : base_expression(0)
+ , postfix_expression_list(0)
+ {}
+
virtual PostfixExpressionAST *asPostfixExpression() { return this; }
virtual unsigned firstToken() const;
@@ -2116,6 +2708,13 @@ public:
SpecifierListAST *cv_qualifier_list;
public:
+ PointerToMemberAST()
+ : global_scope_token(0)
+ , nested_name_specifier_list(0)
+ , star_token(0)
+ , cv_qualifier_list(0)
+ {}
+
virtual PointerToMemberAST *asPointerToMember() { return this; }
virtual unsigned firstToken() const;
@@ -2135,6 +2734,11 @@ public:
SpecifierListAST *cv_qualifier_list;
public:
+ PointerAST()
+ : star_token(0)
+ , cv_qualifier_list(0)
+ {}
+
virtual PointerAST *asPointer() { return this; }
virtual unsigned firstToken() const;
@@ -2150,9 +2754,13 @@ protected:
class CPLUSPLUS_EXPORT ReferenceAST: public PtrOperatorAST
{
public:
- unsigned amp_token;
+ unsigned reference_token;
public:
+ ReferenceAST()
+ : reference_token(0)
+ {}
+
virtual ReferenceAST *asReference() { return this; }
virtual unsigned firstToken() const;
@@ -2172,6 +2780,11 @@ public:
unsigned semicolon_token;
public:
+ BreakStatementAST()
+ : break_token(0)
+ , semicolon_token(0)
+ {}
+
virtual BreakStatementAST *asBreakStatement() { return this; }
virtual unsigned firstToken() const;
@@ -2191,6 +2804,11 @@ public:
unsigned semicolon_token;
public:
+ ContinueStatementAST()
+ : continue_token(0)
+ , semicolon_token(0)
+ {}
+
virtual ContinueStatementAST *asContinueStatement() { return this; }
virtual unsigned firstToken() const;
@@ -2211,6 +2829,12 @@ public:
unsigned semicolon_token;
public:
+ GotoStatementAST()
+ : goto_token(0)
+ , identifier_token(0)
+ , semicolon_token(0)
+ {}
+
virtual GotoStatementAST *asGotoStatement() { return this; }
virtual unsigned firstToken() const;
@@ -2231,6 +2855,12 @@ public:
unsigned semicolon_token;
public:
+ ReturnStatementAST()
+ : return_token(0)
+ , expression(0)
+ , semicolon_token(0)
+ {}
+
virtual ReturnStatementAST *asReturnStatement() { return this; }
virtual unsigned firstToken() const;
@@ -2252,6 +2882,13 @@ public:
unsigned rparen_token;
public:
+ SizeofExpressionAST()
+ : sizeof_token(0)
+ , lparen_token(0)
+ , expression(0)
+ , rparen_token(0)
+ {}
+
virtual SizeofExpressionAST *asSizeofExpression() { return this; }
virtual unsigned firstToken() const;
@@ -2270,6 +2907,10 @@ public:
unsigned literal_token;
public:
+ NumericLiteralAST()
+ : literal_token(0)
+ {}
+
virtual NumericLiteralAST *asNumericLiteral() { return this; }
virtual unsigned firstToken() const;
@@ -2288,6 +2929,10 @@ public:
unsigned literal_token;
public:
+ BoolLiteralAST()
+ : literal_token(0)
+ {}
+
virtual BoolLiteralAST *asBoolLiteral() { return this; }
virtual unsigned firstToken() const;
@@ -2306,6 +2951,10 @@ public:
unsigned this_token;
public:
+ ThisExpressionAST()
+ : this_token(0)
+ {}
+
virtual ThisExpressionAST *asThisExpression() { return this; }
virtual unsigned firstToken() const;
@@ -2326,6 +2975,12 @@ public:
unsigned rparen_token;
public:
+ NestedExpressionAST()
+ : lparen_token(0)
+ , expression(0)
+ , rparen_token(0)
+ {}
+
virtual NestedExpressionAST *asNestedExpression() { return this; }
virtual unsigned firstToken() const;
@@ -2345,6 +3000,11 @@ public:
StringLiteralAST *next;
public:
+ StringLiteralAST()
+ : literal_token(0)
+ , next(0)
+ {}
+
virtual StringLiteralAST *asStringLiteral() { return this; }
virtual unsigned firstToken() const;
@@ -2370,6 +3030,15 @@ public: // annotations
Block *symbol;
public:
+ SwitchStatementAST()
+ : switch_token(0)
+ , lparen_token(0)
+ , condition(0)
+ , rparen_token(0)
+ , statement(0)
+ , symbol(0)
+ {}
+
virtual SwitchStatementAST *asSwitchStatement() { return this; }
virtual unsigned firstToken() const;
@@ -2393,6 +3062,15 @@ public:
DeclarationAST *declaration;
public:
+ TemplateDeclarationAST()
+ : export_token(0)
+ , template_token(0)
+ , less_token(0)
+ , template_parameter_list(0)
+ , greater_token(0)
+ , declaration(0)
+ {}
+
virtual TemplateDeclarationAST *asTemplateDeclaration() { return this; }
virtual unsigned firstToken() const;
@@ -2412,6 +3090,11 @@ public:
ExpressionAST *expression;
public:
+ ThrowExpressionAST()
+ : throw_token(0)
+ , expression(0)
+ {}
+
virtual ThrowExpressionAST *asThrowExpression() { return this; }
virtual unsigned firstToken() const;
@@ -2430,6 +3113,10 @@ public:
DeclarationListAST *declaration_list;
public:
+ TranslationUnitAST()
+ : declaration_list(0)
+ {}
+
virtual TranslationUnitAST *asTranslationUnit() { return this; }
virtual unsigned firstToken() const;
@@ -2450,6 +3137,12 @@ public:
CatchClauseListAST *catch_clause_list;
public:
+ TryBlockStatementAST()
+ : try_token(0)
+ , statement(0)
+ , catch_clause_list(0)
+ {}
+
virtual TryBlockStatementAST *asTryBlockStatement() { return this; }
virtual unsigned firstToken() const;
@@ -2475,6 +3168,15 @@ public: // annotations
Block *symbol;
public:
+ CatchClauseAST()
+ : catch_token(0)
+ , lparen_token(0)
+ , exception_declaration(0)
+ , rparen_token(0)
+ , statement(0)
+ , symbol(0)
+ {}
+
virtual CatchClauseAST *asCatchClause() { return this; }
virtual unsigned firstToken() const;
@@ -2494,6 +3196,11 @@ public:
DeclaratorAST *declarator;
public:
+ TypeIdAST()
+ : type_specifier_list(0)
+ , declarator(0)
+ {}
+
virtual TypeIdAST *asTypeId() { return this; }
virtual unsigned firstToken() const;
@@ -2510,6 +3217,7 @@ class CPLUSPLUS_EXPORT TypenameTypeParameterAST: public DeclarationAST
{
public:
unsigned classkey_token;
+ unsigned dot_dot_dot_token;
NameAST *name;
unsigned equal_token;
ExpressionAST *type_id;
@@ -2518,6 +3226,15 @@ public: // annotations
TypenameArgument *symbol;
public:
+ TypenameTypeParameterAST()
+ : classkey_token(0)
+ , dot_dot_dot_token(0)
+ , name(0)
+ , equal_token(0)
+ , type_id(0)
+ , symbol(0)
+ {}
+
virtual TypenameTypeParameterAST *asTypenameTypeParameter() { return this; }
virtual unsigned firstToken() const;
@@ -2538,6 +3255,7 @@ public:
DeclarationListAST *template_parameter_list;
unsigned greater_token;
unsigned class_token;
+ unsigned dot_dot_dot_token;
NameAST *name;
unsigned equal_token;
ExpressionAST *type_id;
@@ -2546,6 +3264,19 @@ public:
TypenameArgument *symbol;
public:
+ TemplateTypeParameterAST()
+ : template_token(0)
+ , less_token(0)
+ , template_parameter_list(0)
+ , greater_token(0)
+ , class_token(0)
+ , dot_dot_dot_token(0)
+ , name(0)
+ , equal_token(0)
+ , type_id(0)
+ , symbol(0)
+ {}
+
virtual TemplateTypeParameterAST *asTemplateTypeParameter() { return this; }
virtual unsigned firstToken() const;
@@ -2565,6 +3296,11 @@ public:
ExpressionAST *expression;
public:
+ UnaryExpressionAST()
+ : unary_op_token(0)
+ , expression(0)
+ {}
+
virtual UnaryExpressionAST *asUnaryExpression() { return this; }
virtual unsigned firstToken() const;
@@ -2589,6 +3325,14 @@ public: // annotations
UsingDeclaration *symbol;
public:
+ UsingAST()
+ : using_token(0)
+ , typename_token(0)
+ , name(0)
+ , semicolon_token(0)
+ , symbol(0)
+ {}
+
virtual UsingAST *asUsing() { return this; }
virtual unsigned firstToken() const;
@@ -2613,6 +3357,14 @@ public:
UsingNamespaceDirective *symbol;
public:
+ UsingDirectiveAST()
+ : using_token(0)
+ , namespace_token(0)
+ , name(0)
+ , semicolon_token(0)
+ , symbol(0)
+ {}
+
virtual UsingDirectiveAST *asUsingDirective() { return this; }
virtual unsigned firstToken() const;
@@ -2638,6 +3390,15 @@ public: // annotations
Block *symbol;
public:
+ WhileStatementAST()
+ : while_token(0)
+ , lparen_token(0)
+ , condition(0)
+ , rparen_token(0)
+ , statement(0)
+ , symbol(0)
+ {}
+
virtual WhileStatementAST *asWhileStatement() { return this; }
virtual unsigned firstToken() const;
@@ -2662,6 +3423,14 @@ public: // annotations
List<ObjCForwardClassDeclaration *> *symbols;
public:
+ ObjCClassForwardDeclarationAST()
+ : attribute_list(0)
+ , class_token(0)
+ , identifier_list(0)
+ , semicolon_token(0)
+ , symbols(0)
+ {}
+
virtual ObjCClassForwardDeclarationAST *asObjCClassForwardDeclaration() { return this; }
virtual unsigned firstToken() const;
@@ -2695,6 +3464,23 @@ public: // annotations
ObjCClass *symbol;
public:
+ ObjCClassDeclarationAST()
+ : attribute_list(0)
+ , interface_token(0)
+ , implementation_token(0)
+ , class_name(0)
+ , lparen_token(0)
+ , category_name(0)
+ , rparen_token(0)
+ , colon_token(0)
+ , superclass(0)
+ , protocol_refs(0)
+ , inst_vars_decl(0)
+ , member_declaration_list(0)
+ , end_token(0)
+ , symbol(0)
+ {}
+
virtual ObjCClassDeclarationAST *asObjCClassDeclaration() { return this; }
virtual unsigned firstToken() const;
@@ -2719,6 +3505,14 @@ public: // annotations
List<ObjCForwardProtocolDeclaration *> *symbols;
public:
+ ObjCProtocolForwardDeclarationAST()
+ : attribute_list(0)
+ , protocol_token(0)
+ , identifier_list(0)
+ , semicolon_token(0)
+ , symbols(0)
+ {}
+
virtual ObjCProtocolForwardDeclarationAST *asObjCProtocolForwardDeclaration() { return this; }
virtual unsigned firstToken() const;
@@ -2745,6 +3539,16 @@ public: // annotations
ObjCProtocol *symbol;
public:
+ ObjCProtocolDeclarationAST()
+ : attribute_list(0)
+ , protocol_token(0)
+ , name(0)
+ , protocol_refs(0)
+ , member_declaration_list(0)
+ , end_token(0)
+ , symbol(0)
+ {}
+
virtual ObjCProtocolDeclarationAST *asObjCProtocolDeclaration() { return this; }
virtual unsigned firstToken() const;
@@ -2765,6 +3569,12 @@ public:
unsigned greater_token;
public:
+ ObjCProtocolRefsAST()
+ : less_token(0)
+ , identifier_list(0)
+ , greater_token(0)
+ {}
+
virtual ObjCProtocolRefsAST *asObjCProtocolRefs() { return this; }
virtual unsigned firstToken() const;
@@ -2783,6 +3593,10 @@ public:
ExpressionAST *parameter_value_expression;
public:
+ ObjCMessageArgumentAST()
+ : parameter_value_expression(0)
+ {}
+
virtual ObjCMessageArgumentAST *asObjCMessageArgument() { return this; }
virtual unsigned firstToken() const;
@@ -2805,6 +3619,14 @@ public:
unsigned rbracket_token;
public:
+ ObjCMessageExpressionAST()
+ : lbracket_token(0)
+ , receiver_expression(0)
+ , selector(0)
+ , argument_list(0)
+ , rbracket_token(0)
+ {}
+
virtual ObjCMessageExpressionAST *asObjCMessageExpression() { return this; }
virtual unsigned firstToken() const;
@@ -2826,6 +3648,13 @@ public:
unsigned rparen_token;
public:
+ ObjCProtocolExpressionAST()
+ : protocol_token(0)
+ , lparen_token(0)
+ , identifier_token(0)
+ , rparen_token(0)
+ {}
+
virtual ObjCProtocolExpressionAST *asObjCProtocolExpression() { return this; }
virtual unsigned firstToken() const;
@@ -2847,6 +3676,13 @@ public:
unsigned rparen_token;
public:
+ ObjCTypeNameAST()
+ : lparen_token(0)
+ , type_qualifier_token(0)
+ , type_id(0)
+ , rparen_token(0)
+ {}
+
virtual ObjCTypeNameAST *asObjCTypeName() { return this; }
virtual unsigned firstToken() const;
@@ -2866,6 +3702,11 @@ public:
ObjCTypeNameAST *type_name;
public:
+ ObjCEncodeExpressionAST()
+ : encode_token(0)
+ , type_name(0)
+ {}
+
virtual ObjCEncodeExpressionAST *asObjCEncodeExpression() { return this; }
virtual unsigned firstToken() const;
@@ -2887,6 +3728,13 @@ public:
unsigned rparen_token;
public:
+ ObjCSelectorExpressionAST()
+ : selector_token(0)
+ , lparen_token(0)
+ , selector(0)
+ , rparen_token(0)
+ {}
+
virtual ObjCSelectorExpressionAST *asObjCSelectorExpression() { return this; }
virtual unsigned firstToken() const;
@@ -2907,6 +3755,12 @@ public:
unsigned rbrace_token;
public:
+ ObjCInstanceVariablesDeclarationAST()
+ : lbrace_token(0)
+ , instance_variable_list(0)
+ , rbrace_token(0)
+ {}
+
virtual ObjCInstanceVariablesDeclarationAST *asObjCInstanceVariablesDeclaration() { return this; }
virtual unsigned firstToken() const;
@@ -2925,6 +3779,10 @@ public:
unsigned visibility_token;
public:
+ ObjCVisibilityDeclarationAST()
+ : visibility_token(0)
+ {}
+
virtual ObjCVisibilityDeclarationAST *asObjCVisibilityDeclaration() { return this; }
virtual unsigned firstToken() const;
@@ -2945,6 +3803,12 @@ public:
ObjCSelectorAST *method_selector;
public:
+ ObjCPropertyAttributeAST()
+ : attribute_identifier_token(0)
+ , equals_token(0)
+ , method_selector(0)
+ {}
+
virtual ObjCPropertyAttributeAST *asObjCPropertyAttribute() { return this; }
virtual unsigned firstToken() const;
@@ -2971,6 +3835,16 @@ public: // annotations
List<ObjCPropertyDeclaration *> *symbols;
public:
+ ObjCPropertyDeclarationAST()
+ : attribute_list(0)
+ , property_token(0)
+ , lparen_token(0)
+ , property_attribute_list(0)
+ , rparen_token(0)
+ , simple_declaration(0)
+ , symbols(0)
+ {}
+
virtual ObjCPropertyDeclarationAST *asObjCPropertyDeclaration() { return this; }
virtual unsigned firstToken() const;
@@ -2994,6 +3868,13 @@ public: // annotations
Argument *argument;
public:
+ ObjCMessageArgumentDeclarationAST()
+ : type_name(0)
+ , attribute_list(0)
+ , param_name(0)
+ , argument(0)
+ {}
+
virtual ObjCMessageArgumentDeclarationAST *asObjCMessageArgumentDeclaration() { return this; }
virtual unsigned firstToken() const;
@@ -3020,6 +3901,16 @@ public: // annotations
ObjCMethod *symbol;
public:
+ ObjCMethodPrototypeAST()
+ : method_type_token(0)
+ , type_name(0)
+ , selector(0)
+ , argument_list(0)
+ , dot_dot_dot_token(0)
+ , attribute_list(0)
+ , symbol(0)
+ {}
+
virtual ObjCMethodPrototypeAST *asObjCMethodPrototype() { return this; }
virtual unsigned firstToken() const;
@@ -3040,6 +3931,12 @@ public:
unsigned semicolon_token;
public:
+ ObjCMethodDeclarationAST()
+ : method_prototype(0)
+ , function_body(0)
+ , semicolon_token(0)
+ {}
+
virtual ObjCMethodDeclarationAST *asObjCMethodDeclaration() { return this; }
virtual unsigned firstToken() const;
@@ -3060,6 +3957,12 @@ public:
unsigned alias_identifier_token;
public:
+ ObjCSynthesizedPropertyAST()
+ : property_identifier_token(0)
+ , equals_token(0)
+ , alias_identifier_token(0)
+ {}
+
virtual ObjCSynthesizedPropertyAST *asObjCSynthesizedProperty() { return this; }
virtual unsigned firstToken() const;
@@ -3080,6 +3983,12 @@ public:
unsigned semicolon_token;
public:
+ ObjCSynthesizedPropertiesDeclarationAST()
+ : synthesized_token(0)
+ , property_identifier_list(0)
+ , semicolon_token(0)
+ {}
+
virtual ObjCSynthesizedPropertiesDeclarationAST *asObjCSynthesizedPropertiesDeclaration() { return this; }
virtual unsigned firstToken() const;
@@ -3100,6 +4009,12 @@ public:
unsigned semicolon_token;
public:
+ ObjCDynamicPropertiesDeclarationAST()
+ : dynamic_token(0)
+ , property_identifier_list(0)
+ , semicolon_token(0)
+ {}
+
virtual ObjCDynamicPropertiesDeclarationAST *asObjCDynamicPropertiesDeclaration() { return this; }
virtual unsigned firstToken() const;
@@ -3133,6 +4048,19 @@ public: // annotations
Block *symbol;
public:
+ ObjCFastEnumerationAST()
+ : for_token(0)
+ , lparen_token(0)
+ , type_specifier_list(0)
+ , declarator(0)
+ , initializer(0)
+ , in_token(0)
+ , fast_enumeratable_expression(0)
+ , rparen_token(0)
+ , statement(0)
+ , symbol(0)
+ {}
+
virtual ObjCFastEnumerationAST *asObjCFastEnumeration() { return this; }
virtual unsigned firstToken() const;
@@ -3155,6 +4083,14 @@ public:
StatementAST *statement;
public:
+ ObjCSynchronizedStatementAST()
+ : synchronized_token(0)
+ , lparen_token(0)
+ , synchronized_object(0)
+ , rparen_token(0)
+ , statement(0)
+ {}
+
virtual ObjCSynchronizedStatementAST *asObjCSynchronizedStatement() { return this; }
virtual unsigned firstToken() const;
diff --git a/src/shared/cplusplus/ASTClone.cpp b/src/shared/cplusplus/ASTClone.cpp
index 7920644c43db556a40e09e1ff51c0285afe99e92..586d88e21a77d8df6a741d795a2c6561f6a8c81b 100644
--- a/src/shared/cplusplus/ASTClone.cpp
+++ b/src/shared/cplusplus/ASTClone.cpp
@@ -277,8 +277,8 @@ CompoundExpressionAST *CompoundExpressionAST::clone(MemoryPool *pool) const
{
CompoundExpressionAST *ast = new (pool) CompoundExpressionAST;
ast->lparen_token = lparen_token;
- if (compoundStatement)
- ast->compoundStatement = compoundStatement->clone(pool);
+ if (statement)
+ ast->statement = statement->clone(pool);
ast->rparen_token = rparen_token;
return ast;
}
@@ -353,6 +353,7 @@ ClassSpecifierAST *ClassSpecifierAST::clone(MemoryPool *pool) const
for (BaseSpecifierListAST *iter = base_clause_list, **ast_iter = &ast->base_clause_list;
iter; iter = iter->next, ast_iter = &(*ast_iter)->next)
*ast_iter = new (pool) BaseSpecifierListAST((iter->value) ? iter->value->clone(pool) : 0);
+ ast->dot_dot_dot_token = dot_dot_dot_token;
ast->lbrace_token = lbrace_token;
for (DeclarationListAST *iter = member_specifier_list, **ast_iter = &ast->member_specifier_list;
iter; iter = iter->next, ast_iter = &(*ast_iter)->next)
@@ -431,6 +432,7 @@ CtorInitializerAST *CtorInitializerAST::clone(MemoryPool *pool) const
for (MemInitializerListAST *iter = member_initializer_list, **ast_iter = &ast->member_initializer_list;
iter; iter = iter->next, ast_iter = &(*ast_iter)->next)
*ast_iter = new (pool) MemInitializerListAST((iter->value) ? iter->value->clone(pool) : 0);
+ ast->dot_dot_dot_token = dot_dot_dot_token;
return ast;
}
@@ -526,6 +528,9 @@ ElaboratedTypeSpecifierAST *ElaboratedTypeSpecifierAST::clone(MemoryPool *pool)
{
ElaboratedTypeSpecifierAST *ast = new (pool) ElaboratedTypeSpecifierAST;
ast->classkey_token = classkey_token;
+ for (SpecifierListAST *iter = attribute_list, **ast_iter = &ast->attribute_list;
+ iter; iter = iter->next, ast_iter = &(*ast_iter)->next)
+ *ast_iter = new (pool) SpecifierListAST((iter->value) ? iter->value->clone(pool) : 0);
if (name)
ast->name = name->clone(pool);
return ast;
@@ -1032,7 +1037,7 @@ PointerAST *PointerAST::clone(MemoryPool *pool) const
ReferenceAST *ReferenceAST::clone(MemoryPool *pool) const
{
ReferenceAST *ast = new (pool) ReferenceAST;
- ast->amp_token = amp_token;
+ ast->reference_token = reference_token;
return ast;
}
@@ -1208,6 +1213,7 @@ TypenameTypeParameterAST *TypenameTypeParameterAST::clone(MemoryPool *pool) cons
{
TypenameTypeParameterAST *ast = new (pool) TypenameTypeParameterAST;
ast->classkey_token = classkey_token;
+ ast->dot_dot_dot_token = dot_dot_dot_token;
if (name)
ast->name = name->clone(pool);
ast->equal_token = equal_token;
@@ -1226,6 +1232,7 @@ TemplateTypeParameterAST *TemplateTypeParameterAST::clone(MemoryPool *pool) cons
*ast_iter = new (pool) DeclarationListAST((iter->value) ? iter->value->clone(pool) : 0);
ast->greater_token = greater_token;
ast->class_token = class_token;
+ ast->dot_dot_dot_token = dot_dot_dot_token;
if (name)
ast->name = name->clone(pool);
ast->equal_token = equal_token;
diff --git a/src/shared/cplusplus/ASTMatcher.cpp b/src/shared/cplusplus/ASTMatcher.cpp
index e9734c661fe418b73064fc69fa4b332aaf6b3405..42cbadcbdbf0cc7582609e03314d5da2fa030cf6 100644
--- a/src/shared/cplusplus/ASTMatcher.cpp
+++ b/src/shared/cplusplus/ASTMatcher.cpp
@@ -434,9 +434,9 @@ bool ASTMatcher::match(CompoundExpressionAST *node, CompoundExpressionAST *patte
pattern->lparen_token = node->lparen_token;
- if (! pattern->compoundStatement)
- pattern->compoundStatement = node->compoundStatement;
- else if (! AST::match(node->compoundStatement, pattern->compoundStatement, this))
+ if (! pattern->statement)
+ pattern->statement = node->statement;
+ else if (! AST::match(node->statement, pattern->statement, this))
return false;
pattern->rparen_token = node->rparen_token;
@@ -570,6 +570,8 @@ bool ASTMatcher::match(ClassSpecifierAST *node, ClassSpecifierAST *pattern)
else if (! AST::match(node->base_clause_list, pattern->base_clause_list, this))
return false;
+ pattern->dot_dot_dot_token = node->dot_dot_dot_token;
+
pattern->lbrace_token = node->lbrace_token;
if (! pattern->member_specifier_list)
@@ -706,6 +708,8 @@ bool ASTMatcher::match(CtorInitializerAST *node, CtorInitializerAST *pattern)
else if (! AST::match(node->member_initializer_list, pattern->member_initializer_list, this))
return false;
+ pattern->dot_dot_dot_token = node->dot_dot_dot_token;
+
return true;
}
@@ -870,6 +874,11 @@ bool ASTMatcher::match(ElaboratedTypeSpecifierAST *node, ElaboratedTypeSpecifier
pattern->classkey_token = node->classkey_token;
+ if (! pattern->attribute_list)
+ pattern->attribute_list = node->attribute_list;
+ else if (! AST::match(node->attribute_list, pattern->attribute_list, this))
+ return false;
+
if (! pattern->name)
pattern->name = node->name;
else if (! AST::match(node->name, pattern->name, this))
@@ -1725,7 +1734,7 @@ bool ASTMatcher::match(ReferenceAST *node, ReferenceAST *pattern)
(void) node;
(void) pattern;
- pattern->amp_token = node->amp_token;
+ pattern->reference_token = node->reference_token;
return true;
}
@@ -2013,6 +2022,8 @@ bool ASTMatcher::match(TypenameTypeParameterAST *node, TypenameTypeParameterAST
pattern->classkey_token = node->classkey_token;
+ pattern->dot_dot_dot_token = node->dot_dot_dot_token;
+
if (! pattern->name)
pattern->name = node->name;
else if (! AST::match(node->name, pattern->name, this))
@@ -2046,6 +2057,8 @@ bool ASTMatcher::match(TemplateTypeParameterAST *node, TemplateTypeParameterAST
pattern->class_token = node->class_token;
+ pattern->dot_dot_dot_token = node->dot_dot_dot_token;
+
if (! pattern->name)
pattern->name = node->name;
else if (! AST::match(node->name, pattern->name, this))
diff --git a/src/shared/cplusplus/ASTPatternBuilder.h b/src/shared/cplusplus/ASTPatternBuilder.h
index 8596279e1466032b9a1d41830b60d539e80e14f8..fe92a4808a17df7b993766b9c3af2127dc145aa6 100644
--- a/src/shared/cplusplus/ASTPatternBuilder.h
+++ b/src/shared/cplusplus/ASTPatternBuilder.h
@@ -38,13 +38,12 @@ namespace CPlusPlus {
class CPLUSPLUS_EXPORT ASTPatternBuilder
{
MemoryPool pool;
- MemoryPool::State state;
public:
- ASTPatternBuilder(): state(pool.state()) {}
+ ASTPatternBuilder() {}
~ASTPatternBuilder() {}
- void reset() { pool.rewind(state); }
+ void reset() { pool.reset(); }
SimpleSpecifierAST *SimpleSpecifier()
{
diff --git a/src/shared/cplusplus/ASTVisit.cpp b/src/shared/cplusplus/ASTVisit.cpp
index f58974f0168e228cb49c3711e5ba1472d10d60a4..8216f87b488407a463c2ca155f74c39e78414b61 100644
--- a/src/shared/cplusplus/ASTVisit.cpp
+++ b/src/shared/cplusplus/ASTVisit.cpp
@@ -208,7 +208,7 @@ void BaseSpecifierAST::accept0(ASTVisitor *visitor)
void CompoundExpressionAST::accept0(ASTVisitor *visitor)
{
if (visitor->visit(this)) {
- accept(compoundStatement, visitor);
+ accept(statement, visitor);
}
visitor->endVisit(this);
}
@@ -391,6 +391,7 @@ void NamedTypeSpecifierAST::accept0(ASTVisitor *visitor)
void ElaboratedTypeSpecifierAST::accept0(ASTVisitor *visitor)
{
if (visitor->visit(this)) {
+ accept(attribute_list, visitor);
accept(name, visitor);
}
visitor->endVisit(this);
diff --git a/src/shared/cplusplus/Array.h b/src/shared/cplusplus/Array.h
deleted file mode 100644
index 1708d6bfa7d119afd384c9fb7a34c4246bede004..0000000000000000000000000000000000000000
--- a/src/shared/cplusplus/Array.h
+++ /dev/null
@@ -1,129 +0,0 @@
-/**************************************************************************
-**
-** This file is part of Qt Creator
-**
-** Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
-**
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** Commercial Usage
-**
-** Licensees holding valid Qt Commercial licenses may use this file in
-** accordance with the Qt Commercial License Agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Nokia.
-**
-** GNU Lesser General Public License Usage
-**
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** If you are unsure which license is appropriate for your use, please
-** contact the sales department at http://qt.nokia.com/contact.
-**
-**************************************************************************/
-// Copyright (c) 2008 Roberto Raggi <roberto.raggi@gmail.com>
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-#ifndef CPLUSPLUS_ARRAY_H
-#define CPLUSPLUS_ARRAY_H
-
-#include "CPlusPlusForwardDeclarations.h"
-#include <new>
-
-namespace CPlusPlus {
-
-template <typename _Tp, int SEGMENT_SHIFT = 4>
-class CPLUSPLUS_EXPORT Array
-{
- Array(const Array &other);
- void operator =(const Array &other);
-
-public:
- Array()
- : _segments(0),
- _allocatedSegments(0),
- _segmentCount(-1),
- _allocatedElements(0),
- _count(-1)
- { }
-
- ~Array()
- {
- if (_segments) {
- for (int index = 0; index <= _segmentCount; ++index) {
- delete[] (_segments[index] + (index << SEGMENT_SHIFT));
- }
- std::free(_segments);
- }
- }
-
- inline unsigned size() const
- { return _count + 1; }
-
- inline unsigned count() const
- { return _count + 1; }
-
- inline const _Tp &at(unsigned index) const
- { return _segments[index >> SEGMENT_SHIFT][index]; }
-
- inline const _Tp &operator[](unsigned index) const
- { return _segments[index >> SEGMENT_SHIFT][index]; }
-
- inline _Tp &operator[](unsigned index)
- { return _segments[index >> SEGMENT_SHIFT][index]; }
-
- void push_back(const _Tp &value)
- {
- if (++_count == _allocatedElements) {
- if (++_segmentCount == _allocatedSegments) {
- _allocatedSegments += 4;
- _segments = (_Tp **) std::realloc(_segments, _allocatedSegments * sizeof(_Tp *));
- }
-
- _Tp *segment = new _Tp[SEGMENT_SIZE];
- _segments[_segmentCount] = segment - (_segmentCount << SEGMENT_SHIFT);
- _allocatedElements += SEGMENT_SIZE;
- }
-
- _segments[_count >> SEGMENT_SHIFT][_count] = value;
- }
-
-private:
- enum {
- SEGMENT_SIZE = 1 << SEGMENT_SHIFT
- };
-
- _Tp **_segments;
- int _allocatedSegments;
- int _segmentCount;
-
- int _allocatedElements;
- int _count;
-};
-
-} // end of namespace CPlusPlus
-
-
-#endif // CPLUSPLUS_ARRAY_H
diff --git a/src/shared/cplusplus/CheckDeclaration.cpp b/src/shared/cplusplus/CheckDeclaration.cpp
index 828ec6d381e489f15e8c23b16148ce4451272929..dcb2364b11c6ccdc29b80de909089d9e9927deda 100644
--- a/src/shared/cplusplus/CheckDeclaration.cpp
+++ b/src/shared/cplusplus/CheckDeclaration.cpp
@@ -144,16 +144,20 @@ bool CheckDeclaration::visit(SimpleDeclarationAST *ast)
if (_templateParameters && ty) {
if (Class *klass = ty->asClassType()) {
klass->setTemplateParameters(_templateParameters);
+ _templateParameters = 0; // consume the template parameters
}
}
- if (! ast->declarator_list && ast->decl_specifier_list && ! ast->decl_specifier_list->next) {
- if (ElaboratedTypeSpecifierAST *elab_type_spec = ast->decl_specifier_list->value->asElaboratedTypeSpecifier()) {
+ if (ast->decl_specifier_list && ! ast->declarator_list) {
+ ElaboratedTypeSpecifierAST *elab_type_spec = ast->decl_specifier_list->value->asElaboratedTypeSpecifier();
- unsigned sourceLocation = elab_type_spec->firstToken();
+ if (! elab_type_spec && ty.isFriend() && ast->decl_specifier_list->next && ! ast->decl_specifier_list->next->next) {
+ // friend template class
+ elab_type_spec = ast->decl_specifier_list->next->value->asElaboratedTypeSpecifier();
+ }
- if (elab_type_spec->name)
- sourceLocation = elab_type_spec->name->firstToken();
+ if (elab_type_spec) {
+ unsigned sourceLocation = ast->decl_specifier_list->firstToken();
const Name *name = semantic()->check(elab_type_spec->name, _scope);
ForwardClassDeclaration *symbol =
@@ -163,6 +167,8 @@ bool CheckDeclaration::visit(SimpleDeclarationAST *ast)
symbol->setTemplateParameters(_templateParameters);
_templateParameters = 0;
}
+ if (ty.isDeprecated())
+ symbol->setDeprecated(true);
_scope->enterSymbol(symbol);
return false;
@@ -194,6 +200,8 @@ bool CheckDeclaration::visit(SimpleDeclarationAST *ast)
fun->setName(name);
fun->setMethodKey(semantic()->currentMethodKey());
fun->setVirtual(ty.isVirtual());
+ if (ty.isDeprecated())
+ fun->setDeprecated(true);
if (isQ_SIGNAL)
fun->setMethodKey(Function::SignalMethod);
else if (isQ_SLOT)
@@ -210,11 +218,14 @@ bool CheckDeclaration::visit(SimpleDeclarationAST *ast)
symbol->setStartOffset(tokenAt(ast->firstToken()).offset);
symbol->setEndOffset(tokenAt(ast->lastToken()).offset);
- symbol->setType(control()->integerType(IntegerType::Int));
symbol->setType(declTy);
+ if (declTy.isDeprecated())
+ symbol->setDeprecated(true);
- if (_templateParameters && it == ast->declarator_list && ty && ! ty->isClassType())
+ if (_templateParameters && it == ast->declarator_list) {
symbol->setTemplateParameters(_templateParameters);
+ _templateParameters = 0; // consume the template parameters
+ }
symbol->setVisibility(semantic()->currentVisibility());
@@ -230,6 +241,8 @@ bool CheckDeclaration::visit(SimpleDeclarationAST *ast)
symbol->setStorage(Symbol::Mutable);
else if (ty.isTypedef())
symbol->setStorage(Symbol::Typedef);
+ else if (ty.isDeprecated())
+ symbol->setDeprecated(true);
if (it->value && it->value->initializer) {
FullySpecifiedType initTy = semantic()->check(it->value->initializer, _scope);
@@ -309,6 +322,8 @@ bool CheckDeclaration::visit(FunctionDefinitionAST *ast)
Function *fun = funTy->asFunctionType();
fun->setVirtual(ty.isVirtual());
+ if (ty.isDeprecated())
+ fun->setDeprecated(true);
fun->setStartOffset(tokenAt(ast->firstToken()).offset);
fun->setEndOffset(tokenAt(ast->lastToken()).offset);
if (ast->declarator)
@@ -698,6 +713,8 @@ bool CheckDeclaration::visit(ObjCMethodDeclarationAST *ast)
symbol->setStartOffset(tokenAt(ast->firstToken()).offset);
symbol->setEndOffset(tokenAt(ast->lastToken()).offset);
symbol->setVisibility(semantic()->currentObjCVisibility());
+ if (ty.isDeprecated())
+ symbol->setDeprecated(true);
_scope->enterSymbol(symbol);
diff --git a/src/shared/cplusplus/CheckDeclarator.cpp b/src/shared/cplusplus/CheckDeclarator.cpp
index 5a3044051b9301a9b060a83e6db03569a608fbab..dfb045b3a0684d2bc37f11229834cf27bf645bb1 100644
--- a/src/shared/cplusplus/CheckDeclarator.cpp
+++ b/src/shared/cplusplus/CheckDeclarator.cpp
@@ -195,17 +195,9 @@ bool CheckDeclarator::visit(FunctionDeclaratorAST *ast)
}
FullySpecifiedType funTy(fun);
- _fullySpecifiedType = funTy;
-
- for (SpecifierListAST *it = ast->cv_qualifier_list; it; it = it->next) {
- SimpleSpecifierAST *cv = static_cast<SimpleSpecifierAST *>(it->value);
- const int k = tokenKind(cv->specifier_token);
- if (k == T_CONST)
- fun->setConst(true);
- else if (k == T_VOLATILE)
- fun->setVolatile(true);
- }
+ funTy = semantic()->check(ast->cv_qualifier_list, _scope, funTy);
+ _fullySpecifiedType = funTy;
return false;
}
@@ -230,6 +222,9 @@ bool CheckDeclarator::visit(PointerToMemberAST *ast)
bool CheckDeclarator::visit(PointerAST *ast)
{
+ if (_fullySpecifiedType->isReferenceType())
+ translationUnit()->error(ast->firstToken(), "cannot declare pointer to a reference");
+
PointerType *ptrTy = control()->pointerType(_fullySpecifiedType);
FullySpecifiedType ty(ptrTy);
_fullySpecifiedType = ty;
@@ -237,9 +232,14 @@ bool CheckDeclarator::visit(PointerAST *ast)
return false;
}
-bool CheckDeclarator::visit(ReferenceAST *)
+bool CheckDeclarator::visit(ReferenceAST *ast)
{
- ReferenceType *refTy = control()->referenceType(_fullySpecifiedType);
+ const bool rvalueRef = (tokenKind(ast->reference_token) == T_AMPER_AMPER);
+
+ if (_fullySpecifiedType->isReferenceType())
+ translationUnit()->error(ast->firstToken(), "cannot declare reference to a reference");
+
+ ReferenceType *refTy = control()->referenceType(_fullySpecifiedType, rvalueRef);
FullySpecifiedType ty(refTy);
_fullySpecifiedType = ty;
return false;
@@ -281,6 +281,8 @@ bool CheckDeclarator::visit(ObjCMethodPrototypeAST *ast)
method->setVariadic(true);
_fullySpecifiedType = FullySpecifiedType(method);
+ _fullySpecifiedType = semantic()->check(ast->attribute_list, _scope,
+ _fullySpecifiedType);
return false;
}
diff --git a/src/shared/cplusplus/CheckExpression.cpp b/src/shared/cplusplus/CheckExpression.cpp
index c9277c7939d0181701adac98ec6ab092d40f9431..ecbf991c9adb188a1c1b29498a99baade63ad053 100644
--- a/src/shared/cplusplus/CheckExpression.cpp
+++ b/src/shared/cplusplus/CheckExpression.cpp
@@ -289,7 +289,7 @@ bool CheckExpression::visit(ThisExpressionAST *)
bool CheckExpression::visit(CompoundExpressionAST *ast)
{
- _fullySpecifiedType = semantic()->check(ast->compoundStatement, _scope);
+ _fullySpecifiedType = semantic()->check(ast->statement, _scope);
return false;
}
diff --git a/src/shared/cplusplus/CheckSpecifier.cpp b/src/shared/cplusplus/CheckSpecifier.cpp
index 70cdcacd5a2c81c5ce09f173ba581becb766c232..2d1d2e404a9bbf949b19603cd1adf92ee604886f 100644
--- a/src/shared/cplusplus/CheckSpecifier.cpp
+++ b/src/shared/cplusplus/CheckSpecifier.cpp
@@ -69,9 +69,11 @@ CheckSpecifier::CheckSpecifier(Semantic *semantic)
CheckSpecifier::~CheckSpecifier()
{ }
-FullySpecifiedType CheckSpecifier::check(SpecifierListAST *specifier, Scope *scope)
+FullySpecifiedType CheckSpecifier::check(SpecifierListAST *specifier,
+ Scope *scope,
+ const FullySpecifiedType &ty)
{
- FullySpecifiedType previousType = switchFullySpecifiedType(FullySpecifiedType());
+ FullySpecifiedType previousType = switchFullySpecifiedType(ty);
Scope *previousScope = switchScope(scope);
SpecifierListAST *previousSpecifier = switchSpecifier(specifier);
accept(specifier);
@@ -80,9 +82,11 @@ FullySpecifiedType CheckSpecifier::check(SpecifierListAST *specifier, Scope *sco
return switchFullySpecifiedType(previousType);
}
-FullySpecifiedType CheckSpecifier::check(ObjCTypeNameAST *typeName, Scope *scope)
+FullySpecifiedType CheckSpecifier::check(ObjCTypeNameAST *typeName,
+ Scope *scope,
+ const FullySpecifiedType &ty)
{
- FullySpecifiedType previousType = switchFullySpecifiedType(FullySpecifiedType());
+ FullySpecifiedType previousType = switchFullySpecifiedType(ty);
Scope *previousScope = switchScope(scope);
accept(typeName);
@@ -327,6 +331,9 @@ bool CheckSpecifier::visit(ClassSpecifierAST *ast)
klass->setVisibility(semantic()->currentVisibility());
_scope->enterSymbol(klass);
_fullySpecifiedType.setType(klass);
+ accept(ast->attribute_list);
+ if (_fullySpecifiedType.isDeprecated())
+ klass->setDeprecated(true);
for (BaseSpecifierListAST *it = ast->base_clause_list; it; it = it->next) {
BaseSpecifierAST *base = it->value;
@@ -377,6 +384,7 @@ bool CheckSpecifier::visit(ElaboratedTypeSpecifierAST *ast)
{
const Name *name = semantic()->check(ast->name, _scope);
_fullySpecifiedType.setType(control()->namedType(name));
+ accept(ast->attribute_list);
return false;
}
@@ -414,7 +422,11 @@ bool CheckSpecifier::visit(TypeofSpecifierAST *ast)
return false;
}
-bool CheckSpecifier::visit(AttributeSpecifierAST * /*ast*/)
+bool CheckSpecifier::visit(AttributeAST *ast)
{
+ if (ast->identifier_token) {
+ if (identifier(ast->identifier_token) == control()->deprecatedId())
+ _fullySpecifiedType.setDeprecated(true);
+ }
return false;
}
diff --git a/src/shared/cplusplus/CheckSpecifier.h b/src/shared/cplusplus/CheckSpecifier.h
index b2653e1b9bf75eb06151471b1320311737be0141..e66b30603095dea604d78f135bed8710e022c4df 100644
--- a/src/shared/cplusplus/CheckSpecifier.h
+++ b/src/shared/cplusplus/CheckSpecifier.h
@@ -62,8 +62,10 @@ public:
CheckSpecifier(Semantic *semantic);
virtual ~CheckSpecifier();
- FullySpecifiedType check(SpecifierListAST *specifier, Scope *scope);
- FullySpecifiedType check(ObjCTypeNameAST *typeName, Scope *scope);
+ FullySpecifiedType check(SpecifierListAST *specifier, Scope *scope,
+ const FullySpecifiedType &ty = FullySpecifiedType());
+ FullySpecifiedType check(ObjCTypeNameAST *typeName, Scope *scope,
+ const FullySpecifiedType &ty = FullySpecifiedType());
protected:
SpecifierListAST *switchSpecifier(SpecifierListAST *specifier);
@@ -78,7 +80,7 @@ protected:
virtual bool visit(ElaboratedTypeSpecifierAST *ast);
virtual bool visit(EnumSpecifierAST *ast);
virtual bool visit(TypeofSpecifierAST *ast);
- virtual bool visit(AttributeSpecifierAST *ast);
+ virtual bool visit(AttributeAST *ast);
private:
SpecifierListAST *_specifier;
diff --git a/src/shared/cplusplus/Control.cpp b/src/shared/cplusplus/Control.cpp
index 39dd834f029062cd8045d65e9ea85ff9a8f27146..20f622a127bd4f3f2d81fe6d839c04dfc7847246 100644
--- a/src/shared/cplusplus/Control.cpp
+++ b/src/shared/cplusplus/Control.cpp
@@ -53,7 +53,6 @@
#include "CoreTypes.h"
#include "Symbols.h"
#include "Names.h"
-#include "Array.h"
#include "TypeMatcher.h"
#include <map>
#include <set>
@@ -308,9 +307,9 @@ public:
return pointerTypes.intern(PointerType(elementType));
}
- ReferenceType *findOrInsertReferenceType(const FullySpecifiedType &elementType)
+ ReferenceType *findOrInsertReferenceType(const FullySpecifiedType &elementType, bool rvalueRef)
{
- return referenceTypes.intern(ReferenceType(elementType));
+ return referenceTypes.intern(ReferenceType(elementType, rvalueRef));
}
ArrayType *findOrInsertArrayType(const FullySpecifiedType &elementType, unsigned size)
@@ -508,6 +507,7 @@ public:
// symbols
std::vector<Symbol *> symbols;
+ const Identifier *deprecatedId;
// ObjC context keywords:
const Identifier *objcGetterId;
const Identifier *objcSetterId;
@@ -523,6 +523,8 @@ Control::Control()
{
d = new Data(this);
+ d->deprecatedId = findOrInsertIdentifier("deprecated");
+
d->objcGetterId = findOrInsertIdentifier("getter");
d->objcSetterId = findOrInsertIdentifier("setter");
d->objcReadwriteId = findOrInsertIdentifier("readwrite");
@@ -649,8 +651,8 @@ PointerToMemberType *Control::pointerToMemberType(const Name *memberName, const
PointerType *Control::pointerType(const FullySpecifiedType &elementType)
{ return d->findOrInsertPointerType(elementType); }
-ReferenceType *Control::referenceType(const FullySpecifiedType &elementType)
-{ return d->findOrInsertReferenceType(elementType); }
+ReferenceType *Control::referenceType(const FullySpecifiedType &elementType, bool rvalueRef)
+{ return d->findOrInsertReferenceType(elementType, rvalueRef); }
ArrayType *Control::arrayType(const FullySpecifiedType &elementType, unsigned size)
{ return d->findOrInsertArrayType(elementType, size); }
@@ -720,6 +722,9 @@ ObjCMethod *Control::newObjCMethod(unsigned sourceLocation, const Name *name)
ObjCPropertyDeclaration *Control::newObjCPropertyDeclaration(unsigned sourceLocation, const Name *name)
{ return d->newObjCPropertyDeclaration(sourceLocation, name); }
+const Identifier *Control::deprecatedId() const
+{ return d->deprecatedId; }
+
const Identifier *Control::objcGetterId() const
{ return d->objcGetterId; }
diff --git a/src/shared/cplusplus/Control.h b/src/shared/cplusplus/Control.h
index 1ef1a990aba2d7b31bdd8020809f5e30e98e2b29..791d24ca3459907d93bf5307dafc6aad6e273bf6 100644
--- a/src/shared/cplusplus/Control.h
+++ b/src/shared/cplusplus/Control.h
@@ -108,7 +108,7 @@ public:
PointerType *pointerType(const FullySpecifiedType &elementType);
/// Returns a Type object of type ReferenceType.
- ReferenceType *referenceType(const FullySpecifiedType &elementType);
+ ReferenceType *referenceType(const FullySpecifiedType &elementType, bool rvalueRef = false);
/// Retruns a Type object of type ArrayType.
ArrayType *arrayType(const FullySpecifiedType &elementType, unsigned size = 0);
@@ -173,6 +173,7 @@ public:
/// Creates a new Objective-C @property declaration symbol.
ObjCPropertyDeclaration *newObjCPropertyDeclaration(unsigned sourceLocation, const Name *name);
+ const Identifier *deprecatedId() const;
// Objective-C specific context keywords.
const Identifier *objcGetterId() const;
const Identifier *objcSetterId() const;
diff --git a/src/shared/cplusplus/CoreTypes.cpp b/src/shared/cplusplus/CoreTypes.cpp
index 7b9757d050291f8484be2d263fa5e79471a0d990..6c5501b24ef61a5652db819bb7965672ab87992b 100644
--- a/src/shared/cplusplus/CoreTypes.cpp
+++ b/src/shared/cplusplus/CoreTypes.cpp
@@ -154,8 +154,8 @@ bool PointerType::matchType0(const Type *otherType, TypeMatcher *matcher) const
FullySpecifiedType PointerType::elementType() const
{ return _elementType; }
-ReferenceType::ReferenceType(const FullySpecifiedType &elementType)
- : _elementType(elementType)
+ReferenceType::ReferenceType(const FullySpecifiedType &elementType, bool rvalueRef)
+ : _elementType(elementType), _rvalueReference(rvalueRef)
{ }
ReferenceType::~ReferenceType()
@@ -166,6 +166,8 @@ bool ReferenceType::isEqualTo(const Type *other) const
const ReferenceType *o = other->asReferenceType();
if (! o)
return false;
+ else if (isRvalueReference() != o->isRvalueReference())
+ return false;
return _elementType.isEqualTo(o->_elementType);
}
@@ -183,6 +185,9 @@ bool ReferenceType::matchType0(const Type *otherType, TypeMatcher *matcher) cons
FullySpecifiedType ReferenceType::elementType() const
{ return _elementType; }
+bool ReferenceType::isRvalueReference() const
+{ return _rvalueReference; }
+
IntegerType::IntegerType(int kind)
: _kind(kind)
{ }
diff --git a/src/shared/cplusplus/CoreTypes.h b/src/shared/cplusplus/CoreTypes.h
index 36a789dfef1341e0c5251cf46a66ad5520a33aa3..7ad9d5a0c4d07e9c9f995aa4cb5b000009e8ccb4 100644
--- a/src/shared/cplusplus/CoreTypes.h
+++ b/src/shared/cplusplus/CoreTypes.h
@@ -212,10 +212,11 @@ private:
class CPLUSPLUS_EXPORT ReferenceType: public Type
{
public:
- ReferenceType(const FullySpecifiedType &elementType);
+ ReferenceType(const FullySpecifiedType &elementType, bool rvalueRef);
virtual ~ReferenceType();
FullySpecifiedType elementType() const;
+ bool isRvalueReference() const;
virtual bool isEqualTo(const Type *other) const;
@@ -231,6 +232,7 @@ protected:
private:
FullySpecifiedType _elementType;
+ bool _rvalueReference;
};
class CPLUSPLUS_EXPORT ArrayType: public Type
diff --git a/src/shared/cplusplus/FullySpecifiedType.cpp b/src/shared/cplusplus/FullySpecifiedType.cpp
index 7acff01c045dd04685769a15f611e41b8f53fc3e..7cbfdc88f02c3d48a32fcc1fe97f8d160e7c33c8 100644
--- a/src/shared/cplusplus/FullySpecifiedType.cpp
+++ b/src/shared/cplusplus/FullySpecifiedType.cpp
@@ -84,6 +84,8 @@ FullySpecifiedType FullySpecifiedType::qualifiedType() const
ty.setInline(false);
ty.setVirtual(false);
ty.setExplicit(false);
+
+ ty.setDeprecated(false);
return ty;
}
@@ -165,6 +167,12 @@ bool FullySpecifiedType::isExplicit() const
void FullySpecifiedType::setExplicit(bool isExplicit)
{ f._isExplicit = isExplicit; }
+bool FullySpecifiedType::isDeprecated() const
+{ return f._isDeprecated; }
+
+void FullySpecifiedType::setDeprecated(bool isDeprecated)
+{ f._isDeprecated = isDeprecated; }
+
bool FullySpecifiedType::isEqualTo(const FullySpecifiedType &other) const
{
if (_flags != other._flags)
diff --git a/src/shared/cplusplus/FullySpecifiedType.h b/src/shared/cplusplus/FullySpecifiedType.h
index 17959bf10dfb19c553d11ac28b030713c24094e7..7001bca63a9db966dafe18ed8ad08e097bdf8daf 100644
--- a/src/shared/cplusplus/FullySpecifiedType.h
+++ b/src/shared/cplusplus/FullySpecifiedType.h
@@ -107,6 +107,9 @@ public:
bool isExplicit() const;
void setExplicit(bool isExplicit);
+ bool isDeprecated() const;
+ void setDeprecated(bool isDeprecated);
+
bool isEqualTo(const FullySpecifiedType &other) const;
Type &operator*();
@@ -148,6 +151,9 @@ private:
unsigned _isInline: 1;
unsigned _isVirtual: 1;
unsigned _isExplicit: 1;
+
+ // speficiers from attributes
+ unsigned _isDeprecated: 1;
};
union {
unsigned _flags;
diff --git a/src/shared/cplusplus/MemoryPool.cpp b/src/shared/cplusplus/MemoryPool.cpp
index 583320653d28643f55fa70d1b48fd6b97c5980e0..585f8e250b408b565c44cefaf04a4e877fd0d46d 100644
--- a/src/shared/cplusplus/MemoryPool.cpp
+++ b/src/shared/cplusplus/MemoryPool.cpp
@@ -53,31 +53,30 @@
using namespace CPlusPlus;
MemoryPool::MemoryPool()
- : _initializeAllocatedMemory(true),
- _blocks(0),
+ : _blocks(0),
_allocatedBlocks(0),
_blockCount(-1),
- ptr(0),
- end(0)
+ _ptr(0),
+ _end(0)
{ }
MemoryPool::~MemoryPool()
{
- if (_blockCount != -1) {
- for (int i = 0; i < _blockCount + 1; ++i) {
- std::free(_blocks[i]);
+ if (_blocks) {
+ for (int i = 0; i < _allocatedBlocks; ++i) {
+ if (char *b = _blocks[i])
+ std::free(b);
}
- }
- if (_blocks)
std::free(_blocks);
+ }
}
-bool MemoryPool::initializeAllocatedMemory() const
-{ return _initializeAllocatedMemory; }
-
-void MemoryPool::setInitializeAllocatedMemory(bool initializeAllocatedMemory)
-{ _initializeAllocatedMemory = initializeAllocatedMemory; }
+void MemoryPool::reset()
+{
+ _blockCount = -1;
+ _ptr = _end = 0;
+}
void *MemoryPool::allocate_helper(size_t size)
{
@@ -85,39 +84,42 @@ void *MemoryPool::allocate_helper(size_t size)
if (++_blockCount == _allocatedBlocks) {
if (! _allocatedBlocks)
- _allocatedBlocks = 8;
+ _allocatedBlocks = DEFAULT_BLOCK_COUNT;
else
_allocatedBlocks *= 2;
_blocks = (char **) realloc(_blocks, sizeof(char *) * _allocatedBlocks);
+
+ for (int index = _blockCount; index < _allocatedBlocks; ++index)
+ _blocks[index] = 0;
}
char *&block = _blocks[_blockCount];
- if (_initializeAllocatedMemory)
- block = (char *) std::calloc(1, BLOCK_SIZE);
- else
+ if (! block)
block = (char *) std::malloc(BLOCK_SIZE);
- ptr = block;
- end = ptr + BLOCK_SIZE;
+ _ptr = block;
+ _end = _ptr + BLOCK_SIZE;
- void *addr = ptr;
- ptr += size;
+ void *addr = _ptr;
+ _ptr += size;
return addr;
}
-MemoryPool::State MemoryPool::state() const
-{ return State(ptr, _blockCount); }
-
-void MemoryPool::rewind(const State &state)
+RecursiveMemoryPool::RecursiveMemoryPool(MemoryPool *pool)
+ : _pool(pool),
+ _blockCount(pool->_blockCount),
+ _ptr(pool->_ptr),
+ _end(pool->_end)
{
- if (_blockCount == state.blockCount && state.ptr < ptr) {
- if (_initializeAllocatedMemory)
- std::memset(state.ptr, '\0', ptr - state.ptr);
+}
- ptr = state.ptr;
- }
+RecursiveMemoryPool::~RecursiveMemoryPool()
+{
+ _pool->_blockCount = _blockCount;
+ _pool->_ptr = _ptr;
+ _pool->_end = _end;
}
Managed::Managed()
@@ -135,4 +137,3 @@ void Managed::operator delete(void *)
void Managed::operator delete(void *, MemoryPool *)
{ }
-
diff --git a/src/shared/cplusplus/MemoryPool.h b/src/shared/cplusplus/MemoryPool.h
index b202e61ad66845b4926d6ce50933d1dbbd92693d..8156e5c3214071a56f0ee5f308e3946a815f15c5 100644
--- a/src/shared/cplusplus/MemoryPool.h
+++ b/src/shared/cplusplus/MemoryPool.h
@@ -54,6 +54,9 @@
namespace CPlusPlus {
+class MemoryPool;
+class RecursiveMemoryPool;
+
class CPLUSPLUS_EXPORT MemoryPool
{
MemoryPool(const MemoryPool &other);
@@ -63,51 +66,49 @@ public:
MemoryPool();
~MemoryPool();
- bool initializeAllocatedMemory() const;
- void setInitializeAllocatedMemory(bool initializeAllocatedMemory);
+ void reset();
inline void *allocate(size_t size)
{
size = (size + 7) & ~7;
- if (ptr && (ptr + size < end)) {
- void *addr = ptr;
- ptr += size;
+ if (_ptr && (_ptr + size < _end)) {
+ void *addr = _ptr;
+ _ptr += size;
return addr;
}
return allocate_helper(size);
}
- struct State
- {
- char *ptr;
- char *end;
- int blockCount;
-
- inline bool isValid() const
- { return ptr != 0; }
-
- inline State(char *ptr = 0, int blockCount = 0)
- : ptr(ptr), blockCount(blockCount) {}
- };
-
- State state() const;
- void rewind(const State &state);
-
private:
void *allocate_helper(size_t size);
private:
- bool _initializeAllocatedMemory;
char **_blocks;
int _allocatedBlocks;
int _blockCount;
- char *ptr, *end;
+ char *_ptr;
+ char *_end;
+ int _ccc;
enum
{
BLOCK_SIZE = 8 * 1024,
DEFAULT_BLOCK_COUNT = 8
};
+
+ friend class RecursiveMemoryPool;
+};
+
+class CPLUSPLUS_EXPORT RecursiveMemoryPool
+{
+ MemoryPool *_pool;
+ int _blockCount;
+ char *_ptr;
+ char *_end;
+
+public:
+ RecursiveMemoryPool(MemoryPool *pool);
+ ~RecursiveMemoryPool();
};
class CPLUSPLUS_EXPORT Managed
diff --git a/src/shared/cplusplus/Parser.cpp b/src/shared/cplusplus/Parser.cpp
index ce5afdd5faa377280d21ab376d5ba986935e6a89..7be7e61dab70c53e163e2c8838729565f3fbf47d 100644
--- a/src/shared/cplusplus/Parser.cpp
+++ b/src/shared/cplusplus/Parser.cpp
@@ -190,30 +190,6 @@ inline bool isRightAssociative(int tokenKind)
return true; \
}
-class Parser::Rewind
-{
- Parser *_parser;
- MemoryPool::State _state;
-
-public:
- inline Rewind(Parser *parser)
- : _parser(parser) {}
-
- inline void operator()(unsigned tokenIndex)
- { rewind(tokenIndex); }
-
- inline void mark()
- { _state = _parser->_pool->state(); }
-
- inline void rewind(unsigned tokenIndex)
- {
- _parser->rewind(tokenIndex);
-
- if (_state.isValid())
- _parser->_pool->rewind(_state);
- }
-};
-
Parser::Parser(TranslationUnit *unit)
: _translationUnit(unit),
_control(_translationUnit->control()),
@@ -221,9 +197,11 @@ Parser::Parser(TranslationUnit *unit)
_tokenIndex(1),
_templateArguments(0),
_qtMocRunEnabled(false),
+ _cxx0xEnabled(true), // C++0x is enabled by default
_objCEnabled(false),
_inFunctionBody(false),
_inObjCImplementationContext(false),
+ _inExpressionStatement(false),
_expressionDepth(0)
{ }
@@ -236,6 +214,12 @@ bool Parser::qtMocRunEnabled() const
void Parser::setQtMocRunEnabled(bool onoff)
{ _qtMocRunEnabled = onoff; }
+bool Parser::cxx0xEnabled() const
+{ return _cxx0xEnabled; }
+
+void Parser::setCxxOxEnabled(bool onoff)
+{ _cxx0xEnabled = onoff; }
+
bool Parser::objCEnabled() const
{ return _objCEnabled; }
@@ -851,6 +835,10 @@ bool Parser::parseTemplateArgumentList(TemplateArgumentListAST *&node)
*template_argument_ptr = new (_pool) TemplateArgumentListAST;
(*template_argument_ptr)->value = template_argument;
template_argument_ptr = &(*template_argument_ptr)->next;
+
+ if (_cxx0xEnabled && LA() == T_DOT_DOT_DOT)
+ consumeToken(); // ### store this token in the AST
+
while (LA() == T_COMMA) {
consumeToken(); // consume T_COMMA
@@ -858,6 +846,9 @@ bool Parser::parseTemplateArgumentList(TemplateArgumentListAST *&node)
*template_argument_ptr = new (_pool) TemplateArgumentListAST;
(*template_argument_ptr)->value = template_argument;
template_argument_ptr = &(*template_argument_ptr)->next;
+
+ if (_cxx0xEnabled && LA() == T_DOT_DOT_DOT)
+ consumeToken(); // ### store this token in the AST
}
}
@@ -1093,9 +1084,9 @@ bool Parser::parseCvQualifiers(SpecifierListAST *&node)
bool Parser::parsePtrOperator(PtrOperatorListAST *&node)
{
DEBUG_THIS_RULE();
- if (LA() == T_AMPER) {
+ if (LA() == T_AMPER || (_cxx0xEnabled && LA() == T_AMPER_AMPER)) {
ReferenceAST *ast = new (_pool) ReferenceAST;
- ast->amp_token = consumeToken();
+ ast->reference_token = consumeToken();
node = new (_pool) PtrOperatorListAST(ast);
return true;
} else if (LA() == T_STAR) {
@@ -1131,8 +1122,15 @@ bool Parser::parseTemplateArgument(ExpressionAST *&node)
{
DEBUG_THIS_RULE();
unsigned start = cursor();
- if (parseTypeId(node) && (LA() == T_COMMA || LA() == T_GREATER))
- return true;
+ if (parseTypeId(node)) {
+ int index = 1;
+
+ if (_cxx0xEnabled && LA() == T_DOT_DOT_DOT)
+ index = 2;
+
+ if (LA(index) == T_COMMA || LA(index) == T_GREATER)
+ return true;
+ }
rewind(start);
bool previousTemplateArguments = switchTemplateArguments(true);
@@ -1510,6 +1508,8 @@ bool Parser::parseTypenameTypeParameter(DeclarationAST *&node)
if (LA() == T_CLASS || LA() == T_TYPENAME) {
TypenameTypeParameterAST *ast = new (_pool) TypenameTypeParameterAST;
ast->classkey_token = consumeToken();
+ if (_cxx0xEnabled && LA() == T_DOT_DOT_DOT)
+ ast->dot_dot_dot_token = consumeToken();
parseName(ast->name);
if (LA() == T_EQUAL) {
ast->equal_token = consumeToken();
@@ -1534,6 +1534,8 @@ bool Parser::parseTemplateTypeParameter(DeclarationAST *&node)
ast->greater_token = consumeToken();
if (LA() == T_CLASS)
ast->class_token = consumeToken();
+ if (_cxx0xEnabled && LA() == T_DOT_DOT_DOT)
+ ast->dot_dot_dot_token = consumeToken();
// parse optional name
parseName(ast->name);
@@ -1683,6 +1685,7 @@ bool Parser::parseClassSpecifier(SpecifierListAST *&node)
_inFunctionBody = false;
unsigned colon_token = 0;
+ unsigned dot_dot_dot_token = 0;
if (LA() == T_COLON || LA() == T_LBRACE) {
BaseSpecifierListAST *base_clause_list = 0;
@@ -1692,6 +1695,9 @@ bool Parser::parseClassSpecifier(SpecifierListAST *&node)
parseBaseClause(base_clause_list);
+ if (_cxx0xEnabled && LA() == T_DOT_DOT_DOT)
+ dot_dot_dot_token = consumeToken();
+
if (LA() != T_LBRACE) {
_translationUnit->error(cursor(), "expected `{' before `%s'", tok().spell());
@@ -1713,6 +1719,7 @@ bool Parser::parseClassSpecifier(SpecifierListAST *&node)
ast->name = name;
ast->colon_token = colon_token;
ast->base_clause_list = base_clause_list;
+ ast->dot_dot_dot_token = dot_dot_dot_token;
if (LA() == T_LBRACE)
ast->lbrace_token = consumeToken();
@@ -2103,6 +2110,10 @@ bool Parser::parseCtorInitializer(CtorInitializerAST *&node)
ast->colon_token = colon_token;
parseMemInitializerList(ast->member_initializer_list);
+
+ if (_cxx0xEnabled && LA() == T_DOT_DOT_DOT)
+ ast->dot_dot_dot_token = consumeToken();
+
node = ast;
return true;
}
@@ -2114,10 +2125,18 @@ bool Parser::parseElaboratedTypeSpecifier(SpecifierListAST *&node)
DEBUG_THIS_RULE();
if (lookAtClassKey() || LA() == T_ENUM || LA() == T_TYPENAME) {
unsigned classkey_token = consumeToken();
+
+ SpecifierListAST *attributes = 0, **attr_ptr = &attributes;
+ while (LA() == T___ATTRIBUTE__) {
+ parseAttributeSpecifier(*attr_ptr);
+ attr_ptr = &(*attr_ptr)->next;
+ }
+
NameAST *name = 0;
if (parseName(name)) {
ElaboratedTypeSpecifierAST *ast = new (_pool) ElaboratedTypeSpecifierAST;
ast->classkey_token = classkey_token;
+ ast->attribute_list = attributes;
ast->name = name;
node = new (_pool) SpecifierListAST(ast);
return true;
@@ -2259,6 +2278,9 @@ bool Parser::parseMemInitializerList(MemInitializerListAST *&node)
if (LA() == T_LBRACE)
break;
+ else if (_cxx0xEnabled && LA() == T_DOT_DOT_DOT && LA(2) == T_LBRACE)
+ break;
+
else if (LA() == T_COMMA || (LA() == T_IDENTIFIER && (LA(2) == T_LPAREN || LA(2) == T_COLON_COLON))) {
if (LA() != T_COMMA)
_translationUnit->error(cursor(), "expected `,'");
@@ -2273,8 +2295,13 @@ bool Parser::parseMemInitializerList(MemInitializerListAST *&node)
} else break;
}
- if (LA() != T_LBRACE)
+ if (_cxx0xEnabled && LA() == T_DOT_DOT_DOT) {
+ if (LA(2) != T_LBRACE)
+ _translationUnit->error(cursor(), "expected `{'");
+
+ } else if (LA() != T_LBRACE) {
_translationUnit->error(cursor(), "expected `{'");
+ }
return true;
}
@@ -2309,6 +2336,10 @@ bool Parser::parseTypeIdList(ExpressionListAST *&node)
*expression_list_ptr = new (_pool) ExpressionListAST;
(*expression_list_ptr)->value = typeId;
expression_list_ptr = &(*expression_list_ptr)->next;
+
+ if (_cxx0xEnabled && LA() == T_DOT_DOT_DOT)
+ consumeToken(); // ### store this token
+
while (LA() == T_COMMA) {
consumeToken();
@@ -2316,6 +2347,9 @@ bool Parser::parseTypeIdList(ExpressionListAST *&node)
*expression_list_ptr = new (_pool) ExpressionListAST;
(*expression_list_ptr)->value = typeId;
expression_list_ptr = &(*expression_list_ptr)->next;
+
+ if (_cxx0xEnabled && LA() == T_DOT_DOT_DOT)
+ consumeToken(); // ### store this token
}
}
return true;
@@ -2394,6 +2428,10 @@ bool Parser::parseInitializerList(ExpressionListAST *&node)
initializer_ptr = &(*initializer_ptr)->next;
}
}
+
+ if (_cxx0xEnabled && LA() == T_DOT_DOT_DOT)
+ consumeToken(); // ### store this token
+
return true;
}
@@ -2474,21 +2512,34 @@ bool Parser::parseExpressionStatement(StatementAST *&node)
return true;
}
+ const bool wasInExpressionStatement = _inExpressionStatement;
+ _inExpressionStatement = true;
+
+ // switch to the temp pool
+ MemoryPool *previousPool = _pool;
+ _pool = &_expressionStatementTempPool;
+
+ bool parsed = false;
+
ExpressionAST *expression = 0;
- MemoryPool *oldPool = _pool;
- MemoryPool tmp;
- _pool = &tmp;
if (parseExpression(expression)) {
- ExpressionStatementAST *ast = new (oldPool) ExpressionStatementAST;
- ast->expression = expression->clone(oldPool);
+ ExpressionStatementAST *ast = new (previousPool) ExpressionStatementAST;
+ ast->expression = expression->clone(previousPool);
match(T_SEMICOLON, &ast->semicolon_token);
node = ast;
- _pool = oldPool;
- return true;
+ parsed = true;
}
- _pool = oldPool;
- return false;
+ _inExpressionStatement = wasInExpressionStatement;
+
+ if (! _inExpressionStatement) {
+ // rewind the memory pool after parsing a toplevel expression statement.
+ _expressionStatementTempPool.reset();
+ }
+
+ // restore the pool
+ _pool = previousPool;
+ return parsed;
}
bool Parser::parseStatement(StatementAST *&node)
@@ -3583,17 +3634,9 @@ bool Parser::parsePrimaryExpression(ExpressionAST *&node)
ast->lparen_token = consumeToken();
StatementAST *statement = 0;
parseCompoundStatement(statement);
- ast->compoundStatement = statement->asCompoundStatement();
+ ast->statement = statement->asCompoundStatement();
match(T_RPAREN, &ast->rparen_token);
node = ast;
- if (ast->compoundStatement && ast->compoundStatement->statement_list) {
- // check that the last statement is an expression-statement
- StatementAST *lastStmt = ast->compoundStatement->statement_list->lastValue();
- if (!lastStmt || ! ast->asExpressionStatement())
- _translationUnit->error(cursor(),
- "expected an expression statement before token `%s'",
- tok().spell());
- }
return true;
} else {
return parseNestedExpression(node);
diff --git a/src/shared/cplusplus/Parser.h b/src/shared/cplusplus/Parser.h
index 1ae857ea81eda225faed5769fc827217cfe32228..b6f28098371a32a20ea22a6d6a46294bd8cc70d2 100644
--- a/src/shared/cplusplus/Parser.h
+++ b/src/shared/cplusplus/Parser.h
@@ -53,6 +53,7 @@
#include "ASTfwd.h"
#include "Token.h"
#include "TranslationUnit.h"
+#include "MemoryPool.h"
#include <map>
namespace CPlusPlus {
@@ -66,6 +67,9 @@ public:
bool qtMocRunEnabled() const;
void setQtMocRunEnabled(bool onoff);
+ bool cxx0xEnabled() const;
+ void setCxxOxEnabled(bool onoff);
+
bool objCEnabled() const;
void setObjCEnabled(bool onoff);
@@ -274,7 +278,6 @@ public:
int peekAtQtContextKeyword() const;
-private:
bool switchTemplateArguments(bool templateArguments);
bool blockErrors(bool block);
@@ -303,6 +306,7 @@ private:
};
TemplateArgumentListEntry *templateArgumentListEntry(unsigned tokenIndex);
+ void clearTemplateArgumentList() { _templateArgumentList.clear(); }
private:
TranslationUnit *_translationUnit;
@@ -311,11 +315,14 @@ private:
unsigned _tokenIndex;
bool _templateArguments: 1;
bool _qtMocRunEnabled: 1;
+ bool _cxx0xEnabled: 1;
bool _objCEnabled: 1;
bool _inFunctionBody: 1;
bool _inObjCImplementationContext: 1;
+ bool _inExpressionStatement: 1;
int _expressionDepth;
+ MemoryPool _expressionStatementTempPool;
std::map<unsigned, TemplateArgumentListEntry> _templateArgumentList;
class Rewind;
diff --git a/src/shared/cplusplus/Semantic.cpp b/src/shared/cplusplus/Semantic.cpp
index c03e059009cb4f75f2062fc9fa4c923faaf3d736..ebd3aacec258757d93daf072e0dd2c5b41190cee 100644
--- a/src/shared/cplusplus/Semantic.cpp
+++ b/src/shared/cplusplus/Semantic.cpp
@@ -125,8 +125,9 @@ TranslationUnit *Semantic::translationUnit() const
Control *Semantic::control() const
{ return d->control; }
-FullySpecifiedType Semantic::check(SpecifierListAST *specifier, Scope *scope)
-{ return d->checkSpecifier->check(specifier, scope); }
+FullySpecifiedType Semantic::check(SpecifierListAST *specifier, Scope *scope,
+ const FullySpecifiedType &type)
+{ return d->checkSpecifier->check(specifier, scope, type); }
void Semantic::check(DeclarationAST *declaration, Scope *scope, TemplateParameters *templateParameters)
{ d->checkDeclaration->check(declaration, scope, templateParameters); }
@@ -142,8 +143,9 @@ FullySpecifiedType Semantic::check(PtrOperatorListAST *ptrOperators, const Fully
FullySpecifiedType Semantic::check(ObjCMethodPrototypeAST *methodPrototype, Scope *scope)
{ return d->checkDeclarator->check(methodPrototype, scope); }
-FullySpecifiedType Semantic::check(ObjCTypeNameAST *typeName, Scope *scope)
-{ return d->checkSpecifier->check(typeName, scope); }
+FullySpecifiedType Semantic::check(ObjCTypeNameAST *typeName, Scope *scope,
+ const FullySpecifiedType &type)
+{ return d->checkSpecifier->check(typeName, scope, type); }
void Semantic::check(ObjCMessageArgumentDeclarationAST *arg, Scope *scope)
{ return d->checkName->check(arg, scope); }
diff --git a/src/shared/cplusplus/Semantic.h b/src/shared/cplusplus/Semantic.h
index c9e1c5263f0a8122d9ae2c56269f9cd41b2cadf7..a804a72328e8a895e11941e59185c4dd3805ceec 100644
--- a/src/shared/cplusplus/Semantic.h
+++ b/src/shared/cplusplus/Semantic.h
@@ -51,7 +51,7 @@
#include "CPlusPlusForwardDeclarations.h"
#include "ASTfwd.h"
-
+#include "FullySpecifiedType.h"
namespace CPlusPlus {
@@ -67,7 +67,8 @@ public:
TranslationUnit *translationUnit() const;
Control *control() const;
- FullySpecifiedType check(SpecifierListAST *specifier, Scope *scope);
+ FullySpecifiedType check(SpecifierListAST *specifier, Scope *scope,
+ const FullySpecifiedType &type = FullySpecifiedType());
FullySpecifiedType check(DeclaratorAST *declarator, const FullySpecifiedType &type,
Scope *scope, const Name **name = 0); // ### ugly
@@ -87,7 +88,8 @@ public:
const Name *check(NestedNameSpecifierListAST *name, Scope *scope);
- FullySpecifiedType check(ObjCTypeNameAST *typeName, Scope *scope);
+ FullySpecifiedType check(ObjCTypeNameAST *typeName, Scope *scope,
+ const FullySpecifiedType &type = FullySpecifiedType());
void check(ObjCMessageArgumentDeclarationAST *arg, Scope *scope);
diff --git a/src/shared/cplusplus/Symbol.cpp b/src/shared/cplusplus/Symbol.cpp
index 90ce0557379152b26067e9657e0b55db90b362e7..2da2aa9c23767232b212e609735f64df7b42bc1d 100644
--- a/src/shared/cplusplus/Symbol.cpp
+++ b/src/shared/cplusplus/Symbol.cpp
@@ -212,6 +212,12 @@ unsigned Symbol::sourceOffset() const
bool Symbol::isGenerated() const
{ return _isGenerated; }
+bool Symbol::isDeprecated() const
+{ return _isDeprecated; }
+
+void Symbol::setDeprecated(bool isDeprecated)
+{ _isDeprecated = isDeprecated; }
+
void Symbol::setSourceLocation(unsigned sourceLocation)
{
_sourceLocation = sourceLocation;
diff --git a/src/shared/cplusplus/Symbol.h b/src/shared/cplusplus/Symbol.h
index b1dab975e7d9a66ba8332b1d134094697eb60b39..33bd7c92e8bca22f372a61a3c583da6f07902af6 100644
--- a/src/shared/cplusplus/Symbol.h
+++ b/src/shared/cplusplus/Symbol.h
@@ -291,6 +291,9 @@ public:
bool isGenerated() const;
+ bool isDeprecated() const;
+ void setDeprecated(bool isDeprecated);
+
Symbol *enclosingSymbol() const;
/// Returns the eclosing namespace scope.
@@ -334,6 +337,7 @@ private:
Symbol *_next;
bool _isGenerated: 1;
+ bool _isDeprecated: 1;
class IdentityForName;
class HashCode;
diff --git a/src/shared/cplusplus/Symbols.cpp b/src/shared/cplusplus/Symbols.cpp
index 04287c20559f6f65fa815a09b4af780ab1a4fb3d..df059c9776bdf8de663184d01cf45ff9d46724a0 100644
--- a/src/shared/cplusplus/Symbols.cpp
+++ b/src/shared/cplusplus/Symbols.cpp
@@ -624,7 +624,7 @@ bool Class::matchType0(const Type *otherType, TypeMatcher *matcher) const
}
unsigned Class::baseClassCount() const
-{ return _baseClasses.count(); }
+{ return _baseClasses.size(); }
BaseClass *Class::baseClassAt(unsigned index) const
{ return _baseClasses.at(index); }
diff --git a/src/shared/cplusplus/Symbols.h b/src/shared/cplusplus/Symbols.h
index b5f477273719a0e0fda83afcfa9fbc2dadf0e870..039e3542e5c6ac3945115ff247a287e5121f18eb 100644
--- a/src/shared/cplusplus/Symbols.h
+++ b/src/shared/cplusplus/Symbols.h
@@ -53,8 +53,7 @@
#include "Symbol.h"
#include "Type.h"
#include "FullySpecifiedType.h"
-#include "Array.h"
-
+#include <vector>
namespace CPlusPlus {
@@ -511,7 +510,7 @@ protected:
private:
Key _key;
TemplateParameters *_templateParameters;
- Array<BaseClass *> _baseClasses;
+ std::vector<BaseClass *> _baseClasses;
};
class CPLUSPLUS_EXPORT ObjCBaseClass: public Symbol
@@ -593,7 +592,7 @@ public:
virtual ~ObjCProtocol();
unsigned protocolCount() const
- { return _protocols.count(); }
+ { return _protocols.size(); }
ObjCBaseProtocol *protocolAt(unsigned index) const
{ return _protocols.at(index); }
@@ -625,7 +624,7 @@ protected:
virtual bool matchType0(const Type *otherType, TypeMatcher *matcher) const;
private:
- Array<ObjCBaseProtocol *> _protocols;
+ std::vector<ObjCBaseProtocol *> _protocols;
};
class CPLUSPLUS_EXPORT ObjCForwardClassDeclaration: public Symbol, public Type
@@ -677,7 +676,7 @@ public:
{ _baseClass = baseClass; }
unsigned protocolCount() const
- { return _protocols.count(); }
+ { return _protocols.size(); }
ObjCBaseProtocol *protocolAt(unsigned index) const
{ return _protocols.at(index); }
@@ -712,7 +711,7 @@ private:
bool _isInterface;
const Name *_categoryName;
ObjCBaseClass * _baseClass;
- Array<ObjCBaseProtocol *> _protocols;
+ std::vector<ObjCBaseProtocol *> _protocols;
};
class CPLUSPLUS_EXPORT ObjCMethod: public ScopedSymbol, public Type
diff --git a/src/shared/cplusplus/TranslationUnit.cpp b/src/shared/cplusplus/TranslationUnit.cpp
index 3d40a3521d100e4f6053c0f9c3a6247757892bb2..f19b78d851d7d341c1abdaad95a33f4f088d1557 100644
--- a/src/shared/cplusplus/TranslationUnit.cpp
+++ b/src/shared/cplusplus/TranslationUnit.cpp
@@ -69,7 +69,7 @@ TranslationUnit::TranslationUnit(Control *control, const StringLiteral *fileId)
_ast(0),
_flags(0)
{
- _tokens = new Array<Token, 8>();
+ _tokens = new std::vector<Token>();
_previousTranslationUnit = control->switchTranslationUnit(this);
_pool = new MemoryPool();
}
diff --git a/src/shared/cplusplus/TranslationUnit.h b/src/shared/cplusplus/TranslationUnit.h
index 8014adf511a0f56e3c94b0bbbe44b592a7eefe02..53e11abb9bdf7de7ec981786337084bef6d92b5f 100644
--- a/src/shared/cplusplus/TranslationUnit.h
+++ b/src/shared/cplusplus/TranslationUnit.h
@@ -52,9 +52,8 @@
#include "CPlusPlusForwardDeclarations.h"
#include "ASTfwd.h"
#include "Token.h"
-#include "Array.h"
-#include <stdio.h> // for FILE*
-#include <vector> // ### remove me
+#include <cstdio>
+#include <vector>
namespace CPlusPlus {
@@ -184,7 +183,7 @@ private:
const StringLiteral *_fileId;
const char *_firstSourceChar;
const char *_lastSourceChar;
- Array<Token, 8> *_tokens;
+ std::vector<Token> *_tokens;
std::vector<unsigned> _lineOffsets;
std::vector<PPLine> _ppLines;
MemoryPool *_pool;
diff --git a/src/shared/cplusplus/TypeMatcher.cpp b/src/shared/cplusplus/TypeMatcher.cpp
index 0716052842659e81b8092cf4ffbfe4f7542f51e7..4cc1ebd3722e597644e1846e10e4cde53b8f9710 100644
--- a/src/shared/cplusplus/TypeMatcher.cpp
+++ b/src/shared/cplusplus/TypeMatcher.cpp
@@ -116,6 +116,9 @@ bool TypeMatcher::match(const ReferenceType *type, const ReferenceType *otherTyp
if (type == otherType)
return true;
+ else if (type->isRvalueReference() != otherType->isRvalueReference())
+ return false;
+
else if (! type->elementType().match(otherType->elementType(), this))
return false;
diff --git a/src/shared/cplusplus/cplusplus.pri b/src/shared/cplusplus/cplusplus.pri
index e13ff4a278c38143d4848cf8c2a0b4589da6ed6a..39c72c4008969550728bb8d33d27dd6488bc6d44 100644
--- a/src/shared/cplusplus/cplusplus.pri
+++ b/src/shared/cplusplus/cplusplus.pri
@@ -8,7 +8,6 @@ HEADERS += \
$$PWD/ASTMatcher.h \
$$PWD/ASTPatternBuilder.h \
$$PWD/ASTfwd.h \
- $$PWD/Array.h \
$$PWD/TypeMatcher.h \
$$PWD/CPlusPlusForwardDeclarations.h \
$$PWD/CheckDeclaration.h \
@@ -51,7 +50,6 @@ SOURCES += \
$$PWD/ASTPatternBuilder.cpp \
$$PWD/ASTMatcher.cpp \
$$PWD/TypeMatcher.cpp \
- $$PWD/Array.cpp \
$$PWD/CheckDeclaration.cpp \
$$PWD/CheckDeclarator.cpp \
$$PWD/CheckExpression.cpp \
diff --git a/src/shared/help/helpviewer.cpp b/src/shared/help/helpviewer.cpp
index af67ae00c424bf0ba7e0b209698191fa7aef9231..aae50b2ec99fdc6a98239ae92db12a39b97a1473 100644
--- a/src/shared/help/helpviewer.cpp
+++ b/src/shared/help/helpviewer.cpp
@@ -333,18 +333,27 @@ void HelpViewer::wheelEvent(QWheelEvent *e)
QWebView::wheelEvent(e);
}
-void HelpViewer::mouseReleaseEvent(QMouseEvent *e)
+bool HelpViewer::handleForwardBackwardMouseButtons(QMouseEvent *e)
{
if (e->button() == Qt::XButton1) {
triggerPageAction(QWebPage::Back);
- return;
+ return true;
}
-
if (e->button() == Qt::XButton2) {
triggerPageAction(QWebPage::Forward);
- return;
+ return true;
}
+ return false;
+}
+
+void HelpViewer::mouseReleaseEvent(QMouseEvent *e)
+{
+#ifndef Q_OS_LINUX
+ if (handleForwardBackwardMouseButtons(e))
+ return;
+#endif
+
QWebView::mouseReleaseEvent(e);
}
@@ -366,6 +375,12 @@ void HelpViewer::mousePressEvent(QMouseEvent *event)
currentPage->m_pressedButtons = event->buttons();
currentPage->m_keyboardModifiers = event->modifiers();
}
+
+#ifdef Q_OS_LINUX
+ if (handleForwardBackwardMouseButtons(event))
+ return;
+#endif
+
QWebView::mousePressEvent(event);
}
@@ -543,18 +558,35 @@ void HelpViewer::contextMenuEvent(QContextMenuEvent *e)
QApplication::clipboard()->setText(link.toString());
}
-void HelpViewer::mouseReleaseEvent(QMouseEvent *e)
+bool HelpViewer::handleForwardBackwardMouseButtons(QMouseEvent *e)
{
if (e->button() == Qt::XButton1) {
QTextBrowser::backward();
- return;
+ return true;
}
-
if (e->button() == Qt::XButton2) {
QTextBrowser::forward();
- return;
+ return true;
}
+ return false;
+}
+
+void HelpViewer::mousePressEvent(QMouseEvent *e)
+{
+#ifdef Q_OS_LINUX
+ if (handleForwardBackwardMouseButtons(e))
+ return;
+#endif
+}
+
+void HelpViewer::mouseReleaseEvent(QMouseEvent *e)
+{
+#ifndef Q_OS_LINUX
+ if (handleForwardBackwardMouseButtons(e))
+ return;
+#endif
+
controlPressed = e->modifiers() & Qt::ControlModifier;
if ((controlPressed && hasAnchorAt(e->pos())) ||
(e->button() == Qt::MidButton && hasAnchorAt(e->pos()))) {
diff --git a/src/shared/help/helpviewer.h b/src/shared/help/helpviewer.h
index c542dbbe07be5e13640d40fc35b45aba550d2bfb..32ad060d2761d96138f9a4865cd48056dda51972 100644
--- a/src/shared/help/helpviewer.h
+++ b/src/shared/help/helpviewer.h
@@ -116,6 +116,8 @@ private Q_SLOTS:
void setLoadFinished(bool ok);
private:
+ bool handleForwardBackwardMouseButtons(QMouseEvent *e);
+
QHelpEngine *helpEngine;
Help::Internal::CentralWidget* parentWidget;
QUrl homeUrl;
@@ -156,6 +158,7 @@ private:
void openLinkInNewTab(const QString &link);
bool hasAnchorAt(const QPoint& pos);
void contextMenuEvent(QContextMenuEvent *e);
+ void mousePressEvent(QMouseEvent *e);
void mouseReleaseEvent(QMouseEvent *e);
void keyPressEvent(QKeyEvent *e);
@@ -163,6 +166,8 @@ private slots:
void openLinkInNewTab();
private:
+ bool handleForwardBackwardMouseButtons(QMouseEvent *e);
+
int zoomCount;
bool controlPressed;
QString lastAnchor;
diff --git a/src/tools/cplusplus/generate-ast.cpp b/src/tools/cplusplus/generate-ast.cpp
index b76a7b01e2ae6290139bbfcba3a1f57fdcc67db3..3bab1aa41b791b00aa52a6072eeee2508a231ccb 100644
--- a/src/tools/cplusplus/generate-ast.cpp
+++ b/src/tools/cplusplus/generate-ast.cpp
@@ -769,6 +769,72 @@ private:
Overview oo;
};
+static QList<QTextCursor> removeConstructors(ClassSpecifierAST *classAST,
+ TranslationUnit *translationUnit,
+ QTextDocument *document)
+{
+ Overview oo;
+ QList<QTextCursor> cursors;
+ const QString className = oo(classAST->symbol->name());
+
+ for (DeclarationListAST *iter = classAST->member_specifier_list; iter; iter = iter->next) {
+ if (FunctionDefinitionAST *funDef = iter->value->asFunctionDefinition()) {
+ if (oo(funDef->symbol->name()) == className) {
+ // found it:
+ QTextCursor tc = createCursor(translationUnit, funDef, document);
+ tc.movePosition(QTextCursor::EndOfBlock, QTextCursor::KeepAnchor);
+ tc.setPosition(tc.position() + 1, QTextCursor::KeepAnchor);
+ cursors.append(tc);
+ }
+ }
+ }
+
+ return cursors;
+}
+
+static QStringList collectFields(ClassSpecifierAST *classAST)
+{
+ QStringList fields;
+ Overview oo;
+ Class *clazz = classAST->symbol;
+ for (unsigned i = 0; i < clazz->memberCount(); ++i) {
+ Symbol *s = clazz->memberAt(i);
+ if (Declaration *decl = s->asDeclaration()) {
+ FullySpecifiedType ty = decl->type();
+ if (ty->isPointerType())
+ fields.append(oo(decl->name()));
+ else if (ty.isUnsigned())
+ fields.append(oo(decl->name()));
+ }
+ }
+ return fields;
+}
+
+static QString createConstructor(ClassSpecifierAST *classAST)
+{
+ Overview oo;
+ Class *clazz = classAST->symbol;
+
+ QString result(QLatin1String(" "));
+ result.append(oo(clazz->name()));
+ result.append(QLatin1String("()\n"));
+
+ QStringList classFields = collectFields(classAST);
+ for (int i = 0; i < classFields.size(); ++i) {
+ if (i == 0) {
+ result.append(QLatin1String(" : "));
+ result.append(classFields.at(i));
+ result.append(QLatin1String("(0)\n"));
+ } else {
+ result.append(QLatin1String(" , "));
+ result.append(classFields.at(i));
+ result.append(QLatin1String("(0)\n"));
+ }
+ }
+
+ result.append(QLatin1String(" {}\n"));
+ return result;
+}
QStringList generateAST_H(const Snapshot &snapshot, const QDir &cplusplusDir)
{
@@ -802,6 +868,8 @@ QStringList generateAST_H(const Snapshot &snapshot, const QDir &cplusplusDir)
QList<QTextCursor> baseCastMethodCursors = removeCastMethods(astNodes.base);
QMap<ClassSpecifierAST *, QList<QTextCursor> > cursors;
QMap<ClassSpecifierAST *, QString> replacementCastMethods;
+ QMap<ClassSpecifierAST *, QList<QTextCursor> > constructors;
+ QMap<ClassSpecifierAST *, QString> replacementConstructors;
Overview oo;
@@ -812,8 +880,10 @@ QStringList generateAST_H(const Snapshot &snapshot, const QDir &cplusplusDir)
const QString methodName = QLatin1String("as") + className.mid(0, className.length() - 3);
replacementCastMethods[classAST] = QString(" virtual %1 *%2() { return this; }\n").arg(className, methodName);
castMethods.append(QString(" virtual %1 *%2() { return 0; }\n").arg(className, methodName));
-
astDerivedClasses.append(className);
+
+ constructors[classAST] = removeConstructors(classAST, AST_h_document->translationUnit(), &document);
+ replacementConstructors[classAST] = createConstructor(classAST);
}
if (! baseCastMethodCursors.isEmpty()) {
@@ -828,13 +898,23 @@ QStringList generateAST_H(const Snapshot &snapshot, const QDir &cplusplusDir)
for (int classIndex = 0; classIndex < astNodes.deriveds.size(); ++classIndex) {
ClassSpecifierAST *classAST = astNodes.deriveds.at(classIndex);
- // remove the cast methods.
- QList<QTextCursor> c = cursors.value(classAST);
- for (int i = 0; i < c.length(); ++i) {
- c[i].removeSelectedText();
+ { // remove the cast methods.
+ QList<QTextCursor> c = cursors.value(classAST);
+ for (int i = 0; i < c.length(); ++i) {
+ c[i].removeSelectedText();
+ }
+ }
+ { // remove the constructors.
+ QList<QTextCursor> c = constructors.value(classAST);
+ for (int i = 0; i < c.length(); ++i) {
+ c[i].removeSelectedText();
+ }
}
- astNodes.endOfPublicClassSpecifiers[classIndex].insertText(replacementCastMethods.value(classAST));
+ astNodes.endOfPublicClassSpecifiers[classIndex].insertText(
+ replacementConstructors.value(classAST) +
+ QLatin1String("\n") +
+ replacementCastMethods.value(classAST));
}
if (file.open(QFile::WriteOnly)) {
@@ -962,12 +1042,11 @@ void generateASTPatternBuilder_h(const QDir &cplusplusDir)
<< "class CPLUSPLUS_EXPORT ASTPatternBuilder" << endl
<< "{" << endl
<< " MemoryPool pool;" << endl
- << " MemoryPool::State state;" << endl
<< endl
<< "public:" << endl
- << " ASTPatternBuilder(): state(pool.state()) {}" << endl
+ << " ASTPatternBuilder() {}" << endl
<< endl
- << " void reset() { pool.rewind(state); };" << endl
+ << " void reset() { pool.reset(); };" << endl
<< endl;
Control *control = AST_h_document->control();
@@ -1061,8 +1140,13 @@ int main(int argc, char *argv[])
}
QDir cplusplusDir(files.first());
- Snapshot snapshot;
+ if (!QFileInfo(cplusplusDir, QLatin1String("AST.h")).exists()) {
+ std::cerr << "Cannot find AST.h in " << qPrintable(cplusplusDir.absolutePath())
+ << std::endl;
+ return EXIT_FAILURE;
+ }
+ Snapshot snapshot;
QStringList astDerivedClasses = generateAST_H(snapshot, cplusplusDir);
astDerivedClasses.sort();
generateASTFwd_h(snapshot, cplusplusDir, astDerivedClasses);
diff --git a/tests/auto/qml/qmldesigner/bauhaustests/testbauhaus.cpp b/tests/auto/qml/qmldesigner/bauhaustests/testbauhaus.cpp
index 20d88466afbedab58c478c6dfde33ad16f8f5783..9cd69aed50ec2b4f4f605eaa2d13aa220aa08d8a 100644
--- a/tests/auto/qml/qmldesigner/bauhaustests/testbauhaus.cpp
+++ b/tests/auto/qml/qmldesigner/bauhaustests/testbauhaus.cpp
@@ -52,9 +52,9 @@ void loadFile(const QString &fileName)
qDebug() << "starting: " << fileName;
QVERIFY(QFileInfo(fileName).exists());
#ifdef Q_OS_WIN
- const QString bauhausExecutable = "bauhaus.exe";
+ const QString bauhausExecutable = "../../../../../bin/qtcreator.exe";
#else
- const QString bauhausExecutable = QDir::current().absoluteFilePath("bauhaus");
+ const QString bauhausExecutable = QDir::current().absoluteFilePath("../../../../../bin/qtcreator.bin");
#endif
QVERIFY(QFileInfo(bauhausExecutable).isExecutable());
process.start(bauhausExecutable, QStringList() << fileName);
diff --git a/tests/auto/qml/qmldesigner/coretests/testcore.cpp b/tests/auto/qml/qmldesigner/coretests/testcore.cpp
index 846e5a64239d9eeff6b2d3d0d87a1f8287e70c84..5872281cbb590ed00bbd98145fe7c103468bff8e 100644
--- a/tests/auto/qml/qmldesigner/coretests/testcore.cpp
+++ b/tests/auto/qml/qmldesigner/coretests/testcore.cpp
@@ -2570,7 +2570,7 @@ void TestCore::testRewriterExceptionHandling()
rootNode.variantProperty("bla") = QVariant("blah\"");
rootNode.variantProperty("text") = QVariant("text");
transaction.commit();
- QFAIL("RewritingExecption should be thrown");
+ QFAIL("RewritingException should be thrown");
} catch (RewritingException &e) {
QVERIFY(rootNode.isValid());
QCOMPARE(rootNode.type(), QLatin1String("Qt/Text"));
diff --git a/tests/auto/qml/qmlprojectmanager/fileformat/tst_fileformat.cpp b/tests/auto/qml/qmlprojectmanager/fileformat/tst_fileformat.cpp
index fc9828d70ae6def7f39e518401cb5217e3742889..107bfc02c40f240613e2a6d26759f6a99a152ded 100644
--- a/tests/auto/qml/qmlprojectmanager/fileformat/tst_fileformat.cpp
+++ b/tests/auto/qml/qmlprojectmanager/fileformat/tst_fileformat.cpp
@@ -30,7 +30,7 @@ QString testDataDir = QLatin1String(SRCDIR "/data");
void TestProject::testFileFilter()
{
//
- // search for qml files in local directory
+ // Search for qml files in directory + subdirectories
//
QString projectFile = QLatin1String(
"import QmlProject 1.0\n"
@@ -53,18 +53,19 @@ void TestProject::testFileFilter()
project->setSourceDirectory(testDataDir);
QStringList expectedFiles(QStringList() << testDataDir + "/file1.qml"
- << testDataDir + "/file2.qml");
+ << testDataDir + "/file2.qml"
+ << testDataDir + "/subdir/file3.qml");
QCOMPARE(project->files().toSet(), expectedFiles.toSet());
}
//
- // search for all qml files in all subdirectories
+ // search for all qml files in directory
//
projectFile = QLatin1String(
"import QmlProject 1.0\n"
"Project {\n"
" QmlFiles {\n"
- " recursive: true\n"
+ " recursive: false\n"
" }\n"
"}\n");
@@ -82,8 +83,7 @@ void TestProject::testFileFilter()
project->setSourceDirectory(testDataDir);
QStringList expectedFiles(QStringList() << testDataDir + "/file1.qml"
- << testDataDir + "/file2.qml"
- << testDataDir + "/subdir/file3.qml");
+ << testDataDir + "/file2.qml");
QCOMPARE(project->files().toSet(), expectedFiles.toSet());
}
@@ -121,6 +121,7 @@ void TestProject::testFileFilter()
"Project {\n"
" QmlFiles {\n"
" directory: \".\"\n"
+ " recursive: false\n"
" }"
" QmlFiles {\n"
" directory: \"subdir\"\n"
@@ -250,7 +251,7 @@ void TestProject::testLibraryPaths()
QString projectFile = QLatin1String(
"import QmlProject 1.0\n"
"Project {\n"
- " libraryPaths: [ \"../otherLibrary\", \"library\" ]\n"
+ " importPaths: [ \"../otherLibrary\", \"library\" ]\n"
"}\n");
{
@@ -268,7 +269,7 @@ void TestProject::testLibraryPaths()
QStringList expectedPaths(QStringList() << "../otherLibrary"
<< "library");
- QCOMPARE(project->libraryPaths().toSet(), expectedPaths.toSet());
+ QCOMPARE(project->importPaths().toSet(), expectedPaths.toSet());
}
}
diff --git a/tests/manual/cplusplus-dump/main.cpp b/tests/manual/cplusplus-dump/main.cpp
index 7acfb788431206e40d40484041b53a384bc8d06c..a87adfe364b4b090ed58da56e2c98b0a47ffe1cc 100644
--- a/tests/manual/cplusplus-dump/main.cpp
+++ b/tests/manual/cplusplus-dump/main.cpp
@@ -205,13 +205,15 @@ public:
protected:
QByteArray name(Symbol *s) {
- QByteArray name = abi::__cxa_demangle(typeid(*s).name(), 0, 0, 0) + 11;
+ QByteArray result = abi::__cxa_demangle(typeid(*s).name(), 0, 0, 0) + 11;
if (s->identifier()) {
- name.append("\\nid: ");
- name.append(s->identifier()->chars());
+ result.append("\\nid: ");
+ result.append(s->identifier()->chars());
}
+ if (s->isDeprecated())
+ result.append("\\n(deprecated)");
- return name;
+ return result;
}
virtual bool preVisit(Symbol *s) {
@@ -272,6 +274,8 @@ protected:
} else {
out << "NO ID";
}
+ if (symbol->isDeprecated())
+ out << "\\n(deprecated)";
out << "\"];" << std::endl;
return true;
@@ -286,6 +290,8 @@ protected:
out << qPrintable(o(symbol->name()));
out << ": ";
out << qPrintable(o(symbol->type()));
+ if (symbol->isDeprecated())
+ out << "\\n(deprecated)";
out << "\"];" << std::endl;
return true;
@@ -297,6 +303,8 @@ protected:
virtual bool visit(BaseClass *symbol) {
out << _id[symbol].constData() << " [label=\"BaseClass\\n";
out << qPrintable(o(symbol->name()));
+ if (symbol->isDeprecated())
+ out << "\\n(deprecated)";
out << "\"];" << std::endl;
return true;
diff --git a/tests/manual/gdbdebugger/simple/app.cpp b/tests/manual/gdbdebugger/simple/app.cpp
index 5834b359a9a88e9a1dd36e8b12c0341c767d244b..9e0ff0c8ce9b3cc149f88544e0488d3ee364b7a2 100644
--- a/tests/manual/gdbdebugger/simple/app.cpp
+++ b/tests/manual/gdbdebugger/simple/app.cpp
@@ -265,12 +265,32 @@ void testPeekAndPoke3()
}
+namespace { // anon
+
+struct Something
+{
+ Something() { a = b = 1; }
+
+ void foo()
+ {
+ a = 42;
+ b = 43;
+ }
+
+ int a, b;
+};
+
+} // anon
+
void testAnonymous()
{
TestAnonymous a;
a.i = 1;
a.i = 2;
a.i = 3;
+
+ Something s;
+ s.foo();
}
void testFunctionPointer()
@@ -881,17 +901,17 @@ void testStdList()
void testStdMap()
{
+#if 0
std::map<QString, Foo> gg3;
gg3["22.0"] = Foo(22);
gg3["33.0"] = Foo(33);
gg3["44.0"] = Foo(44);
-
std::map<const char *, Foo> m1;
m1["22.0"] = Foo(22);
m1["33.0"] = Foo(33);
m1["44.0"] = Foo(44);
-#if 1
+
std::map<uint, uint> gg;
gg[11] = 1;
gg[22] = 2;
@@ -899,9 +919,11 @@ void testStdMap()
gg[44] = 4;
gg[55] = 5;
-#endif
+ std::pair<uint, QStringList> p = std::make_pair(3, QStringList() << "11");
+ std::vector< std::pair<uint, QStringList> > v;
+ v.push_back(p);
+ v.push_back(p);
-#if 0
std::map<uint, QStringList> ggl;
ggl[11] = QStringList() << "11";
ggl[22] = QStringList() << "22";
@@ -924,7 +946,9 @@ void testStdMap()
std::map<int, QString> gg2;
gg2[22] = "22.0";
+#endif
+#if 1
QObject ob;
std::map<QString, QPointer<QObject> > map;
map["Hallo"] = QPointer<QObject>(&ob);
@@ -1163,6 +1187,7 @@ void testQVariant1()
v = 1;
v = 1.0;
v = "string";
+ v = QRect(100, 200, 300, 400);
v = 1;
}
@@ -1174,7 +1199,7 @@ void testQVariant2()
*(QString*)value.data() = QString("XXX");
int i = 1;
-#if 0
+#if 1
QVariant var;
var.setValue(1);
var.setValue(2);
@@ -1187,10 +1212,10 @@ void testQVariant2()
var.setValue(QStringList() << "Hello" << "Hello");
var.setValue(QStringList() << "World" << "Hello" << "Hello");
#endif
-#if 0
+#if 1
QVariant var3;
QHostAddress ha("127.0.0.1");
- qVariantSetValue(var, ha);
+ var.setValue(ha);
var3 = var;
var3 = var;
var3 = var;
@@ -1501,7 +1526,7 @@ int testReference()
{
QString a = "hello";
const QString &b = fooxx();
- QString c = "world";
+ const QString c = "world";
return a.size() + b.size() + c.size();
}
@@ -1590,41 +1615,15 @@ int main(int argc, char *argv[])
return 0;
}
-//Q_DECLARE_METATYPE(QHostAddress)
+Q_DECLARE_METATYPE(QHostAddress)
Q_DECLARE_METATYPE(QList<int>)
+Q_DECLARE_METATYPE(QStringList)
-//#define COMMA ,
-//Q_DECLARE_METATYPE(QMap<uint COMMA QStringList>)
+typedef QMap<uint, QStringList> MyType;
+#define COMMA ,
+Q_DECLARE_METATYPE(QMap<uint COMMA QStringList>)
QT_BEGIN_NAMESPACE
-
-template <>
-struct QMetaTypeId<QHostAddress>
-{
- enum { Defined = 1 };
- static int qt_metatype_id()
- {
- static QBasicAtomicInt metatype_id = Q_BASIC_ATOMIC_INITIALIZER(0);
- if (!metatype_id)
- metatype_id = qRegisterMetaType<QHostAddress>
- ("myns::QHostAddress");
- return metatype_id; \
- } \
-};
-
-template <>
-struct QMetaTypeId< QMap<uint, QStringList> >
-{
- enum { Defined = 1 };
- static int qt_metatype_id()
- {
- static QBasicAtomicInt metatype_id = Q_BASIC_ATOMIC_INITIALIZER(0);
- if (!metatype_id)
- metatype_id = qRegisterMetaType< QMap<uint, QStringList> >
- ("myns::QMap<uint, myns::QStringList>");
- return metatype_id; \
- } \
-};
QT_END_NAMESPACE
#include "app.moc"
diff --git a/tests/manual/qml/testfiles/flipable.qml b/tests/manual/qml/testfiles/flipable.qml
new file mode 100644
index 0000000000000000000000000000000000000000..16af9d7827dec12e4e7e31dd6ca155fcb9008837
--- /dev/null
+++ b/tests/manual/qml/testfiles/flipable.qml
@@ -0,0 +1,6 @@
+import Qt 4.6
+
+Rectangle {
+ width: 640
+ height: 480
+}