Cleanup: removed commented className() methods

7 files changed, 17 insertions, 42 deletions

diff --git a/src/core/abstract/MCAbstractMessage.cc b/src/core/abstract/MCAbstractMessage.cc
index 00a4b9b9..f1768aec 100644
--- a/src/core/abstract/MCAbstractMessage.cc
+++ b/src/core/abstract/MCAbstractMessage.cc
@@ -39,13 +39,6 @@ String * AbstractMessage::description()
     }
 }
 
-#if 0
-String * AbstractMessage::className()
-{
-    return MCSTR("MessageHeader");
-}
-#endif
-
 Object * AbstractMessage::copy()
 {
     return new AbstractMessage(this);
diff --git a/src/core/abstract/MCAbstractMessagePart.cc b/src/core/abstract/MCAbstractMessagePart.cc
index 6939d060..98acec98 100644
--- a/src/core/abstract/MCAbstractMessagePart.cc
+++ b/src/core/abstract/MCAbstractMessagePart.cc
@@ -37,13 +37,6 @@ String * AbstractMessagePart::description()
     return result;
 }
 
-#if 0
-String * AbstractMessagePart::className()
-{
-    return MCSTR("AbstractMessagePart");
-}
-#endif
-
 Object * AbstractMessagePart::copy()
 {
     return new AbstractMessagePart(this);
diff --git a/src/core/abstract/MCAbstractMultipart.cc b/src/core/abstract/MCAbstractMultipart.cc
index fa48d959..207b2962 100644
--- a/src/core/abstract/MCAbstractMultipart.cc
+++ b/src/core/abstract/MCAbstractMultipart.cc
@@ -65,13 +65,6 @@ String * AbstractMultipart::description()
     return result;
 }
 
-#if 0
-String * AbstractMultipart::className()
-{
-    return MCSTR("AbstractMultipart");
-}
-#endif
-
 Object * AbstractMultipart::copy()
 {
     return new AbstractMultipart(this);
diff --git a/src/core/abstract/MCAbstractPart.cc b/src/core/abstract/MCAbstractPart.cc
index 30c4c8f0..b2e6281d 100644
--- a/src/core/abstract/MCAbstractPart.cc
+++ b/src/core/abstract/MCAbstractPart.cc
@@ -13,6 +13,7 @@ AbstractPart::AbstractPart()
 AbstractPart::AbstractPart(AbstractPart * other)
 {
     init();
+    setUniqueID(other->mUniqueID);
     setFilename(other->mFilename);
     setMimeType(other->mMimeType);
     setCharset(other->mCharset);
@@ -24,6 +25,7 @@ AbstractPart::AbstractPart(AbstractPart * other)
 
 void AbstractPart::init()
 {
+    mUniqueID = NULL;
     mFilename = NULL;
     mMimeType = NULL;
     mCharset = NULL;
@@ -35,6 +37,7 @@ void AbstractPart::init()
 
 AbstractPart::~AbstractPart()
 {
+    MC_SAFE_RELEASE(mUniqueID);
     MC_SAFE_RELEASE(mFilename);
     MC_SAFE_RELEASE(mMimeType);
     MC_SAFE_RELEASE(mCharset);
@@ -67,13 +70,6 @@ String * AbstractPart::description()
     return result;
 }
 
-#if 0
-String * AbstractPart::className()
-{
-    return MCSTR("AbstractPart");
-}
-#endif
-
 Object * AbstractPart::copy()
 {
     return new AbstractPart(this);
@@ -89,6 +85,16 @@ void AbstractPart::setPartType(PartType type)
     mPartType = type;
 }
 
+String * AbstractPart::uniqueID()
+{
+    return mUniqueID;
+}
+
+void AbstractPart::setUniqueID(String * uniqueID)
+{
+    MC_SAFE_REPLACE_COPY(String, mUniqueID, uniqueID);
+}
+
 String * AbstractPart::filename()
 {
     return mFilename;
diff --git a/src/core/abstract/MCAbstractPart.h b/src/core/abstract/MCAbstractPart.h
index f7b29ced..db034654 100644
--- a/src/core/abstract/MCAbstractPart.h
+++ b/src/core/abstract/MCAbstractPart.h
@@ -28,6 +28,9 @@ namespace mailcore {
 		virtual String * charset();
 		virtual void setCharset(String * charset);
 		
+		virtual String * uniqueID();
+		virtual void setUniqueID(String * uniqueID);
+        
 		virtual String * contentID();
 		virtual void setContentID(String * contentID);
 		
@@ -49,6 +52,7 @@ namespace mailcore {
 		virtual Object * copy();
         
 	private:
+		String * mUniqueID;
 		String * mFilename;
 		String * mMimeType;
 		String * mCharset;
diff --git a/src/core/abstract/MCAddress.cc b/src/core/abstract/MCAddress.cc
index 25bed974..2ef1cd2b 100644
--- a/src/core/abstract/MCAddress.cc
+++ b/src/core/abstract/MCAddress.cc
@@ -177,13 +177,6 @@ String * Address::description()
     return result;
 }
 
-#if 0
-String * Address::className()
-{
-    return MCSTR("Address");
-}
-#endif
-
 bool Address::isEqual(Object * otherObject)
 {
     Address * otherAddress = (Address *) otherObject;
diff --git a/src/core/abstract/MCMessageHeader.cc b/src/core/abstract/MCMessageHeader.cc
index 765bc085..b0574293 100644
--- a/src/core/abstract/MCMessageHeader.cc
+++ b/src/core/abstract/MCMessageHeader.cc
@@ -154,13 +154,6 @@ String * MessageHeader::description()
     return result;
 }
 
-#if 0
-String * MessageHeader::className()
-{
-    return MCSTR("MessageHeader");
-}
-#endif
-
 Object * MessageHeader::copy()
 {
     return new MessageHeader(this);