summaryrefslogtreecommitdiffstats
path: root/lib/widgets/qcomboview.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'lib/widgets/qcomboview.cpp')
-rw-r--r--lib/widgets/qcomboview.cpp74
1 files changed, 37 insertions, 37 deletions
diff --git a/lib/widgets/qcomboview.cpp b/lib/widgets/qcomboview.cpp
index cb44f32c..625e4d25 100644
--- a/lib/widgets/qcomboview.cpp
+++ b/lib/widgets/qcomboview.cpp
@@ -158,7 +158,7 @@ QComboView::QComboView( bool rw, TQWidget *parent, const char *name )
d->completeNow = FALSE;
d->completionTimer = new TQTimer( this );
- setFocusPolicy( TQ_StrongFocus );
+ setFocusPolicy( TQWidget::StrongFocus );
d->ed = 0;
if ( rw )
@@ -290,7 +290,7 @@ TQSize QComboView::sizeHint() const
maxW = w;
}
*/
- d->sizeHint = (style().tqsizeFromContents(TQStyle::CT_ComboBox, this,
+ d->sizeHint = (style().sizeFromContents(TQStyle::CT_ComboBox, this,
TQSize(maxW, maxH)).expandedTo(TQApplication::globalStrut()));
return d->sizeHint;
@@ -466,7 +466,7 @@ void QComboView::paintEvent( TQPaintEvent * )
void QComboView::mousePressEvent( TQMouseEvent *e )
{
- if ( e->button() != Qt::LeftButton )
+ if ( e->button() != TQt::LeftButton )
return;
if ( d->discardNextMousePress ) {
d->discardNextMousePress = FALSE;
@@ -491,7 +491,7 @@ void QComboView::mousePressEvent( TQMouseEvent *e )
d->arrowDown = TRUE;
repaint( FALSE );
}
- TQTimer::singleShot( 200, this, TQT_SLOT(internalClickTimeout()));
+ TQTimer::singleShot( 200, this, TQ_SLOT(internalClickTimeout()));
d->shortClick = TRUE;
}
}
@@ -850,7 +850,7 @@ bool QComboView::eventFilter( TQObject *object, TQEvent *event )
{
if ( !event )
return TRUE;
- else if ( TQT_BASE_OBJECT(object) == TQT_BASE_OBJECT(d->ed) ) {
+ else if ( object == d->ed ) {
if ( event->type() == TQEvent::KeyPress ) {
bool isAccepted = ( (TQKeyEvent*)event )->isAccepted();
keyPressEvent( (TQKeyEvent *)event );
@@ -887,15 +887,15 @@ bool QComboView::eventFilter( TQObject *object, TQEvent *event )
}
}
}
- } else if ( ( TQT_BASE_OBJECT(object) == TQT_BASE_OBJECT(d->listView()) ||
- TQT_BASE_OBJECT(object) == TQT_BASE_OBJECT(d->listView()->viewport()) )) {
+ } else if ( ( object == d->listView() ||
+ object == d->listView()->viewport() )) {
TQMouseEvent *e = (TQMouseEvent*)event;
switch( event->type() ) {
case TQEvent::MouseMove:
if ( !d->mouseWasInsidePopup ) {
// tqWarning("!d->mouseWasInsidePopup");
TQPoint pos = e->pos();
- if ( TQT_TQRECT_OBJECT(d->listView()->rect()).contains( pos ) )
+ if ( d->listView()->rect().contains( pos ) )
d->mouseWasInsidePopup = TRUE;
// Check if arrow button should toggle
if ( d->arrowPressed ) {
@@ -917,7 +917,7 @@ bool QComboView::eventFilter( TQObject *object, TQEvent *event )
}
}
}
- } else if ((e->state() & ( Qt::RightButton | Qt::LeftButton | Qt::MidButton ) ) == 0 &&
+ } else if ((e->state() & ( TQt::RightButton | TQt::LeftButton | TQt::MidButton ) ) == 0 &&
style().styleHint(TQStyle::SH_ComboBox_ListMouseTracking, this)) {
// tqWarning("event filter:: emu");
TQWidget *mouseW = TQApplication::widgetAt( e->globalPos(), TRUE );
@@ -935,7 +935,7 @@ bool QComboView::eventFilter( TQObject *object, TQEvent *event )
break;
case TQEvent::MouseButtonRelease:
- if ( TQT_TQRECT_OBJECT(d->listView()->rect()).contains( e->pos() ) ) {
+ if ( d->listView()->rect().contains( e->pos() ) ) {
TQMouseEvent tmp( TQEvent::MouseButtonDblClick,
e->pos(), e->button(), e->state() ) ;
// will hide popup
@@ -955,7 +955,7 @@ bool QComboView::eventFilter( TQObject *object, TQEvent *event )
break;
case TQEvent::MouseButtonDblClick:
case TQEvent::MouseButtonPress:
- if ( !TQT_TQRECT_OBJECT(d->listView()->rect()).contains( e->pos() ) ) {
+ if ( !d->listView()->rect().contains( e->pos() ) ) {
TQPoint globalPos = d->listView()->mapToGlobal(e->pos());
if ( TQApplication::widgetAt( globalPos, TRUE ) == this ) {
d->discardNextMousePress = TRUE;
@@ -1241,16 +1241,16 @@ void QComboView::setListView( TQListView * newListView )
d->listView()->resize( 100, 10 );
*/
- connect( d->listView(), TQT_SIGNAL(returnPressed(TQListViewItem*)),
- TQT_SLOT(internalActivate(TQListViewItem*)));
- connect( d->listView(), TQT_SIGNAL(doubleClicked(TQListViewItem*)),
- TQT_SLOT(internalActivate(TQListViewItem*)));
- connect( d->listView(), TQT_SIGNAL(doubleClicked(TQListViewItem*)),
- TQT_SLOT(checkState(TQListViewItem*)));
- connect( d->listView(), TQT_SIGNAL(currentChanged(TQListViewItem*)),
- TQT_SLOT(internalHighlight(TQListViewItem*)));
- connect( d->listView(), TQT_SIGNAL(selectionChanged(TQListViewItem*)),
- TQT_SLOT(internalHighlight(TQListViewItem*)));
+ connect( d->listView(), TQ_SIGNAL(returnPressed(TQListViewItem*)),
+ TQ_SLOT(internalActivate(TQListViewItem*)));
+ connect( d->listView(), TQ_SIGNAL(doubleClicked(TQListViewItem*)),
+ TQ_SLOT(internalActivate(TQListViewItem*)));
+ connect( d->listView(), TQ_SIGNAL(doubleClicked(TQListViewItem*)),
+ TQ_SLOT(checkState(TQListViewItem*)));
+ connect( d->listView(), TQ_SIGNAL(currentChanged(TQListViewItem*)),
+ TQ_SLOT(internalHighlight(TQListViewItem*)));
+ connect( d->listView(), TQ_SIGNAL(selectionChanged(TQListViewItem*)),
+ TQ_SLOT(internalHighlight(TQListViewItem*)));
}
@@ -1359,7 +1359,7 @@ void QComboView::setEditable( bool y )
d->ed = 0;
}
- setFocusPolicy( TQ_StrongFocus );
+ setFocusPolicy( TQWidget::StrongFocus );
updateGeometry();
update();
}
@@ -1386,16 +1386,16 @@ void QComboView::setUpListView()
d->listView()->header()->hide();
- connect( d->listView(), TQT_SIGNAL(returnPressed(TQListViewItem*)),
- TQT_SLOT(internalActivate(TQListViewItem*)));
- connect( d->listView(), TQT_SIGNAL(doubleClicked(TQListViewItem*)),
- TQT_SLOT(internalActivate(TQListViewItem*)));
- connect( d->listView(), TQT_SIGNAL(doubleClicked(TQListViewItem*)),
- TQT_SLOT(checkState(TQListViewItem*)));
- connect( d->listView(), TQT_SIGNAL(currentChanged(TQListViewItem*)),
- TQT_SLOT(internalHighlight(TQListViewItem*)));
- connect( d->listView(), TQT_SIGNAL(selectionChanged(TQListViewItem*)),
- TQT_SLOT(internalHighlight(TQListViewItem*)));
+ connect( d->listView(), TQ_SIGNAL(returnPressed(TQListViewItem*)),
+ TQ_SLOT(internalActivate(TQListViewItem*)));
+ connect( d->listView(), TQ_SIGNAL(doubleClicked(TQListViewItem*)),
+ TQ_SLOT(internalActivate(TQListViewItem*)));
+ connect( d->listView(), TQ_SIGNAL(doubleClicked(TQListViewItem*)),
+ TQ_SLOT(checkState(TQListViewItem*)));
+ connect( d->listView(), TQ_SIGNAL(currentChanged(TQListViewItem*)),
+ TQ_SLOT(internalHighlight(TQListViewItem*)));
+ connect( d->listView(), TQ_SIGNAL(selectionChanged(TQListViewItem*)),
+ TQ_SLOT(internalHighlight(TQListViewItem*)));
}
@@ -1430,20 +1430,20 @@ void QComboView::setLineEdit( TQLineEdit *edit )
d->ed = edit;
- if ( TQT_BASE_OBJECT(edit->parent()) != TQT_BASE_OBJECT(this) ) {
+ if ( edit->parent() != this ) {
edit->reparent( this, TQPoint(0,0), FALSE );
edit->setFont( font() );
}
- connect (edit, TQT_SIGNAL( textChanged( const TQString& ) ),
- this, TQT_SIGNAL( textChanged( const TQString& ) ) );
- connect( edit, TQT_SIGNAL(returnPressed()), TQT_SLOT(returnPressed()) );
+ connect (edit, TQ_SIGNAL( textChanged( const TQString& ) ),
+ this, TQ_SIGNAL( textChanged( const TQString& ) ) );
+ connect( edit, TQ_SIGNAL(returnPressed()), TQ_SLOT(returnPressed()) );
edit->setFrame( FALSE );
d->updateLinedGeometry();
edit->installEventFilter( this );
setFocusProxy( edit );
- setFocusPolicy( TQ_StrongFocus );
+ setFocusPolicy( TQWidget::StrongFocus );
setUpListView();
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-21 21:01:32 +0000