Rename a number of classes to enhance compatibility with KDE4

11 files changed, 186 insertions, 186 deletions

diff --git a/khexedit/hexviewwidget.cc b/khexedit/hexviewwidget.cc
index 5ebd75b..50ce5cc 100644
--- a/khexedit/hexviewwidget.cc
+++ b/khexedit/hexviewwidget.cc
@@ -1091,7 +1091,7 @@ int CHexViewWidget::bookmarkMenu( const TQString &title )
   }
 
   TQString text;
-  KPopupMenu *popup = new KPopupMenu(  0 );
+  TDEPopupMenu *popup = new TDEPopupMenu(  0 );
   popup->insertTitle( title );
   for( uint i=0; i < list.count(); i++ )
   {
diff --git a/khexedit/lib/kbufferranges.h b/khexedit/lib/kbufferranges.h
index 8a215ed..622ff4a 100644
--- a/khexedit/lib/kbufferranges.h
+++ b/khexedit/lib/kbufferranges.h
@@ -96,7 +96,7 @@ class TDEBufferRanges
     bool Modified;
 
     KSection Marking;
-    KSelection Selection;
+    TDESelection Selection;
     /** memories first selected word on wordwise selection */
     KSection FirstWordSelection;
 
diff --git a/khexedit/lib/kselection.h b/khexedit/lib/kselection.h
index 19b8a99..7e69d9b 100644
--- a/khexedit/lib/kselection.h
+++ b/khexedit/lib/kselection.h
@@ -34,20 +34,20 @@ namespace KHE
   *
   *@author Friedrich W. H.  Kossebau
   */
-class KSelection : public KSection
+class TDESelection : public KSection
 {
   public:
     /** creates a selection with a given start.
       * @param Index index in front of which the selection begins
       */
-    KSelection( int Index );
+    TDESelection( int Index );
     /** creates an invalid selection */
-    KSelection();
-    ~KSelection();
+    TDESelection();
+    ~TDESelection();
 
   public:
-    KSelection &operator=( const KSelection &S );
-    KSelection &operator=( const KSection &S );
+    TDESelection &operator=( const TDESelection &S );
+    TDESelection &operator=( const KSection &S );
 
   public: // modification access
     /** starts the selection. 
@@ -103,18 +103,18 @@ class KSelection : public KSection
 };
 
 
-inline KSelection::KSelection() : Anchor( -1 ) {}
-inline KSelection::KSelection( int Index ) : Anchor( Index )  {}
-inline KSelection::~KSelection() {}
+inline TDESelection::TDESelection() : Anchor( -1 ) {}
+inline TDESelection::TDESelection( int Index ) : Anchor( Index )  {}
+inline TDESelection::~TDESelection() {}
 
-inline KSelection &KSelection::operator=( const KSelection &S )
+inline TDESelection &TDESelection::operator=( const TDESelection &S )
 { 
   KSection::operator=(S); 
   Anchor = S.Anchor; 
   return *this; 
 }
 
-inline KSelection &KSelection::operator=( const KSection &S )
+inline TDESelection &TDESelection::operator=( const KSection &S )
 { 
   KSection::operator=(S); 
   Anchor = start(); 
@@ -122,14 +122,14 @@ inline KSelection &KSelection::operator=( const KSection &S )
 }
 
 
-inline void KSelection::setStart( int Index )
+inline void TDESelection::setStart( int Index )
 {
   Anchor = Index;
   unset();
 }
 
 
-inline void KSelection::setEnd( int Index )
+inline void TDESelection::setEnd( int Index )
 {
   // nothing selected?
   if( Index == Anchor )
@@ -148,30 +148,30 @@ inline void KSelection::setEnd( int Index )
   }
 }
 
-inline void KSelection::reverse() 
+inline void TDESelection::reverse() 
 {
    Anchor = isForward() ? end()+1 : start();
 }
 
-inline void KSelection::setForward() 
+inline void TDESelection::setForward() 
 {
    Anchor = start();
 }
 
-inline void KSelection::setBackward() 
+inline void TDESelection::setBackward() 
 {
    Anchor = end()+1;
 }
 
-inline int KSelection::anchor() const { return Anchor; }
+inline int TDESelection::anchor() const { return Anchor; }
 
-inline void KSelection::cancel() { Anchor = -1; unset(); }
+inline void TDESelection::cancel() { Anchor = -1; unset(); }
 
-inline bool KSelection::started() const { return Anchor != -1; }
+inline bool TDESelection::started() const { return Anchor != -1; }
 
-inline bool KSelection::justStarted() const { return Anchor != -1 && start() == -1; }
+inline bool TDESelection::justStarted() const { return Anchor != -1 && start() == -1; }
 
-inline bool KSelection::isForward() const { return Anchor == start(); }
+inline bool TDESelection::isForward() const { return Anchor == start(); }
 
 }
 
diff --git a/khexedit/listview.cc b/khexedit/listview.cc
index 63f18d8..f9ff882 100644
--- a/khexedit/listview.cc
+++ b/khexedit/listview.cc
@@ -25,7 +25,7 @@
 
 
 CListView::CListView( TQWidget *parent, const char *name, int visibleItem )
-  :KListView( parent, name ),  mVisibleItem(TQMAX( 1, visibleItem ))
+  :TDEListView( parent, name ),  mVisibleItem(TQMAX( 1, visibleItem ))
 {
   setVisibleItem(visibleItem);
 }
diff --git a/khexedit/listview.h b/khexedit/listview.h
index 7f687cb..acb020d 100644
--- a/khexedit/listview.h
+++ b/khexedit/listview.h
@@ -23,7 +23,7 @@
 
 #include <klistview.h>
 
-class CListView : public KListView
+class CListView : public TDEListView
 {
   Q_OBJECT
   
diff --git a/khexedit/optiondialog.cc b/khexedit/optiondialog.cc
index b0360a3..94c18d1 100644
--- a/khexedit/optiondialog.cc
+++ b/khexedit/optiondialog.cc
@@ -33,7 +33,7 @@
 
 #include <kcolordialog.h>
 #include <kcolordrag.h>
-#include <kfontdialog.h> // For KFontChooser
+#include <kfontdialog.h> // For TDEFontChooser
 #include <kiconloader.h>
 #include <klocale.h>
 #include <kglobalsettings.h>
@@ -390,7 +390,7 @@ void COptionDialog::setupFontPage( void )
   hline->setFrameStyle( TQFrame::Sunken | TQFrame::HLine );
   topLayout->addWidget( hline );
 
-  mFont.chooser = new KFontChooser( page, "font", true, TQStringList(), false, 4 );
+  mFont.chooser = new TDEFontChooser( page, "font", true, TQStringList(), false, 4 );
   topLayout->addWidget( mFont.chooser );
   TQFont fixFont( TDEGlobalSettings::fixedFont() );
   fixFont.setBold(true);
@@ -1051,7 +1051,7 @@ SDisplayCursor::EFocusMode COptionDialog::cursorFocusMode( void )
 
 
 CColorListBox::CColorListBox( TQWidget *parent, const char *name, WFlags f )
-  :KListBox( parent, name, f ), mCurrentOnDragEnter(-1)
+  :TDEListBox( parent, name, f ), mCurrentOnDragEnter(-1)
 {
   connect( this, TQT_SIGNAL(selected(int)), this, TQT_SLOT(newColor(int)) );
   setAcceptDrops( true);
diff --git a/khexedit/optiondialog.h b/khexedit/optiondialog.h
index b9c649e..31debab 100644
--- a/khexedit/optiondialog.h
+++ b/khexedit/optiondialog.h
@@ -31,7 +31,7 @@ class TQPushbutton;
 class TQRadioButton;
 class TQSpinBox;
 class TQComboBox;
-class KFontChooser;
+class TDEFontChooser;
 
 
 #include <kdialogbase.h>
@@ -40,7 +40,7 @@ class KFontChooser;
 
 
 
-class CColorListBox : public KListBox
+class CColorListBox : public TDEListBox
 {
   Q_OBJECT
   
@@ -198,7 +198,7 @@ class COptionDialog : public KDialogBase
     struct SFontWidgets
     {
       TQCheckBox    *checkSystem;
-      KFontChooser *chooser;
+      TDEFontChooser *chooser;
       TQLineEdit    *nonPrintInput;
     };
     struct SFileWidgets
diff --git a/khexedit/parts/kpart/khepart.cpp b/khexedit/parts/kpart/khepart.cpp
index a204671..7fb6a33 100644
--- a/khexedit/parts/kpart/khepart.cpp
+++ b/khexedit/parts/kpart/khepart.cpp
@@ -72,7 +72,7 @@ void KHexEditPart::setupTools( bool BrowserViewWanted )
   if( !BrowserViewWanted ) new TDEClipboardTool( this );
   
   new KZoomToolet( this );
-  new KSelectToolet( this );
+  new TDESelectToolet( this );
   new KHEValueCodingToolet( this );
   new KHECharEncodingToolet( this );
   new KHEResizeStyleToolet( this );
@@ -81,7 +81,7 @@ void KHexEditPart::setupTools( bool BrowserViewWanted )
 */
 void KHexEditPart::setupActions( bool BrowserViewWanted )
 {
-  KActionCollection *AC = actionCollection();
+  TDEActionCollection *AC = actionCollection();
   // create our actions
   CopyAction = BrowserViewWanted ? 0 : KStdAction::copy( TQT_TQOBJECT(HexEdit), TQT_SLOT(copy()), AC );
 
@@ -89,7 +89,7 @@ void KHexEditPart::setupActions( bool BrowserViewWanted )
   KStdAction::deselect(  this, TQT_SLOT(slotUnselect()),  AC );
 
   // value encoding
-  CodingAction = new KSelectAction( i18n("&Value Coding"), 0, AC, "view_valuecoding" );
+  CodingAction = new TDESelectAction( i18n("&Value Coding"), 0, AC, "view_valuecoding" );
   TQStringList List;
   List.append( i18n("&Hexadecimal") );
   List.append( i18n("&Decimal")     );
@@ -99,17 +99,17 @@ void KHexEditPart::setupActions( bool BrowserViewWanted )
   connect( CodingAction, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotSetCoding(int)) );
 
   // document encoding
-  EncodingAction = new KSelectAction( i18n("&Char Encoding"), 0, AC, "view_charencoding" );
+  EncodingAction = new TDESelectAction( i18n("&Char Encoding"), 0, AC, "view_charencoding" );
   EncodingAction->setItems( KCharCodec::codecNames() );
   connect( EncodingAction, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotSetEncoding(int)) );
 
-  ShowUnprintableAction = new KToggleAction( i18n("Show &Unprintable Chars (<32)"), 0, this, TQT_SLOT(slotSetShowUnprintable()), actionCollection(), "view_showunprintable" );
+  ShowUnprintableAction = new TDEToggleAction( i18n("Show &Unprintable Chars (<32)"), 0, this, TQT_SLOT(slotSetShowUnprintable()), actionCollection(), "view_showunprintable" );
 
   KStdAction::zoomIn(  TQT_TQOBJECT(HexEdit), TQT_SLOT(zoomIn()),   actionCollection() );
   KStdAction::zoomOut( TQT_TQOBJECT(HexEdit), TQT_SLOT(zoomOut()),  actionCollection() );
 
   // resize style
-  ResizeStyleAction = new KSelectAction( i18n("&Resize Style"), 0, AC, "resizestyle" );
+  ResizeStyleAction = new TDESelectAction( i18n("&Resize Style"), 0, AC, "resizestyle" );
   List.clear();
   List.append( i18n("&No Resize") );
   List.append( i18n("&Lock Groups") );
@@ -117,10 +117,10 @@ void KHexEditPart::setupActions( bool BrowserViewWanted )
   ResizeStyleAction->setItems( List );
   connect( ResizeStyleAction, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotSetResizeStyle(int)) );
 
