1 files changed, 15 insertions, 15 deletions

diff --git a/kivio/kiviopart/kiviostencilsetaction.cpp b/kivio/kiviopart/kiviostencilsetaction.cpp
index bccbe0aa..340d88b8 100644
--- a/kivio/kiviopart/kiviostencilsetaction.cpp
+++ b/kivio/kiviopart/kiviostencilsetaction.cpp
@@ -64,14 +64,14 @@ static const char * default_plug_xpm[] = {
 "  ##############"};
 
 KivioStencilSetAction::KivioStencilSetAction(const TQString &text, const TQString &pix,
-  KActionCollection *parent, const char *name)
-  : KAction(text, pix, 0, parent, name)
+  TDEActionCollection *parent, const char *name)
+  : TDEAction(text, pix, 0, parent, name)
 {
   setShortcutConfigurable( false );
 
   m_pathList.setAutoDelete(true);
 
-  m_popup = new KPopupMenu(0L,"KivioStencilSetAction::popup");
+  m_popup = new TDEPopupMenu(0L,"KivioStencilSetAction::popup");
   updateMenu();
 }
 
@@ -82,7 +82,7 @@ KivioStencilSetAction::~KivioStencilSetAction()
   m_popup = 0;
 }
 
-KPopupMenu* KivioStencilSetAction::popupMenu() const
+TDEPopupMenu* KivioStencilSetAction::popupMenu() const
 {
   return m_popup;
 }
@@ -94,10 +94,10 @@ void KivioStencilSetAction::popup( const TQPoint& global )
 
 int KivioStencilSetAction::plug( TQWidget* widget, int index)
 {
-  // This function is copied from KActionMenu::plug
-  if (kapp && !kapp->authorizeKAction(name()))
+  // This function is copied from TDEActionMenu::plug
+  if (kapp && !kapp->authorizeTDEAction(name()))
     return -1;
-  kdDebug(129) << "KAction::plug( " << widget << ", " << index << " )" << endl; // remove -- ellis
+  kdDebug(129) << "TDEAction::plug( " << widget << ", " << index << " )" << endl; // remove -- ellis
   if ( widget->inherits(TQPOPUPMENU_OBJECT_NAME_STRING) )
   {
     TQPopupMenu* menu = static_cast<TQPopupMenu*>( widget );
@@ -117,11 +117,11 @@ int KivioStencilSetAction::plug( TQWidget* widget, int index)
 
     return containerCount() - 1;
   }
-  else if ( widget->inherits( "KToolBar" ) )
+  else if ( widget->inherits( "TDEToolBar" ) )
   {
-    KToolBar *bar = static_cast<KToolBar *>( widget );
+    TDEToolBar *bar = static_cast<TDEToolBar *>( widget );
 
-    int id_ = KAction::getToolButtonID();
+    int id_ = TDEAction::getToolButtonID();
 
     if ( icon().isEmpty() && !iconSet().isNull() )
       bar->insertButton( iconSet().pixmap(), id_, TQT_SIGNAL( clicked() ), this,
@@ -212,11 +212,11 @@ void KivioStencilSetAction::loadCollections( const TQString& rootDirStr )
     if(colFInfo->fileName() != ".." && colFInfo->fileName() != ".")
     {
       cId = KivioStencilSpawnerSet::readId(colFInfo->absFilePath());
-      KPopupMenu* ch;
+      TDEPopupMenu* ch;
       int index = m_collectionIdList.findIndex(cId);
       
       if(index < 0) {
-        ch = new KPopupMenu;
+        ch = new TDEPopupMenu;
         connect(ch,TQT_SIGNAL(activated(int)),TQT_SLOT(slotActivated(int)));
         m_popup->insertItem(TQIconSet(dirtPixmap(colFInfo->absFilePath())),
           KivioStencilSpawnerSet::readTitle(colFInfo->absFilePath()),ch);
@@ -233,7 +233,7 @@ void KivioStencilSetAction::loadCollections( const TQString& rootDirStr )
   }
 }
 
-void KivioStencilSetAction::loadSet( KPopupMenu* menu, const TQString& rootDirStr )
+void KivioStencilSetAction::loadSet( TDEPopupMenu* menu, const TQString& rootDirStr )
 {
   TQDir rootDir( rootDirStr );
 
@@ -286,10 +286,10 @@ void KivioStencilSetAction::slotActivated(int id)
 
 void KivioStencilSetAction::clearCollectionMenuList()
 {
-  TQValueList<KPopupMenu*>::Iterator it;
+  TQValueList<TDEPopupMenu*>::Iterator it;
   
   for(it = m_collectionMenuList.begin(); it != m_collectionMenuList.end(); ++it) {
-    KPopupMenu* m = (*it);
+    TDEPopupMenu* m = (*it);
     delete m;
   }