From: sbh <sergey.belash@opencascade.com>
Date: Tue, 2 Sep 2014 15:45:18 +0000 (+0400)
Subject: Merge branch 'master' of newgeom:newgeom.git
X-Git-Tag: V_0.4.4~92
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=853952fd4ddc93c0cd6a7122d37b618199864396;p=modules%2Fshaper.git

Merge branch 'master' of newgeom:newgeom.git
---

853952fd4ddc93c0cd6a7122d37b618199864396
diff --cc src/Config/Config_FeatureMessage.h
index ea6bd4f8c,be79646a9..0cfe67def
--- a/src/Config/Config_FeatureMessage.h
+++ b/src/Config/Config_FeatureMessage.h
@@@ -32,33 -32,20 +32,33 @@@ class Config_FeatureMessage : public Ev
  
   public:
    //const Events_ID theID, const void* theSender = 0
 -  CONFIG_EXPORT Config_FeatureMessage(const Events_ID theId, const void* theParent = 0);CONFIG_EXPORT virtual ~Config_FeatureMessage();
 +  CONFIG_EXPORT Config_FeatureMessage(const Events_ID theId, const void* theParent = 0);
 +  CONFIG_EXPORT virtual ~Config_FeatureMessage();
  
    //Auto-generated getters/setters
 -  CONFIG_EXPORT const std::string& icon() const;CONFIG_EXPORT const std::string& id() const;CONFIG_EXPORT const std::string& keysequence() const;CONFIG_EXPORT const std::string& text() const;CONFIG_EXPORT const std::string& tooltip() const;
 +  CONFIG_EXPORT const std::string& icon() const;
 +  CONFIG_EXPORT const std::string& id() const;
 +  CONFIG_EXPORT const std::string& keysequence() const;
 +  CONFIG_EXPORT const std::string& text() const;
 +  CONFIG_EXPORT const std::string& tooltip() const;
 +  CONFIG_EXPORT const std::string& groupId() const;
 +  CONFIG_EXPORT const std::string& workbenchId() const;
 +  CONFIG_EXPORT const std::string& pluginLibrary() const;
 +  CONFIG_EXPORT const std::string& nestedFeatures() const;
 +  CONFIG_EXPORT bool isUseInput() const;
 +  CONFIG_EXPORT bool isInternal() const;
  
 -  CONFIG_EXPORT const std::string& groupId() const;CONFIG_EXPORT const std::string& workbenchId() const;CONFIG_EXPORT const std::string& pluginLibrary() const;CONFIG_EXPORT const std::string& nestedFeatures() const;CONFIG_EXPORT bool isUseInput() const;CONFIG_EXPORT bool isInternal() const;
 -
 -  CONFIG_EXPORT void setIcon(const std::string& icon);CONFIG_EXPORT void setId(
 -      const std::string& id);CONFIG_EXPORT void setKeysequence(const std::string& keysequence);CONFIG_EXPORT void setText(
 -      const std::string& text);CONFIG_EXPORT void setTooltip(const std::string& tooltip);CONFIG_EXPORT void setGroupId(
 -      const std::string& groupId);CONFIG_EXPORT void setWorkbenchId(const std::string& workbenchId);CONFIG_EXPORT void setPluginLibrary(
 -      const std::string& thePluginLibrary);CONFIG_EXPORT void setNestedFeatures(
 -      const std::string& theNestedFeatures);CONFIG_EXPORT void setUseInput(bool isUseInput);CONFIG_EXPORT void setInternal(
 -      bool isInternal);
 +  CONFIG_EXPORT void setIcon(const std::string& icon);
 +  CONFIG_EXPORT void setId(const std::string& id);
 +  CONFIG_EXPORT void setKeysequence(const std::string& keysequence);
 +  CONFIG_EXPORT void setText(const std::string& text);
 +  CONFIG_EXPORT void setTooltip(const std::string& tooltip);
 +  CONFIG_EXPORT void setGroupId(const std::string& groupId);
 +  CONFIG_EXPORT void setWorkbenchId(const std::string& workbenchId);
 +  CONFIG_EXPORT void setPluginLibrary(const std::string& thePluginLibrary);
 +  CONFIG_EXPORT void setNestedFeatures(const std::string& theNestedFeatures);
 +  CONFIG_EXPORT void setUseInput(bool isUseInput);
 +  CONFIG_EXPORT void setInternal(bool isInternal);
  };
  
- #endif // CONFIG_MESSAGE_H
+ #endif // CONFIG_MESSAGE_H