-  ShowOffsetColumnAction = new KToggleAction( i18n("&Line Offset"), Key_F11, this, TQT_SLOT(slotToggleOffsetColumn()), AC, "view_lineoffset" );
+  ShowOffsetColumnAction = new TDEToggleAction( i18n("&Line Offset"), Key_F11, this, TQT_SLOT(slotToggleOffsetColumn()), AC, "view_lineoffset" );
 
   // show buffer columns
-  ToggleColumnsAction = new KSelectAction( i18n("&Columns"), 0, AC, "togglecolumns" );
+  ToggleColumnsAction = new TDESelectAction( i18n("&Columns"), 0, AC, "togglecolumns" );
   List.clear();
   List.append( i18n("&Values Column") );
   List.append( i18n("&Chars Column") );
diff --git a/khexedit/parts/kpart/khepart.h b/khexedit/parts/kpart/khepart.h
index ccbd038..dcdba24 100644
--- a/khexedit/parts/kpart/khepart.h
+++ b/khexedit/parts/kpart/khepart.h
@@ -24,9 +24,9 @@
 #include "kbigbuffer.h"
 
 // forward declarations
-class KRadioAction;
-class KToggleAction;
-class KSelectAction;
+class TDERadioAction;
+class TDEToggleAction;
+class TDESelectAction;
 
 namespace KHE
 {
@@ -80,15 +80,15 @@ class KHexEditPart : public KParts::ReadOnlyPart
     KBigBuffer Wrapping;
 
     // edit menu
-    KAction *CopyAction;
+    TDEAction *CopyAction;
     // view menu
-    KSelectAction *CodingAction;
-    KSelectAction *EncodingAction;
-    KToggleAction *ShowUnprintableAction;
+    TDESelectAction *CodingAction;
+    TDESelectAction *EncodingAction;
+    TDEToggleAction *ShowUnprintableAction;
     // settings menu
-    KSelectAction *ResizeStyleAction;
-    KToggleAction *ShowOffsetColumnAction;
-    KSelectAction *ToggleColumnsAction;
+    TDESelectAction *ResizeStyleAction;
+    TDEToggleAction *ShowOffsetColumnAction;
+    TDESelectAction *ToggleColumnsAction;
 };
 
 }
