diff options
| author | Jedrzej Nowacki <jedrzej.nowacki@nokia.com> | 2010-11-02 08:06:12 (GMT) |
|---|---|---|
| committer | Jedrzej Nowacki <jedrzej.nowacki@nokia.com> | 2010-11-02 08:10:45 (GMT) |
| commit | 0c7143d83d1de082ca8a5d2a7dd33cb85c7857c9 (patch) | |
| tree | 6bb7c0f6c6b00c58977f836d99a176cd7715595e /tests/auto/qscriptvaluegenerated/tst_qscriptvalue.h | |
| parent | 56039e26397daaa5f8fa8c6f5d63792632281545 (diff) | |
| download | Qt-0c7143d83d1de082ca8a5d2a7dd33cb85c7857c9.zip Qt-0c7143d83d1de082ca8a5d2a7dd33cb85c7857c9.tar.gz Qt-0c7143d83d1de082ca8a5d2a7dd33cb85c7857c9.tar.bz2 | |
Fix regression in tst_maketestselftest::naming_convention.
Change tst_QScriptValueGenerated test to obey the naming_convention test
Reviewed-by: Kent Hansen
Diffstat (limited to 'tests/auto/qscriptvaluegenerated/tst_qscriptvalue.h')
| -rw-r--r-- | tests/auto/qscriptvaluegenerated/tst_qscriptvalue.h | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/tests/auto/qscriptvaluegenerated/tst_qscriptvalue.h b/tests/auto/qscriptvaluegenerated/tst_qscriptvalue.h index 50ab878..8248ef3 100644 --- a/tests/auto/qscriptvaluegenerated/tst_qscriptvalue.h +++ b/tests/auto/qscriptvaluegenerated/tst_qscriptvalue.h @@ -54,13 +54,13 @@ Q_DECLARE_METATYPE(QVariant) Q_DECLARE_METATYPE(QScriptValue) -class tst_QScriptValue : public QObject +class tst_QScriptValueGenerated : public QObject { Q_OBJECT public: - tst_QScriptValue(); - virtual ~tst_QScriptValue(); + tst_QScriptValueGenerated(); + virtual ~tst_QScriptValueGenerated(); private slots: // Generated test functions @@ -185,12 +185,12 @@ private slots: void qscriptvalue_castquint16(); private: - typedef void (tst_QScriptValue::*InitDataFunction)(); - typedef void (tst_QScriptValue::*DefineDataFunction)(const char *); + typedef void (tst_QScriptValueGenerated::*InitDataFunction)(); + typedef void (tst_QScriptValueGenerated::*DefineDataFunction)(const char *); void dataHelper(InitDataFunction init, DefineDataFunction define); QTestData &newRow(const char *tag); - typedef void (tst_QScriptValue::*TestFunction)(const char *, const QScriptValue &); + typedef void (tst_QScriptValueGenerated::*TestFunction)(const char *, const QScriptValue &); void testHelper(TestFunction fun); // Generated functions @@ -364,7 +364,7 @@ private: }; #define DEFINE_TEST_FUNCTION(name) \ -void tst_QScriptValue::name##_data() { dataHelper(&tst_QScriptValue::name##_initData, &tst_QScriptValue::name##_makeData); } \ -void tst_QScriptValue::name() { testHelper(&tst_QScriptValue::name##_test); } +void tst_QScriptValueGenerated::name##_data() { dataHelper(&tst_QScriptValueGenerated::name##_initData, &tst_QScriptValueGenerated::name##_makeData); } \ +void tst_QScriptValueGenerated::name() { testHelper(&tst_QScriptValueGenerated::name##_test); } #endif |