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

Qt Designer plugin: Port to new signals & slots syntax.

Browse Source 
Split ResourceHandler::updateResources(bool updateProjectResources)
into 2 slots to make it compatible to void signals.

Change-Id: I0614637cd575c45f9acd6514fe04fe08dfcfcff8
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
This commit is contained in:
Friedemann Kleint
2015-06-02 09:14:40 +02:00
parent 17aaf04309
commit 9572b6f739
9 changed files with 40 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/plugins/designer/resourcehandler.cpp
View File

@@ -97,10 +97,10 @@ void ResourceHandler::ensureInitialized()
m_initialized = true;
ProjectTree *tree = ProjectTree::instance();
connect(tree, SIGNAL(filesAdded()), this, SLOT(updateResources()));
connect(tree, SIGNAL(filesRemoved()), this, SLOT(updateResources()));
connect(tree, SIGNAL(foldersAdded()), this, SLOT(updateResources()));
connect(tree, SIGNAL(foldersRemoved()), this, SLOT(updateResources()));
connect(tree, &ProjectTree::filesAdded, this, &ResourceHandler::updateResources);
connect(tree, &ProjectTree::filesRemoved, this, &ResourceHandler::updateResources);
connect(tree, &ProjectTree::foldersAdded, this, &ResourceHandler::updateResources);
connect(tree, &ProjectTree::foldersRemoved, this, &ResourceHandler::updateResources);
m_originalUiQrcPaths = m_form->activeResourceFilePaths();
if (Designer::Constants::Internal::debug)
qDebug() << "ResourceHandler::ensureInitialized() origPaths=" << m_originalUiQrcPaths;
@@ -111,7 +111,7 @@ ResourceHandler::~ResourceHandler()
}
void ResourceHandler::updateResources(bool updateProjectResources)
void ResourceHandler::updateResourcesHelper(bool updateProjectResources)
{
if (m_handlingResources)
return;