summaryrefslogtreecommitdiffstats
path: root/src/table/qtable.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/table/qtable.cpp')
-rw-r--r--src/table/qtable.cpp28
1 files changed, 14 insertions, 14 deletions
diff --git a/src/table/qtable.cpp b/src/table/qtable.cpp
index 40f407bfe..555b3e03a 100644
--- a/src/table/qtable.cpp
+++ b/src/table/qtable.cpp
@@ -2824,9 +2824,9 @@ void TQTable::drawContents( TQPainter *p, int cx, int cy, int cw, int ch )
TQTableItem *itm = item( r, c );
if ( itm &&
( itm->colSpan() > 1 || itm->rowSpan() > 1 ) ) {
- bool goon = r == itm->row() && c == itm->col() ||
- r == rowfirst && c == itm->col() ||
- r == itm->row() && c == colfirst;
+ bool goon = (r == itm->row() && c == itm->col()) ||
+ (r == rowfirst && c == itm->col()) ||
+ (r == itm->row() && c == colfirst);
if ( !goon )
continue;
rowp = rowPos( itm->row() );
@@ -3680,7 +3680,7 @@ void TQTable::contentsMousePressEventEx( TQMouseEvent* e )
} else if ( ( e->state() & ControlButton ) == ControlButton ) {
setCurrentCell( tmpRow, tmpCol, FALSE, TRUE );
if ( selMode != NoSelection ) {
- if ( selMode == Single || selMode == SingleRow && !isSelected( tmpRow, tmpCol, FALSE ) )
+ if ( selMode == Single || ( selMode == SingleRow && !isSelected( tmpRow, tmpCol, FALSE ) ) )
clearSelection();
if ( !(selMode == SingleRow && isSelected( tmpRow, tmpCol, FALSE )) ) {
currentSel = new TQTableSelection();
@@ -4033,7 +4033,7 @@ bool TQTable::eventFilter( TQObject *o, TQEvent *e )
}
if ( ( edMode == Replacing ||
- itm && itm->editType() == TQTableItem::WhenCurrent ) &&
+ ( itm && itm->editType() == TQTableItem::WhenCurrent ) ) &&
( ke->key() == Key_Up || ke->key() == Key_Prior ||
ke->key() == Key_Home || ke->key() == Key_Down ||
ke->key() == Key_Next || ke->key() == Key_End ||
@@ -4218,7 +4218,7 @@ void TQTable::keyPressEvent( TQKeyEvent* e )
TQWidget *w = beginEdit( tmpRow, tmpCol,
itm ? itm->isReplaceable() : TRUE );
if ( w ) {
- setEditMode( ( !itm || itm && itm->isReplaceable()
+ setEditMode( ( !itm || ( itm && itm->isReplaceable() )
? Replacing : Editing ), tmpRow, tmpCol );
TQApplication::sendEvent( w, e );
return;
@@ -4725,7 +4725,7 @@ TQRect TQTable::cellGeometry( int row, int col ) const
{
TQTableItem *itm = item( row, col );
- if ( !itm || itm->rowSpan() == 1 && itm->colSpan() == 1 )
+ if ( !itm || ( itm->rowSpan() == 1 && itm->colSpan() == 1 ) )
return TQRect( columnPos( col ), rowPos( row ),
columnWidth( col ), rowHeight( row ) );
@@ -6706,8 +6706,8 @@ void TQTableHeader::paintEvent( TQPaintEvent *e )
}
paintSection( &p, i, r );
p.restore();
- if ( orientation() == Horizontal && r. right() >= e->rect().right() ||
- orientation() == Vertical && r. bottom() >= e->rect().bottom() )
+ if ( ( orientation() == Horizontal && r. right() >= e->rect().right() ) ||
+ ( orientation() == Vertical && r. bottom() >= e->rect().bottom() ) )
return;
}
if ( !reg.isEmpty() )
@@ -6728,7 +6728,7 @@ void TQTableHeader::paintSection( TQPainter *p, int index, const TQRect& fr )
return;
if ( sectionState( index ) != Selected ||
- orientation() == Horizontal && isRowSelection( table->selectionMode() ) ) {
+ ( orientation() == Horizontal && isRowSelection( table->selectionMode() ) ) ) {
TQHeader::paintSection( p, index, fr );
} else {
TQStyle::SFlags flags = TQStyle::Style_Off | ( orient == Horizontal ? TQStyle::Style_Horizontal : 0 );
@@ -6817,8 +6817,8 @@ bool TQTableHeader::doSelection( TQMouseEvent *e )
if ( startPos == -1 ) {
int secAt = sectionAt( p );
- if ( ( e->state() & ControlButton ) != ControlButton &&
- ( e->state() & ShiftButton ) != ShiftButton ||
+ if ( ( ( e->state() & ControlButton ) != ControlButton &&
+ ( e->state() & ShiftButton ) != ShiftButton ) ||
table->selectionMode() == TQTable::Single ||
table->selectionMode() == TQTable::SingleRow ) {
startPos = p;
@@ -6853,8 +6853,8 @@ bool TQTableHeader::doSelection( TQMouseEvent *e )
table->setCurrentCell( 0, secAt );
}
- if ( orientation() == Horizontal && table->isColumnSelected(secAt) ||
- orientation() == Vertical && table->isRowSelected(secAt)) {
+ if ( ( orientation() == Horizontal && table->isColumnSelected(secAt) ) ||
+ ( orientation() == Vertical && table->isRowSelected(secAt) ) ) {
setSectionState( secAt, Selected );
}