[Kbarcode-svn] SF.net SVN: kbarcode: [42] trunk/src

[<vz...@us...>]

Revision: 42
          http://kbarcode.svn.sourceforge.net/kbarcode/?rev=42&view=rev
Author:   vzsolt
Date:     2008-03-04 09:35:54 -0800 (Tue, 04 Mar 2008)

Log Message:
-----------
Reverted my last changes to these files. (Back to the original condition.)

Modified Paths:
--------------
    trunk/src/pixmapbarcode.cpp
    trunk/src/pixmapbarcode.h

Modified: trunk/src/pixmapbarcode.cpp
===================================================================
--- trunk/src/pixmapbarcode.cpp	2008-03-04 17:34:13 UTC (rev 41)
+++ trunk/src/pixmapbarcode.cpp	2008-03-04 17:35:54 UTC (rev 42)
@@ -87,20 +87,19 @@
 {
 }
 
-// FIXME: do we need this one?
-// const PixmapBarcode & PixmapBarcode::operator=( const BarkodeEngine & rhs )
-// {
-//     const PixmapBarcode* pix = dynamic_cast<const PixmapBarcode*>(&rhs);
-// 
-//     if( pix ) 
-//     {
-//         m_pdf417_options = pix->m_pdf417_options;
-//         p                = pix->p;
-//     }
-// 
-//     return *this;
-// }
+const PixmapBarcode & PixmapBarcode::operator=( const BarkodeEngine & rhs )
+{
+    const PixmapBarcode* pix = dynamic_cast<const PixmapBarcode*>(&rhs);
 
+     if( pix ) 
+     {
+         m_pdf417_options = pix->m_pdf417_options;
+         p                = pix->p;
+     }
+
+     return *this;
+}
+
 const QSize PixmapBarcode::size() const
 {
     return ( p.size().isNull() ? QSize( 100, 80 ) : p.size() );

Modified: trunk/src/pixmapbarcode.h
===================================================================
--- trunk/src/pixmapbarcode.h	2008-03-04 17:34:13 UTC (rev 41)
+++ trunk/src/pixmapbarcode.h	2008-03-04 17:35:54 UTC (rev 42)
@@ -63,12 +63,8 @@
         PixmapBarcode();
         ~PixmapBarcode();
 
-        // This isn't right...
-        // warning: ‘virtual const PixmapBarcode& PixmapBarcode::operator=(const BarkodeEngine&)’ was hidden
-        // warning: by ‘PurePostscriptBarcode& PurePostscriptBarcode::operator=(const PurePostscriptBarcode&)’
+        const PixmapBarcode & operator=( const BarkodeEngine & rhs );
 
-        // virtual const PixmapBarcode & operator=( const BarkodeEngine & rhs );
-
         inline EEngine engine() const;
         const QSize size() const;
         void update( const QPaintDevice* device );


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.