diff options
| -rw-r--r-- | khexedit/bitswapwidget.cc | 4 | ||||
| -rw-r--r-- | khexedit/hexeditorwidget.cc | 6 | ||||
| -rw-r--r-- | khexedit/hexeditstate.h | 4 | ||||
| -rw-r--r-- | khexedit/optiondialog.cc | 4 | ||||
| -rw-r--r-- | khexedit/statusbarprogress.cc | 8 |
5 files changed, 13 insertions, 13 deletions
diff --git a/khexedit/bitswapwidget.cc b/khexedit/bitswapwidget.cc index 1a1a3d3..14c81c1 100644 --- a/khexedit/bitswapwidget.cc +++ b/khexedit/bitswapwidget.cc @@ -98,8 +98,8 @@ void CDigitLabel::drawContents( TQPainter *p ) if( hasFocus() == true ) { - p->fillRect( cr, tqpalette().active().highlight() ); - p->setPen( tqpalette().active().highlightedText() ); + p->fillRect( cr, palette().active().highlight() ); + p->setPen( palette().active().highlightedText() ); } else { diff --git a/khexedit/hexeditorwidget.cc b/khexedit/hexeditorwidget.cc index 720c0bf..894b70f 100644 --- a/khexedit/hexeditorwidget.cc +++ b/khexedit/hexeditorwidget.cc @@ -427,7 +427,7 @@ void CHexEditorWidget::setLayout( const SDisplayLayout &layout ) mDisplayState.layout.edgeMarginWidth = layout.edgeMarginWidth; mDisplayState.layout.columnCharSpace = layout.columnCharSpace; mDisplayState.layout.columnSpacing = layout.columnSpacing; - mDisplayState.tqlayout.horzGridWidth = tqlayout.horzGridWidth; + mDisplayState.layout.horzGridWidth = layout.horzGridWidth; mDisplayState.layout.vertGridWidth = layout.vertGridWidth; // @@ -453,8 +453,8 @@ void CHexEditorWidget::setColor( const SDisplayColor &color ) // // The selection colors can not be chosen. // - mDisplayState.color.selectBg = kapp->tqpalette().active().highlight(); - mDisplayState.color.selectFg = kapp->tqpalette().active().highlightedText(); + mDisplayState.color.selectBg = kapp->palette().active().highlight(); + mDisplayState.color.selectFg = kapp->palette().active().highlightedText(); if( mDisplayState.color.useSystemColor == true ) { diff --git a/khexedit/hexeditstate.h b/khexedit/hexeditstate.h index 199d2cc..2ae2c8c 100644 --- a/khexedit/hexeditstate.h +++ b/khexedit/hexeditstate.h @@ -382,8 +382,8 @@ class SDisplayColor textBg = TQt::white; secondTextBg = TQt::white; inactiveBg = TQt::gray; - selectBg = kapp->tqpalette().active().highlight(); - selectFg = kapp->tqpalette().active().highlightedText(); + selectBg = kapp->palette().active().highlight(); + selectFg = kapp->palette().active().highlightedText(); markBg = TQt::blue; markFg = TQt::white; primaryFg[0] = TQt::black; diff --git a/khexedit/optiondialog.cc b/khexedit/optiondialog.cc index f6bec82..eceb759 100644 --- a/khexedit/optiondialog.cc +++ b/khexedit/optiondialog.cc @@ -901,11 +901,11 @@ void COptionDialog::setLayout( SDisplayLayout &layout, SDisplayLine &line ) slotColumnSepCheck( layout.columnCharSpace ); mLayout.columnSepSpin->setValue( layout.columnSpacing ); - if( tqlayout.horzGridWidth == 0 && tqlayout.vertGridWidth == 0 ) + if( layout.horzGridWidth == 0 && layout.vertGridWidth == 0 ) { mLayout.gridCombo->setCurrentItem(0); } - else if( tqlayout.horzGridWidth != 0 && tqlayout.vertGridWidth != 0 ) + else if( layout.horzGridWidth != 0 && layout.vertGridWidth != 0 ) { mLayout.gridCombo->setCurrentItem(3); } diff --git a/khexedit/statusbarprogress.cc b/khexedit/statusbarprogress.cc index 59facfc..f08baf6 100644 --- a/khexedit/statusbarprogress.cc +++ b/khexedit/statusbarprogress.cc @@ -67,8 +67,8 @@ void CStatusBarProgress::initialize( void ) mBarPixmap = 0; mBarStyle = Solid; - mBarColor = tqpalette().active().highlight(); - mBarTextColor = tqpalette().active().highlightedText(); + mBarColor = palette().active().highlight(); + mBarTextColor = palette().active().highlightedText(); mTextColor = palette().active().text(); setBackgroundColor( palette().active().background() ); @@ -246,8 +246,8 @@ void CStatusBarProgress::adjustStyle( void ) void CStatusBarProgress::paletteChange( const TQPalette & ) { - mBarColor = tqpalette().active().highlight(); - mBarTextColor = tqpalette().active().highlightedText(); + mBarColor = palette().active().highlight(); + mBarTextColor = palette().active().highlightedText(); mTextColor = palette().active().text(); setBackgroundColor( palette().active().background() ); } |