[Kde-imaging] kdeextragear-libs-1/kipi-plugins/acquireimages

[Gilles Caulier]

CVS commit by cgilles: 

Remove KMenuAction (not necessary since this plugin is in IMPORTPLUGIN category)
CCMAIL: kde-imaging at kde.org


  M +7 -10     plugin_acquireimages.cpp   1.11
  M +0 -2      plugin_acquireimages.h   1.7


--- kdeextragear-libs-1/kipi-plugins/acquireimages/plugin_acquireimages.cpp  #1.10:1.11
@@ -62,7 +63,4 @@ void Plugin_AcquireImages::setup( QWidge
 {
     KIPI::Plugin::setup( widget );
-    m_action_acquire = new KActionMenu(i18n("&Acquire images"),
-                                             actionCollection(),
-                                             "acquire");
 
     m_action_scanimages = new KAction (i18n("Scan Images..."),         // Menu message.
@@ -74,6 +72,4 @@ void Plugin_AcquireImages::setup( QWidge
                                             "scan_images");
 
-    m_action_acquire->insert(m_action_scanimages);
-
     m_action_screenshotimages =  new KAction (i18n("Screenshot..."),   // Menu message.
                                             "ksnapshot",               // Menu icon.
@@ -84,6 +80,6 @@ void Plugin_AcquireImages::setup( QWidge
                                             "screenshot_images");
 
-    m_action_acquire->insert(m_action_screenshotimages);
-    addAction( m_action_acquire );
+    addAction( m_action_scanimages );
+    addAction( m_action_screenshotimages );
 }
 
@@ -147,9 +143,10 @@ void Plugin_AcquireImages::slotAcquireIm
 }
 
+
+/////////////////////////////////////////////////////////////////////////////////////////////////////
+
 KIPI::Category Plugin_AcquireImages::category( KAction* action ) const
 {
-    if ( action == m_action_acquire )
-       return KIPI::IMPORTPLUGIN;
-    else if ( action == m_action_scanimages )
+    if ( action == m_action_scanimages )
        return KIPI::IMPORTPLUGIN;
     else if ( action == m_action_screenshotimages )

--- kdeextragear-libs-1/kipi-plugins/acquireimages/plugin_acquireimages.h  #1.6:1.7
@@ -32,5 +32,4 @@
 class KScanDialog;
 class KAction;
-class KActionMenu;
 
 class AcquireImageDialog;
@@ -52,5 +51,4 @@ public slots:
 
 private:
-  KActionMenu        *m_action_acquire;
   KAction            *m_action_scanimages;
   KAction            *m_action_screenshotimages;