feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Merge remote-tracking branch 'origin/2.5'

Browse Source 
Conflicts:
	src/plugins/remotelinux/startgdbserverdialog.cpp

Change-Id: I69597e20d5372e9baf12ac09fc20d39406683f9e
This commit is contained in:
Eike Ziller
2012-03-08 07:48:55 +01:00
parent 3a808b0fd8 62fd2713d0
commit 4b8df15f3d
233 changed files with 1429 additions and 1125 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/valgrind/callgrindtool.cpp
View File

@@ -577,8 +577,8 @@ IAnalyzerEngine *CallgrindToolPrivate::createEngine(const AnalyzerStartParameter
{
CallgrindEngine *engine = new CallgrindEngine(q, sp, runConfiguration);
connect(engine, SIGNAL(parserDataReady(CallgrindEngine *)),
SLOT(takeParserData(CallgrindEngine *)));
connect(engine, SIGNAL(parserDataReady(CallgrindEngine*)),
SLOT(takeParserData(CallgrindEngine*)));
connect(engine, SIGNAL(starting(const Analyzer::IAnalyzerEngine*)),
SLOT(engineStarting(const Analyzer::IAnalyzerEngine*)));
connect(engine, SIGNAL(finished()),

4
src/plugins/valgrind/memchecktool.cpp
View File

@@ -257,7 +257,7 @@ void MemcheckTool::maybeActiveRunConfigurationChanged()
m_settings = settings;
QTC_ASSERT(m_settings, return);
connect(m_settings, SIGNAL(destroyed(QObject *)), SLOT(settingsDestroyed(QObject *)));
connect(m_settings, SIGNAL(destroyed(QObject*)), SLOT(settingsDestroyed(QObject*)));
ValgrindBaseSettings *memcheckSettings = m_settings->subConfig<ValgrindBaseSettings>();
QTC_ASSERT(memcheckSettings, return);
@@ -443,7 +443,7 @@ QWidget *MemcheckTool::createWidgets()
m_filterMenu->addSeparator();
m_filterMenu->addAction(m_filterProjectAction);
m_filterMenu->addAction(m_suppressionSeparator);
connect(m_filterMenu, SIGNAL(triggered(QAction *)), SLOT(updateErrorFilter()));
connect(m_filterMenu, SIGNAL(triggered(QAction*)), SLOT(updateErrorFilter()));
filterButton->setMenu(m_filterMenu);
layout->addWidget(filterButton);

4
src/plugins/valgrind/valgrindengine.cpp
View File

@@ -112,8 +112,8 @@ bool ValgrindEngine::start()
connect(runner(), SIGNAL(processOutputReceived(QByteArray,Utils::OutputFormat)),
SLOT(receiveProcessOutput(QByteArray,Utils::OutputFormat)));
connect(runner(), SIGNAL(processErrorReceived(QString, QProcess::ProcessError)),
SLOT(receiveProcessError(QString, QProcess::ProcessError)));
connect(runner(), SIGNAL(processErrorReceived(QString,QProcess::ProcessError)),
SLOT(receiveProcessError(QString,QProcess::ProcessError)));
connect(runner(), SIGNAL(finished()),
SLOT(runnerFinished()));

4
src/plugins/valgrind/valgrindprocess.cpp
View File

@@ -56,8 +56,8 @@ ValgrindProcess::ValgrindProcess(QObject *parent)
LocalValgrindProcess::LocalValgrindProcess(QObject *parent)
: ValgrindProcess(parent)
{
connect(&m_process, SIGNAL(finished(int, QProcess::ExitStatus)),
this, SIGNAL(finished(int, QProcess::ExitStatus)));
connect(&m_process, SIGNAL(finished(int,QProcess::ExitStatus)),
this, SIGNAL(finished(int,QProcess::ExitStatus)));
connect(&m_process, SIGNAL(started()),
this, SIGNAL(started()));
connect(&m_process, SIGNAL(error(QProcess::ProcessError)),

4
src/plugins/valgrind/valgrindrunner.cpp
View File

@@ -104,8 +104,8 @@ void ValgrindRunner::Private::run(ValgrindProcess *_process)
q, SIGNAL(processOutputReceived(QByteArray,Utils::OutputFormat)));
QObject::connect(process, SIGNAL(started()),
q, SLOT(processStarted()));
QObject::connect(process, SIGNAL(finished(int, QProcess::ExitStatus)),
q, SLOT(processFinished(int, QProcess::ExitStatus)));
QObject::connect(process, SIGNAL(finished(int,QProcess::ExitStatus)),
q, SLOT(processFinished(int,QProcess::ExitStatus)));
QObject::connect(process, SIGNAL(error(QProcess::ProcessError)),
q, SLOT(processError(QProcess::ProcessError)));

8
src/plugins/valgrind/xmlprotocol/threadedparser.cpp
View File

@@ -119,11 +119,11 @@ void ThreadedParser::parse(QIODevice *device)
connect(parser, SIGNAL(internalError(QString)),
SLOT(slotInternalError(QString)),
Qt::QueuedConnection);
connect(parser, SIGNAL(errorCount(qint64, qint64)),
SIGNAL(errorCount(qint64, qint64)),
connect(parser, SIGNAL(errorCount(qint64,qint64)),
SIGNAL(errorCount(qint64,qint64)),
Qt::QueuedConnection);
connect(parser, SIGNAL(suppressionCount(QString, qint64)),
SIGNAL(suppressionCount(QString, qint64)),
connect(parser, SIGNAL(suppressionCount(QString,qint64)),
SIGNAL(suppressionCount(QString,qint64)),
Qt::QueuedConnection);
connect(parser, SIGNAL(finished()), SIGNAL(finished()),
Qt::QueuedConnection);