Better copy constructor hierarchy

diff --git a/src/dataobjects/emufrontfile.cpp b/src/dataobjects/emufrontfile.cpp
index f6ee835..dd68586 100644 (file)
--- a/src/dataobjects/emufrontfile.cpp
+++ b/src/dataobjects/emufrontfile.cpp
@@ -26,6 +26,10 @@ EmuFrontFile::EmuFrontFile(int type) : EmuFrontObject(), type(type) { }
 EmuFrontFile::EmuFrontFile(int id, QString name, QString checksum, int size, int type)
    : EmuFrontObject(id, name), checkSum(checksum), size(size), type(type) { }
 
+EmuFrontFile::EmuFrontFile(EmuFrontFile &eff)
+    : EmuFrontObject(eff), checkSum(eff.checkSum), size(eff.size), type(eff.type)
+{}
+
 QString EmuFrontFile::getCheckSum() const
 { return checkSum; }
 

diff --git a/src/dataobjects/emufrontfile.h b/src/dataobjects/emufrontfile.h
index 4b457ff..43d4517 100644 (file)
--- a/src/dataobjects/emufrontfile.h
+++ b/src/dataobjects/emufrontfile.h
@@ -28,6 +28,7 @@ public:
     EmuFrontFile();
     EmuFrontFile(int type);
     EmuFrontFile(int id, QString name, QString checksum, int size, int type);
+    EmuFrontFile(EmuFrontFile &);
     QString getCheckSum() const;
     void setCheckSum(QString);
     int getSize() const;

diff --git a/src/dataobjects/emufrontobject.h b/src/dataobjects/emufrontobject.h
index 97a589f..6b9c064 100644 (file)
--- a/src/dataobjects/emufrontobject.h
+++ b/src/dataobjects/emufrontobject.h
@@ -28,7 +28,6 @@ public:
     EmuFrontObject();
     EmuFrontObject(int id, QString name);
 
-    // No need for these as long we use QString (see Implicit Data Sharing)
     EmuFrontObject(const EmuFrontObject &);
     ~EmuFrontObject();
     EmuFrontObject &operator=(const EmuFrontObject &);

diff --git a/src/dataobjects/mediaimage.cpp b/src/dataobjects/mediaimage.cpp
index 87ab431..0ec8f62 100644 (file)
--- a/src/dataobjects/mediaimage.cpp
+++ b/src/dataobjects/mediaimage.cpp
@@ -31,4 +31,7 @@ MediaImage::MediaImage(QString name, QString checksum, int size)
     : EmuFrontFile(-1, name, checksum, size, EmuFrontFile::FileType_MediaImage)
 { }
 
+MediaImage::MediaImage(MediaImage &mi)
+    : EmuFrontFile(mi) {}
+
 

diff --git a/src/dataobjects/mediaimage.h b/src/dataobjects/mediaimage.h
index 6ca418f..712958f 100644 (file)
--- a/src/dataobjects/mediaimage.h
+++ b/src/dataobjects/mediaimage.h
@@ -28,6 +28,7 @@ public:
     MediaImage();
     MediaImage(QString name, QString checksum, int size);
     MediaImage(int id, QString name, QString checksum, int size);
+    MediaImage(MediaImage&);
 };
 
 #endif // MEDIAIMAGE_H

diff --git a/src/dataobjects/mediaimagecontainer.cpp b/src/dataobjects/mediaimagecontainer.cpp
index e4b2db9..ce9c267 100644 (file)
--- a/src/dataobjects/mediaimagecontainer.cpp
+++ b/src/dataobjects/mediaimagecontainer.cpp
@@ -26,16 +26,12 @@ MediaImageContainer::MediaImageContainer()
 }
 
 MediaImageContainer::MediaImageContainer(int id, QString name, QString checksum, int size, QList<MediaImage *>images)
-    : EmuFrontFile(id, name, checksum, size, EmuFrontFile::FileType_MediaImageContainer)
-{
-    lstMediaImage = QList<MediaImage*>();
-}
+    : EmuFrontFile(id, name, checksum, size, EmuFrontFile::FileType_MediaImageContainer), lstMediaImage(images)
+{ }
 
 MediaImageContainer::MediaImageContainer(QString name, QString checksum, int size, QList<MediaImage *>images)
-    : EmuFrontFile(-1, name, checksum, size, EmuFrontFile::FileType_MediaImageContainer)
-{
-    lstMediaImage = QList<MediaImage*>();
-}
+    : EmuFrontFile(-1, name, checksum, size, EmuFrontFile::FileType_MediaImageContainer), lstMediaImage(images)
+{ }
 
 MediaImageContainer::~MediaImageContainer()
 {
@@ -43,11 +39,11 @@ MediaImageContainer::~MediaImageContainer()
 }
 
 MediaImageContainer::MediaImageContainer(MediaImageContainer &mic)
-    : EmuFrontFile(mic.id, mic.name, mic.checkSum, mic.size, mic.type)
+    : EmuFrontFile(mic)
 {
     lstMediaImage = QList<MediaImage*>();
     foreach(MediaImage *mi, mic.lstMediaImage)
-        lstMediaImage.append(new MediaImage(mi));
+        lstMediaImage.append(new MediaImage(*mi));
 }
 
 MediaImageContainer& MediaImageContainer::operator =(MediaImageContainer &mic)
@@ -59,8 +55,8 @@ MediaImageContainer& MediaImageContainer::operator =(MediaImageContainer &mic)
     checkSum = mic.checkSum;
     size = mic.size;
     qDeleteAll(lstMediaImage);
-    foreach(MediaImage *mi, mic)
-        lstMediaImage.append(new MediaImage(mi));
+    foreach(MediaImage *mi, mic.lstMediaImage)
+        lstMediaImage.append(new MediaImage(*mi));
     return (*this);
 }