Skip to content

Some modernisation of QtPropertyBrowser #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Some modernisation of QtPropertyBrowser #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7d32d1a
Changes to allow compilation with no_keywords
john-paulsmith May 15, 2019
ad957f7
Removed use of obsolete QColorDialog::getRgba()
john-paulsmith May 15, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/qtbuttonpropertybrowser.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -235,9 +235,9 @@ void QtButtonPropertyBrowserPrivate::slotToggled(bool checked)
setExpanded(item, checked);

if (checked)
emit q_ptr->expanded(m_itemToIndex.value(item));
Q_EMIT q_ptr->expanded(m_itemToIndex.value(item));
else
emit q_ptr->collapsed(m_itemToIndex.value(item));
Q_EMIT q_ptr->collapsed(m_itemToIndex.value(item));
}

void QtButtonPropertyBrowserPrivate::updateLater()
Expand Down
18 changes: 8 additions & 10 deletions src/qteditorfactory.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1531,7 +1531,7 @@ public Q_SLOTS:
void keyReleaseEvent(QKeyEvent *e);
void paintEvent(QPaintEvent *);
bool event(QEvent *e);
private slots:
private Q_SLOTS:
void slotClearChar();
private:
void handleKeyEvent(QKeyEvent *e);
Expand Down Expand Up @@ -1591,7 +1591,7 @@ void QtCharEdit::slotClearChar()
if (m_value.isNull())
return;
setValue(QChar());
emit valueChanged(m_value);
Q_EMIT valueChanged(m_value);
}

void QtCharEdit::handleKeyEvent(QKeyEvent *e)
Expand Down Expand Up @@ -1624,7 +1624,7 @@ void QtCharEdit::handleKeyEvent(QKeyEvent *e)
const QString str = m_value.isNull() ? QString() : QString(m_value);
m_lineEdit->setText(str);
e->accept();
emit valueChanged(m_value);
Q_EMIT valueChanged(m_value);
}

void QtCharEdit::setValue(const QChar &value)
Expand Down Expand Up @@ -2205,12 +2205,10 @@ void QtColorEditWidget::setValue(const QColor &c)

void QtColorEditWidget::buttonClicked()
{
bool ok = false;
QRgb oldRgba = m_color.rgba();
QRgb newRgba = QColorDialog::getRgba(oldRgba, &ok, this);
if (ok && newRgba != oldRgba) {
setValue(QColor::fromRgba(newRgba));
emit valueChanged(m_color);
QColor newColor = QColorDialog::getColor(m_color, this);
if (newColor != m_color) {
setValue(newColor);
Q_EMIT valueChanged(m_color);
}
}

Expand Down Expand Up @@ -2432,7 +2430,7 @@ void QtFontEditWidget::buttonClicked()
if (m_font.strikeOut() != newFont.strikeOut())
f.setStrikeOut(newFont.strikeOut());
setValue(f);
emit valueChanged(m_font);
Q_EMIT valueChanged(m_font);
}
}

Expand Down
12 changes: 6 additions & 6 deletions src/qtpropertybrowser.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -543,27 +543,27 @@ void QtProperty::propertyChanged()
void QtAbstractPropertyManagerPrivate::propertyDestroyed(QtProperty *property)
{
if (m_properties.contains(property)) {
emit q_ptr->propertyDestroyed(property);
Q_EMIT q_ptr->propertyDestroyed(property);
q_ptr->uninitializeProperty(property);
m_properties.remove(property);
}
}

void QtAbstractPropertyManagerPrivate::propertyChanged(QtProperty *property) const
{
emit q_ptr->propertyChanged(property);
Q_EMIT q_ptr->propertyChanged(property);
}

void QtAbstractPropertyManagerPrivate::propertyRemoved(QtProperty *property,
QtProperty *parentProperty) const
{
emit q_ptr->propertyRemoved(property, parentProperty);
Q_EMIT q_ptr->propertyRemoved(property, parentProperty);
}

void QtAbstractPropertyManagerPrivate::propertyInserted(QtProperty *property,
QtProperty *parentProperty, QtProperty *afterProperty) const
{
emit q_ptr->propertyInserted(property, parentProperty, afterProperty);
Q_EMIT q_ptr->propertyInserted(property, parentProperty, afterProperty);
}

/*!
Expand Down Expand Up @@ -793,7 +793,7 @@ QtProperty *QtAbstractPropertyManager::addProperty(const QString &name)
*/
QtProperty * QtAbstractPropertyManager::qtProperty(const QString &id)const
{
foreach(QtProperty* prop, d_ptr->m_properties)
Q_FOREACH(QtProperty* prop, d_ptr->m_properties)
{
if (prop->propertyId() == id)
{
Expand Down Expand Up @@ -2038,7 +2038,7 @@ void QtAbstractPropertyBrowser::setCurrentItem(QtBrowserItem *item)
QtBrowserItem *oldItem = d_ptr->m_currentItem;
d_ptr->m_currentItem = item;
if (oldItem != item)
emit currentItemChanged(item);
Q_EMIT currentItemChanged(item);
}

#if QT_VERSION >= 0x040400
Expand Down
4 changes: 2 additions & 2 deletions src/qtpropertybrowserutils.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -320,7 +320,7 @@ void QtKeySequenceEdit::slotClearShortcut()
if (m_keySequence.isEmpty())
return;
setKeySequence(QKeySequence());
emit keySequenceChanged(m_keySequence);
Q_EMIT keySequenceChanged(m_keySequence);
}

void QtKeySequenceEdit::handleKeyEvent(QKeyEvent *e)
Expand Down Expand Up @@ -349,7 +349,7 @@ void QtKeySequenceEdit::handleKeyEvent(QKeyEvent *e)
m_keySequence = QKeySequence(k0, k1, k2, k3);
m_lineEdit->setText(m_keySequence.toString(QKeySequence::NativeText));
e->accept();
emit keySequenceChanged(m_keySequence);
Q_EMIT keySequenceChanged(m_keySequence);
}

void QtKeySequenceEdit::setKeySequence(const QKeySequence &sequence)
Expand Down
2 changes: 1 addition & 1 deletion src/qtpropertybrowserutils_p.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ public Q_SLOTS:
void keyReleaseEvent(QKeyEvent *e);
void paintEvent(QPaintEvent *);
bool event(QEvent *e);
private slots:
private Q_SLOTS:
void slotClearShortcut();
private:
void handleKeyEvent(QKeyEvent *e);
Expand Down
Loading