rows = w.elementRow();
if (!rows.isEmpty()) {
- m_output.append(m_indent).append("if (").append(varName).append("?.rowCount() < ").append(rows.size()).append(')').endl()
- .append(m_indent).append(m_option.indent).append(varName).append("?.setRowCount(").append(rows.size()).append(")").endl();
+ m_output.append(m_indent).append("if (").append(qm.isEmpty() ? "" : "(").append(varName).append(qm).append(".rowCount").append(qm.isEmpty() ? "" : " as Int)").append(" < ").append(rows.size()).append(')').endl()
+ .append(m_indent).append(m_option.indent).append(varName).append(qm).append(".rowCount = ").append(rows.size()).endl();
}
for (int i = 0; i < rows.size(); ++i) {
@@ -2356,9 +2398,9 @@ private void initializeTableWidget(DomWidget w) {
String itemName = item.writeSetupUi("", Item.EmptyItemPolicy.ConstructItemAndVariable);
StringBuilder parentPath = new StringBuilder();
- parentPath.append(varName).append("?.verticalHeaderItem(").append(i).append(')');
+ parentPath.append(varName).append(qm).append(".verticalHeaderItem(").append(i).append(')');
item.writeRetranslateUi(parentPath.toString());
- m_output.append(m_indent).append(varName).append("?.setVerticalHeaderItem("
+ m_output.append(m_indent).append(varName).append(qm).append(".setVerticalHeaderItem("
).append(i).append(", ").append(itemName).append(")").endl();
}
}
@@ -2380,10 +2422,10 @@ private void initializeTableWidget(DomWidget w) {
String itemName = item.writeSetupUi("", Item.EmptyItemPolicy.ConstructItemAndVariable);
StringBuilder parentPath = new StringBuilder();
- parentPath.append(varName).append("?.item(").append(r
+ parentPath.append(varName).append(qm).append(".item(").append(r
).append(", ").append(c).append(')');
item.writeRetranslateUi(parentPath.toString());
- m_output.append(m_indent).append(varName).append("?.setItem(").append(r).append(", ").append(c).append(", ").append(itemName).append(")").endl();
+ m_output.append(m_indent).append(varName).append(qm).append(".setItem(").append(r).append(", ").append(c).append(", ").append(itemName).append(")").endl();
}
}
enableSorting(w, varName, tempName);
@@ -2393,19 +2435,21 @@ private String disableSorting(DomWidget w, String varName) {
// turn off sortingEnabled to force programmatic item order (setItem())
String tempName = "";
if (!w.elementItem().isEmpty()) {
+ final String qm = varName.startsWith("this.") ? "?" : "";
tempName = m_driver.unique("__sortingEnabled");
m_refreshOut.endl();
m_refreshOut.append(m_indent);
- m_refreshOut.append("boolean ");
- m_refreshOut.append(tempName).append(" = ").append(varName).append("?.isSortingEnabled()").endl()
- .append(m_indent).append(varName).append("?.setSortingEnabled(false)").endl();
+ m_refreshOut.append("val ");
+ m_refreshOut.append(tempName).append(" = ").append(varName).append(qm).append(".isSortingEnabled()==true").endl()
+ .append(m_indent).append(varName).append(qm).append(".setSortingEnabled(false)").endl();
}
return tempName;
}
private void enableSorting(DomWidget w, String varName, String tempName) {
if (!w.elementItem().isEmpty()) {
- m_refreshOut.append(m_indent).append(varName).append("?.setSortingEnabled(").append(tempName).append(")").append('\n');
+ final String qm = varName.startsWith("this.") ? "?" : "";
+ m_refreshOut.append(m_indent).append(varName).append(qm).append(".setSortingEnabled(").append(tempName).append(")").append('\n');
}
}
@@ -2432,45 +2476,45 @@ private String writeFontProperties(DomFont f) {
String fontName = m_driver.unique("font");
m_fontPropertiesNameMap.put(f, fontName);
- m_output.append(m_indent).append("var ").append(fontName).append(" = QFont()").endl();
+ m_output.append(m_indent).append("val ").append(fontName).append(" = QFont()").endl();
if (f.hasElementFamily() && !f.elementFamily().isEmpty()) {
- m_output.append(m_indent).append(fontName).append("?.setFamilies("
- ).append("java.util.Arrays.asList("
+ m_output.append(m_indent).append(fontName).append(".setFamilies("
+ ).append("QList.of("
).append(formatString(f.elementFamily())
).append("))").endl();
}
if (f.hasElementPointSize() && f.elementPointSize() > 0) {
- m_output.append(m_indent).append(fontName).append("?.setPointSize(").append(f.elementPointSize()
+ m_output.append(m_indent).append(fontName).append(".setPointSize(").append(f.elementPointSize()
).append(")").endl();
}
if (f.hasElementBold()) {
- m_output.append(m_indent).append(fontName).append("?.setBold("
+ m_output.append(m_indent).append(fontName).append(".setBold("
).append(Boolean.toString(f.elementBold())).append(")").endl();
}
if (f.hasElementItalic()) {
- m_output.append(m_indent).append(fontName).append("?.setItalic("
+ m_output.append(m_indent).append(fontName).append(".setItalic("
).append(Boolean.toString(f.elementItalic())).append(")").endl();
}
if (f.hasElementUnderline()) {
- m_output.append(m_indent).append(fontName).append("?.setUnderline("
+ m_output.append(m_indent).append(fontName).append(".setUnderline("
).append(Boolean.toString(f.elementUnderline())).append(")").endl();
}
if (f.hasElementStrikeOut()) {
- m_output.append(m_indent).append(fontName).append("?.setStrikeOut("
+ m_output.append(m_indent).append(fontName).append(".setStrikeOut("
).append(Boolean.toString(f.elementStrikeOut())).append(")").endl();
}
if (f.hasElementKerning()) {
- m_output.append(m_indent).append(fontName).append("?.setKerning("
+ m_output.append(m_indent).append(fontName).append(".setKerning("
).append(Boolean.toString(f.elementKerning())).append(")").endl();
}
if (f.hasElementAntialiasing()) {
- m_output.append(m_indent).append(fontName).append("?.setStyleStrategy(QFont.StyleStrategy."
+ m_output.append(m_indent).append(fontName).append(".setStyleStrategy(QFont.StyleStrategy."
).append((f.elementAntialiasing() ? "PreferDefault" : "NoAntialias")
).append(")").endl();
}
if (f.hasElementStyleStrategy()) {
- m_output.append(m_indent).append(fontName).append("?.setStyleStrategy(QFont.StyleStrategy.")
+ m_output.append(m_indent).append(fontName).append(".setStyleStrategy(QFont.StyleStrategy.")
.append(f.elementStyleStrategy()).append(")").endl();
}
return fontName;
@@ -2479,7 +2523,7 @@ private String writeFontProperties(DomFont f) {
private static void writeIconAddFile(QTextStream output, String indent,
String iconName, String fileName,
String mode, String state){
- output.append(indent).append(iconName).append("?.addFile(").append(formatString(fileName)).append(", QSize(), QIcon.Mode.")
+ output.append(indent).append(iconName).append(".addFile(").append(formatString(fileName)).append(", QSize(), QIcon.Mode.")
.append(mode).append(", QIcon.State.").append(state).append(")").endl();
}
@@ -2524,7 +2568,7 @@ private static void writeResourceIcon(QTextStream output,
private static void writeIconAddPixmap(QTextStream output, String indent,
String iconName, String call,
String mode, String state){
- output.append(indent).append(iconName).append("?.addPixmap(").append(call)
+ output.append(indent).append(iconName).append(".addPixmap(").append(call)
.append(", QIcon.Mode.").append(mode).append(", QIcon.State.")
.append(state).append(")").endl();
}
@@ -2551,7 +2595,7 @@ private String writeIconProperties(DomResourceIcon i) {
if (!isIconFormat44(i)) { // pre-4.4 legacy
m_output.append(m_indent);
- m_output.append("var ");
+ m_output.append("val ");
m_output.append(iconName).append(" = ").append(pixCall("QIcon", i.text())).append(';').endl();
return iconName;
}
@@ -2559,17 +2603,17 @@ private String writeIconProperties(DomResourceIcon i) {
// 4.4 onwards
if (i.attributeTheme().isEmpty()) {
// No theme: Write resource icon as is
- m_output.append(m_indent).append("var ").append(iconName).append(" = QIcon()").endl();
+ m_output.append(m_indent).append("val ").append(iconName).append(" = QIcon()").endl();
if (m_uic.pixmapFunction().isEmpty())
writeResourceIcon(m_output, iconName, m_indent, i);
else
writePixmapFunctionIcon(m_output, iconName, m_indent, i);
return iconName;
}else if(i.attributeTheme().startsWith(":") || i.attributeTheme().startsWith("classpath:") || i.attributeTheme().startsWith("/:classpath:")) {
- m_output.append(m_indent).append("var ").append(iconName).append(" = QIcon(").append(formatString(i.attributeTheme())).append(")").endl();
+ m_output.append(m_indent).append("val ").append(iconName).append(" = QIcon(").append(formatString(i.attributeTheme())).append(")").endl();
return iconName;
}else if(i.attributeResource().startsWith(":") || i.attributeResource().startsWith("classpath:") || i.attributeResource().startsWith("/:classpath:")) {
- m_output.append(m_indent).append("var ").append(iconName).append(" = QIcon(").append(formatString(i.attributeResource())).append(")").endl();
+ m_output.append(m_indent).append("val ").append(iconName).append(" = QIcon(").append(formatString(i.attributeResource())).append(")").endl();
return iconName;
}
@@ -2577,7 +2621,7 @@ private String writeIconProperties(DomResourceIcon i) {
if (iconHasStatePixmaps(i)) {
// Theme + default state pixmaps:
// Generate code to check the theme and default to state pixmaps
- m_output.append(m_indent).append("var ").append(iconName).append(" = QIcon()").endl();
+ m_output.append(m_indent).append("val ").append(iconName).append(" = QIcon()").endl();
String themeNameStringVariableC = "iconThemeName";
// Store theme name in a variable
m_output.append(m_indent);
@@ -2602,7 +2646,7 @@ private String writeIconProperties(DomResourceIcon i) {
}
// Theme, but no state pixmaps: Construct from theme directly.
- m_output.append(m_indent).append("var ").append(iconName).append(" = QIcon(QIcon.fromTheme(")
+ m_output.append(m_indent).append("val ").append(iconName).append(" = QIcon(QIcon.fromTheme(")
.append(formatString(i.attributeTheme())).append("))").endl();
return iconName;
}
@@ -2662,7 +2706,7 @@ private String writeSizePolicy(DomSizePolicy sp) {
String spName = m_driver.unique("sizePolicy");
m_sizePolicyNameMap.put(sp, spName);
- m_output.append(m_indent).append("var ").append(spName).append(" = QSizePolicy(");
+ m_output.append(m_indent).append("val ").append(spName).append(" = QSizePolicy(");
if (sp.hasElementHSizeType() && sp.hasElementVSizeType()) {
m_output.append("QSizePolicy.Policy.")
.append(QSizePolicy.Policy.resolve(sp.elementHSizeType()).name())
@@ -2674,9 +2718,9 @@ private String writeSizePolicy(DomSizePolicy sp) {
}
m_output.append(")").endl();
- m_output.append(m_indent).append(spName).append("?.setHorizontalStretch("
+ m_output.append(m_indent).append(spName).append(".setHorizontalStretch("
).append(sp.elementHorStretch()).append(")").endl();
- m_output.append(m_indent).append(spName).append("?.setVerticalStretch("
+ m_output.append(m_indent).append(spName).append(".setVerticalStretch("
).append(sp.elementVerStretch()).append(")").endl();
return spName;
}
@@ -2728,13 +2772,12 @@ private void addButtonGroup(DomWidget buttonNode, String varName) {
String className = "QButtonGroup";
m_output.append(m_indent);
if (createGroupOnTheFly)
- m_output.append("var ");
+ m_output.append("val ");
m_output.append(groupName).append(" = ").append(className).append('(').append(m_mainFormVarName).append(")").endl();
m_buttonGroups.add(groupName);
writeProperties(groupName, objectName, className, group.elementProperty());
}
- m_output.append(m_indent).append(groupName).append("?.addButton("
- ).append(varName).append(")").endl();
+ m_output.append(m_indent).append(groupName).append(".addButton(").append(varName).append(")").endl();
}
@SuppressWarnings("unused")
diff --git a/src/java/modules/qtjambi/Qt6/io/qt/core/QPermission.java b/src/java/modules/qtjambi/Qt6/io/qt/core/QPermission.java
new file mode 100644
index 00000000..ba947f53
--- /dev/null
+++ b/src/java/modules/qtjambi/Qt6/io/qt/core/QPermission.java
@@ -0,0 +1,15 @@
+package io.qt.core;
+
+import io.qt.QtObject;
+
+/**
+ * Java wrapper for Qt's class QPermission
+ */
+public abstract class QPermission extends QtObject implements java.lang.Cloneable{
+ QPermission(QPrivateConstructor p) {
+ super(p);
+ }
+
+ @Override
+ public abstract QPermission clone();
+}
diff --git a/src/java/modules/qtjambi/build.xml b/src/java/modules/qtjambi/build.xml
index d3509ba1..6229af53 100644
--- a/src/java/modules/qtjambi/build.xml
+++ b/src/java/modules/qtjambi/build.xml
@@ -9,10 +9,45 @@