summaryrefslogtreecommitdiffstats
path: root/khexedit
diff options
context:
space:
mode:
Diffstat (limited to 'khexedit')
-rw-r--r--khexedit/bitswapwidget.cc2
-rw-r--r--khexedit/chartabledialog.cc2
-rw-r--r--khexedit/fileinfodialog.cc4
-rw-r--r--khexedit/hexbuffer.cc14
-rw-r--r--khexedit/hexdrag.cc2
-rw-r--r--khexedit/hexeditorwidget.cc2
-rw-r--r--khexedit/hexeditstate.h4
-rw-r--r--khexedit/hexviewwidget.cc2
-rw-r--r--khexedit/lib/codecs/ktextcharcodec.cpp12
-rw-r--r--khexedit/lib/kbufferdrag.cpp4
-rw-r--r--khexedit/lib/khexedit.cpp2
-rw-r--r--khexedit/optiondialog.cc2
-rw-r--r--khexedit/parts/kpart/khepart.cpp2
-rw-r--r--khexedit/statusbarprogress.cc2
-rw-r--r--khexedit/stringdialog.cc2
15 files changed, 29 insertions, 29 deletions
diff --git a/khexedit/bitswapwidget.cc b/khexedit/bitswapwidget.cc
index 14c81c1..337b447 100644
--- a/khexedit/bitswapwidget.cc
+++ b/khexedit/bitswapwidget.cc
@@ -38,7 +38,7 @@ CDigitLabel::~CDigitLabel( void )
void CDigitLabel::initialize( void )
{
- TQFont font( KGlobalSettings::generalFont() );
+ TQFont font( TDEGlobalSettings::generalFont() );
font.setBold( true );
setFont( font );
}
diff --git a/khexedit/chartabledialog.cc b/khexedit/chartabledialog.cc
index a560ea8..933fa7e 100644
--- a/khexedit/chartabledialog.cc
+++ b/khexedit/chartabledialog.cc
@@ -45,7 +45,7 @@ CCharTableDialog::CCharTableDialog( TQWidget *parent, const char *name,
if( topLayout == 0 ) { return; }
mCharacterList = new CListView( plainPage(), "characterList" );
- mCharacterList->setFont( KGlobalSettings::fixedFont() );
+ mCharacterList->setFont( TDEGlobalSettings::fixedFont() );
mCharacterList->addColumn( i18n("Decimal") );
mCharacterList->addColumn( i18n("Hexadecimal") );
mCharacterList->addColumn( i18n("Octal") );
diff --git a/khexedit/fileinfodialog.cc b/khexedit/fileinfodialog.cc
index a619846..bfa7ff2 100644
--- a/khexedit/fileinfodialog.cc
+++ b/khexedit/fileinfodialog.cc
@@ -100,7 +100,7 @@ CFileInfoDialog::CFileInfoDialog( TQWidget *parent,const char *name,bool modal)
gbox->addWidget( mFileSizeLabel, 1, 1 );
mFrequencyList = new CListView( plainPage(), "stringList" );
- mFrequencyList->setFont( KGlobalSettings::fixedFont() );
+ mFrequencyList->setFont( TDEGlobalSettings::fixedFont() );
mFrequencyList->addColumn( i18n("Hexadecimal") );
mFrequencyList->addColumn( i18n("Decimal") );
@@ -219,7 +219,7 @@ void CFileInfoDialog::setStatistics( SStatisticControl &sc )
setClean();
mFrequencyList->clear();
mFileNameLabel->setText( sc.documentName );
- mFileSizeLabel->setText( KGlobal::locale()->formatNumber(sc.documentSize, 0) );
+ mFileSizeLabel->setText( TDEGlobal::locale()->formatNumber(sc.documentSize, 0) );
TQString d, h, o, b, c, n, p;
TQListViewItem *item = 0;
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() );
diff --git a/khexedit/hexdrag.cc b/khexedit/hexdrag.cc
index 1c9e234..f833256 100644
--- a/khexedit/hexdrag.cc
+++ b/khexedit/hexdrag.cc
@@ -52,7 +52,7 @@ void CHexDrag::prepPixmap(void)
// Wont use it yet,
//
/*
- KIconLoader &loader = *KGlobal::iconLoader();
+ KIconLoader &loader = *TDEGlobal::iconLoader();
TQPixmap pix = loader.loadIcon( "binary.xpm" );
TQPoint hotspot( pix.width()-20,pix.height()/2 );
diff --git a/khexedit/hexeditorwidget.cc b/khexedit/hexeditorwidget.cc
index 894b70f..5bf6c7f 100644
--- a/khexedit/hexeditorwidget.cc
+++ b/khexedit/hexeditorwidget.cc
@@ -493,7 +493,7 @@ void CHexEditorWidget::setFont( const SDisplayFont &font )
SDisplayFontInfo fontInfo;
if( mDisplayState.font.useSystemFont == true )
{
- fontInfo.font = KGlobalSettings::fixedFont();
+ fontInfo.font = TDEGlobalSettings::fixedFont();
}
else
{
diff --git a/khexedit/hexeditstate.h b/khexedit/hexeditstate.h
index 2ae2c8c..339a26a 100644
--- a/khexedit/hexeditstate.h
+++ b/khexedit/hexeditstate.h
@@ -429,7 +429,7 @@ class SDisplayFontInfo
SDisplayFontInfo &init( void )
{
- font = KGlobalSettings::fixedFont();
+ font = TDEGlobalSettings::fixedFont();
nonPrintChar = '.';
return( *this );
}
@@ -444,7 +444,7 @@ class SDisplayFont
SDisplayFont( void )
{
useSystemFont = false;
- localFont = KGlobalSettings::fixedFont();
+ localFont = TDEGlobalSettings::fixedFont();
nonPrintChar = '.';
}
diff --git a/khexedit/hexviewwidget.cc b/khexedit/hexviewwidget.cc
index 22f939d..5ebd75b 100644
--- a/khexedit/hexviewwidget.cc
+++ b/khexedit/hexviewwidget.cc
@@ -89,7 +89,7 @@ bool CDragManager::start( TQMouseEvent *e )
if( mActivateMode == Movement )
{
- if( (mOrigin - e->pos()).manhattanLength() > KGlobalSettings::dndEventDelay() )
+ if( (mOrigin - e->pos()).manhattanLength() > TDEGlobalSettings::dndEventDelay() )
{
mPending = false;
emit startDrag( e->state() & ShiftButton ? true : false );
diff --git a/khexedit/lib/codecs/ktextcharcodec.cpp b/khexedit/lib/codecs/ktextcharcodec.cpp
index b45c76d..6b27670 100644
--- a/khexedit/lib/codecs/ktextcharcodec.cpp
+++ b/khexedit/lib/codecs/ktextcharcodec.cpp
@@ -79,7 +79,7 @@ static bool is8Bit( TQTextCodec *Codec )
static TQTextCodec *createLatin1()
{
- return KGlobal::charsets()->codecForName( EncodingNames[0].Name );
+ return TDEGlobal::charsets()->codecForName( EncodingNames[0].Name );
}
/** heuristic seems to be doomed :(
@@ -120,12 +120,12 @@ const TQStringList &KTextCharCodec::codecNames()
// first call?
if( CodecNames.isEmpty() )
{
- const TQStringList &CharSets = KGlobal::charsets()->availableEncodingNames();
+ const TQStringList &CharSets = TDEGlobal::charsets()->availableEncodingNames();
for( TQStringList::ConstIterator it = CharSets.begin(); it != CharSets.end(); ++it )
{
bool Found = true;
- TQTextCodec* Codec = KGlobal::charsets()->codecForName( *it, Found );
+ TQTextCodec* Codec = TDEGlobal::charsets()->codecForName( *it, Found );
if( Found && is8Bit(Codec) )
CodecNames.append( TQString::fromLatin1(Codec->name()) );
}
@@ -161,7 +161,7 @@ TQStringList KTextCharCodec::CodecNames;
KTextCharCodec *KTextCharCodec::createLocalCodec()
{
- TQTextCodec *Codec = KGlobal::locale()->codecForEncoding();
+ TQTextCodec *Codec = TDEGlobal::locale()->codecForEncoding();
if( !is8Bit(Codec) )
Codec = createLatin1();
return new KTextCharCodec( Codec );
@@ -171,7 +171,7 @@ KTextCharCodec *KTextCharCodec::createLocalCodec()
KTextCharCodec *KTextCharCodec::createCodec( const TQString &CodeName )
{
bool Ok;
- TQTextCodec *Codec = KGlobal::charsets()->codecForName( CodeName, Ok );
+ TQTextCodec *Codec = TDEGlobal::charsets()->codecForName( CodeName, Ok );
if( Ok )
Ok = is8Bit( Codec );
return Ok ? new KTextCharCodec( Codec ) : 0;
@@ -187,7 +187,7 @@ const TQStringList &KTextCharCodec::codecNames()
{
bool Found = true;
TQString Name = TQString::fromLatin1( EncodingNames[i].Name );
- TQTextCodec* Codec = KGlobal::charsets()->codecForName( Name, Found );
+ TQTextCodec* Codec = TDEGlobal::charsets()->codecForName( Name, Found );
if( Found )
CodecNames.append( TQString::fromLatin1(Codec->name()) );
}
diff --git a/khexedit/lib/kbufferdrag.cpp b/khexedit/lib/kbufferdrag.cpp
index 35fbbca..54b776e 100644
--- a/khexedit/lib/kbufferdrag.cpp
+++ b/khexedit/lib/kbufferdrag.cpp
@@ -47,7 +47,7 @@ static const char *localTextPlain()
if( TextPlainLocal.isNull() )
{
- TextPlainLocal = TQCString(KGlobal::locale()->encoding()).lower();
+ TextPlainLocal = TQCString(TDEGlobal::locale()->encoding()).lower();
// remove the whitespaces
int s;
while( (s=TextPlainLocal.find(' ')) >= 0 )
@@ -74,7 +74,7 @@ static TQTextCodec* codecForCharset( const TQCString& Desc )
return TQTextCodec::codecForName( CharSetName );
}
// no charset=, use locale
- return KGlobal::locale()->codecForEncoding();
+ return TDEGlobal::locale()->codecForEncoding();
}
diff --git a/khexedit/lib/khexedit.cpp b/khexedit/lib/khexedit.cpp
index 2a833d6..6a7c433 100644
--- a/khexedit/lib/khexedit.cpp
+++ b/khexedit/lib/khexedit.cpp
@@ -128,7 +128,7 @@ KHexEdit::KHexEdit( KDataBuffer *Buffer, TQWidget *Parent, const char *Name, WFl
FixedFont.setFixedPitch( true );
setFont( FixedFont );
#else
- setFont( KGlobalSettings::fixedFont() );
+ setFont( TDEGlobalSettings::fixedFont() );
#endif
// get the full control
diff --git a/khexedit/optiondialog.cc b/khexedit/optiondialog.cc
index 89ed9b3..c33700c 100644
--- a/khexedit/optiondialog.cc
+++ b/khexedit/optiondialog.cc
@@ -392,7 +392,7 @@ void COptionDialog::setupFontPage( void )
mFont.chooser = new KFontChooser( page, "font", true, TQStringList(), false, 4 );
topLayout->addWidget( mFont.chooser );
- TQFont fixFont( KGlobalSettings::fixedFont() );
+ TQFont fixFont( TDEGlobalSettings::fixedFont() );
fixFont.setBold(true);
mFont.chooser->setFont( fixFont, true );
mFont.chooser->setSampleText( i18n("KHexEdit editor font") );
diff --git a/khexedit/parts/kpart/khepart.cpp b/khexedit/parts/kpart/khepart.cpp
index 5ccafbf..a204671 100644
--- a/khexedit/parts/kpart/khepart.cpp
+++ b/khexedit/parts/kpart/khepart.cpp
@@ -69,7 +69,7 @@ KHexEditPart::~KHexEditPart()
/*
void KHexEditPart::setupTools( bool BrowserViewWanted )
{
- if( !BrowserViewWanted ) new KClipboardTool( this );
+ if( !BrowserViewWanted ) new TDEClipboardTool( this );
new KZoomToolet( this );
new KSelectToolet( this );
diff --git a/khexedit/statusbarprogress.cc b/khexedit/statusbarprogress.cc
index f08baf6..5e7814d 100644
--- a/khexedit/statusbarprogress.cc
+++ b/khexedit/statusbarprogress.cc
@@ -72,7 +72,7 @@ void CStatusBarProgress::initialize( void )
mTextColor = palette().active().text();
setBackgroundColor( palette().active().background() );
- TQFont font( KGlobalSettings::generalFont() );
+ TQFont font( TDEGlobalSettings::generalFont() );
font.setBold( true );
setFont( font );
diff --git a/khexedit/stringdialog.cc b/khexedit/stringdialog.cc
index 52a845e..37247ae 100644
--- a/khexedit/stringdialog.cc
+++ b/khexedit/stringdialog.cc
@@ -91,7 +91,7 @@ CStringDialog::CStringDialog( TQWidget *parent, const char *name, bool modal )
// Using listview as suggested by Dima Rogozin <dima@mercury.co.il>
//
mStringList = new CListView( plainPage(), "stringList" );
- mStringList->setFont( KGlobalSettings::fixedFont() );
+ mStringList->setFont( TDEGlobalSettings::fixedFont() );
mStringList->addColumn( i18n("Offset") );
mStringList->addColumn( i18n("String") );
mStringList->setAllColumnsShowFocus( true );
generated by cgit v1.2.1 (git 2.18.0) at 2024-12-29 18:37:04 +0000