Rename a number of classes to enhance compatibility with KDE4

3 files changed, 11 insertions, 11 deletions

diff --git a/kontact/plugins/knotes/knotes_part.cpp b/kontact/plugins/knotes/knotes_part.cpp
index 725219f4..d73bd1fb 100644
--- a/kontact/plugins/knotes/knotes_part.cpp
+++ b/kontact/plugins/knotes/knotes_part.cpp
@@ -50,13 +50,13 @@ KNotesPart::KNotesPart( TQObject *parent, const char *name )
   setInstance( new TDEInstance( "knotes" ) );
 
   // create the actions
-  new KAction( i18n( "&New" ), "knotes", CTRL+Key_N, this, TQT_SLOT( newNote() ),
+  new TDEAction( i18n( "&New" ), "knotes", CTRL+Key_N, this, TQT_SLOT( newNote() ),
                actionCollection(), "file_new" );
-  new KAction( i18n( "Rename..." ), "text", this, TQT_SLOT( renameNote() ),
+  new TDEAction( i18n( "Rename..." ), "text", this, TQT_SLOT( renameNote() ),
                actionCollection(), "edit_rename" );
-  new KAction( i18n( "Delete" ), "editdelete", Key_Delete, this, TQT_SLOT( killSelectedNotes() ),
+  new TDEAction( i18n( "Delete" ), "editdelete", Key_Delete, this, TQT_SLOT( killSelectedNotes() ),
                actionCollection(), "edit_delete" );
-  new KAction( i18n( "Print Selected Notes..." ), "print", CTRL+Key_P, this, TQT_SLOT( printSelectedNotes() ),
+  new TDEAction( i18n( "Print Selected Notes..." ), "print", CTRL+Key_P, this, TQT_SLOT( printSelectedNotes() ),
                actionCollection(), "print_note" );
 
   // TODO icons: s/editdelete/knotes_delete/ or the other way round in knotes
@@ -398,8 +398,8 @@ void KNotesPart::renamedNote( TQIconViewItem* )
 
 void KNotesPart::slotOnCurrentChanged( TQIconViewItem* )
 {
-  KAction *renameAction = actionCollection()->action( "edit_rename" );
-  KAction *deleteAction = actionCollection()->action( "edit_delete" );
+  TDEAction *renameAction = actionCollection()->action( "edit_rename" );
+  TDEAction *deleteAction = actionCollection()->action( "edit_delete" );
 
   if ( !mNotesView->currentItem() ) {
     renameAction->setEnabled( false );
diff --git a/kontact/plugins/knotes/knotes_part_p.h b/kontact/plugins/knotes/knotes_part_p.h
index 91c198af..648c94c2 100644
--- a/kontact/plugins/knotes/knotes_part_p.h
+++ b/kontact/plugins/knotes/knotes_part_p.h
@@ -147,7 +147,7 @@ class KNoteEditDlg : public KDialogBase, virtual public KXMLGUIClient
       KXMLGUIFactory factory( &builder, TQT_TQOBJECT(this) );
       factory.addClient( this );
 
-      mTool = static_cast<KToolBar *>(factory.container( "note_tool", this ));
+      mTool = static_cast<TDEToolBar *>(factory.container( "note_tool", this ));
 
       layout->addWidget( mTool );
       layout->addWidget( mNoteEdit );
@@ -181,8 +181,8 @@ class KNoteEditDlg : public KDialogBase, virtual public KXMLGUIClient
   private:
     KLineEdit  *mTitleEdit;
     KNoteEdit  *mNoteEdit;
-    KToolBar   *mTool;
-    KPopupMenu *mEditMenu;
+    TDEToolBar   *mTool;
+    TDEPopupMenu *mEditMenu;
 };
 
 
diff --git a/kontact/plugins/knotes/knotes_plugin.cpp b/kontact/plugins/knotes/knotes_plugin.cpp
index 2f3f470b..adf704b1 100644
--- a/kontact/plugins/knotes/knotes_plugin.cpp
+++ b/kontact/plugins/knotes/knotes_plugin.cpp
@@ -44,9 +44,9 @@ KNotesPlugin::KNotesPlugin( Kontact::Core *core, const char *, const TQStringLis
 {
   setInstance( KNotesPluginFactory::instance() );
 
-  insertNewAction( new KAction( i18n( "New Note..." ), "knotes", CTRL+SHIFT+Key_N,
+  insertNewAction( new TDEAction( i18n( "New Note..." ), "knotes", CTRL+SHIFT+Key_N,
                    this, TQT_SLOT( slotNewNote() ), actionCollection(), "new_note" ) );
-  insertSyncAction( new KAction( i18n( "Synchronize Notes" ), "reload", 0,
+  insertSyncAction( new TDEAction( i18n( "Synchronize Notes" ), "reload", 0,
                    this, TQT_SLOT( slotSyncNotes() ), actionCollection(), "knotes_sync" ) );
 }