summaryrefslogtreecommitdiffstats
path: root/src/tools/uic
diff options
context:
space:
mode:
Diffstat (limited to 'src/tools/uic')
-rw-r--r--src/tools/uic/cpp/cppextractimages.h6
-rw-r--r--src/tools/uic/cpp/cppwritedeclaration.h14
-rw-r--r--src/tools/uic/cpp/cppwriteicondata.h6
-rw-r--r--src/tools/uic/cpp/cppwriteicondeclaration.h6
-rw-r--r--src/tools/uic/cpp/cppwriteiconinitialization.h6
-rw-r--r--src/tools/uic/cpp/cppwriteincludes.h20
-rw-r--r--src/tools/uic/cpp/cppwriteinitialization.cpp16
-rw-r--r--src/tools/uic/cpp/cppwriteinitialization.h32
-rw-r--r--src/tools/uic/customwidgetsinfo.h6
-rw-r--r--src/tools/uic/databaseinfo.h4
-rw-r--r--src/tools/uic/uic.pro6
-rw-r--r--src/tools/uic/validator.h12
12 files changed, 68 insertions, 66 deletions
diff --git a/src/tools/uic/cpp/cppextractimages.h b/src/tools/uic/cpp/cppextractimages.h
index ce5fd75b5d..162359ca13 100644
--- a/src/tools/uic/cpp/cppextractimages.h
+++ b/src/tools/uic/cpp/cppextractimages.h
@@ -52,9 +52,9 @@ class ExtractImages : public TreeWalker
public:
ExtractImages(const Option &opt);
- void acceptUI(DomUI *node);
- void acceptImages(DomImages *images);
- void acceptImage(DomImage *image);
+ void acceptUI(DomUI *node) Q_DECL_OVERRIDE;
+ void acceptImages(DomImages *images) Q_DECL_OVERRIDE;
+ void acceptImage(DomImage *image) Q_DECL_OVERRIDE;
private:
QTextStream *m_output;
diff --git a/src/tools/uic/cpp/cppwritedeclaration.h b/src/tools/uic/cpp/cppwritedeclaration.h
index 7cd8b3581e..7ce7cd083c 100644
--- a/src/tools/uic/cpp/cppwritedeclaration.h
+++ b/src/tools/uic/cpp/cppwritedeclaration.h
@@ -50,13 +50,13 @@ struct WriteDeclaration : public TreeWalker
{
WriteDeclaration(Uic *uic, bool activateScripts);
- void acceptUI(DomUI *node);
- void acceptWidget(DomWidget *node);
- void acceptSpacer(DomSpacer *node);
- void acceptLayout(DomLayout *node);
- void acceptActionGroup(DomActionGroup *node);
- void acceptAction(DomAction *node);
- void acceptButtonGroup(const DomButtonGroup *buttonGroup);
+ void acceptUI(DomUI *node) Q_DECL_OVERRIDE;
+ void acceptWidget(DomWidget *node) Q_DECL_OVERRIDE;
+ void acceptSpacer(DomSpacer *node) Q_DECL_OVERRIDE;
+ void acceptLayout(DomLayout *node) Q_DECL_OVERRIDE;
+ void acceptActionGroup(DomActionGroup *node) Q_DECL_OVERRIDE;
+ void acceptAction(DomAction *node) Q_DECL_OVERRIDE;
+ void acceptButtonGroup(const DomButtonGroup *buttonGroup) Q_DECL_OVERRIDE;
private:
Uic *m_uic;
diff --git a/src/tools/uic/cpp/cppwriteicondata.h b/src/tools/uic/cpp/cppwriteicondata.h
index 0dc2bf0721..613b7d7ca3 100644
--- a/src/tools/uic/cpp/cppwriteicondata.h
+++ b/src/tools/uic/cpp/cppwriteicondata.h
@@ -52,9 +52,9 @@ class WriteIconData : public TreeWalker
public:
WriteIconData(Uic *uic);
- void acceptUI(DomUI *node);
- void acceptImages(DomImages *images);
- void acceptImage(DomImage *image);
+ void acceptUI(DomUI *node) Q_DECL_OVERRIDE;
+ void acceptImages(DomImages *images) Q_DECL_OVERRIDE;
+ void acceptImage(DomImage *image) Q_DECL_OVERRIDE;
static void writeImage(QTextStream &output, const QString &indent,
bool limitXPM_LineLength, const DomImage *image);
diff --git a/src/tools/uic/cpp/cppwriteicondeclaration.h b/src/tools/uic/cpp/cppwriteicondeclaration.h
index c093430bec..f717208b59 100644
--- a/src/tools/uic/cpp/cppwriteicondeclaration.h
+++ b/src/tools/uic/cpp/cppwriteicondeclaration.h
@@ -51,9 +51,9 @@ class WriteIconDeclaration : public TreeWalker
public:
WriteIconDeclaration(Uic *uic);
- void acceptUI(DomUI *node);
- void acceptImages(DomImages *images);
- void acceptImage(DomImage *image);
+ void acceptUI(DomUI *node) Q_DECL_OVERRIDE;
+ void acceptImages(DomImages *images) Q_DECL_OVERRIDE;
+ void acceptImage(DomImage *image) Q_DECL_OVERRIDE;
private:
Driver *driver;
diff --git a/src/tools/uic/cpp/cppwriteiconinitialization.h b/src/tools/uic/cpp/cppwriteiconinitialization.h
index d8a0a6195f..53f7de6597 100644
--- a/src/tools/uic/cpp/cppwriteiconinitialization.h
+++ b/src/tools/uic/cpp/cppwriteiconinitialization.h
@@ -53,9 +53,9 @@ class WriteIconInitialization : public TreeWalker
public:
WriteIconInitialization(Uic *uic);
- void acceptUI(DomUI *node);
- void acceptImages(DomImages *images);
- void acceptImage(DomImage *image);
+ void acceptUI(DomUI *node) Q_DECL_OVERRIDE;
+ void acceptImages(DomImages *images) Q_DECL_OVERRIDE;
+ void acceptImage(DomImage *image) Q_DECL_OVERRIDE;
static QString iconFromDataFunction();
diff --git a/src/tools/uic/cpp/cppwriteincludes.h b/src/tools/uic/cpp/cppwriteincludes.h
index 6f6a0f6105..0d446514f1 100644
--- a/src/tools/uic/cpp/cppwriteincludes.h
+++ b/src/tools/uic/cpp/cppwriteincludes.h
@@ -53,24 +53,24 @@ struct WriteIncludes : public TreeWalker
{
WriteIncludes(Uic *uic);
- void acceptUI(DomUI *node);
- void acceptWidget(DomWidget *node);
- void acceptLayout(DomLayout *node);
- void acceptSpacer(DomSpacer *node);
- void acceptProperty(DomProperty *node);
- void acceptWidgetScripts(const DomScripts &, DomWidget *, const DomWidgets &);
+ void acceptUI(DomUI *node) Q_DECL_OVERRIDE;
+ void acceptWidget(DomWidget *node) Q_DECL_OVERRIDE;
+ void acceptLayout(DomLayout *node) Q_DECL_OVERRIDE;
+ void acceptSpacer(DomSpacer *node) Q_DECL_OVERRIDE;
+ void acceptProperty(DomProperty *node) Q_DECL_OVERRIDE;
+ void acceptWidgetScripts(const DomScripts &, DomWidget *, const DomWidgets &) Q_DECL_OVERRIDE;
//
// custom widgets
//
- void acceptCustomWidgets(DomCustomWidgets *node);
- void acceptCustomWidget(DomCustomWidget *node);
+ void acceptCustomWidgets(DomCustomWidgets *node) Q_DECL_OVERRIDE;
+ void acceptCustomWidget(DomCustomWidget *node) Q_DECL_OVERRIDE;
//
// include hints
//
- void acceptIncludes(DomIncludes *node);
- void acceptInclude(DomInclude *node);
+ void acceptIncludes(DomIncludes *node) Q_DECL_OVERRIDE;
+ void acceptInclude(DomInclude *node) Q_DECL_OVERRIDE;
bool scriptsActivated() const { return m_scriptsActivated; }
diff --git a/src/tools/uic/cpp/cppwriteinitialization.cpp b/src/tools/uic/cpp/cppwriteinitialization.cpp
index 5a1c1850d4..2627c4cf5c 100644
--- a/src/tools/uic/cpp/cppwriteinitialization.cpp
+++ b/src/tools/uic/cpp/cppwriteinitialization.cpp
@@ -913,6 +913,7 @@ void WriteInitialization::acceptLayout(DomLayout *node)
m_layoutMarginType = SubLayoutMargin;
DomPropertyList propList = node->elementProperty();
+ DomPropertyList newPropList;
if (m_layoutWidget) {
bool left, top, right, bottom;
left = top = right = bottom = false;
@@ -932,31 +933,38 @@ void WriteInitialization::acceptLayout(DomLayout *node)
DomProperty *p = new DomProperty();
p->setAttributeName(QLatin1String("leftMargin"));
p->setElementNumber(0);
- propList.append(p);
+ newPropList.append(p);
}
if (!top) {
DomProperty *p = new DomProperty();
p->setAttributeName(QLatin1String("topMargin"));
p->setElementNumber(0);
- propList.append(p);
+ newPropList.append(p);
}
if (!right) {
DomProperty *p = new DomProperty();
p->setAttributeName(QLatin1String("rightMargin"));
p->setElementNumber(0);
- propList.append(p);
+ newPropList.append(p);
}
if (!bottom) {
DomProperty *p = new DomProperty();
p->setAttributeName(QLatin1String("bottomMargin"));
p->setElementNumber(0);
- propList.append(p);
+ newPropList.append(p);
}
m_layoutWidget = false;
}
+ propList.append(newPropList);
+
writeProperties(varName, className, propList, WritePropertyIgnoreMargin|WritePropertyIgnoreSpacing);
+ // Clean up again:
+ propList.clear();
+ qDeleteAll(newPropList);
+ newPropList.clear();
+
m_layoutChain.push(node);
TreeWalker::acceptLayout(node);
m_layoutChain.pop();
diff --git a/src/tools/uic/cpp/cppwriteinitialization.h b/src/tools/uic/cpp/cppwriteinitialization.h
index 1cf3e750b4..53bc57d376 100644
--- a/src/tools/uic/cpp/cppwriteinitialization.h
+++ b/src/tools/uic/cpp/cppwriteinitialization.h
@@ -110,47 +110,47 @@ struct WriteInitialization : public TreeWalker
//
// widgets
//
- void acceptUI(DomUI *node);
- void acceptWidget(DomWidget *node);
- void acceptWidgetScripts(const DomScripts &, DomWidget *node, const DomWidgets &childWidgets);
+ void acceptUI(DomUI *node) Q_DECL_OVERRIDE;
+ void acceptWidget(DomWidget *node) Q_DECL_OVERRIDE;
+ void acceptWidgetScripts(const DomScripts &, DomWidget *node, const DomWidgets &childWidgets) Q_DECL_OVERRIDE;
- void acceptLayout(DomLayout *node);
- void acceptSpacer(DomSpacer *node);
- void acceptLayoutItem(DomLayoutItem *node);
+ void acceptLayout(DomLayout *node) Q_DECL_OVERRIDE;
+ void acceptSpacer(DomSpacer *node) Q_DECL_OVERRIDE;
+ void acceptLayoutItem(DomLayoutItem *node) Q_DECL_OVERRIDE;
//
// actions
//
- void acceptActionGroup(DomActionGroup *node);
- void acceptAction(DomAction *node);
- void acceptActionRef(DomActionRef *node);
+ void acceptActionGroup(DomActionGroup *node) Q_DECL_OVERRIDE;
+ void acceptAction(DomAction *node) Q_DECL_OVERRIDE;
+ void acceptActionRef(DomActionRef *node) Q_DECL_OVERRIDE;
//
// tab stops
//
- void acceptTabStops(DomTabStops *tabStops);
+ void acceptTabStops(DomTabStops *tabStops) Q_DECL_OVERRIDE;
//
// custom widgets
//
- void acceptCustomWidgets(DomCustomWidgets *node);
- void acceptCustomWidget(DomCustomWidget *node);
+ void acceptCustomWidgets(DomCustomWidgets *node) Q_DECL_OVERRIDE;
+ void acceptCustomWidget(DomCustomWidget *node) Q_DECL_OVERRIDE;
//
// layout defaults/functions
//
- void acceptLayoutDefault(DomLayoutDefault *node) { m_LayoutDefaultHandler.acceptLayoutDefault(node); }
- void acceptLayoutFunction(DomLayoutFunction *node) { m_LayoutDefaultHandler.acceptLayoutFunction(node); }
+ void acceptLayoutDefault(DomLayoutDefault *node) Q_DECL_OVERRIDE { m_LayoutDefaultHandler.acceptLayoutDefault(node); }
+ void acceptLayoutFunction(DomLayoutFunction *node) Q_DECL_OVERRIDE { m_LayoutDefaultHandler.acceptLayoutFunction(node); }
//
// signal/slot connections
//
- void acceptConnection(DomConnection *connection);
+ void acceptConnection(DomConnection *connection) Q_DECL_OVERRIDE;
//
// images
//
- void acceptImage(DomImage *image);
+ void acceptImage(DomImage *image) Q_DECL_OVERRIDE;
enum {
Use43UiFile = 0,
diff --git a/src/tools/uic/customwidgetsinfo.h b/src/tools/uic/customwidgetsinfo.h
index 5e58d6c3ce..6b0f7ed81a 100644
--- a/src/tools/uic/customwidgetsinfo.h
+++ b/src/tools/uic/customwidgetsinfo.h
@@ -48,10 +48,10 @@ class CustomWidgetsInfo : public TreeWalker
public:
CustomWidgetsInfo();
- void acceptUI(DomUI *node);
+ void acceptUI(DomUI *node) Q_DECL_OVERRIDE;
- void acceptCustomWidgets(DomCustomWidgets *node);
- void acceptCustomWidget(DomCustomWidget *node);
+ void acceptCustomWidgets(DomCustomWidgets *node) Q_DECL_OVERRIDE;
+ void acceptCustomWidget(DomCustomWidget *node) Q_DECL_OVERRIDE;
inline QStringList customWidgets() const
{ return m_customWidgets.keys(); }
diff --git a/src/tools/uic/databaseinfo.h b/src/tools/uic/databaseinfo.h
index 0c80ad9551..92e0b37fe1 100644
--- a/src/tools/uic/databaseinfo.h
+++ b/src/tools/uic/databaseinfo.h
@@ -47,8 +47,8 @@ class DatabaseInfo : public TreeWalker
public:
DatabaseInfo();
- void acceptUI(DomUI *node);
- void acceptWidget(DomWidget *node);
+ void acceptUI(DomUI *node) Q_DECL_OVERRIDE;
+ void acceptWidget(DomWidget *node) Q_DECL_OVERRIDE;
inline QStringList connections() const
{ return m_connections; }
diff --git a/src/tools/uic/uic.pro b/src/tools/uic/uic.pro
index 77b8c4ba02..a625bdef9a 100644
--- a/src/tools/uic/uic.pro
+++ b/src/tools/uic/uic.pro
@@ -10,10 +10,4 @@ HEADERS += uic.h
SOURCES += main.cpp \
uic.cpp
-*-maemo* {
- # UIC will crash when running inside QEMU if built with -O2
- QMAKE_CFLAGS_RELEASE -= -O2
- QMAKE_CXXFLAGS_RELEASE -= -O2
-}
-
load(qt_tool)
diff --git a/src/tools/uic/validator.h b/src/tools/uic/validator.h
index 82f6b71b1a..82511776a8 100644
--- a/src/tools/uic/validator.h
+++ b/src/tools/uic/validator.h
@@ -48,14 +48,14 @@ struct Validator : public TreeWalker
{
Validator(Uic *uic);
- void acceptUI(DomUI *node);
- void acceptWidget(DomWidget *node);
+ void acceptUI(DomUI *node) Q_DECL_OVERRIDE;
+ void acceptWidget(DomWidget *node) Q_DECL_OVERRIDE;
- void acceptLayoutItem(DomLayoutItem *node);
- void acceptLayout(DomLayout *node);
+ void acceptLayoutItem(DomLayoutItem *node) Q_DECL_OVERRIDE;
+ void acceptLayout(DomLayout *node) Q_DECL_OVERRIDE;
- void acceptActionGroup(DomActionGroup *node);
- void acceptAction(DomAction *node);
+ void acceptActionGroup(DomActionGroup *node) Q_DECL_OVERRIDE;
+ void acceptAction(DomAction *node) Q_DECL_OVERRIDE;
private:
Driver *m_driver;
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-26 15:14:23 +0000