Commit e8cce2a3 authored by Arnold Dumas's avatar Arnold Dumas
Browse files

ValgrindFake: Use Qt5-style connects



Change-Id: I9d4fcf45b1424cd84b836ae3b883f23709300b95
Reviewed-by: Tobias Hunger's avatarTobias Hunger <tobias.hunger@qt.io>
parent eac3beb4
...@@ -140,7 +140,7 @@ int main(int argc, char** argv) ...@@ -140,7 +140,7 @@ int main(int argc, char** argv)
} }
OutputGenerator generator(&socket, &xmlFile); OutputGenerator generator(&socket, &xmlFile);
QObject::connect(&generator, SIGNAL(finished()), &app, SLOT(quit())); QObject::connect(&generator, &OutputGenerator::finished, &app, &QCoreApplication::quit);
generator.setCrashRandomly(arg_crash); generator.setCrashRandomly(arg_crash);
generator.setOutputGarbage(arg_garbage); generator.setOutputGarbage(arg_garbage);
generator.setWait(arg_wait); generator.setWait(arg_wait);
......
...@@ -65,8 +65,8 @@ OutputGenerator::OutputGenerator(QAbstractSocket *output, QIODevice *input) : ...@@ -65,8 +65,8 @@ OutputGenerator::OutputGenerator(QAbstractSocket *output, QIODevice *input) :
m_timer.setSingleShot(true); m_timer.setSingleShot(true);
m_timer.start(); m_timer.start();
connect(&m_timer, SIGNAL(timeout()), connect(&m_timer, &QTimer::timeout,
this, SLOT(writeOutput())); this, &OutputGenerator::writeOutput);
} }
void OutputGenerator::setCrashRandomly(bool enable) void OutputGenerator::setCrashRandomly(bool enable)
......
...@@ -52,13 +52,13 @@ public: ...@@ -52,13 +52,13 @@ public:
Q_SIGNALS: Q_SIGNALS:
void finished(); void finished();
private slots:
/// write output to the stream until the next error
void writeOutput();
private: private:
void produceRuntimeError(); void produceRuntimeError();
/// write output to the stream until the next error
void writeOutput();
QAbstractSocket *m_output; QAbstractSocket *m_output;
QIODevice *m_input; QIODevice *m_input;
QTimer m_timer; QTimer m_timer;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment