From 7a6b3c64d4b424c09928bfd593ca4aa0738b1e02 Mon Sep 17 00:00:00 2001
From: Marcelo Lira <marcelo.lira@openbossa.org>
Date: Mon, 22 Nov 2010 19:11:05 -0300
Subject: Moved members of FunctionModification to parent Modification class.

'removal' public attribute and 'isRemovedModifier' public method were
moved from FunctionModification to Modification, this benefits
FieldModification class, that inherits from the latter.
---
 typesystem.h | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

(limited to 'typesystem.h')

diff --git a/typesystem.h b/typesystem.h
index 6961cbda5..5b0e7ca7b 100644
--- a/typesystem.h
+++ b/typesystem.h
@@ -310,7 +310,7 @@ struct APIEXTRACTOR_API Modification
         VirtualSlot =          0x10000 | NonFinal
     };
 
-    Modification() : modifiers(0) { }
+    Modification() : modifiers(0), removal(TypeSystem::NoLanguage) { }
 
     bool isAccessModifier() const
     {
@@ -368,22 +368,24 @@ struct APIEXTRACTOR_API Modification
         return modifiers & Rename;
     }
 
+    bool isRemoveModifier() const
+    {
+        return removal != TypeSystem::NoLanguage;
+    }
+
     uint modifiers;
     QString renamedToName;
+    TypeSystem::Language removal;
 };
 
 struct APIEXTRACTOR_API FunctionModification: public Modification
 {
-    FunctionModification(double vr) : removal(TypeSystem::NoLanguage), m_thread(false), m_allowThread(false), m_version(vr) {}
+    FunctionModification(double vr) : m_thread(false), m_allowThread(false), m_version(vr) {}
 
     bool isCodeInjection() const
     {
         return modifiers & CodeInjection;
     }
-    bool isRemoveModifier() const
-    {
-        return removal != TypeSystem::NoLanguage;
-    }
     void setIsThread(bool flag)
     {
         m_thread = flag;
@@ -414,7 +416,6 @@ struct APIEXTRACTOR_API FunctionModification: public Modification
     QString signature;
     QString association;
     CodeSnipList snips;
-    TypeSystem::Language removal;
 
     QList<ArgumentModification> argument_mods;
 
-- 
cgit v1.2.3