[Uml-devel] KDE/kdesdk/umbrello/umbrello
Oliver Kellogg
okellogg at users.sourceforge.net
Sat Sep 1 23:30:14 UTC 2007
SVN commit 707484 by okellogg:
CodeGenerationPolicy::ScopePolicy: Fold into Uml::Visibility::Value.
M +4 -4 codegenerationpolicy.cpp
M +10 -9 codegenerationpolicy.h
M +5 -5 codegenerators/dcodeaccessormethod.cpp
M +5 -5 codegenerators/dcodeclassfielddeclarationblock.cpp
M +2 -2 codegenerators/dcodegenerationpolicypage.cpp
M +5 -5 codegenerators/javacodeaccessormethod.cpp
M +5 -5 codegenerators/javacodeclassfielddeclarationblock.cpp
M +2 -2 codegenerators/javacodegenerationpolicypage.cpp
M +5 -5 codegenerators/rubycodeaccessormethod.cpp
M +5 -5 codegenerators/rubycodeclassfielddeclarationblock.cpp
M +2 -2 codegenerators/rubycodegenerationpolicypage.cpp
M +2 -2 optionstate.h
M +4 -4 umbrello.kcfg
M +2 -1 umlnamespace.h
--- trunk/KDE/kdesdk/umbrello/umbrello/codegenerationpolicy.cpp #707483:707484
@@ -332,21 +332,21 @@
return Settings::getOptionState().codeGenerationState.autoGenEmptyConstructors;
}
-void CodeGenerationPolicy::setAttributeAccessorScope(ScopePolicy var) {
+void CodeGenerationPolicy::setAttributeAccessorScope(Uml::Visibility::Value var) {
Settings::getOptionState().codeGenerationState.defaultAttributeAccessorScope = var;
emit modifiedCodeContent();
}
-CodeGenerationPolicy::ScopePolicy CodeGenerationPolicy::getAttributeAccessorScope() {
+Uml::Visibility::Value CodeGenerationPolicy::getAttributeAccessorScope() {
return Settings::getOptionState().codeGenerationState.defaultAttributeAccessorScope;
}
-void CodeGenerationPolicy::setAssociationFieldScope(ScopePolicy var) {
+void CodeGenerationPolicy::setAssociationFieldScope(Uml::Visibility::Value var) {
Settings::getOptionState().codeGenerationState.defaultAssocFieldScope = var;
emit modifiedCodeContent();
}
-CodeGenerationPolicy::ScopePolicy CodeGenerationPolicy::getAssociationFieldScope() {
+Uml::Visibility::Value CodeGenerationPolicy::getAssociationFieldScope() {
return Settings::getOptionState().codeGenerationState.defaultAssocFieldScope;
}
--- trunk/KDE/kdesdk/umbrello/umbrello/codegenerationpolicy.h #707483:707484
@@ -23,6 +23,8 @@
#include <qdir.h>
#include <qdom.h>
+#include "umlnamespace.h"
+
class QWidget;
class KConfig;
class CodeGenerationPolicyPage;
@@ -53,7 +55,6 @@
enum NewLineType {UNIX=0, DOS, MAC};
enum IndentationType {NONE=0, TAB, SPACE};
enum CommentStyle { SingleLine=0, MultiLine };
- enum ScopePolicy { Public=0, Private, Protected, FromParent };
// Constructors/Destructors
//
@@ -251,25 +252,25 @@
* Set the value of m_attributeAccessorScope
* @param var the new value
*/
- void setAttributeAccessorScope(ScopePolicy var);
+ void setAttributeAccessorScope(Uml::Visibility::Value var);
/**
* Get the value of m_attributeAccessorScope
- * @return the ScopePolicy value of m_attributeAccessorScope
+ * @return the Visibility value of m_attributeAccessorScope
*/
- ScopePolicy getAttributeAccessorScope();
+ Uml::Visibility::Value getAttributeAccessorScope();
/**
* Set the value of m_associationFieldScope
* @param var the new value
*/
- void setAssociationFieldScope(ScopePolicy var);
+ void setAssociationFieldScope(Uml::Visibility::Value var);
/**
* Get the value of m_associationFieldScope
- * @return the ScopePolicy value of m_associationFieldScope
+ * @return the Visibility value of m_associationFieldScope
*/
- ScopePolicy getAssociationFieldScope();
+ Uml::Visibility::Value getAssociationFieldScope();
/**
* Create a new dialog interface for this object.
@@ -353,8 +354,8 @@
ModifyNamePolicy m_modifyPolicy;
bool m_autoGenerateConstructors;
CommentStyle m_commentStyle;
- ScopePolicy m_attributeAccessorScope;
- ScopePolicy m_associationFieldScope;
+ Uml::Visibility::Value m_attributeAccessorScope;
+ Uml::Visibility::Value m_associationFieldScope;
*/
// these 2 private fields 'cache' the string values of other fields we may frequently call for
--- trunk/KDE/kdesdk/umbrello/umbrello/codegenerators/dcodeaccessormethod.cpp #707483:707484
@@ -134,7 +134,7 @@
CodeGenerationPolicy *commonpolicy = UMLApp::app()->getCommonPolicy();
// gather defs
- CodeGenerationPolicy::ScopePolicy scopePolicy = commonpolicy->getAttributeAccessorScope();
+ Uml::Visibility::Value scopePolicy = commonpolicy->getAttributeAccessorScope();
QString strVis = ddoc->scopeToDDecl(dfield->getVisibility());
QString fieldName = dfield->getFieldName();
QString fieldType = dfield->getTypeName();
@@ -147,13 +147,13 @@
// we need to be more sophisticated
if(dfield->parentIsAttribute())
switch (scopePolicy) {
- case CodeGenerationPolicy::Public:
- case CodeGenerationPolicy::Private:
- case CodeGenerationPolicy::Protected:
+ case Uml::Visibility::Public:
+ case Uml::Visibility::Private:
+ case Uml::Visibility::Protected:
strVis = ddoc->scopeToDDecl((Uml::Visibility::Value) scopePolicy);
break;
default:
- case CodeGenerationPolicy::FromParent:
+ case Uml::Visibility::FromParent:
// do nothing..already have taken parent value
break;
}
--- trunk/KDE/kdesdk/umbrello/umbrello/codegenerators/dcodeclassfielddeclarationblock.cpp #707483:707484
@@ -52,7 +52,7 @@
DClassifierCodeDocument* jdoc = dynamic_cast<DClassifierCodeDocument*>(doc);
CodeGenerationPolicy * commonpolicy = UMLApp::app()->getCommonPolicy();
- CodeGenerationPolicy::ScopePolicy scopePolicy = commonpolicy->getAssociationFieldScope();
+ Uml::Visibility::Value scopePolicy = commonpolicy->getAssociationFieldScope();
// Set the comment
QString notes = getParentObject()->getDoc();
@@ -66,13 +66,13 @@
if(!jcf->parentIsAttribute())
{
switch (scopePolicy) {
- case CodeGenerationPolicy::Public:
- case CodeGenerationPolicy::Private:
- case CodeGenerationPolicy::Protected:
+ case Uml::Visibility::Public:
+ case Uml::Visibility::Private:
+ case Uml::Visibility::Protected:
scopeStr = jdoc->scopeToDDecl((Uml::Visibility::Value) scopePolicy);
break;
default:
- case CodeGenerationPolicy::FromParent:
+ case Uml::Visibility::FromParent:
// do nothing here... will leave as from parent object
break;
}
--- trunk/KDE/kdesdk/umbrello/umbrello/codegenerators/dcodegenerationpolicypage.cpp #707483:707484
@@ -55,8 +55,8 @@
commonPolicy->blockSignals(true);
commonPolicy->setCommentStyle((CodeGenerationPolicy::CommentStyle ) form->m_SelectCommentStyle->currentItem());
- commonPolicy->setAttributeAccessorScope((CodeGenerationPolicy::ScopePolicy) (form->m_accessorScopeCB->currentItem()));
- commonPolicy->setAssociationFieldScope((CodeGenerationPolicy::ScopePolicy) (form->m_assocFieldScopeCB->currentItem()));
+ commonPolicy->setAttributeAccessorScope((Uml::Visibility::Value) (form->m_accessorScopeCB->currentItem()));
+ commonPolicy->setAssociationFieldScope((Uml::Visibility::Value) (form->m_assocFieldScopeCB->currentItem()));
commonPolicy->setAutoGenerateConstructors(form->m_generateConstructors->isChecked());
parent->setAutoGenerateAttribAccessors(form->m_generateAttribAccessors->isChecked());
parent->setAutoGenerateAssocAccessors(form->m_generateAssocAccessors->isChecked());
--- trunk/KDE/kdesdk/umbrello/umbrello/codegenerators/javacodeaccessormethod.cpp #707483:707484
@@ -139,7 +139,7 @@
CodeGenerationPolicy *commonpolicy = UMLApp::app()->getCommonPolicy();
// gather defs
- CodeGenerationPolicy::ScopePolicy scopePolicy = commonpolicy->getAttributeAccessorScope();
+ Uml::Visibility::Value scopePolicy = commonpolicy->getAttributeAccessorScope();
QString strVis = javadoc->scopeToJavaDecl(javafield->getVisibility());
QString fieldName = javafield->getFieldName();
QString fieldType = javafield->getTypeName();
@@ -152,13 +152,13 @@
// we need to be more sophisticated
if(javafield->parentIsAttribute())
switch (scopePolicy) {
- case CodeGenerationPolicy::Public:
- case CodeGenerationPolicy::Private:
- case CodeGenerationPolicy::Protected:
+ case Uml::Visibility::Public:
+ case Uml::Visibility::Private:
+ case Uml::Visibility::Protected:
strVis = javadoc->scopeToJavaDecl((Uml::Visibility::Value) scopePolicy);
break;
default:
- case CodeGenerationPolicy::FromParent:
+ case Uml::Visibility::FromParent:
// do nothing..already have taken parent value
break;
}
--- trunk/KDE/kdesdk/umbrello/umbrello/codegenerators/javacodeclassfielddeclarationblock.cpp #707483:707484
@@ -56,7 +56,7 @@
JavaClassifierCodeDocument* jdoc = dynamic_cast<JavaClassifierCodeDocument*>(doc);
CodeGenerationPolicy * commonpolicy = UMLApp::app()->getCommonPolicy();
- CodeGenerationPolicy::ScopePolicy scopePolicy = commonpolicy->getAssociationFieldScope();
+ Uml::Visibility::Value scopePolicy = commonpolicy->getAssociationFieldScope();
// Set the comment
QString notes = getParentObject()->getDoc();
@@ -70,13 +70,13 @@
if(!jcf->parentIsAttribute())
{
switch (scopePolicy) {
- case CodeGenerationPolicy::Public:
- case CodeGenerationPolicy::Private:
- case CodeGenerationPolicy::Protected:
+ case Uml::Visibility::Public:
+ case Uml::Visibility::Private:
+ case Uml::Visibility::Protected:
scopeStr = jdoc->scopeToJavaDecl((Uml::Visibility::Value) scopePolicy);
break;
default:
- case CodeGenerationPolicy::FromParent:
+ case Uml::Visibility::FromParent:
// do nothing here... will leave as from parent object
break;
}
--- trunk/KDE/kdesdk/umbrello/umbrello/codegenerators/javacodegenerationpolicypage.cpp #707483:707484
@@ -59,8 +59,8 @@
commonPolicy->blockSignals(true);
commonPolicy->setCommentStyle((CodeGenerationPolicy::CommentStyle ) form->m_SelectCommentStyle->currentItem());
- commonPolicy->setAttributeAccessorScope((CodeGenerationPolicy::ScopePolicy) (form->m_accessorScopeCB->currentItem()));
- commonPolicy->setAssociationFieldScope((CodeGenerationPolicy::ScopePolicy) (form->m_assocFieldScopeCB->currentItem()));
+ commonPolicy->setAttributeAccessorScope((Uml::Visibility::Value) (form->m_accessorScopeCB->currentItem()));
+ commonPolicy->setAssociationFieldScope((Uml::Visibility::Value) (form->m_assocFieldScopeCB->currentItem()));
commonPolicy->setAutoGenerateConstructors(form->m_generateConstructors->isChecked());
parent->setAutoGenerateAttribAccessors(form->m_generateAttribAccessors->isChecked());
parent->setAutoGenerateAssocAccessors(form->m_generateAssocAccessors->isChecked());
--- trunk/KDE/kdesdk/umbrello/umbrello/codegenerators/rubycodeaccessormethod.cpp #707483:707484
@@ -143,7 +143,7 @@
// gather defs
CodeGenerationPolicy *p = UMLApp::app()->getCommonPolicy();
- CodeGenerationPolicy::ScopePolicy scopePolicy = p->getAttributeAccessorScope();
+ Uml::Visibility::Value scopePolicy = p->getAttributeAccessorScope();
QString strVis = rubydoc->scopeToRubyDecl(rubyfield->getVisibility());
QString fieldName = RubyCodeGenerator::cppToRubyName(rubyfield->getFieldName());
QString fieldType = RubyCodeGenerator::cppToRubyType(rubyfield->getTypeName());
@@ -161,13 +161,13 @@
// we need to be more sophisticated
if(rubyfield->parentIsAttribute())
switch (scopePolicy) {
- case CodeGenerationPolicy::Public:
- case CodeGenerationPolicy::Private:
- case CodeGenerationPolicy::Protected:
+ case Uml::Visibility::Public:
+ case Uml::Visibility::Private:
+ case Uml::Visibility::Protected:
strVis = rubydoc->scopeToRubyDecl((Uml::Visibility::Value) scopePolicy);
break;
default:
- case CodeGenerationPolicy::FromParent:
+ case Uml::Visibility::FromParent:
// do nothing..already have taken parent value
break;
}
--- trunk/KDE/kdesdk/umbrello/umbrello/codegenerators/rubycodeclassfielddeclarationblock.cpp #707483:707484
@@ -50,7 +50,7 @@
RubyCodeClassField * rcf = dynamic_cast<RubyCodeClassField*>(cf);
RubyClassifierCodeDocument* rdoc = dynamic_cast<RubyClassifierCodeDocument*>(doc);
CodeGenerationPolicy * p = UMLApp::app()->getCommonPolicy();
- CodeGenerationPolicy::ScopePolicy scopePolicy = p->getAssociationFieldScope();
+ Uml::Visibility::Value scopePolicy = p->getAssociationFieldScope();
// Set the comment
QString notes = getParentObject()->getDoc();
@@ -64,13 +64,13 @@
if(!rcf->parentIsAttribute())
{
switch (scopePolicy) {
- case CodeGenerationPolicy::Public:
- case CodeGenerationPolicy::Private:
- case CodeGenerationPolicy::Protected:
+ case Uml::Visibility::Public:
+ case Uml::Visibility::Private:
+ case Uml::Visibility::Protected:
scopeStr = rdoc->scopeToRubyDecl((Uml::Visibility::Value) scopePolicy);
break;
default:
- case CodeGenerationPolicy::FromParent:
+ case Uml::Visibility::FromParent:
// do nothing here... will leave as from parent object
break;
}
--- trunk/KDE/kdesdk/umbrello/umbrello/codegenerators/rubycodegenerationpolicypage.cpp #707483:707484
@@ -57,8 +57,8 @@
parent->blockSignals(true);
common->setCommentStyle((CodeGenerationPolicy::CommentStyle) form.m_SelectCommentStyle->currentItem());
- common->setAttributeAccessorScope((CodeGenerationPolicy::ScopePolicy) form.m_accessorScopeCB->currentItem());
- common->setAssociationFieldScope((CodeGenerationPolicy::ScopePolicy) form.m_assocFieldScopeCB->currentItem());
+ common->setAttributeAccessorScope((Uml::Visibility::Value) form.m_accessorScopeCB->currentItem());
+ common->setAssociationFieldScope((Uml::Visibility::Value) form.m_assocFieldScopeCB->currentItem());
common->setAutoGenerateConstructors(form.m_generateConstructors->isChecked());
parent->setAutoGenerateAttribAccessors(form.m_generateAttribAccessors->isChecked());
parent->setAutoGenerateAssocAccessors(form.m_generateAssocAccessors->isChecked());
--- trunk/KDE/kdesdk/umbrello/umbrello/optionstate.h #707483:707484
@@ -72,8 +72,8 @@
struct CodeGenerationState{
bool autoGenEmptyConstructors;
CodeGenerationPolicy::CommentStyle commentStyle;
- CodeGenerationPolicy::ScopePolicy defaultAssocFieldScope;
- CodeGenerationPolicy::ScopePolicy defaultAttributeAccessorScope;
+ Uml::Visibility::Value defaultAssocFieldScope;
+ Uml::Visibility::Value defaultAttributeAccessorScope;
bool forceDoc;
bool forceSections;
QDir headingsDirectory;
--- trunk/KDE/kdesdk/umbrello/umbrello/umbrello.kcfg #707483:707484
@@ -261,14 +261,14 @@
<entry name="defaultAssocFieldScope" type="Enum">
<label>Default Association Field Scope</label>
<whatisthis>Sets the default Association field scope</whatisthis>
- <choices name="CodeGenerationPolicy::ScopePolicy" />
- <default>CodeGenerationPolicy::FromParent</default>
+ <choices name="Uml::Visibility::Value" />
+ <default>Uml::Visibility::FromParent</default>
</entry>
<entry name="defaultAttributeAccessorScope" type="Enum">
<label>Default Attribute Accessor Scope</label>
<whatisthis>Sets the default attribute accessor scope</whatisthis>
- <choices name="CodeGenerationPolicy::ScopePolicy" />
- <default>CodeGenerationPolicy::FromParent</default>
+ <choices name="Uml::Visibility::Value" />
+ <default>Uml::Visibility::FromParent</default>
</entry>
<entry name="forceDoc" type="Bool">
<label>Force Documentation</label>
--- trunk/KDE/kdesdk/umbrello/umbrello/umlnamespace.h #707483:707484
@@ -68,7 +68,8 @@
Public,
Private,
Protected,
- Implementation // objects marked with this are declared in the implementation file.
+ Implementation, // objects marked with this are declared in the implementation file.
+ FromParent = 3 // alias for Implementation, used by CodeGenerationPolicy
};
Visibility();
Visibility(Value v);
More information about the umbrello-devel
mailing list