diff --git a/khexedit/toplevel.cc b/khexedit/toplevel.cc
index cd92779..ded9e20 100644
--- a/khexedit/toplevel.cc
+++ b/khexedit/toplevel.cc
@@ -46,7 +46,7 @@
 TQPtrList<KHexEdit> KHexEdit::mWindowList;
 
 KHexEdit::KHexEdit( void )
-  : KMainWindow(0, "toplevel"), mStartupOffset(0),
+  : TDEMainWindow(0, "toplevel"), mStartupOffset(0),
   mIsModified(0)
 {
   mWindowList.append( this );
@@ -130,7 +130,7 @@ void KHexEdit::setupActions( void )
   KStdAction::keyBindings(guiFactory(), TQT_SLOT(configureShortcuts()), 
 actionCollection());
    
-  mAction.insert     = new KAction( i18n("&Insert..."), CTRL+Key_I,
+  mAction.insert     = new TDEAction( i18n("&Insert..."), CTRL+Key_I,
     TQT_TQOBJECT(editor()), TQT_SLOT(insertFile()), actionCollection(), "insert_file" );
   mAction.openRecent = KStdAction::openRecent( TQT_TQOBJECT(this), TQT_SLOT( slotFileOpenRecent( const KURL& ) ), actionCollection() );
   mAction.save       = KStdAction::save( TQT_TQOBJECT(editor()), TQT_SLOT(save()), actionCollection() );
@@ -140,17 +140,17 @@ actionCollection());
 
   mAction.close      = KStdAction::close( TQT_TQOBJECT(editor()), TQT_SLOT(close()), actionCollection() );
   mAction.print      = KStdAction::print( TQT_TQOBJECT(editor()), TQT_SLOT(print()), actionCollection() );
-  mAction.exportData = new KAction( i18n("E&xport..."), 0,
+  mAction.exportData = new TDEAction( i18n("E&xport..."), 0,
     TQT_TQOBJECT(editor()), TQT_SLOT(exportDialog()), actionCollection(), "export" );
-  mAction.cancel     = new KAction( i18n("&Cancel Operation"),
+  mAction.cancel     = new TDEAction( i18n("&Cancel Operation"),
     "stop", 0, TQT_TQOBJECT(editor()), TQT_SLOT(stop()), actionCollection(), "cancel" );
-  mAction.readOnly   = new KToggleAction( i18n("&Read Only"),
+  mAction.readOnly   = new TDEToggleAction( i18n("&Read Only"),
     0, TQT_TQOBJECT(editor()), TQT_SLOT(toggleWriteProtection()),actionCollection(), "read_only" );
-  mAction.resizeLock = new KToggleAction( i18n("&Allow Resize"),
+  mAction.resizeLock = new TDEToggleAction( i18n("&Allow Resize"),
    0, TQT_TQOBJECT(editor()), TQT_SLOT(toggleResizeLock()),actionCollection(), "resize_lock" );
-  mAction.newWindow  = new KAction( i18n("N&ew Window"),
+  mAction.newWindow  = new TDEAction( i18n("N&ew Window"),
     0, TQT_TQOBJECT(this), TQT_SLOT(newWindow()),actionCollection(), "new_window" );
-  mAction.closeWindow= new KAction( i18n("Close &Window"),
+  mAction.closeWindow= new TDEAction( i18n("Close &Window"),
     0, TQT_TQOBJECT(this), TQT_SLOT(closeWindow()),actionCollection(), "close_window" );
   mAction.quit       = KStdAction::quit( TQT_TQOBJECT(this), TQT_SLOT(closeProgram()), actionCollection() );
 
@@ -165,27 +165,27 @@ actionCollection());
   mAction.findNext   = KStdAction::findNext(  TQT_TQOBJECT(editor()), TQT_SLOT(findNext()), actionCollection() );
   mAction.findPrev   = KStdAction::findPrev(  TQT_TQOBJECT(editor()),TQT_SLOT(findPrevious()),actionCollection() );
   mAction.replace  = KStdAction::replace(   TQT_TQOBJECT(editor()), TQT_SLOT(replace()), actionCollection() );
-  mAction.gotoOffset = new KAction( i18n("&Goto Offset..."), CTRL+Key_G,
+  mAction.gotoOffset = new TDEAction( i18n("&Goto Offset..."), CTRL+Key_G,
     TQT_TQOBJECT(editor()), TQT_SLOT(gotoOffset()),actionCollection(), "goto_offset" );
-  mAction.insertPattern = new KAction( i18n("&Insert Pattern..."), CTRL+Key_Insert,
+  mAction.insertPattern = new TDEAction( i18n("&Insert Pattern..."), CTRL+Key_Insert,
     TQT_TQOBJECT(editor()), TQT_SLOT(insertPattern()), actionCollection(), "insert_pattern" );
 
-  mAction.copyAsText = new KAction( i18n("Copy as &Text"), 0,
+  mAction.copyAsText = new TDEAction( i18n("Copy as &Text"), 0,
     TQT_TQOBJECT(editor()), TQT_SLOT(copyText()), actionCollection(), "copy_as_text" );
-  mAction.pasteToNewFile = new KAction( i18n("Paste into New &File"), 0,
+  mAction.pasteToNewFile = new TDEAction( i18n("Paste into New &File"), 0,
     TQT_TQOBJECT(editor()), TQT_SLOT(pasteNewFile()), actionCollection(), "paste_into_new_file" );
-  mAction.pasteToNewWindow = new KAction( i18n("Paste into New &Window"), 0,
+  mAction.pasteToNewWindow = new TDEAction( i18n("Paste into New &Window"), 0,
     TQT_TQOBJECT(this), TQT_SLOT(pasteNewWindow()), actionCollection(), "paste_into_new_window" );
 
-  mAction.hexadecimal = new KRadioAction( i18n("&Hexadecimal"),
+  mAction.hexadecimal = new TDERadioAction( i18n("&Hexadecimal"),
     0, TQT_TQOBJECT(this), TQT_SLOT(setDisplayMode()), actionCollection(), "mode_hex" );
-  mAction.decimal     = new KRadioAction( i18n("&Decimal"),
+  mAction.decimal     = new TDERadioAction( i18n("&Decimal"),
     0, TQT_TQOBJECT(this), TQT_SLOT(setDisplayMode()), actionCollection(), "mode_dec" );
-  mAction.octal       = new KRadioAction( i18n("&Octal"),
+  mAction.octal       = new TDERadioAction( i18n("&Octal"),
     0, TQT_TQOBJECT(this), TQT_SLOT(setDisplayMode()), actionCollection(), "mode_oct" );
-  mAction.binary      = new KRadioAction( i18n("&Binary"),
+  mAction.binary      = new TDERadioAction( i18n("&Binary"),
     0, TQT_TQOBJECT(this), TQT_SLOT(setDisplayMode()), actionCollection(), "mode_bin" );
-  mAction.textOnly    = new KRadioAction( i18n("&Text"),
+  mAction.textOnly    = new TDERadioAction( i18n("&Text"),
     0, TQT_TQOBJECT(this), TQT_SLOT(setDisplayMode()), actionCollection(), "mode_text" );
   mAction.hexadecimal->setExclusiveGroup( "displayMode" );
   mAction.decimal->setExclusiveGroup( "displayMode" );
@@ -193,87 +193,87 @@ actionCollection());
   mAction.binary->setExclusiveGroup( "displayMode" );
   mAction.textOnly->setExclusiveGroup( "displayMode" );
 
-  mAction.showOffsetColumn = new KToggleAction( i18n("Show O&ffset Column"),
+  mAction.showOffsetColumn = new TDEToggleAction( i18n("Show O&ffset Column"),
     0, TQT_TQOBJECT(editor()), TQT_SLOT(toggleOffsetColumnVisibility()),actionCollection(), "show_offset_column" );
-  mAction.showTextColumn = new KToggleAction( i18n("Show Te&xt Field"),
+  mAction.showTextColumn = new TDEToggleAction( i18n("Show Te&xt Field"),
     0, TQT_TQOBJECT(editor()), TQT_SLOT(toggleTextColumnVisibility()),actionCollection(), "show_text_field" );
-  mAction.offsetAsDecimal = new KToggleAction( i18n("Off&set as Decimal"),
+  mAction.offsetAsDecimal = new TDEToggleAction( i18n("Off&set as Decimal"),
     0, TQT_TQOBJECT(editor()), TQT_SLOT(toggleOffsetAsDecimal()),actionCollection(), "offset_as_decimal" );
-  mAction.dataUppercase = new KToggleAction( i18n("&Upper Case (Data)"),
+  mAction.dataUppercase = new TDEToggleAction( i18n("&Upper Case (Data)"),
     0, TQT_TQOBJECT(editor()), TQT_SLOT(toggleDataUppercase()),actionCollection(), "upper_case_data" );
-  mAction.offsetUppercase = new KToggleAction( i18n("Upper &Case (Offset)"),
+  mAction.offsetUppercase = new TDEToggleAction( i18n("Upper &Case (Offset)"),
     0, TQT_TQOBJECT(editor()), TQT_SLOT(toggleOffsetUppercase()),actionCollection(), "upper_case_offset" );
 
-  mAction.defaultEncoding = new KRadioAction( i18n("&Default encoding", "&Default"),
+  mAction.defaultEncoding = new TDERadioAction( i18n("&Default encoding", "&Default"),
     0, TQT_TQOBJECT(this), TQT_SLOT( setEncoding()), actionCollection(), "enc_default" );
-  mAction.usAsciiEncoding = new KRadioAction( i18n("US-&ASCII (7 bit)"),
+  mAction.usAsciiEncoding = new TDERadioAction( i18n("US-&ASCII (7 bit)"),
     0, TQT_TQOBJECT(this), TQT_SLOT( setEncoding()), actionCollection(), "enc_ascii");
-  mAction.ebcdicEncoding  = new KRadioAction( i18n("&EBCDIC"),
+  mAction.ebcdicEncoding  = new TDERadioAction( i18n("&EBCDIC"),
     0, TQT_TQOBJECT(this), TQT_SLOT( setEncoding()), actionCollection(), "enc_ebcdic" );
-//   mAction.customEncoding  = new KAction( i18n("&Custom..."),
+//   mAction.customEncoding  = new TDEAction( i18n("&Custom..."),
 //     0, TQT_TQOBJECT(editor()), TQT_SLOT( encoding()), actionCollection(), "enc_custom" );
   mAction.defaultEncoding->setExclusiveGroup( "encodingMode" );
   mAction.usAsciiEncoding->setExclusiveGroup( "encodingMode" );
   mAction.ebcdicEncoding->setExclusiveGroup( "encodingMode" );
 
-  mAction.strings = new KAction( i18n("&Extract Strings..."), 0,
+  mAction.strings = new TDEAction( i18n("&Extract Strings..."), 0,
     TQT_TQOBJECT(editor()), TQT_SLOT(strings()), actionCollection(), "extract_strings" );
-//   mAction.recordViewer = new KAction( i18n("&Record Viewer"), 0,
+//   mAction.recordViewer = new TDEAction( i18n("&Record Viewer"), 0,
 //     TQT_TQOBJECT(editor()), TQT_SLOT(recordView()), actionCollection(), "record_viewer" );
-  mAction.filter = new KAction( i18n("&Binary Filter..."), 0,
+  mAction.filter = new TDEAction( i18n("&Binary Filter..."), 0,
     TQT_TQOBJECT(editor()), TQT_SLOT(filter()), actionCollection(), "binary_filter" );
-  mAction.characterTable = new KAction( i18n("&Character Table"), 0,
+  mAction.characterTable = new TDEAction( i18n("&Character Table"), 0,
     TQT_TQOBJECT(editor()), TQT_SLOT(chart()), actionCollection(), "char_table" );
-  mAction.converter = new KAction( i18n("C&onverter"), 0,
+  mAction.converter = new TDEAction( i18n("C&onverter"), 0,
     TQT_TQOBJECT(editor()), TQT_SLOT(converter()), actionCollection(), "converter" );
-  mAction.statistics = new KAction( i18n("&Statistics"), 0,
+  mAction.statistics = new TDEAction( i18n("&Statistics"), 0,
     TQT_TQOBJECT(editor()), TQT_SLOT(statistics()), actionCollection(), "statistics" );
 
   mAction.addBookmark = KStdAction::addBookmark( TQT_TQOBJECT(editor()),
     TQT_SLOT(addBookmark()), actionCollection() );
-  mAction.replaceBookmark = new KAction( i18n("&Replace Bookmark"), CTRL+Key_E,
+  mAction.replaceBookmark = new TDEAction( i18n("&Replace Bookmark"), CTRL+Key_E,
     TQT_TQOBJECT(editor()), TQT_SLOT(replaceBookmark()), actionCollection(), "replace_bookmark");
-  mAction.removeBookmark = new KAction( i18n("R&emove Bookmark"), CTRL+Key_U,
+  mAction.removeBookmark = new TDEAction( i18n("R&emove Bookmark"), CTRL+Key_U,
     TQT_TQOBJECT(editor()), TQT_SLOT(removeBookmark()), actionCollection(), "remove_bookmark" );
-  mAction.removeAllBookmark = new KAction( i18n("Re&move All"), 0,
+  mAction.removeAllBookmark = new TDEAction( i18n("Re&move All"), 0,
     TQT_TQOBJECT(editor()), TQT_SLOT(removeAllBookmark()), actionCollection(), "remove_all_bookmarks" );
-  mAction.nextBookmark = new KAction( i18n("Goto &Next Bookmark"),
+  mAction.nextBookmark = new TDEAction( i18n("Goto &Next Bookmark"),
 				      ALT+Key_Down, TQT_TQOBJECT(editor()),
 				      TQT_SLOT(gotoNextBookmark()), actionCollection(), "next_bookmark" );
-  mAction.prevBookmark = new KAction( i18n("Goto &Previous Bookmark"),
+  mAction.prevBookmark = new TDEAction( i18n("Goto &Previous Bookmark"),
 				      ALT+Key_Up, TQT_TQOBJECT(editor()),
 				      TQT_SLOT(gotoPrevBookmark()), actionCollection(), "prev_bookmark" );
 
   createStandardStatusBarAction();
   setStandardToolBarMenuEnabled(true);
-  mAction.showFullPath  = new KToggleAction( i18n("Show F&ull Path"),
+  mAction.showFullPath  = new TDEToggleAction( i18n("Show F&ull Path"),
     0, TQT_TQOBJECT(this), TQT_SLOT(showFullPath()), actionCollection(), "show_full_path" );
 
-  mAction.tabHide = new KRadioAction( i18n("&Hide"),
+  mAction.tabHide = new TDERadioAction( i18n("&Hide"),
     0, TQT_TQOBJECT(this), TQT_SLOT(showDocumentTabs()), actionCollection(), "doctab_hide" );
-  mAction.tabShowAboveEditor = new KRadioAction( i18n("&Above Editor"),
+  mAction.tabShowAboveEditor = new TDERadioAction( i18n("&Above Editor"),
     0, TQT_TQOBJECT(this), TQT_SLOT(showDocumentTabs()), actionCollection(), "doctab_above" );
-  mAction.tabShowBelowEditor = new KRadioAction( i18n("&Below Editor"),
+  mAction.tabShowBelowEditor = new TDERadioAction( i18n("&Below Editor"),
     0, TQT_TQOBJECT(this), TQT_SLOT(showDocumentTabs()), actionCollection(), "doctab_below" );
   mAction.tabHide->setExclusiveGroup( "editorTab" );
   mAction.tabShowAboveEditor->setExclusiveGroup( "editorTab" );
   mAction.tabShowBelowEditor->setExclusiveGroup( "editorTab" );
 
-  mAction.conversionHide  = new KRadioAction( i18n("&Hide"),
+  mAction.conversionHide  = new TDERadioAction( i18n("&Hide"),
     0, TQT_TQOBJECT(this), TQT_SLOT(showConversionField()), actionCollection(), "conversion_field_hide");
-  mAction.conversionFloat = new KRadioAction( i18n("&Floating"),
+  mAction.conversionFloat = new TDERadioAction( i18n("&Floating"),
     0, TQT_TQOBJECT(this), TQT_SLOT(showConversionField()), actionCollection(), "conversion_field_float");
-  mAction.conversionEmbed = new KRadioAction( i18n("&Embed in Main Window"),
+  mAction.conversionEmbed = new TDERadioAction( i18n("&Embed in Main Window"),
     0, TQT_TQOBJECT(this), TQT_SLOT(showConversionField()), actionCollection(), "conversion_field_embed");
   mAction.conversionHide->setExclusiveGroup( "conversionField" );
   mAction.conversionFloat->setExclusiveGroup( "conversionField" );
   mAction.conversionEmbed->setExclusiveGroup( "conversionField" );
 
-  mAction.searchHide = new KRadioAction( i18n("&Hide"),
+  mAction.searchHide = new TDERadioAction( i18n("&Hide"),
     0, TQT_TQOBJECT(this), TQT_SLOT(showSearchBar()), actionCollection(), "searchbar_hide" );
-  mAction.searchShowAboveEditor = new KRadioAction( i18n("&Above Editor"),
+  mAction.searchShowAboveEditor = new TDERadioAction( i18n("&Above Editor"),
     Key_F5, TQT_TQOBJECT(this), TQT_SLOT(showSearchBar()), actionCollection(), "searchbar_above" );
-  mAction.searchShowBelowEditor = new KRadioAction( i18n("&Below Editor"),
+  mAction.searchShowBelowEditor = new TDERadioAction( i18n("&Below Editor"),
     Key_F6, TQT_TQOBJECT(this), TQT_SLOT(showSearchBar()), actionCollection(), "searchbar_below" );
   mAction.searchHide->setExclusiveGroup( "searchBar" );
   mAction.searchShowAboveEditor->setExclusiveGroup( "searchBar" );
@@ -281,7 +281,7 @@ actionCollection());
 
   KStdAction::saveOptions(TQT_TQOBJECT(this), TQT_SLOT(writeConfiguration()), actionCollection());
   KStdAction::preferences(TQT_TQOBJECT(editor()) ,TQT_SLOT(options()),actionCollection() );
-//   mAction.favorites = new KAction( i18n("P&rofiles..."), 0,
+//   mAction.favorites = new TDEAction( i18n("P&rofiles..."), 0,
 //     TQT_TQOBJECT(editor()), TQT_SLOT(favorites()), actionCollection(), "favorites" );
 
   KStdAction::help( TQT_TQOBJECT(this), TQT_SLOT(appHelpActivated()), actionCollection() );
@@ -376,7 +376,7 @@ void KHexEdit::initialize( bool openFiles )
 
   if ( openFiles && editor()->openFile() != SDisplayMisc::none )
   {
-    // Code modified from tdelibs/tdeui/kactionclasses.cpp KRecentFilesAction::loadEntries
+    // Code modified from tdelibs/tdeui/kactionclasses.cpp TDERecentFilesAction::loadEntries
       
     TDEConfig* config = kapp->config();
 
@@ -809,7 +809,7 @@ void KHexEdit::fileState( SFileState &state )
 
 void KHexEdit::layoutChanged( const SDisplayLayout &layout )
 {
-  KRadioAction *radioAction;
+  TDERadioAction *radioAction;
 
   if( layout.primaryMode == SDisplayLayout::hexadecimal )
   {
@@ -914,7 +914,7 @@ void KHexEdit::bookmarkChanged( TQPtrList<SCursorOffset> &list )
     return;
   }
 
-  mAction.bookmarkList.append(new KActionSeparator());
+  mAction.bookmarkList.append(new TDEActionSeparator());
 
   TQString text, offset;
   int i=0;
@@ -923,11 +923,11 @@ void KHexEdit::bookmarkChanged( TQPtrList<SCursorOffset> &list )
   {
     offset.sprintf("%04X:%04X", p->offset>>16, p->offset&0x0000FFFF );
     text = i18n("Offset: %1").arg(offset);
-    KAction *action = new KAction(text, 0, mAction.bookmarkMapper, TQT_SLOT(map()), TQT_TQOBJECT(this), text.latin1());
+    TDEAction *action = new TDEAction(text, 0, mAction.bookmarkMapper, TQT_SLOT(map()), TQT_TQOBJECT(this), text.latin1());
     int key = acceleratorNumKey( i );
     if( key > 0 )
     {
-      action->setShortcut(KShortcut(ALT+key));
+      action->setShortcut(TDEShortcut(ALT+key));
     }
     mAction.bookmarkMapper->setMapping(action, i);
     mAction.bookmarkList.append(action);
@@ -996,7 +996,7 @@ void KHexEdit::editMode( CHexBuffer::EEditMode editMode )
 
 void KHexEdit::encodingChanged( const SEncodeState &encodeState )
 {
-  KRadioAction *radioAction;
+  TDERadioAction *radioAction;
 
   if( encodeState.mode == CConversion::cnvDefault )
   {
@@ -1324,7 +1324,7 @@ bool KHexEdit::eventFilter( TQObject *o, TQEvent *event )
     return( true );
   }
 
-  return KMainWindow::eventFilter( o, event );
+  return TDEMainWindow::eventFilter( o, event );
 }
 
 
diff --git a/khexedit/toplevel.h b/khexedit/toplevel.h
index 8af4f0d..e92503d 100644
--- a/khexedit/toplevel.h
+++ b/khexedit/toplevel.h
@@ -35,17 +35,17 @@
 #include "statusbarprogress.h"
 
 class TQSignalMapper;
-class KAction;
-class KRecentFilesAction;
-class KRadioAction;
-class KSelectAction;
-class KToggleAction;
-class KToolBarButton;
+class TDEAction;
+class TDERecentFilesAction;
+class TDERadioAction;
+class TDESelectAction;
+class TDEToggleAction;
+class TDEToolBarButton;
 class KURL;
 class CDragLabel;
 
 
-class KHexEdit : public KMainWindow
+class KHexEdit : public TDEMainWindow
 {
   Q_OBJECT
   
@@ -64,79 +64,79 @@ class KHexEdit : public KMainWindow
 
   struct SActionList
   {
-    KAction *insert;
-    KRecentFilesAction *openRecent;
-    KAction *save;
-    KAction *saveAs;
-    KAction *revert;
-    KAction *close;
-    KAction *print;
-    KAction *exportData;
-    KAction *cancel;
-    KToggleAction *readOnly;
-    KToggleAction *resizeLock;
-    KAction *newWindow;
-    KAction *closeWindow;
-    KAction *quit;
-    KAction *undo;
-    KAction *redo;
-    KAction *cut;
-    KAction *copy;
-    KAction *paste;
-    KAction *selectAll;
-    KAction *unselect;
-    KAction *find;
-    KAction *findNext;
-    KAction *findPrev;
-    KAction *replace;
-    KAction *gotoOffset;
-    KAction *insertPattern;
-    KAction *copyAsText;
-    KAction *pasteToNewFile;
-    KAction *pasteToNewWindow;
-    KRadioAction *hexadecimal;
-    KRadioAction *decimal;
-    KRadioAction *octal;
-    KRadioAction *binary;
-    KRadioAction *textOnly;
-    KToggleAction *showOffsetColumn;
-    KToggleAction *showTextColumn;
-    KToggleAction *offsetAsDecimal;
-    KToggleAction *dataUppercase;
-    KToggleAction *offsetUppercase;
-    KRadioAction *defaultEncoding;
-    KRadioAction *usAsciiEncoding;
-    KRadioAction *ebcdicEncoding;
-//     KAction *customEncoding;
-
-    KAction *strings;
-//     KAction *recordViewer;
-    KAction *filter;
-    KAction *characterTable;
-    KAction *converter;
-    KAction *statistics;
-
-    KAction *addBookmark;
-    KAction *replaceBookmark;
-    KAction *removeBookmark;
-    KAction *removeAllBookmark;
-    KAction *nextBookmark;
-    KAction *prevBookmark;
-
-    KToggleAction *showFullPath;
-    KRadioAction *tabHide;
-    KRadioAction *tabShowBelowEditor;
-    KRadioAction *tabShowAboveEditor;
-    KRadioAction *conversionHide;
-    KRadioAction *conversionFloat;
-    KRadioAction *conversionEmbed;
-    KRadioAction *searchHide;
-    KRadioAction *searchShowAboveEditor;
-    KRadioAction *searchShowBelowEditor;
-
-//     KAction *favorites;
-
-    TQPtrList< KAction > bookmarkList;
+    TDEAction *insert;
+    TDERecentFilesAction *openRecent;
+    TDEAction *save;
+    TDEAction *saveAs;
+    TDEAction *revert;
+    TDEAction *close;
+    TDEAction *print;
+    TDEAction *exportData;
+    TDEAction *cancel;
+    TDEToggleAction *readOnly;
+    TDEToggleAction *resizeLock;
+    TDEAction *newWindow;
+    TDEAction *closeWindow;
+    TDEAction *quit;
+    TDEAction *undo;
+    TDEAction *redo;
+    TDEAction *cut;
+    TDEAction *copy;
+    TDEAction *paste;
+    TDEAction *selectAll;
+    TDEAction *unselect;
+    TDEAction *find;
+    TDEAction *findNext;
+    TDEAction *findPrev;
+    TDEAction *replace;
+    TDEAction *gotoOffset;
+    TDEAction *insertPattern;
+    TDEAction *copyAsText;
+    TDEAction *pasteToNewFile;
+    TDEAction *pasteToNewWindow;
+    TDERadioAction *hexadecimal;
+    TDERadioAction *decimal;
+    TDERadioAction *octal;
+    TDERadioAction *binary;
+    TDERadioAction *textOnly;
+    TDEToggleAction *showOffsetColumn;
+    TDEToggleAction *showTextColumn;
+    TDEToggleAction *offsetAsDecimal;
+    TDEToggleAction *dataUppercase;
+    TDEToggleAction *offsetUppercase;
+    TDERadioAction *defaultEncoding;
+    TDERadioAction *usAsciiEncoding;
+    TDERadioAction *ebcdicEncoding;
+//     TDEAction *customEncoding;
+
+    TDEAction *strings;
+//     TDEAction *recordViewer;
+    TDEAction *filter;
+    TDEAction *characterTable;
+    TDEAction *converter;
+    TDEAction *statistics;
+
+    TDEAction *addBookmark;
+    TDEAction *replaceBookmark;
+    TDEAction *removeBookmark;
+    TDEAction *removeAllBookmark;
+    TDEAction *nextBookmark;
+    TDEAction *prevBookmark;
+
+    TDEToggleAction *showFullPath;
+    TDERadioAction *tabHide;
+    TDERadioAction *tabShowBelowEditor;
+    TDERadioAction *tabShowAboveEditor;
+    TDERadioAction *conversionHide;
+    TDERadioAction *conversionFloat;
+    TDERadioAction *conversionEmbed;
+    TDERadioAction *searchHide;
+    TDERadioAction *searchShowAboveEditor;
+    TDERadioAction *searchShowBelowEditor;
+
+//     TDEAction *favorites;
+
+    TQPtrList< TDEAction > bookmarkList;
     TQSignalMapper *bookmarkMapper;
   };
 
@@ -234,7 +234,7 @@ protected:
     SActionList mAction;
 
     CDragLabel     *mDragLabel;
-    KToolBarButton *mWriteProtectButton;
+    TDEToolBarButton *mWriteProtectButton;
 
     bool mIsModified;
     bool mShowFullPath;