Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnsgar Radermacher2013-11-04 08:31:43 -0500
committerAnsgar Radermacher2013-11-04 08:31:43 -0500
commitaaf42a430e6cb29d2935475c45d5fc77ed98501b (patch)
tree7d8c50e8b5468d3c77a4ec879f17d0a642dbb98b /extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src
parentc3e33d3babb34f6948200b9a06fa428edf675d15 (diff)
parentee77297e3ec2e434a3dc89f1e23221a995398674 (diff)
downloadorg.eclipse.papyrus-aaf42a430e6cb29d2935475c45d5fc77ed98501b.tar.gz
org.eclipse.papyrus-aaf42a430e6cb29d2935475c45d5fc77ed98501b.tar.xz
org.eclipse.papyrus-aaf42a430e6cb29d2935475c45d5fc77ed98501b.zip
Merge branch 'Qompass'
Conflicts: extraplugins/codegen/org.eclipse.papyrus.cpp.codegen.ui/META-INF/MANIFEST.MF extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/CppClassHeader.emtl extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/CppDocumentation.emtl extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/clazz/CppClassTypeAndEnum.emtl extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/operation/CppOperations.emtl
Diffstat (limited to 'extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src')
-rw-r--r--extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/CppClassHeader.emtl12
-rw-r--r--extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/CppDocumentation.emtl4
-rw-r--r--extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/clazz/CppClassTypeAndEnum.emtl4
-rw-r--r--extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/operation/CppOperations.emtl32
4 files changed, 52 insertions, 0 deletions
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/CppClassHeader.emtl b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/CppClassHeader.emtl
index 93f229094ce..0126195414d 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/CppClassHeader.emtl
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/CppClassHeader.emtl
@@ -28,10 +28,14 @@
<eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean"/>
<definition href="platform:/plugin/org.eclipse.papyrus.acceleo/org/eclipse/papyrus/acceleo/GenUtils.emtl#/0/hasStereotype.1"/>
<<<<<<< HEAD
+<<<<<<< HEAD
<argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/5">
=======
<argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/7">
>>>>>>> - [Bug 420376] Generated C++ code is not formatted
+=======
+ <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/7">
+>>>>>>> refs/heads/Qompass
<eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier"/>
</argument>
<argument xsi:type="ocl.ecore:TypeExp" eType="/6/Union">
@@ -219,10 +223,14 @@
<eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
<definition href="platform:/plugin/org.eclipse.papyrus.acceleo/org/eclipse/papyrus/acceleo/GenUtils.emtl#/0/getFullNameUC"/>
<<<<<<< HEAD
+<<<<<<< HEAD
<argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/26">
=======
<argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/31">
>>>>>>> - [Bug 420376] Generated C++ code is not formatted
+=======
+ <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/31">
+>>>>>>> refs/heads/Qompass
<eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier"/>
</argument>
</body>
@@ -231,10 +239,14 @@
<eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
<definition href="platform:/plugin/org.eclipse.papyrus.acceleo/org/eclipse/papyrus/acceleo/GenUtils.emtl#/0/getFullNameUC"/>
<<<<<<< HEAD
+<<<<<<< HEAD
<argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/27">
=======
<argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/32">
>>>>>>> - [Bug 420376] Generated C++ code is not formatted
+=======
+ <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/32">
+>>>>>>> refs/heads/Qompass
<eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier"/>
</argument>
</body>
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/CppDocumentation.emtl b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/CppDocumentation.emtl
index f02c32f643c..c90b1a6efdf 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/CppDocumentation.emtl
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/CppDocumentation.emtl
@@ -123,10 +123,14 @@
<eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
<definition href="platform:/plugin/org.eclipse.papyrus.acceleo/org/eclipse/papyrus/acceleo/GenUtils.emtl#/0/getComments"/>
<<<<<<< HEAD
+<<<<<<< HEAD
<argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/23">
=======
<argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/33">
>>>>>>> - [Bug 420376] Generated C++ code is not formatted
+=======
+ <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/33">
+>>>>>>> refs/heads/Qompass
<eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Parameter"/>
</argument>
</source>
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/clazz/CppClassTypeAndEnum.emtl b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/clazz/CppClassTypeAndEnum.emtl
index 87f12d18900..48d38fca763 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/clazz/CppClassTypeAndEnum.emtl
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/clazz/CppClassTypeAndEnum.emtl
@@ -9,9 +9,13 @@
</input>
<imports href="platform:/plugin/org.eclipse.papyrus.acceleo/org/eclipse/papyrus/acceleo/GenUtils.emtl#/0"/>
<<<<<<< HEAD
+<<<<<<< HEAD
=======
<imports href="platform:/plugin/utils/CppGenUtils.emtl#/0"/>
>>>>>>> - [Bug 420376] Generated C++ code is not formatted
+=======
+ <imports href="platform:/plugin/utils/CppGenUtils.emtl#/0"/>
+>>>>>>> refs/heads/Qompass
<imports href="../CppPrimitiveTypes.emtl#/0"/>
<imports href="../CppEnumerations.emtl#/0"/>
<ownedModuleElement xsi:type="mtl:Template" name="TypeAndEnumForVisibility" visibility="Public">
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/operation/CppOperations.emtl b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/operation/CppOperations.emtl
index 42b8f6bebf5..e3b085443c6 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/operation/CppOperations.emtl
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/operation/CppOperations.emtl
@@ -337,10 +337,14 @@
<eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean"/>
<definition href="platform:/plugin/org.eclipse.papyrus.acceleo/org/eclipse/papyrus/acceleo/GenUtils.emtl#/0/hasStereotype.1"/>
<<<<<<< HEAD
+<<<<<<< HEAD
<argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/34">
=======
<argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/43">
>>>>>>> - [Bug 420376] Generated C++ code is not formatted
+=======
+ <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/43">
+>>>>>>> refs/heads/Qompass
<eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Element"/>
</argument>
<argument xsi:type="ocl.ecore:TypeExp" eType="/6/Inline">
@@ -429,10 +433,14 @@
<eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
<definition href="platform:/plugin/utils/Modifier.emtl#/0/modConst"/>
<<<<<<< HEAD
+<<<<<<< HEAD
<argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/52">
=======
<argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/61">
>>>>>>> - [Bug 420376] Generated C++ code is not formatted
+=======
+ <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/61">
+>>>>>>> refs/heads/Qompass
<eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Operation"/>
</argument>
</body>
@@ -510,10 +518,14 @@
<eType xsi:type="ocl.ecore:AnyType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny"/>
<definition href="platform:/plugin/org.eclipse.papyrus.acceleo/org/eclipse/papyrus/acceleo/GenUtils.emtl#/0/getApplication"/>
<<<<<<< HEAD
+<<<<<<< HEAD
<argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/59">
=======
<argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/78">
>>>>>>> - [Bug 420376] Generated C++ code is not formatted
+=======
+ <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/78">
+>>>>>>> refs/heads/Qompass
<eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Operation"/>
</argument>
<argument xsi:type="ocl.ecore:TypeExp" eType="/6/ConstInit">
@@ -533,10 +545,14 @@
<eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean"/>
<definition href="platform:/plugin/org.eclipse.papyrus.acceleo/org/eclipse/papyrus/acceleo/GenUtils.emtl#/0/hasStereotype.1"/>
<<<<<<< HEAD
+<<<<<<< HEAD
<argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/58">
=======
<argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/77">
>>>>>>> - [Bug 420376] Generated C++ code is not formatted
+=======
+ <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/77">
+>>>>>>> refs/heads/Qompass
<eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Operation"/>
</argument>
<argument xsi:type="ocl.ecore:TypeExp" eType="/6/ConstInit">
@@ -547,10 +563,14 @@
<eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean"/>
<definition href="platform:/plugin/org.eclipse.papyrus.acceleo/org/eclipse/papyrus/acceleo/GenUtils.emtl#/0/hasStereotype.1"/>
<<<<<<< HEAD
+<<<<<<< HEAD
<argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/58">
=======
<argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/77">
>>>>>>> - [Bug 420376] Generated C++ code is not formatted
+=======
+ <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/77">
+>>>>>>> refs/heads/Qompass
<eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Operation"/>
</argument>
<argument xsi:type="ocl.ecore:TypeExp" eType="/6/Create">
@@ -574,10 +594,14 @@
<eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
<definition href="platform:/plugin/org.eclipse.papyrus.acceleo/org/eclipse/papyrus/acceleo/GenUtils.emtl#/0/getBody"/>
<<<<<<< HEAD
+<<<<<<< HEAD
<argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/64">
=======
<argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/83">
>>>>>>> - [Bug 420376] Generated C++ code is not formatted
+=======
+ <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/83">
+>>>>>>> refs/heads/Qompass
<eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Operation"/>
</argument>
<argument xsi:type="ocl.ecore:VariableExp" name="language" referredVariable="/0/getBodyInTemplate/language">
@@ -676,10 +700,14 @@
<eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
<definition href="platform:/plugin/org.eclipse.papyrus.acceleo/org/eclipse/papyrus/acceleo/GenUtils.emtl#/0/getBody"/>
<<<<<<< HEAD
+<<<<<<< HEAD
<argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/85">
=======
<argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/104">
>>>>>>> - [Bug 420376] Generated C++ code is not formatted
+=======
+ <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/104">
+>>>>>>> refs/heads/Qompass
<eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Operation"/>
</argument>
<argument xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="C/C++">
@@ -782,10 +810,14 @@
<eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
<definition href="platform:/plugin/utils/Modifier.emtl#/0/modConst"/>
<<<<<<< HEAD
+<<<<<<< HEAD
<argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/95">
=======
<argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/114">
>>>>>>> - [Bug 420376] Generated C++ code is not formatted
+=======
+ <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/114">
+>>>>>>> refs/heads/Qompass
<eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Operation"/>
</argument>
</body>

Back to the top