summaryrefslogtreecommitdiffstats
path: root/tests/auto/tools/moc
diff options
context:
space:
mode:
Diffstat (limited to 'tests/auto/tools/moc')
-rw-r--r--tests/auto/tools/moc/gadgetwithnoenums.h30
-rw-r--r--tests/auto/tools/moc/task189996.h10
-rw-r--r--tests/auto/tools/moc/template-gtgt.h4
3 files changed, 25 insertions, 19 deletions
diff --git a/tests/auto/tools/moc/gadgetwithnoenums.h b/tests/auto/tools/moc/gadgetwithnoenums.h
index 5a9a789471..0da75e8eb1 100644
--- a/tests/auto/tools/moc/gadgetwithnoenums.h
+++ b/tests/auto/tools/moc/gadgetwithnoenums.h
@@ -43,20 +43,24 @@
#include <QObject>
-class GadgetWithNoEnums {
+class GadgetWithNoEnums
+{
Q_GADGET
- public:
- GadgetWithNoEnums() {}
- virtual ~GadgetWithNoEnums() {}
-};
-
-class DerivedGadgetWithEnums : public GadgetWithNoEnums {
- Q_GADGET
- Q_ENUMS( FooEnum )
- public:
- enum FooEnum { FooValue };
- DerivedGadgetWithEnums() {}
- ~DerivedGadgetWithEnums() {}
+
+public:
+ GadgetWithNoEnums() {}
+ virtual ~GadgetWithNoEnums() {}
+};
+
+class DerivedGadgetWithEnums : public GadgetWithNoEnums
+{
+ Q_GADGET
+ Q_ENUMS( FooEnum )
+
+public:
+ enum FooEnum { FooValue };
+ DerivedGadgetWithEnums() {}
+ ~DerivedGadgetWithEnums() {}
};
#endif
diff --git a/tests/auto/tools/moc/task189996.h b/tests/auto/tools/moc/task189996.h
index 975d762fa8..01b210d6eb 100644
--- a/tests/auto/tools/moc/task189996.h
+++ b/tests/auto/tools/moc/task189996.h
@@ -43,10 +43,12 @@
#ifndef TASK189996_H
#define TASK189996_H
-#include <QObject>
-
-class InlineSlotsWithThrowDeclaration : public QObject {
- Q_OBJECT
+#include <QObject>
+
+class InlineSlotsWithThrowDeclaration : public QObject
+{
+ Q_OBJECT
+
public slots:
void a() throw() { }
void b() const throw() { }
diff --git a/tests/auto/tools/moc/template-gtgt.h b/tests/auto/tools/moc/template-gtgt.h
index baa8553103..2c2f56c34d 100644
--- a/tests/auto/tools/moc/template-gtgt.h
+++ b/tests/auto/tools/moc/template-gtgt.h
@@ -39,13 +39,13 @@
**
****************************************************************************/
template<class TYPE, size_t COUNT>
-class myTemplate :
+class myTemplate :
QString,
QVector<TYPE, QList<COUNT>>
{};
template<class TYPE, size_t COUNT>
-class myTemplate2 :
+class myTemplate2 :
QString,
QVector<TYPE, QList< (4 >> 2) >>
{};