Rename a number of classes to enhance compatibility with KDE4

1 files changed, 13 insertions, 13 deletions

diff --git a/kdiff3plugin/kdiff3plugin.cpp b/kdiff3plugin/kdiff3plugin.cpp
index 92f0639..21f171c 100755
--- a/kdiff3plugin/kdiff3plugin.cpp
+++ b/kdiff3plugin/kdiff3plugin.cpp
@@ -94,59 +94,59 @@ KDiff3Plugin::KDiff3Plugin( KonqPopupMenu* pPopupmenu, const char *name, const T
                 (3 Files selected): Compare 's1', 's2' and 's3'
    */
 
-   KActionMenu* pActionMenu = new KActionMenu (i18n ("KDiff3"), "kdiff3", actionCollection (), "kdiff3_menu" );
-   KAction* pAction = 0;
+   TDEActionMenu* pActionMenu = new TDEActionMenu (i18n ("KDiff3"), "kdiff3", actionCollection (), "kdiff3_menu" );
+   TDEAction* pAction = 0;
    TQString s;
 
    if(m_list.count() == 1)
    {
       int historyCount = s_pHistory ? s_pHistory->count() : 0;
       s = i18n("Compare with %1").arg( historyCount>0 ? s_pHistory->front() : TQString() );
-      pAction = new KAction ( s,0, this, TQT_SLOT(slotCompareWith()), actionCollection());
+      pAction = new TDEAction ( s,0, this, TQT_SLOT(slotCompareWith()), actionCollection());
       pAction->setEnabled( m_list.count()>0 && historyCount>0 );
       pActionMenu->insert (pAction);
 
       s = i18n("Merge with %1").arg( historyCount>0 ? s_pHistory->front() : TQString() );
-      pAction = new KAction( s, 0, this, TQT_SLOT(slotMergeWith()), actionCollection());
+      pAction = new TDEAction( s, 0, this, TQT_SLOT(slotMergeWith()), actionCollection());
       pAction->setEnabled( m_list.count()>0 && historyCount>0 );
       pActionMenu->insert (pAction);
 
       s = i18n("Save '%1' for later").arg( ( m_list.front() ) );
-      pAction = new KAction ( s, 0, this, TQT_SLOT(slotSaveForLater()), actionCollection());
+      pAction = new TDEAction ( s, 0, this, TQT_SLOT(slotSaveForLater()), actionCollection());
       pAction->setEnabled( m_list.count()>0 );
       pActionMenu->insert(pAction);
 
-      pAction = new KAction (i18n("3-way merge with base"), 0, this, TQT_SLOT(slotMergeThreeWay()), actionCollection());
+      pAction = new TDEAction (i18n("3-way merge with base"), 0, this, TQT_SLOT(slotMergeThreeWay()), actionCollection());
       pAction->setEnabled( m_list.count()>0 && historyCount>=2 );
       pActionMenu->insert (pAction);
 
       if ( s_pHistory && !s_pHistory->empty() )
       {
-         KActionMenu* pHistoryMenu = new KActionMenu( i18n("Compare with ..."), "CompareWith", actionCollection (), "kdiff3_history_menu");
+         TDEActionMenu* pHistoryMenu = new TDEActionMenu( i18n("Compare with ..."), "CompareWith", actionCollection (), "kdiff3_history_menu");
          pHistoryMenu->setEnabled( m_list.count()>0 && historyCount>0 );
          pActionMenu->insert(pHistoryMenu);
          for (TQStringList::iterator i = s_pHistory->begin(); i!=s_pHistory->end(); ++i)
          {
-            pAction = new KAction( *i, "History", 0, this, TQT_SLOT(slotCompareWithHistoryItem()), actionCollection());
+            pAction = new TDEAction( *i, "History", 0, this, TQT_SLOT(slotCompareWithHistoryItem()), actionCollection());
             pHistoryMenu->insert (pAction);
          }
 
-         pAction = new KAction (i18n("Clear list"), 0, this, TQT_SLOT(slotClearList()), actionCollection());
+         pAction = new TDEAction (i18n("Clear list"), 0, this, TQT_SLOT(slotClearList()), actionCollection());
          pActionMenu->insert (pAction);
          pAction->setEnabled( historyCount>0 );
       }
    }
    else if(m_list.count() == 2)
    {
-      pAction = new KAction (i18n("Compare"), 0, this, TQT_SLOT(slotCompareTwoFiles()), actionCollection());
+      pAction = new TDEAction (i18n("Compare"), 0, this, TQT_SLOT(slotCompareTwoFiles()), actionCollection());
       pActionMenu->insert (pAction);
    }
    else if ( m_list.count() == 3 )
    {
-      pAction = new KAction (i18n("3 way comparison"), 0, this, TQT_SLOT(slotCompareThreeFiles()), actionCollection());
+      pAction = new TDEAction (i18n("3 way comparison"), 0, this, TQT_SLOT(slotCompareThreeFiles()), actionCollection());
       pActionMenu->insert (pAction);
    }
-   pAction = new KAction (i18n("About KDiff3 menu plugin ..."), 0, this, TQT_SLOT(slotAbout()), actionCollection());
+   pAction = new TDEAction (i18n("About KDiff3 menu plugin ..."), 0, this, TQT_SLOT(slotAbout()), actionCollection());
    pActionMenu->insert (pAction);
 
    addSeparator();
@@ -171,7 +171,7 @@ void KDiff3Plugin::slotCompareWith()
 
 void KDiff3Plugin::slotCompareWithHistoryItem()
 {
-   const KAction* pAction = dynamic_cast<const KAction*>( sender() );
+   const TDEAction* pAction = dynamic_cast<const TDEAction*>( sender() );
    if ( m_list.count() > 0 && pAction )
    {
       TQStringList args;