[SCM] exiv2 packaging branch, master, updated. debian/0.25-3.1-3734-gdcbc29a

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/exiv2.git;a=commitdiff;h=16564f8

The following commit has been merged in the master branch:
commit 16564f8ff20c6827018b5419d5b530fff763cd97
Author: Andreas Huggel <ahuggel at gmx.net>
Date:   Mon May 31 16:41:59 2004 +0000

    Removed unnecessary dynamic_casts
---
 src/actions.cpp | 28 ++++++++++++++--------------
 src/actions.hpp | 14 +++++++-------
 2 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/src/actions.cpp b/src/actions.cpp
index d906d41..6c391f4 100644
--- a/src/actions.cpp
+++ b/src/actions.cpp
@@ -20,13 +20,13 @@
  */
 /*
   File:      actions.cpp
-  Version:   $Name:  $ $Revision: 1.23 $
+  Version:   $Name:  $ $Revision: 1.24 $
   Author(s): Andreas Huggel (ahu) <ahuggel at gmx.net>
   History:   08-Dec-03, ahu: created
  */
 // *****************************************************************************
 #include "rcsid.hpp"
-EXIV2_RCSID("@(#) $Name:  $ $Revision: 1.23 $ $RCSfile: actions.cpp,v $")
+EXIV2_RCSID("@(#) $Name:  $ $Revision: 1.24 $ $RCSfile: actions.cpp,v $")
 
 // *****************************************************************************
 // included header files
@@ -432,10 +432,10 @@ namespace Action {
 
     Print::AutoPtr Print::clone() const
     {
-        return AutoPtr(dynamic_cast<Print*>(clone_()));
+        return AutoPtr(clone_());
     }
 
-    Task* Print::clone_() const
+    Print* Print::clone_() const
     {
         return new Print(*this);
     }
@@ -515,10 +515,10 @@ namespace Action {
 
     Rename::AutoPtr Rename::clone() const
     {
-        return AutoPtr(dynamic_cast<Rename*>(clone_()));
+        return AutoPtr(clone_());
     }
 
-    Task* Rename::clone_() const
+    Rename* Rename::clone_() const
     {
         return new Rename(*this);
     }
@@ -579,10 +579,10 @@ namespace Action {
 
     Erase::AutoPtr Erase::clone() const
     {
-        return AutoPtr(dynamic_cast<Erase*>(clone_()));
+        return AutoPtr(clone_());
     }
 
-    Task* Erase::clone_() const
+    Erase* Erase::clone_() const
     {
         return new Erase(*this);
     }
@@ -663,10 +663,10 @@ namespace Action {
 
     Extract::AutoPtr Extract::clone() const
     {
-        return AutoPtr(dynamic_cast<Extract*>(clone_()));
+        return AutoPtr(clone_());
     }
 
-    Task* Extract::clone_() const
+    Extract* Extract::clone_() const
     {
         return new Extract(*this);
     }
@@ -699,10 +699,10 @@ namespace Action {
 
     Insert::AutoPtr Insert::clone() const
     {
-        return AutoPtr(dynamic_cast<Insert*>(clone_()));
+        return AutoPtr(clone_());
     }
 
-    Task* Insert::clone_() const
+    Insert* Insert::clone_() const
     {
         return new Insert(*this);
     }
@@ -736,10 +736,10 @@ namespace Action {
 
     Adjust::AutoPtr Adjust::clone() const
     {
-        return AutoPtr(dynamic_cast<Adjust*>(clone_()));
+        return AutoPtr(clone_());
     }
 
-    Task* Adjust::clone_() const
+    Adjust* Adjust::clone_() const
     {
         return new Adjust(*this);
     }
diff --git a/src/actions.hpp b/src/actions.hpp
index ea1f556..8f9af6e 100644
--- a/src/actions.hpp
+++ b/src/actions.hpp
@@ -22,7 +22,7 @@
   @file    actions.hpp
   @brief   Implements base class Task, TaskFactory and the various supported
            actions (derived from Task).
-  @version $Name:  $ $Revision: 1.9 $
+  @version $Name:  $ $Revision: 1.10 $
   @author  Andreas Huggel (ahu)
            <a href="mailto:ahuggel at gmx.net">ahuggel at gmx.net</a>
   @date    11-Dec-03, ahu: created
@@ -167,7 +167,7 @@ namespace Action {
                      const std::string& label ="") const;
 
     private:
-        virtual Task* clone_() const;
+        virtual Print* clone_() const;
 
         std::string path_;
         int align_;                // for the alignment of the summary output
@@ -185,7 +185,7 @@ namespace Action {
         AutoPtr clone() const;
 
     private:
-        virtual Task* clone_() const;
+        virtual Rename* clone_() const;
     }; // class Rename
 
     //! %Adjust the Exif (or other metadata) timestamps
@@ -197,7 +197,7 @@ namespace Action {
         AutoPtr clone() const;
 
     private:
-        virtual Task* clone_() const;
+        virtual Adjust* clone_() const;
         int adjustDateTime(Exiv2::ExifData& exifData,
                            const std::string& key, 
                            const std::string& path) const;
@@ -225,7 +225,7 @@ namespace Action {
         int eraseExifData(Exiv2::ExifData& exifData) const;
 
     private:
-        virtual Task* clone_() const;
+        virtual Erase* clone_() const;
         std::string path_;
 
     }; // class Erase
@@ -254,7 +254,7 @@ namespace Action {
         int writeExifData(Exiv2::ExifData& exifData) const;
 
     private:
-        virtual Task* clone_() const;
+        virtual Extract* clone_() const;
         std::string path_;
 
     }; // class Extract
@@ -270,7 +270,7 @@ namespace Action {
         AutoPtr clone() const;
 
     private:
-        virtual Task* clone_() const;
+        virtual Insert* clone_() const;
 
     }; // class Insert
 

-- 
exiv2 packaging