Use tdeApprename/tdeapp

Signed-off-by: Michele Calgaro <[email protected]>

9 files changed, 43 insertions, 43 deletions

diff --git a/khexedit/dialog.cpp b/khexedit/dialog.cpp
index 76f48bc..a26ed0e 100644
--- a/khexedit/dialog.cpp
+++ b/khexedit/dialog.cpp
@@ -78,7 +78,7 @@ CGotoDialog::CGotoDialog( TQWidget *parent, const char *name, bool modal )
   gbox->addWidget( mCheckVisible, 2, 0 );
   gbox->setRowStretch( 3, 10 );
 
-  TDEConfig &config = *kapp->config();
+  TDEConfig &config = *tdeApp->config();
   config.setGroup("Goto Dialog");
   mCheckFromCursor->setChecked( config.readBoolEntry( "FromCursor", false ) );
   mCheckVisible->setChecked( config.readBoolEntry( "StayVisible", true ) );
@@ -89,7 +89,7 @@ CGotoDialog::CGotoDialog( TQWidget *parent, const char *name, bool modal )
 
 CGotoDialog::~CGotoDialog( void )
 {
-  TDEConfig &config = *kapp->config();
+  TDEConfig &config = *tdeApp->config();
   config.setGroup("Goto Dialog");
   config.writeEntry( "FromCursor", mCheckFromCursor->isChecked() );
   config.writeEntry( "StayVisible", mCheckVisible->isChecked() );
@@ -232,7 +232,7 @@ CFindDialog::CFindDialog( TQWidget *parent, const char *name, bool modal )
   gbox->addWidget( mCheckIgnoreCase, 3, 0 );
   gbox->setRowStretch( 4, 10 );
 
-  TDEConfig &config = *kapp->config();
+  TDEConfig &config = *tdeApp->config();
   config.setGroup("Find Dialog");
   mCheckFromCursor->setChecked( config.readBoolEntry( "FromCursor", true ) );
   mCheckInSelection->setChecked( config.readBoolEntry( "InSelection", false) );
@@ -248,7 +248,7 @@ CFindDialog::CFindDialog( TQWidget *parent, const char *name, bool modal )
 
 CFindDialog::~CFindDialog( void )
 {
-  TDEConfig &config = *kapp->config();
+  TDEConfig &config = *tdeApp->config();
   config.setGroup("Find Dialog");
   config.writeEntry( "FromCursor", mCheckFromCursor->isChecked() );
   config.writeEntry( "InSelection", mCheckInSelection->isChecked() );
@@ -573,7 +573,7 @@ CReplaceDialog::CReplaceDialog( TQWidget *parent, const char *name, bool modal )
   gbox->addWidget( mCheckIgnoreCase, 3, 0 );
   gbox->setRowStretch( 4, 10 );
 
-  TDEConfig &config = *kapp->config();
+  TDEConfig &config = *tdeApp->config();
   config.setGroup("Replace Dialog");
   mCheckFromCursor->setChecked( config.readBoolEntry( "FromCursor", true ) );
   mCheckInSelection->setChecked( config.readBoolEntry( "InSelection", false) );
@@ -592,7 +592,7 @@ CReplaceDialog::CReplaceDialog( TQWidget *parent, const char *name, bool modal )
 
 CReplaceDialog::~CReplaceDialog( void )
 {
-  TDEConfig &config = *kapp->config();
+  TDEConfig &config = *tdeApp->config();
   config.setGroup("Replace Dialog");
   config.writeEntry( "FromCursor", mCheckFromCursor->isChecked() );
   config.writeEntry( "InSelection", mCheckInSelection->isChecked() );
@@ -1146,7 +1146,7 @@ CInsertDialog::CInsertDialog( TQWidget *parent, const char *name, bool modal )
   connect( mCheckOnCursor, TQ_SIGNAL(clicked()), TQ_SLOT(cursorCheck()) );
   gbox->setRowStretch( 3, 10 );
 
-  TDEConfig &config = *kapp->config();
+  TDEConfig &config = *tdeApp->config();
   config.setGroup("Insert Pattern Dialog");
   mCheckPattern->setChecked( config.readBoolEntry( "RepeatPattern", false ) );
   mCheckOnCursor->setChecked( config.readBoolEntry( "InsertOnCursor", false) );
@@ -1159,7 +1159,7 @@ CInsertDialog::CInsertDialog( TQWidget *parent, const char *name, bool modal )
 
 CInsertDialog::~CInsertDialog( void )
 {
-  TDEConfig &config = *kapp->config();
+  TDEConfig &config = *tdeApp->config();
   config.setGroup("Insert Pattern Dialog");
   config.writeEntry( "RepeatPattern", mCheckPattern->isChecked() );
   config.writeEntry( "InsertOnCursor", mCheckOnCursor->isChecked() );
diff --git a/khexedit/hexeditorwidget.cpp b/khexedit/hexeditorwidget.cpp
index 5638576..d066738 100644
--- a/khexedit/hexeditorwidget.cpp
+++ b/khexedit/hexeditorwidget.cpp
@@ -64,8 +64,8 @@ CHexEditorWidget::CHexEditorWidget( TQWidget *parent, const char *name )
   connect( mHexView, TQ_SIGNAL(pleaseOpenFile( const TQString&, bool, uint )),
 	   TQ_SLOT( open(const TQString&, bool, uint)) );
   connect( mHexView, TQ_SIGNAL(pleaseStepFile(bool)), TQ_SLOT( stepFile(bool)) );
-  connect( kapp, TQ_SIGNAL( tdedisplayFontChanged() ), TQ_SLOT( fontChanged() ) );
-  connect( kapp, TQ_SIGNAL( tdedisplayPaletteChanged() ),TQ_SLOT( paletteChanged()) );
+  connect( tdeApp, TQ_SIGNAL( tdedisplayFontChanged() ), TQ_SLOT( fontChanged() ) );
+  connect( tdeApp, TQ_SIGNAL( tdedisplayPaletteChanged() ),TQ_SLOT( paletteChanged()) );
   connect( mHexView, TQ_SIGNAL( layoutChanged( const SDisplayLayout & ) ),
 	   TQ_SLOT( layoutChanged( const SDisplayLayout & ) ) );
   connect( mHexView, TQ_SIGNAL( inputModeChanged( const SDisplayInputMode & ) ),
@@ -453,26 +453,26 @@ void CHexEditorWidget::setColor( const SDisplayColor &color )
   //
   // The selection colors can not be chosen.
   //
-  mDisplayState.color.selectBg = kapp->palette().active().highlight();
-  mDisplayState.color.selectFg = kapp->palette().active().highlightedText();
+  mDisplayState.color.selectBg = tdeApp->palette().active().highlight();
+  mDisplayState.color.selectFg = tdeApp->palette().active().highlightedText();
 
   if( mDisplayState.color.useSystemColor == true )
   {
     SDisplayColor c = mDisplayState.color;
-    c.textBg           = kapp->palette().active().base();
-    c.secondTextBg     = kapp->palette().active().base();
-    c.offsetBg         = kapp->palette().active().base();
-    c.inactiveBg       = kapp->palette().active().base();
-    c.primaryFg[0]     = kapp->palette().active().text();
-    c.primaryFg[1]     = kapp->palette().active().text();
-    c.nonPrintFg       = kapp->palette().active().text();
-    c.offsetFg         = kapp->palette().active().text();
-    c.secondaryFg      = kapp->palette().active().text();
-    c.leftSeparatorFg  = kapp->palette().active().text();
-    c.rightSeparatorFg = kapp->palette().active().text();
-    c.cursorBg         = kapp->palette().active().text();
-    c.cursorFg         = kapp->palette().active().base();
-    c.gridFg           = kapp->palette().active().text();
+    c.textBg           = tdeApp->palette().active().base();
+    c.secondTextBg     = tdeApp->palette().active().base();
+    c.offsetBg         = tdeApp->palette().active().base();
+    c.inactiveBg       = tdeApp->palette().active().base();
+    c.primaryFg[0]     = tdeApp->palette().active().text();
+    c.primaryFg[1]     = tdeApp->palette().active().text();
+    c.nonPrintFg       = tdeApp->palette().active().text();
+    c.offsetFg         = tdeApp->palette().active().text();
+    c.secondaryFg      = tdeApp->palette().active().text();
+    c.leftSeparatorFg  = tdeApp->palette().active().text();
+    c.rightSeparatorFg = tdeApp->palette().active().text();
+    c.cursorBg         = tdeApp->palette().active().text();
+    c.cursorFg         = tdeApp->palette().active().base();
+    c.gridFg           = tdeApp->palette().active().text();
     SDisplayColor defaultColor;
     c.bookmarkBg       = defaultColor.bookmarkBg;
     c.bookmarkFg       = defaultColor.bookmarkFg;
@@ -2347,20 +2347,20 @@ int CHexEditorWidget::progressParse( const SProgressData &pd )
     emit operationChanged( false );
     mProgressBusy = false;
     enableInputLock( false );
-    kapp->processEvents();
+    tdeApp->processEvents();
     return( Err_Success );
   }
   else if( pd.useFraction == 1 )
   {
     emit enableProgressText( true );
     emit setProgress( (int)(100.0 * pd.fraction ) );
-    kapp->processEvents();
+    tdeApp->processEvents();
   }
   else
   {
     emit enableProgressText( true );
     emit setProgress( pd.curPage, pd.maxPage );
-    kapp->processEvents();
+    tdeApp->processEvents();
   }
 
   if( mProgressStop == false )
diff --git a/khexedit/hexeditstate.h b/khexedit/hexeditstate.h
index 47ace2c..51d72bc 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->palette().active().highlight();
-      selectFg         = kapp->palette().active().highlightedText();
+      selectBg         = tdeApp->palette().active().highlight();
+      selectFg         = tdeApp->palette().active().highlightedText();
       markBg           = TQt::blue;
       markFg           = TQt::white;
       primaryFg[0]     = TQt::black;
diff --git a/khexedit/hexmanagerwidget.cpp b/khexedit/hexmanagerwidget.cpp
index a9a018f..361c8c8 100644
--- a/khexedit/hexmanagerwidget.cpp
+++ b/khexedit/hexmanagerwidget.cpp
@@ -133,7 +133,7 @@ void CHexManagerWidget::setConversionVisibility( EConversionPosition position )
     p.setY(point.y() + rect.height()/2 - mConverter->minimumSize().height()/2);
     mConverter->resize( mConverter->minimumSize() );
     mConverter->reparent( 0, WStyle_Customize | WStyle_DialogBorder, p, true );
-    mConverter->setCaption(kapp->makeStdCaption(i18n("Conversion")));
+    mConverter->setCaption(tdeApp->makeStdCaption(i18n("Conversion")));
   }
   else
   {
diff --git a/khexedit/hextoolwidget.cpp b/khexedit/hextoolwidget.cpp
index d6f51ed..84d3033 100644
--- a/khexedit/hextoolwidget.cpp
+++ b/khexedit/hextoolwidget.cpp
@@ -141,7 +141,7 @@ CHexToolWidget::CHexToolWidget( TQWidget *parent, const char *name )
 
   mUtilBox->activate();
 
-  connect( kapp, TQ_SIGNAL( tdedisplayFontChanged() ),
+  connect( tdeApp, TQ_SIGNAL( tdedisplayFontChanged() ),
 	   TQ_SLOT( fontChanged() ) );
 
   mCursorState.valid = false;
diff --git a/khexedit/hexviewwidget.cpp b/khexedit/hexviewwidget.cpp
index 19a1d54..bcdca2f 100644
--- a/khexedit/hexviewwidget.cpp
+++ b/khexedit/hexviewwidget.cpp
@@ -139,7 +139,7 @@ void CDragManager::timerEvent( TQTimerEvent *e )
     if( mPending == true )
     {
       mPending = false;
-      emit startDrag( ( kapp->keyboardModifiers() & TDEApplication::ShiftModifier ) );
+      emit startDrag( ( tdeApp->keyboardModifiers() & TDEApplication::ShiftModifier ) );
     }
   }
 }
@@ -451,7 +451,7 @@ void CHexViewWidget::paletteChanged( void )
 
 void CHexViewWidget::fontChanged( void )
 {
-  //setFont( kapp->fixedFont, true );
+  //setFont( tdeApp->fixedFont, true );
 }
 
 void CHexViewWidget::filter( SFilterControl &fc )
diff --git a/khexedit/hexviewwidget.h b/khexedit/hexviewwidget.h
index 1b73ec1..99db8cf 100644
--- a/khexedit/hexviewwidget.h
+++ b/khexedit/hexviewwidget.h
@@ -312,7 +312,7 @@ class CHexViewWidget : public TQFrame
 
 inline bool CHexViewWidget::shiftButtonState( void )
 {
-  return kapp->keyboardModifiers() & TDEApplication::ShiftModifier;
+  return tdeApp->keyboardModifiers() & TDEApplication::ShiftModifier;
 }
 
 
diff --git a/khexedit/stringdialog.cpp b/khexedit/stringdialog.cpp
index 4d4c9dd..aa7ef6b 100644
--- a/khexedit/stringdialog.cpp
+++ b/khexedit/stringdialog.cpp
@@ -150,7 +150,7 @@ void CStringDialog::showEvent( TQShowEvent *e )
 
 void CStringDialog::readConfiguration( void )
 {
-  TDEConfig &config = *kapp->config();
+  TDEConfig &config = *tdeApp->config();
   config.setGroup( "String Dialog" );
 
   mLengthSpin->setValue( config.readNumEntry("MinimumLength", 4)  );
@@ -163,7 +163,7 @@ void CStringDialog::readConfiguration( void )
 
 void CStringDialog::writeConfiguration( void )
 {
-  TDEConfig &config = *kapp->config();
+  TDEConfig &config = *tdeApp->config();
   config.setGroup( "String Dialog" );
 
   config.writeEntry( "MinimumLength", mLengthSpin->value() );
diff --git a/khexedit/toplevel.cpp b/khexedit/toplevel.cpp
index 474faa3..8f3650a 100644
--- a/khexedit/toplevel.cpp
+++ b/khexedit/toplevel.cpp
@@ -375,7 +375,7 @@ void KHexEdit::initialize( bool openFiles )
   {
     // Code modified from tdelibs/tdeui/tdeactionclasses.cpp TDERecentFilesAction::loadEntries
       
-    TDEConfig* config = kapp->config();
+    TDEConfig* config = tdeApp->config();
 
     const TQString oldGroup = config->group();
     
@@ -608,7 +608,7 @@ void KHexEdit::closeProgram( void )
       mWindowList.removeRef( mWindowList.first() );
     }
 
-    kapp->quit();
+    tdeApp->quit();
   }
   else
   {
@@ -641,14 +641,14 @@ bool KHexEdit::queryExit( void )
 
 void KHexEdit::readConfiguration( void )
 {
-  TDEConfig &config = *kapp->config();
+  TDEConfig &config = *tdeApp->config();
   readConfiguration( config );
 }
 
 
 void KHexEdit::writeConfiguration( void )
 {
-  TDEConfig &config = *kapp->config();
+  TDEConfig &config = *tdeApp->config();
   writeConfiguration( config );
 }
 
@@ -1351,7 +1351,7 @@ void KHexEdit::resizeTest()
   for( int i=0; i<loop; i+=4 )
   {
     resize( i+400, i+400 );
-    //kapp->processOneEvent();
+    //tdeApp->processOneEvent();
   }
 
   gettimeofday( &t2, 0 );