diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:50:20 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:50:20 -0600 |
| commit | aef5eada7f51ee48f3d21448db290bd8f06953a8 (patch) | |
| tree | 9d6e7572ebcc27e402501d6966f9b46361a1702c /khexedit/hexbuffer.cc | |
| parent | 95d05392f9bc01594738a1e06ebf23123b3d3e6e (diff) | |
| download | tdeutils-aef5eada7f51ee48f3d21448db290bd8f06953a8.tar.gz tdeutils-aef5eada7f51ee48f3d21448db290bd8f06953a8.zip | |
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'khexedit/hexbuffer.cc')
| -rw-r--r-- | khexedit/hexbuffer.cc | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/khexedit/hexbuffer.cc b/khexedit/hexbuffer.cc index 1e34ae7..8a516a8 100644 --- a/khexedit/hexbuffer.cc +++ b/khexedit/hexbuffer.cc @@ -1860,7 +1860,7 @@ void CHexBuffer::drawText( TQPainter &paint, uint line, int x1, int x2, int y, int CHexBuffer::headerHeight( TQPainter &paint ) { TQFont font( paint.font() ); - paint.setFont( KGlobalSettings::generalFont() ); + paint.setFont( TDEGlobalSettings::generalFont() ); const TQFontMetrics &fm = paint.fontMetrics(); int height = fm.height(); @@ -1871,7 +1871,7 @@ int CHexBuffer::headerHeight( TQPainter &paint ) int CHexBuffer::headerMargin( TQPainter &paint ) { TQFont font( paint.font() ); - paint.setFont( KGlobalSettings::generalFont() ); + paint.setFont( TDEGlobalSettings::generalFont() ); const TQFontMetrics &fm = paint.fontMetrics(); int margin = fm.height() / 2; @@ -1885,7 +1885,7 @@ void CHexBuffer::drawHeader( TQPainter &paint, int sx, int width, int y, const SPagePosition &position ) { TQFont font( paint.font() ); - paint.setFont( KGlobalSettings::generalFont() ); + paint.setFont( TDEGlobalSettings::generalFont() ); const TQFontMetrics &fm = paint.fontMetrics(); paint.fillRect( sx, y, width, fm.height(), TQt::white ); @@ -1918,13 +1918,13 @@ void CHexBuffer::drawHeader( TQPainter &paint, int sx, int width, int y, { TQDateTime datetime; datetime.setTime_t( position.now ); - msg = KGlobal::locale()->formatDateTime(datetime); + msg = TDEGlobal::locale()->formatDateTime(datetime); } else if( header.pos[i] == SPageHeader::PageNumber ) { msg = i18n("Page %1 of %2") - .arg(KGlobal::locale()->formatNumber(position.curPage, 0)) - .arg(KGlobal::locale()->formatNumber(position.maxPage, 0)); + .arg(TDEGlobal::locale()->formatNumber(position.curPage, 0)) + .arg(TDEGlobal::locale()->formatNumber(position.maxPage, 0)); } else if( header.pos[i] == SPageHeader::FileName ) { @@ -1937,7 +1937,7 @@ void CHexBuffer::drawHeader( TQPainter &paint, int sx, int width, int y, if( 0 && pos[i] == TQPainter::AlignRight ) { - //const TQFontMetrics &f = TQFontMetrics( KGlobalSettings::generalFont() ); + //const TQFontMetrics &f = TQFontMetrics( TDEGlobalSettings::generalFont() ); //TQRect r = paint.boundingRect(sx, y, width, fm.height(), pos[i], msg ); //printf("R: %d, %d, %d, %d\n", r.x(), r.y(), r.width(), r.height() ); |