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

QmlPM: Use Qt5-style connects

Browse Source 
The heavy lifting was done by clazy.

Change-Id: I8fe343c8e7cfc9b0e620afe4ae947f9e997899f9
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
This commit is contained in:
Orgad Shaneh
2016-07-01 12:19:37 +03:00
committed by Orgad Shaneh
parent ca5ce834ef
commit 32ea9a644d
9 changed files with 30 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/plugins/qmlprojectmanager/fileformat/filefilteritems.cpp
View File

@@ -43,7 +43,7 @@ FileFilterBaseItem::FileFilterBaseItem(QObject *parent) :
m_updateFileListTimer.setSingleShot(true);
m_updateFileListTimer.setInterval(50);
connect(&m_updateFileListTimer, SIGNAL(timeout()), this, SLOT(updateFileListNow()));
connect(&m_updateFileListTimer, &QTimer::timeout, this, &FileFilterBaseItem::updateFileListNow);
}
Utils::FileSystemWatcher *FileFilterBaseItem::dirWatcher()
@@ -51,7 +51,8 @@ Utils::FileSystemWatcher *FileFilterBaseItem::dirWatcher()
if (!m_dirWatcher) {
m_dirWatcher = new Utils::FileSystemWatcher(1, this); // Separate id, might exceed OS limits.
m_dirWatcher->setObjectName(QLatin1String("FileFilterBaseItemWatcher"));
connect(m_dirWatcher, SIGNAL(directoryChanged(QString)), this, SLOT(updateFileList()));
connect(m_dirWatcher, &Utils::FileSystemWatcher::directoryChanged,
this, &FileFilterBaseItem::updateFileList);
}
return m_dirWatcher;
}

3
src/plugins/qmlprojectmanager/fileformat/filefilteritems.h
View File

@@ -72,11 +72,10 @@ signals:
void pathsChanged();
void filesChanged(const QSet<QString> &added, const QSet<QString> &removed);
private slots:
private:
void updateFileList();
void updateFileListNow();
private:
QString absolutePath(const QString &path) const;
QString absoluteDir() const;

4
src/plugins/qmlprojectmanager/fileformat/qmlprojectitem.cpp
View File

@@ -94,8 +94,8 @@ void QmlProjectItem::setSourceDirectory(const QString &directoryPath)
FileFilterBaseItem *fileFilter = qobject_cast<FileFilterBaseItem*>(contentElement);
if (fileFilter) {
fileFilter->setDefaultDirectory(directoryPath);
connect(fileFilter, SIGNAL(filesChanged(QSet<QString>,QSet<QString>)),
this, SIGNAL(qmlFilesChanged(QSet<QString>,QSet<QString>)));
connect(fileFilter, &FileFilterBaseItem::filesChanged,
this, &QmlProjectItem::qmlFilesChanged);
}
}