summaryrefslogtreecommitdiffstats
path: root/kdeui/kcompletionbox.cpp
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-01-07 03:45:53 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-01-07 03:45:53 +0000
commit10308be19ef7fa44699562cc75946e7ea1fdf6b9 (patch)
tree4bc444c00a79e88105f2cfce5b6209994c413ca0 /kdeui/kcompletionbox.cpp
parent307136d8eef0ba133b78ceee8e901138d4c996a1 (diff)
downloadtdelibs-10308be19ef7fa44699562cc75946e7ea1fdf6b9.tar.gz
tdelibs-10308be19ef7fa44699562cc75946e7ea1fdf6b9.zip
Revert automated changes
Sorry guys, they are just not ready for prime time Work will continue as always git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdelibs@1212479 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kdeui/kcompletionbox.cpp')
-rw-r--r--kdeui/kcompletionbox.cpp26
1 files changed, 13 insertions, 13 deletions
diff --git a/kdeui/kcompletionbox.cpp b/kdeui/kcompletionbox.cpp
index c830a7b21..ed75ecd21 100644
--- a/kdeui/kcompletionbox.cpp
+++ b/kdeui/kcompletionbox.cpp
@@ -231,7 +231,7 @@ bool KCompletionBox::eventFilter( TQObject *o, TQEvent *e )
// any mouse-click on something else than "this" makes us hide
else if ( type == TQEvent::MouseButtonPress ) {
TQMouseEvent *ev = static_cast<TQMouseEvent *>( e );
- if ( !rect().tqcontains( ev->pos() )) // this widget
+ if ( !rect().contains( ev->pos() )) // this widget
hide();
if ( !d->emitSelected && currentItem() && !::qt_cast<TQScrollBar*>(o) )
@@ -260,7 +260,7 @@ void KCompletionBox::popup()
clearSelection();
if ( !isVisible() )
show();
- else if ( size().height() != tqsizeHint().height() )
+ else if ( size().height() != sizeHint().height() )
sizeAndPosition();
}
}
@@ -302,7 +302,7 @@ void KCompletionBox::show()
d->upwardBox = false;
if ( d->m_parent ) {
sizeAndPosition();
- tqApp->installEventFilter( this );
+ qApp->installEventFilter( this );
}
// ### we shouldn't need to call this, but without this, the scrollbars
@@ -310,21 +310,21 @@ void KCompletionBox::show()
//triggerUpdate( true );
// Workaround for I'm not sure whose bug - if this KCompletionBox' parent
- // is in a tqlayout, that tqlayout will detect inserting new child (posted
- // ChildInserted event), and will trigger retqlayout (post LayoutHint event).
+ // is in a layout, that layout will detect inserting new child (posted
+ // ChildInserted event), and will trigger relayout (post LayoutHint event).
// TQWidget::show() sends also posted ChildInserted events for the parent,
- // and later all LayoutHint events, which causes tqlayout updating.
+ // and later all LayoutHint events, which causes layout updating.
// The problem is, KCompletionBox::eventFilter() detects resizing
// of the parent, and calls hide() - and this hide() happen in the middle
// of show(), causing inconsistent state. I'll try to submit a Qt patch too.
- tqApp->sendPostedEvents();
+ qApp->sendPostedEvents();
KListBox::show();
}
void KCompletionBox::hide()
{
if ( d->m_parent )
- tqApp->removeEventFilter( this );
+ qApp->removeEventFilter( this );
d->cancelText = TQString::null;
KListBox::hide();
}
@@ -335,8 +335,8 @@ TQRect KCompletionBox::calculateGeometry() const
int ih = itemHeight();
int h = QMIN( 15 * ih, (int) count() * ih ) + 2*frameWidth();
- int w = (d->m_parent) ? d->m_parent->width() : KListBox::tqminimumSizeHint().width();
- w = QMAX( KListBox::tqminimumSizeHint().width(), w );
+ int w = (d->m_parent) ? d->m_parent->width() : KListBox::minimumSizeHint().width();
+ w = QMAX( KListBox::minimumSizeHint().width(), w );
//If we're inside a combox, Qt by default makes the dropdown
// as wide as the combo, and gives the style a chance
@@ -373,7 +373,7 @@ TQRect KCompletionBox::calculateGeometry() const
return TQRect(x, y, w, h);
}
-TQSize KCompletionBox::tqsizeHint() const
+TQSize KCompletionBox::sizeHint() const
{
return calculateGeometry().size();
}
@@ -485,7 +485,7 @@ void KCompletionBox::setItems( const TQStringList& items )
}
else {
//Keep track of whether we need to change anything,
- //so we can avoid a tqrepaint for identical updates,
+ //so we can avoid a repaint for identical updates,
//to reduce flicker
bool dirty = false;
@@ -520,7 +520,7 @@ void KCompletionBox::setItems( const TQStringList& items )
triggerUpdate( false );
}
- if ( isVisible() && size().height() != tqsizeHint().height() )
+ if ( isVisible() && size().height() != sizeHint().height() )
sizeAndPosition();
blockSignals( block );