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

Normalized connect()s

Browse Source 
Change-Id: Ieb95bd04026d4a8ba824e6355031954332654e99
Reviewed-by: hjk <qthjk@ovi.com>
This commit is contained in:
Robert Loehning
2012-07-26 14:53:45 +02:00
committed by hjk
parent 8eae872660
commit ed7c80d4c6
6 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
share/qtcreator/templates/wizards/bb-qt5-quick2app/main.cpp
View File

@@ -14,8 +14,8 @@ int main( int argc, char** argv )
view->setSource( QUrl( "app/native/qml/main.qml" ) ); view->setSource( QUrl( "app/native/qml/main.qml" ) );
QDeclarativeEngine* engine = view->engine(); QDeclarativeEngine* engine = view->engine();
QObject::connect( engine, SIGNAL( quit() ), QObject::connect( engine, SIGNAL(quit()),
QCoreApplication::instance(), SLOT( quit() ) ); QCoreApplication::instance(), SLOT(quit()) );
window = view; window = view;
window->showMaximized(); window->showMaximized();

8
src/plugins/android/androiddebugsupport.cpp
View File

@@ -124,8 +124,8 @@ AndroidDebugSupport::AndroidDebugSupport(AndroidRunConfiguration *runConfig,
connect(m_runner, SIGNAL(remoteProcessStarted(int,int)), connect(m_runner, SIGNAL(remoteProcessStarted(int,int)),
SLOT(handleRemoteProcessStarted(int,int))); SLOT(handleRemoteProcessStarted(int,int)));
connect(m_runner, SIGNAL(remoteProcessFinished(const QString &)), connect(m_runner, SIGNAL(remoteProcessFinished(QString)),
SLOT(handleRemoteProcessFinished(const QString &))); SLOT(handleRemoteProcessFinished(QString)));
connect(m_runner, SIGNAL(remoteErrorOutput(QByteArray)), connect(m_runner, SIGNAL(remoteErrorOutput(QByteArray)),
SLOT(handleRemoteErrorOutput(QByteArray))); SLOT(handleRemoteErrorOutput(QByteArray)));
@@ -146,8 +146,8 @@ void AndroidDebugSupport::handleRemoteProcessStarted(int gdbServerPort, int qmlP
void AndroidDebugSupport::handleRemoteProcessFinished(const QString &errorMsg) void AndroidDebugSupport::handleRemoteProcessFinished(const QString &errorMsg)
{ {
disconnect(m_runner, SIGNAL(remoteProcessFinished(const QString &)), disconnect(m_runner, SIGNAL(remoteProcessFinished(QString)),
this,SLOT(handleRemoteProcessFinished(const QString &))); this,SLOT(handleRemoteProcessFinished(QString)));
m_runControl->engine()->notifyEngineRemoteSetupFailed(errorMsg); m_runControl->engine()->notifyEngineRemoteSetupFailed(errorMsg);
} }

4
src/plugins/android/androidruncontrol.cpp
View File

@@ -67,8 +67,8 @@ void AndroidRunControl::start()
SLOT(handleRemoteErrorOutput(QByteArray))); SLOT(handleRemoteErrorOutput(QByteArray)));
connect(m_runner, SIGNAL(remoteOutput(QByteArray)), connect(m_runner, SIGNAL(remoteOutput(QByteArray)),
SLOT(handleRemoteOutput(QByteArray))); SLOT(handleRemoteOutput(QByteArray)));
connect(m_runner, SIGNAL(remoteProcessFinished(const QString &)), connect(m_runner, SIGNAL(remoteProcessFinished(QString)),
SLOT(handleRemoteProcessFinished(const QString &))); SLOT(handleRemoteProcessFinished(QString)));
appendMessage(tr("Starting remote process ..."), Utils::NormalMessageFormat); appendMessage(tr("Starting remote process ..."), Utils::NormalMessageFormat);
m_runner->start(); m_runner->start();
} }

4
src/plugins/coreplugin/documentmanager.cpp
View File

@@ -292,7 +292,7 @@ void DocumentManager::addDocuments(const QList<IDocument *> &documents, bool add
foreach (IDocument *document, documents) { foreach (IDocument *document, documents) {
if (document && !d->m_documentsWithoutWatch.contains(document)) { if (document && !d->m_documentsWithoutWatch.contains(document)) {
connect(document, SIGNAL(destroyed(QObject*)), m_instance, SLOT(documentDestroyed(QObject*))); connect(document, SIGNAL(destroyed(QObject*)), m_instance, SLOT(documentDestroyed(QObject*)));
connect(document, SIGNAL(fileNameChanged(QString,QString)), m_instance, SLOT(fileNameChanged(QString, QString))); connect(document, SIGNAL(fileNameChanged(QString,QString)), m_instance, SLOT(fileNameChanged(QString,QString)));
d->m_documentsWithoutWatch.append(document); d->m_documentsWithoutWatch.append(document);
} }
} }
@@ -303,7 +303,7 @@ void DocumentManager::addDocuments(const QList<IDocument *> &documents, bool add
if (document && !d->m_documentsWithWatch.contains(document)) { if (document && !d->m_documentsWithWatch.contains(document)) {
connect(document, SIGNAL(changed()), m_instance, SLOT(checkForNewFileName())); connect(document, SIGNAL(changed()), m_instance, SLOT(checkForNewFileName()));
connect(document, SIGNAL(destroyed(QObject*)), m_instance, SLOT(documentDestroyed(QObject*))); connect(document, SIGNAL(destroyed(QObject*)), m_instance, SLOT(documentDestroyed(QObject*)));
connect(document, SIGNAL(fileNameChanged(QString,QString)), m_instance, SLOT(fileNameChanged(QString, QString))); connect(document, SIGNAL(fileNameChanged(QString,QString)), m_instance, SLOT(fileNameChanged(QString,QString)));
addFileInfo(document); addFileInfo(document);
} }
} }

4
src/plugins/debugger/memoryagent.cpp
View File

@@ -154,8 +154,8 @@ void MemoryAgent::connectBinEditorWidget(QWidget *w)
SIGNAL(dataChanged(Core::IEditor*,quint64,QByteArray)), SIGNAL(dataChanged(Core::IEditor*,quint64,QByteArray)),
SLOT(handleDataChanged(Core::IEditor*,quint64,QByteArray))); SLOT(handleDataChanged(Core::IEditor*,quint64,QByteArray)));
connect(w, connect(w,
SIGNAL(addWatchpointRequested(quint64, uint)), SIGNAL(addWatchpointRequested(quint64,uint)),
SLOT(handleWatchpointRequest(quint64, uint))); SLOT(handleWatchpointRequest(quint64,uint)));
} }
bool MemoryAgent::doCreateBinEditor(quint64 addr, unsigned flags, bool MemoryAgent::doCreateBinEditor(quint64 addr, unsigned flags,

2
src/plugins/qnx/blackberryabstractdeploystep.cpp
View File

@@ -143,7 +143,7 @@ void BlackBerryAbstractDeployStep::runCommands()
m_process->setEnvironment(m_environment); m_process->setEnvironment(m_environment);
m_process->setWorkingDirectory(m_buildDirectory); m_process->setWorkingDirectory(m_buildDirectory);
connect(m_process, SIGNAL(finished(int,QProcess::ExitStatus)), this, SLOT(handleProcessFinished(int, QProcess::ExitStatus)), Qt::DirectConnection); connect(m_process, SIGNAL(finished(int,QProcess::ExitStatus)), this, SLOT(handleProcessFinished(int,QProcess::ExitStatus)), Qt::DirectConnection);
runNextCommand(); runNextCommand();
} }