Rename a number of classes to enhance compatibility with KDE4

1 files changed, 39 insertions, 39 deletions

diff --git a/kbarcode/labeleditor.cpp b/kbarcode/labeleditor.cpp
index c4a1b51..2945266 100644
--- a/kbarcode/labeleditor.cpp
+++ b/kbarcode/labeleditor.cpp
@@ -226,8 +226,8 @@ void LabelEditor::createCommandHistory()
 
 void LabelEditor::createCommandHistoryActions()
 {
-    undoAct = (KAction*)actionCollection()->action("edit_undo");
-    redoAct = (KAction*)actionCollection()->action("edit_redo");
+    undoAct = (TDEAction*)actionCollection()->action("edit_undo");
+    redoAct = (TDEAction*)actionCollection()->action("edit_redo");
 
     undoAct->plug( editMenu, 0 );
     redoAct->plug( editMenu, 1 );
@@ -437,46 +437,46 @@ bool LabelEditor::newLabel()
 
 void LabelEditor::setupActions()
 {
-    KAction* newAct = KStdAction::openNew( TQT_TQOBJECT(this), TQT_SLOT(startEditor()), actionCollection() );
-    KAction* loadAct = KStdAction::open( TQT_TQOBJECT(this), TQT_SLOT(startLoadEditor()), actionCollection() );
-    KAction* quitAct = KStdAction::quit(TQT_TQOBJECT(kapp), TQT_SLOT(quit()), actionCollection());
-    KAction* closeAct = KStdAction::close( TQT_TQOBJECT(this), TQT_SLOT( close() ), actionCollection(), "close" );
-    closeLabelAct = new KAction( i18n("Close &Label" ), 0, 0, TQT_TQOBJECT(this),  TQT_SLOT( closeLabel() ), actionCollection() );
+    TDEAction* newAct = KStdAction::openNew( TQT_TQOBJECT(this), TQT_SLOT(startEditor()), actionCollection() );
+    TDEAction* loadAct = KStdAction::open( TQT_TQOBJECT(this), TQT_SLOT(startLoadEditor()), actionCollection() );
+    TDEAction* quitAct = KStdAction::quit(TQT_TQOBJECT(kapp), TQT_SLOT(quit()), actionCollection());
+    TDEAction* closeAct = KStdAction::close( TQT_TQOBJECT(this), TQT_SLOT( close() ), actionCollection(), "close" );
+    closeLabelAct = new TDEAction( i18n("Close &Label" ), 0, 0, TQT_TQOBJECT(this),  TQT_SLOT( closeLabel() ), actionCollection() );
 
-    recentAct = new KRecentFilesAction( i18n("&Recent Files"), 0, TQT_TQOBJECT(this),  TQT_SLOT( loadRecentEditor( const KURL& ) ) );
+    recentAct = new TDERecentFilesAction( i18n("&Recent Files"), 0, TQT_TQOBJECT(this),  TQT_SLOT( loadRecentEditor( const KURL& ) ) );
 
-    KAction* importPrintFileAct = new KAction( i18n("&Import and Print Batch File..."), BarIconSet( "fileprint" ), 0, TQT_TQOBJECT(this),  TQT_SLOT( batchPrint() ), actionCollection() );
+    TDEAction* importPrintFileAct = new TDEAction( i18n("&Import and Print Batch File..."), BarIconSet( "fileprint" ), 0, TQT_TQOBJECT(this),  TQT_SLOT( batchPrint() ), actionCollection() );
 
     saveAct = KStdAction::save( TQT_TQOBJECT(this), TQT_SLOT( save() ), actionCollection(), "save" );
     saveAsAct = KStdAction::saveAs( TQT_TQOBJECT(this), TQT_SLOT( saveas() ), actionCollection(), "saveas" );
-    descriptionAct = new KAction( i18n("&Change description..."), 0, 0, TQT_TQOBJECT(this),  TQT_SLOT(changeDes()), actionCollection() );
-    deleteAct = new KAction( i18n("&Delete Object"), TQIconSet( BarIcon("editdelete") ), Key_Delete, TQT_TQOBJECT(cv), TQT_SLOT( deleteCurrent() ), actionCollection() );
-    editPropAct = new KAction( i18n("&Properties..."), 0, 0, TQT_TQOBJECT(this),  TQT_SLOT( doubleClickedCurrent() ), actionCollection() );
+    descriptionAct = new TDEAction( i18n("&Change description..."), 0, 0, TQT_TQOBJECT(this),  TQT_SLOT(changeDes()), actionCollection() );
+    deleteAct = new TDEAction( i18n("&Delete Object"), TQIconSet( BarIcon("editdelete") ), Key_Delete, TQT_TQOBJECT(cv), TQT_SLOT( deleteCurrent() ), actionCollection() );
+    editPropAct = new TDEAction( i18n("&Properties..."), 0, 0, TQT_TQOBJECT(this),  TQT_SLOT( doubleClickedCurrent() ), actionCollection() );
     printAct = KStdAction::print( TQT_TQOBJECT(this), TQT_SLOT( print() ), actionCollection(), "print" );
-    bcpAct = new KAction( i18n("Print to &Barcode Printer..."), 0, 0, TQT_TQOBJECT(this),  TQT_SLOT( printBCP() ), actionCollection() );
-    imgAct = new KAction( i18n("Print to &Image..."), 0, 0, TQT_TQOBJECT(this),  TQT_SLOT(printImage() ), actionCollection() );
-    changeSizeAct = new KAction( i18n("&Change Label..."), 0, 0, TQT_TQOBJECT(this),  TQT_SLOT( changeSize() ), actionCollection() );
-    barcodeAct = new KAction( i18n("Insert &Barcode"), TQIconSet( BarIcon("barcode") ), 0, TQT_TQOBJECT(this),  TQT_SLOT( insertBarcode() ), actionCollection() );
+    bcpAct = new TDEAction( i18n("Print to &Barcode Printer..."), 0, 0, TQT_TQOBJECT(this),  TQT_SLOT( printBCP() ), actionCollection() );
+    imgAct = new TDEAction( i18n("Print to &Image..."), 0, 0, TQT_TQOBJECT(this),  TQT_SLOT(printImage() ), actionCollection() );
+    changeSizeAct = new TDEAction( i18n("&Change Label..."), 0, 0, TQT_TQOBJECT(this),  TQT_SLOT( changeSize() ), actionCollection() );
+    barcodeAct = new TDEAction( i18n("Insert &Barcode"), TQIconSet( BarIcon("barcode") ), 0, TQT_TQOBJECT(this),  TQT_SLOT( insertBarcode() ), actionCollection() );
     barcodeAct->setEnabled( Barkode::haveBarcode() );
 
-    pictureAct = new KAction( i18n("Insert &Picture"), TQIconSet( BarIcon("inline_image") ), 0, TQT_TQOBJECT(this),  TQT_SLOT( insertPicture() ), actionCollection() );
-    textAct = new KAction( i18n("Insert &Text"), TQIconSet( BarIcon("text") ), 0, TQT_TQOBJECT(this),  TQT_SLOT( insertText() ), actionCollection() );
-    textDataAct = new KAction( i18n("Insert &Data Field"), TQIconSet( BarIcon("contents") ), 0, TQT_TQOBJECT(this),  TQT_SLOT( insertDataText() ), actionCollection() );
-    textLineAct = new KAction( i18n("Insert &Text Line"), TQIconSet( BarIcon("text") ), 0, TQT_TQOBJECT(this),  TQT_SLOT( insertTextLine() ), actionCollection() );
-    lineAct = new KAction( i18n("Insert &Line"), TQIconSet( BarIcon("kbarcodelinetool") ), 0, TQT_TQOBJECT(this),  TQT_SLOT( insertLine() ), actionCollection() );
-    rectAct = new KAction( i18n("Insert &Rectangle"), TQIconSet( BarIcon("kbarcoderect") ), 0, TQT_TQOBJECT(this),  TQT_SLOT( insertRect() ), actionCollection() );
-    circleAct = new KAction( i18n("Insert &Ellipse"), TQIconSet( BarIcon("kbarcodeellipse") ), 0, TQT_TQOBJECT(this),  TQT_SLOT( insertCircle() ), actionCollection() );
+    pictureAct = new TDEAction( i18n("Insert &Picture"), TQIconSet( BarIcon("inline_image") ), 0, TQT_TQOBJECT(this),  TQT_SLOT( insertPicture() ), actionCollection() );
+    textAct = new TDEAction( i18n("Insert &Text"), TQIconSet( BarIcon("text") ), 0, TQT_TQOBJECT(this),  TQT_SLOT( insertText() ), actionCollection() );
+    textDataAct = new TDEAction( i18n("Insert &Data Field"), TQIconSet( BarIcon("contents") ), 0, TQT_TQOBJECT(this),  TQT_SLOT( insertDataText() ), actionCollection() );
+    textLineAct = new TDEAction( i18n("Insert &Text Line"), TQIconSet( BarIcon("text") ), 0, TQT_TQOBJECT(this),  TQT_SLOT( insertTextLine() ), actionCollection() );
+    lineAct = new TDEAction( i18n("Insert &Line"), TQIconSet( BarIcon("kbarcodelinetool") ), 0, TQT_TQOBJECT(this),  TQT_SLOT( insertLine() ), actionCollection() );
+    rectAct = new TDEAction( i18n("Insert &Rectangle"), TQIconSet( BarIcon("kbarcoderect") ), 0, TQT_TQOBJECT(this),  TQT_SLOT( insertRect() ), actionCollection() );
+    circleAct = new TDEAction( i18n("Insert &Ellipse"), TQIconSet( BarIcon("kbarcodeellipse") ), 0, TQT_TQOBJECT(this),  TQT_SLOT( insertCircle() ), actionCollection() );
     spellAct = KStdAction::spelling( TQT_TQOBJECT(this), TQT_SLOT(spellCheck()), actionCollection(), "spell" );
-    gridAct = new KToggleAction( i18n("&Grid"), TQIconSet( BarIcon("kbarcodegrid") ), 0, TQT_TQOBJECT(this),  TQT_SLOT( toggleGrid() ), actionCollection() );
-    previewAct = new KAction( i18n("&Preview..."), 0, 0, TQT_TQOBJECT(this),  TQT_SLOT( preview() ), actionCollection() );
-    sep = new KActionSeparator( TQT_TQOBJECT(this) );
+    gridAct = new TDEToggleAction( i18n("&Grid"), TQIconSet( BarIcon("kbarcodegrid") ), 0, TQT_TQOBJECT(this),  TQT_SLOT( toggleGrid() ), actionCollection() );
+    previewAct = new TDEAction( i18n("&Preview..."), 0, 0, TQT_TQOBJECT(this),  TQT_SLOT( preview() ), actionCollection() );
+    sep = new TDEActionSeparator( TQT_TQOBJECT(this) );
     cutAct = KStdAction::cut( TQT_TQOBJECT(this), TQT_SLOT( cut() ), actionCollection(), "cut" );
     copyAct = KStdAction::copy( TQT_TQOBJECT(this), TQT_SLOT( copy() ), actionCollection(), "copy" );
     pasteAct = KStdAction::paste( TQT_TQOBJECT(this), TQT_SLOT( paste() ), actionCollection(), "paste" );
     selectAllAct = KStdAction::selectAll( TQT_TQOBJECT(cv), TQT_SLOT( selectAll() ), actionCollection(), "select_all" );
     deSelectAllAct = KStdAction::deselect( TQT_TQOBJECT(cv), TQT_SLOT( deSelectAll() ), actionCollection(), "de_select_all" );
-    addressBookAct = new KAction( i18n("Address&book"), TQIconSet( BarIcon("kaddressbook") ), 0, TQT_TQOBJECT(this),  TQT_SLOT( launchAddressBook() ), actionCollection() );
-    KAction* singleBarcodeAct = new KAction(i18n("&Create Single Barcode..."), "",
+    addressBookAct = new TDEAction( i18n("Address&book"), TQIconSet( BarIcon("kaddressbook") ), 0, TQT_TQOBJECT(this),  TQT_SLOT( launchAddressBook() ), actionCollection() );
+    TDEAction* singleBarcodeAct = new TDEAction(i18n("&Create Single Barcode..."), "",
                                 0, TQT_TQOBJECT(this),  TQT_SLOT(startBarcodeGen()),
                                 actionCollection(), "create" );
     singleBarcodeAct->setEnabled( Barkode::haveBarcode() );
@@ -490,7 +490,7 @@ void LabelEditor::setupActions()
     copyAct->plug( toolBar() );
     pasteAct->plug( toolBar() );
 
-    tools = new KToolBar( this, this->leftDock(), true, "tools" );
+    tools = new TDEToolBar( this, this->leftDock(), true, "tools" );
 
     barcodeAct->plug( tools );
     pictureAct->plug( tools );
@@ -500,19 +500,19 @@ void LabelEditor::setupActions()
     lineAct->plug( tools );
     rectAct->plug( tools );
     circleAct->plug( tools );
-    (new KActionSeparator( TQT_TQOBJECT(this) ))->plug( tools );
+    (new TDEActionSeparator( TQT_TQOBJECT(this) ))->plug( tools );
 //    spellAct->plug( tools );  // KDE 3.2
     gridAct->plug( tools );
 
     DSMainWindow::setupActions();
     connect( recentAct, TQT_SIGNAL( urlSelected( const KURL& ) ), TQT_TQOBJECT(this),  TQT_SLOT( startLoadRecentEditor( const KURL& ) ) );
 
-    KPopupMenu* fileMenu = new KPopupMenu( this );
-    editMenu = new KPopupMenu( this );
-    KPopupMenu* viewMenu = new KPopupMenu( this );
-    KPopupMenu* insMenu = new KPopupMenu( this );
-    KPopupMenu* toolMenu = new KPopupMenu( this );
-    KPopupMenu* barMenu = new KPopupMenu( this );
+    TDEPopupMenu* fileMenu = new TDEPopupMenu( this );
+    editMenu = new TDEPopupMenu( this );
+    TDEPopupMenu* viewMenu = new TDEPopupMenu( this );
+    TDEPopupMenu* insMenu = new TDEPopupMenu( this );
+    TDEPopupMenu* toolMenu = new TDEPopupMenu( this );
+    TDEPopupMenu* barMenu = new TDEPopupMenu( this );
 
     menuBar()->removeItemAt( 0 );
     menuBar()->insertItem( i18n("&File"), fileMenu, -1, 0 );
@@ -575,16 +575,16 @@ void LabelEditor::setupActions()
 
 void LabelEditor::setupContextMenu()
 {
-    m_mnuContext = new KPopupMenu( this );
+    m_mnuContext = new TDEPopupMenu( this );
     m_mnuContext->setCheckable( true );
     
-    KPopupMenu* orderMenu = new KPopupMenu( m_mnuContext );
+    TDEPopupMenu* orderMenu = new TDEPopupMenu( m_mnuContext );
     orderMenu->insertItem( i18n("&On Top"), TQT_TQOBJECT(this),  TQT_SLOT( onTopCurrent() ) );
     orderMenu->insertItem( i18n("&Raise"), TQT_TQOBJECT(this),  TQT_SLOT( raiseCurrent() ) );
     orderMenu->insertItem( i18n("&Lower"), TQT_TQOBJECT(this),  TQT_SLOT( lowerCurrent() ) );
     orderMenu->insertItem( i18n("&To Background"), TQT_TQOBJECT(this),  TQT_SLOT( backCurrent() ) );
 
-    KPopupMenu* centerMenu = new KPopupMenu( m_mnuContext );
+    TDEPopupMenu* centerMenu = new TDEPopupMenu( m_mnuContext );
     centerMenu->insertItem( i18n("Center &Horizontally"), TQT_TQOBJECT(this),  TQT_SLOT( centerHorizontal() ) );
     centerMenu->insertItem( i18n("Center &Vertically"), TQT_TQOBJECT(this),  TQT_SLOT( centerVertical() ) );