[Uml-devel] branches/work/soc-umbrello

[Gopala Krishna A]

SVN commit 854009 by gopala:

Merged revisions 853060 via svnmerge from 
svn+ssh://svn.kde.org/home/kde/trunk/KDE/kdesdk/umbrello

........
  r853060 | okellogg | 2008-08-27 11:27:31 +0530 (Wed, 27 Aug 2008) | 3 lines
  
  Remove non-functioning code generator which had been committed by accident.
  CCMAIL: thibault.normand at gmail.com
........


 _M            . (directory)  
 M  +0 -1      umbrello/CMakeLists.txt  
 D             umbrello/codegenerators/use (directory)  
 M  +0 -7      umbrello/uml.cpp  
 M  +3 -3      umbrello/uml.h  
 M  +30 -31    umbrello/umlnamespace.h  


** branches/work/soc-umbrello #property svnmerge-integrated
   - /trunk/KDE/kdesdk/umbrello:1-851837
   + /trunk/KDE/kdesdk/umbrello:1-851837,853060
--- branches/work/soc-umbrello/umbrello/CMakeLists.txt #854008:854009
@@ -28,7 +28,6 @@
   ${CMAKE_CURRENT_SOURCE_DIR}/codegenerators/ruby/
   ${CMAKE_CURRENT_SOURCE_DIR}/codegenerators/sql/
   ${CMAKE_CURRENT_SOURCE_DIR}/codegenerators/tcl/
-  ${CMAKE_CURRENT_SOURCE_DIR}/codegenerators/use/
   ${CMAKE_CURRENT_SOURCE_DIR}/codegenerators/xml/
   ${CMAKE_CURRENT_SOURCE_DIR}/codegenwizard/
   ${Boost_INCLUDE_DIR}
--- branches/work/soc-umbrello/umbrello/uml.cpp #854008:854009
@@ -263,7 +263,6 @@
     setProgLangAction(Uml::pl_SQL,          "SQL",             "setLang_sql");
     setProgLangAction(Uml::pl_Tcl,          "Tcl",             "setLang_tcl");
     setProgLangAction(Uml::pl_XMLSchema,    "XMLSchema",       "setLang_xmlschema");
-    setProgLangAction(Uml::pl_Ocl,          "Ocl",             "setLang_ocl");
 
     connect(m_langAct[Uml::pl_ActionScript], SIGNAL(triggered()), this, SLOT(setLang_actionscript()));
     connect(m_langAct[Uml::pl_Ada],          SIGNAL(triggered()), this, SLOT(setLang_ada()));
@@ -284,7 +283,6 @@
     connect(m_langAct[Uml::pl_SQL],          SIGNAL(triggered()), this, SLOT(setLang_sql()));
     connect(m_langAct[Uml::pl_Tcl],          SIGNAL(triggered()), this, SLOT(setLang_tcl()));
     connect(m_langAct[Uml::pl_XMLSchema],    SIGNAL(triggered()), this, SLOT(setLang_xmlschema()));
-    connect(m_langAct[Uml::pl_Ocl],          SIGNAL(triggered()), this, SLOT(setLang_ocl()));
 
     fileNew->setToolTip(i18n("Creates a new document"));
     fileOpen->setToolTip(i18n("Opens an existing document"));
@@ -1724,11 +1722,6 @@
     setActiveLanguage(Uml::pl_XMLSchema);
 }
 
-void UMLApp::setLang_ocl()
-{
-    setActiveLanguage(Uml::pl_Ocl);
-}
-
 void UMLApp::setActiveLanguage(Uml::Programming_Language pl)
 {
     updateLangSelectMenu(pl);
--- branches/work/soc-umbrello/umbrello/uml.h #854008:854009
@@ -66,10 +66,10 @@
  * to the window's Doc object. The handling of views is realized with two different widgets:
  *   - stack widget
  *   - tab widget
- * The current view handling is set as an option. 
+ * The current view handling is set as an option.
  * UMLApp reimplements the methods that KMainWindow provides for main window handling and supports
  * full session management as well as using KActions.
- * 
+ *
  * @see KMainWindow
  * @see KApplication
  * @see KConfig
@@ -396,7 +396,7 @@
     void readOptions();
 
     /**
-     * Initializes the KActions and the status bar of the application 
+     * Initializes the KActions and the status bar of the application
      * and calls setupGUI().
      */
     void initActions();
--- branches/work/soc-umbrello/umbrello/umlnamespace.h #854008:854009
@@ -17,7 +17,7 @@
 #include <kdebug.h>
 
 /**
- *@author Paul Hensgen
+ * @author Paul Hensgen
  * Bugs and comments to uml-devel at lists.sf.net or http://bugs.kde.org
  */
 namespace Uml
@@ -266,23 +266,23 @@
         Unique
     };
 
-/**
- * Constants used for indexing the roles of associations.
- */
+    /**
+     * Constants used for indexing the roles of associations.
+     */
     enum Role_Type { A, B };
 
-/**
- * Direction of operation parameters:
- *   in = operation uses the parameter as an input value
- *   out = operation fills the parameter as a return value
- *   inout = operation both reads and writes the parameter
- * The numeric values of this enum are not currently saved to file.
- */
+    /**
+     * Direction of operation parameters:
+     *   in = operation uses the parameter as an input value
+     *   out = operation fills the parameter as a return value
+     *   inout = operation both reads and writes the parameter
+     * The numeric values of this enum are not currently saved to file.
+     */
     enum Parameter_Direction { pd_In, pd_InOut, pd_Out };
 
-/**
- * Supported programming languages
- */
+    /**
+     * Supported programming languages
+     */
     enum Programming_Language {
         pl_ActionScript,
         pl_Ada,
@@ -303,21 +303,27 @@
         pl_SQL,
         pl_Tcl,
         pl_XMLSchema,
-        pl_Ocl,
         pl_Reserved
     };
 
-/**
- * The data type used for unique IDs.
- */
+    /**
+     * The data type used for unique IDs.
+     */
     typedef std::string IDType;
 
-/**
- * Reserved value for uninitialized/illegal ID.
- */
+    /**
+     * Reserved value for uninitialized/illegal ID.
+     */
     const IDType id_None = "-1";
     const IDType id_Reserved = "0";
 
+    /**
+     * Function for comparing tags in XMI files.
+     */
+    bool tagEq (const QString& tag, const QString& pattern);
+
+}  // end namespace Uml
+
 # define STR2ID(id)  qPrintable(id)
 # define ID2STR(id)  QString(id.c_str())
 
@@ -326,15 +332,8 @@
 #define uError()   kError(8060)
 #define uWarning() kWarning(8060)
 
-/**
- * Function for comparing tags in XMI files.
- */
-    bool tagEq (const QString& tag, const QString& pattern);
+#define DISABLE_COPY(Class)                     \
+    Class(const Class &);                       \
+    Class &operator=(const Class &);
 
-}  // end namespace Uml
-
-#define DISABLE_COPY(Class) \
-     Class(const Class &); \
-     Class &operator=(const Class &);
-
 #endif