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

Convert to new connect api

Browse Source 
Change-Id: I80aad51340bcde953763dec36cf989d6e19d4cd0
Reviewed-by: hjk <hjk@theqtcompany.com>
This commit is contained in:
Montel Laurent
2015-01-30 10:19:13 +01:00
committed by hjk
parent f479c1979e
commit 0df6780176
18 changed files with 53 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/plugins/autotoolsprojectmanager/autotoolsbuildsettingswidget.cpp
View File

@@ -64,7 +64,8 @@ AutotoolsBuildSettingsWidget::AutotoolsBuildSettingsWidget(AutotoolsBuildConfigu
m_pathChooser->setEnvironment(bc->environment());
m_pathChooser->setHistoryCompleter(QLatin1String("AutoTools.BuildDir.History"));
fl->addRow(tr("Build directory:"), m_pathChooser);
connect(m_pathChooser, SIGNAL(changed(QString)), this, SLOT(buildDirectoryChanged()));
connect(m_pathChooser, &Utils::PathChooser::changed,
this, &AutotoolsBuildSettingsWidget::buildDirectoryChanged);
m_pathChooser->setBaseFileName(bc->target()->project()->projectDirectory());
m_pathChooser->setPath(m_buildConfiguration->rawBuildDirectory().toString());

2
src/plugins/autotoolsprojectmanager/autotoolsopenprojectwizard.cpp
View File

@@ -101,7 +101,7 @@ BuildPathPage::BuildPathPage(AutotoolsOpenProjectWizard *wizard)
m_pc->setHistoryCompleter(QLatin1String("AutoTools.BuildDir.History"));
m_pc->setBaseDirectory(m_wizard->sourceDirectory());
m_pc->setPath(m_wizard->buildDirectory());
connect(m_pc, SIGNAL(changed(QString)), this, SLOT(buildDirectoryChanged()));
connect(m_pc, &Utils::PathChooser::changed, this, &BuildPathPage::buildDirectoryChanged);
fl->addRow(tr("Build directory:"), m_pc);
setTitle(tr("Build Location"));
}

12
src/plugins/autotoolsprojectmanager/autotoolsproject.cpp
View File

@@ -143,8 +143,8 @@ bool AutotoolsProject::fromMap(const QVariantMap &map)
if (!Project::fromMap(map))
return false;
connect(m_fileWatcher, SIGNAL(fileChanged(QString)),
this, SLOT(onFileChanged(QString)));
connect(m_fileWatcher, &Utils::FileSystemWatcher::fileChanged,
this, &AutotoolsProject::onFileChanged);
// Load the project tree structure.
loadProjectTree();
@@ -172,11 +172,11 @@ void AutotoolsProject::loadProjectTree()
// Parse the makefile asynchronously in a thread
m_makefileParserThread = new MakefileParserThread(m_fileName);
connect(m_makefileParserThread, SIGNAL(started()),
this, SLOT(makefileParsingStarted()));
connect(m_makefileParserThread, &MakefileParserThread::started,
this, &AutotoolsProject::makefileParsingStarted);
connect(m_makefileParserThread, SIGNAL(finished()),
this, SLOT(makefileParsingFinished()));
connect(m_makefileParserThread, &MakefileParserThread::finished,
this, &AutotoolsProject::makefileParsingFinished);
m_makefileParserThread->start();
}

2
src/plugins/autotoolsprojectmanager/makefileparser.cpp
View File

@@ -292,7 +292,7 @@ void MakefileParser::parseSubDirs()
continue;
MakefileParser parser(subDirMakefile);
connect(&parser, SIGNAL(status(QString)), this, SIGNAL(status(QString)));
connect(&parser, &MakefileParser::status, this, &MakefileParser::status);
const bool success = parser.parse();
// Don't return, try to parse as many sub directories

3
src/plugins/autotoolsprojectmanager/makefileparserthread.cpp
View File

@@ -46,7 +46,8 @@ MakefileParserThread::MakefileParserThread(const QString &makefile) :
m_makefiles(),
m_includePaths()
{
connect(&m_parser, SIGNAL(status(QString)), this, SIGNAL(status(QString)));
connect(&m_parser, &MakefileParser::status,
this, &MakefileParserThread::status);
}
QStringList MakefileParserThread::sources() const