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

Qml: Fix more invalid NOTIFY signals

Browse Source 
Remove unimplemented NOTIFY signals. Furthermore the signals must
be declared in the same class as the Q_PROPERTY (not in a base class):
Fix this in filefilteritems.h.
This commit is contained in:
Kai Koehne
2010-08-23 10:07:45 +02:00
parent a1289a6ead
commit 8eecf8fcd8
4 changed files with 40 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -51,7 +51,6 @@ void FileFilterBaseItem::setFilter(const QString &filter)
m_regExpList << QRegExp(pattern, Qt::CaseInsensitive, QRegExp::Wildcard);
}
emit filterChanged();
updateFileList();
}
@@ -222,13 +221,18 @@ QmlFileFilterItem::QmlFileFilterItem(QObject *parent)
setFilter(QLatin1String("*.qml"));
}
JsFileFilterItem::JsFileFilterItem(QObject *parent)
: FileFilterBaseItem(parent)
{
setFilter(QLatin1String("*.js"));
}
void JsFileFilterItem::setFilter(const QString &filter)
{
FileFilterBaseItem::setFilter(filter);
emit filterChanged();
}
ImageFileFilterItem::ImageFileFilterItem(QObject *parent)
: FileFilterBaseItem(parent)
{
@@ -241,11 +245,23 @@ ImageFileFilterItem::ImageFileFilterItem(QObject *parent)
setFilter(filter);
}
void ImageFileFilterItem::setFilter(const QString &filter)
{
FileFilterBaseItem::setFilter(filter);
emit filterChanged();
}
CssFileFilterItem::CssFileFilterItem(QObject *parent)
: FileFilterBaseItem(parent)
{
setFilter(QLatin1String("*.css"));
}
void CssFileFilterItem::setFilter(const QString &filter)
{
FileFilterBaseItem::setFilter(filter);
emit filterChanged();
}
} // namespace QmlProjectManager

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

@@ -46,7 +46,6 @@ signals:
void recursiveChanged();
void pathsChanged();
void filesChanged(const QSet<QString> &added, const QSet<QString> &removed);
void filterChanged();
private slots:
void updateFileList();
@@ -89,7 +88,12 @@ public:
class JsFileFilterItem : public FileFilterBaseItem {
Q_OBJECT
Q_PROPERTY(QString filter READ filter WRITE setFilter NOTIFY filterChanged())
Q_PROPERTY(QString filter READ filter WRITE setFilter NOTIFY filterChanged)
void setFilter(const QString &filter);
signals:
void filterChanged();
public:
JsFileFilterItem(QObject *parent = 0);
@@ -97,7 +101,12 @@ public:
class ImageFileFilterItem : public FileFilterBaseItem {
Q_OBJECT
Q_PROPERTY(QString filter READ filter WRITE setFilter NOTIFY filterChanged())
Q_PROPERTY(QString filter READ filter WRITE setFilter NOTIFY filterChanged)
void setFilter(const QString &filter);
signals:
void filterChanged();
public:
ImageFileFilterItem(QObject *parent = 0);
@@ -105,7 +114,12 @@ public:
class CssFileFilterItem : public FileFilterBaseItem {
Q_OBJECT
Q_PROPERTY(QString filter READ filter WRITE setFilter NOTIFY filterChanged())
Q_PROPERTY(QString filter READ filter WRITE setFilter NOTIFY filterChanged)
void setFilter(const QString &filter);
signals:
void filterChanged();
public:
CssFileFilterItem(QObject *parent = 0);