diff options
| author | Michele Calgaro <michele.calgaro@yahoo.it> | 2023-08-12 18:44:08 +0900 |
|---|---|---|
| committer | Michele Calgaro <michele.calgaro@yahoo.it> | 2023-08-18 21:44:59 +0900 |
| commit | 1607518b8c749b4195c5ab11b405f77001526a6a (patch) | |
| tree | 89b8bc00c6b9625f6a4f061594f57f457d18a174 /lib/koproperty | |
| parent | 64574118b7f71db7cb0a7f513a824dd51185b632 (diff) | |
| download | koffice-1607518b8c749b4195c5ab11b405f77001526a6a.tar.gz koffice-1607518b8c749b4195c5ab11b405f77001526a6a.zip | |
Drop TQT_BASE_OBJECT* defines
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
(cherry picked from commit a7ea84c97639f635d798348432f355e3ac496a1d)
Diffstat (limited to 'lib/koproperty')
| -rw-r--r-- | lib/koproperty/editor.cpp | 2 | ||||
| -rw-r--r-- | lib/koproperty/editors/pixmapedit.cpp | 2 | ||||
| -rw-r--r-- | lib/koproperty/editors/spinbox.cpp | 8 |
3 files changed, 6 insertions, 6 deletions
diff --git a/lib/koproperty/editor.cpp b/lib/koproperty/editor.cpp index d4c61ec2..2dc05f48 100644 --- a/lib/koproperty/editor.cpp +++ b/lib/koproperty/editor.cpp @@ -915,7 +915,7 @@ Editor::resizeEvent(TQResizeEvent *ev) bool Editor::eventFilter( TQObject * watched, TQEvent * e ) { - if ((TQT_BASE_OBJECT(watched)==TQT_BASE_OBJECT(this) || TQT_BASE_OBJECT(watched)==TQT_BASE_OBJECT(viewport())) && e->type()==TQEvent::KeyPress) { + if ((watched==this || watched==viewport()) && e->type()==TQEvent::KeyPress) { if (handleKeyPress(TQT_TQKEYEVENT(e))) return true; } diff --git a/lib/koproperty/editors/pixmapedit.cpp b/lib/koproperty/editors/pixmapedit.cpp index cf7645bf..4e295c96 100644 --- a/lib/koproperty/editors/pixmapedit.cpp +++ b/lib/koproperty/editors/pixmapedit.cpp @@ -205,7 +205,7 @@ PixmapEdit::resizeEvent(TQResizeEvent *e) bool PixmapEdit::eventFilter(TQObject *o, TQEvent *ev) { - if(TQT_BASE_OBJECT(o) == m_edit) { + if(o == m_edit) { if(ev->type() == TQEvent::MouseButtonPress && TQT_TQMOUSEEVENT(ev)->button()==Qt::LeftButton) { if(m_previewPixmap.height() <= m_edit->height() && m_previewPixmap.width() <= m_edit->width()) diff --git a/lib/koproperty/editors/spinbox.cpp b/lib/koproperty/editors/spinbox.cpp index 4d9266a8..e76ca930 100644 --- a/lib/koproperty/editors/spinbox.cpp +++ b/lib/koproperty/editors/spinbox.cpp @@ -59,7 +59,7 @@ void IntSpinBox::setValue(const TQVariant &value) bool IntSpinBox::eventFilter(TQObject *o, TQEvent *e) { - if(TQT_BASE_OBJECT(o) == editor()) + if(o == editor()) { if(e->type() == TQEvent::KeyPress) { @@ -71,7 +71,7 @@ IntSpinBox::eventFilter(TQObject *o, TQEvent *e) } } } - if ((TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(editor()) || TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(this) || TQT_BASE_OBJECT(o->parent()) == TQT_BASE_OBJECT(this)) + if ((o == editor() || o == this || o->parent() == this) && e->type() == TQEvent::Wheel && static_cast<IntEdit*>(parentWidget())->isReadOnly()) { return true; //avoid value changes for read-only widget @@ -192,7 +192,7 @@ DoubleSpinBox::DoubleSpinBox (double lower, double upper, double step, double va bool DoubleSpinBox::eventFilter(TQObject *o, TQEvent *e) { - if(TQT_BASE_OBJECT(o) == editor()) + if(o == editor()) { if(e->type() == TQEvent::KeyPress) { @@ -204,7 +204,7 @@ DoubleSpinBox::eventFilter(TQObject *o, TQEvent *e) } } } - if ((TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(editor()) || TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(this) || TQT_BASE_OBJECT(o->parent()) == TQT_BASE_OBJECT(this)) + if ((o == editor() || o == this || o->parent() == this) && e->type() == TQEvent::Wheel && static_cast<IntEdit*>(parentWidget())->isReadOnly()) { return true; //avoid value changes for read-only widget |