[Kde-imaging] kdeextragear-libs-1

[Gilles Caulier]

CVS commit by cgilles: 

Added new plugin category : COLLECTIONSPLUGIN.
Changed category plugin for 'DirOperations' and 'FindImages' to COLLECTIONSPLUGIN.

CCMAIL: kde-imaging at kde.org, digikam-devel at lists.sourceforge.net


  M +2 -0      kipi-plugins/ChangeLog   1.4
  M +1 -1      kipi-plugins/diroperations/plugin_diroperations.cpp   1.10
  M +1 -1      kipi-plugins/findimages/plugin_findimages.cpp   1.9
  M +17 -9     libkipi/libkipi/plugin.cpp   1.6
  M +26 -16    libkipi/libkipi/plugin.h   1.11


--- kdeextragear-libs-1/kipi-plugins/ChangeLog  #1.3:1.4
@@ -1,4 +1,6 @@
 v1.0.0-beta1 
 ----------------------------------------------------------------------------
+        * <Gilles Caulier> Changed category plugin for 'DirOperations' and 
+          'FindImages' to COLLECTIONSPLUGIN.
         * <Gilles Caulier> Fixed plugins menu icons rendering in the host apps.
         * <Gilles Caulier> Re-added GamaCablibration plugin for old 

--- kdeextragear-libs-1/kipi-plugins/diroperations/plugin_diroperations.cpp  #1.9:1.10
@@ -131,5 +131,5 @@ void Plugin_DirOperations::slotAlbumSele
 KIPI::Category  Plugin_DirOperations::category() const
 {
-    return KIPI::IMAGESPLUGIN;
+    return KIPI::COLLECTIONSPLUGIN;
 }
 

--- kdeextragear-libs-1/kipi-plugins/findimages/plugin_findimages.cpp  #1.8:1.9
@@ -200,5 +200,5 @@ void Plugin_FindImages::customEvent(QCus
 KIPI::Category Plugin_FindImages::category() const
 {
-    return KIPI::IMAGESPLUGIN;
+    return KIPI::COLLECTIONSPLUGIN;
 }
 

--- kdeextragear-libs-1/libkipi/libkipi/plugin.cpp  #1.5:1.6
@@ -1,10 +1,11 @@
 /* ============================================================
  * File  : plugin.cpp
- * Author: Renchi Raju <renchi at pooh.tam.uiuc.edu>
- * Date  : 2004-02-18
+ * Authors: KIPI team developers
+ *          
+ * Date   : 2004-02
  * Description :
  *
- * Copyright 2004 by Renchi Raju
-
+ * Copyright 2004 by the KIPI team
+ * 
  * This program is free software; you can redistribute it
  * and/or modify it under the terms of the GNU General
@@ -20,10 +21,17 @@
  * ============================================================ */
 
-#include <kaction.h>
+// Qt includes.
 
-#include "plugin.h"
+#include <qwidget.h>
+
+// KDE includes.
+
+#include <kaction.h>
 #include <kinstance.h>
 #include <kdebug.h>
-#include <qwidget.h>
+
+// Local includes.
+
+#include "plugin.h"
 
 KIPI::Plugin::Plugin( KInstance* instance, QObject *parent, const char* name)

--- kdeextragear-libs-1/libkipi/libkipi/plugin.h  #1.10:1.11
@@ -1,10 +1,11 @@
 /* ============================================================
  * File  : plugin.h
- * Author: Renchi Raju <renchi at pooh.tam.uiuc.edu>
- * Date  : 2004-02-18
+ * Authors: KIPI team developers
+ *          
+ * Date   : 2004-02
  * Description :
  *
- * Copyright 2004 by Renchi Raju
-
+ * Copyright 2004 by the KIPI team
+ * 
  * This program is free software; you can redistribute it
  * and/or modify it under the terms of the GNU General
@@ -23,13 +24,22 @@
 #define KIPI_PLUGIN_H
 
+// Qt includes.
+
 #include <qobject.h>
-#include "libkipi/interface.h"
+
+// KDE includes.
+
 #include <kaction.h>
 
+// Lib KIPI includes.
+
+#include "libkipi/interface.h"
+
 class KInstance;
 
 namespace KIPI
 {
-    enum Category {
+    enum Category 
+       {
         IMAGESPLUGIN = 0,
         EFFECTSPLUGIN,
@@ -37,5 +47,6 @@ namespace KIPI
         IMPORTPLUGIN,
         EXPORTPLUGIN,
-        BATCHPLUGIN     
+       BATCHPLUGIN,
+       COLLECTIONSPLUGIN
     };
 
@@ -63,3 +73,3 @@ namespace KIPI
 }
 
-#endif /* KIPI_PLUGIN_H */
+#endif  // KIPI_PLUGIN_H