[Uml-devel] KDE/kdesdk/umbrello/umbrello

[Ralf Habacker]

SVN commit 1268731 by habacker:

renamed m_<UpperCaseChar>* to m_<lowercasechar>* in class NoteWidget

 M  +2 -2      controller/notewidgetcontroller.cpp  
 M  +14 -14    widgets/notewidget.cpp  
 M  +3 -3      widgets/notewidget.h  


--- trunk/KDE/kdesdk/umbrello/umbrello/controller/notewidgetcontroller.cpp #1268730:1268731
@@ -44,7 +44,7 @@
 {
     Q_UNUSED(me);
     //TODO Copied from old code. What it does?
-    if (m_noteWidget->m_DiagramLink == Uml::id_None) {
+    if (m_noteWidget->m_diagramLink == Uml::id_None) {
         // setup popup menu if not already created.
         if ( !m_noteWidget->m_pMenu )
             m_noteWidget->setupPopupMenu();
@@ -53,6 +53,6 @@
         m_noteWidget->slotMenuSelection(action);
     } else {
         UMLDoc *umldoc = UMLApp::app()->document();
-        umldoc->changeCurrentView(m_noteWidget->m_DiagramLink);
+        umldoc->changeCurrentView(m_noteWidget->m_diagramLink);
     }
 }
--- trunk/KDE/kdesdk/umbrello/umbrello/widgets/notewidget.cpp #1268730:1268731
@@ -39,8 +39,8 @@
   : UMLWidget(view, id, new NoteWidgetController(this))
 {
     UMLWidget::setBaseType(WidgetBase::wt_Note);
-    m_DiagramLink = Uml::id_None;
-    m_NoteType = noteType;
+    m_diagramLink = Uml::id_None;
+    m_noteType = noteType;
     setZ(20); //make sure always on top.
 }
 
@@ -79,7 +79,7 @@
     p.drawLine(offsetX + w - margin, offsetY, offsetX + w - margin, offsetY + margin);
     p.drawLine(offsetX + w - margin, offsetY + margin, offsetX + w, offsetY + margin);
     p.setPen(Qt::black);
-    switch(m_NoteType) {
+    switch(m_noteType) {
     case NoteWidget::PreCondition :
         p.drawText(offsetX, offsetY + margin, w, fontHeight, Qt::AlignCenter, "<< precondition >>");
         break;
@@ -107,7 +107,7 @@
  */
 NoteWidget::NoteType NoteWidget::getNoteType() const
 {
-    return m_NoteType;
+    return m_noteType;
 }
 
 /**
@@ -130,7 +130,7 @@
  */
 void NoteWidget::setNoteType( NoteType noteType )
 {
-    m_NoteType = noteType;
+    m_noteType = noteType;
 }
 
 /**
@@ -194,7 +194,7 @@
  */
 Uml::IDType NoteWidget::getDiagramLink() const
 {
-    return m_DiagramLink;
+    return m_diagramLink;
 }
 
 /**
@@ -213,7 +213,7 @@
     }
     QString linkText("Diagram: " + view->name());
     setDocumentation(linkText);
-    m_DiagramLink = viewID;
+    m_diagramLink = viewID;
 }
 
 /**
@@ -245,7 +245,7 @@
     setDocumentation( qElement.attribute("text", "") );
     QString diagramlink = qElement.attribute("diagramlink", "");
     if (!diagramlink.isEmpty())
-        m_DiagramLink = STR2ID(diagramlink);
+        m_diagramLink = STR2ID(diagramlink);
     QString type = qElement.attribute("noteType", "");
     setNoteType( (NoteType)type.toInt() );
     return true;
@@ -259,9 +259,9 @@
     QDomElement noteElement = qDoc.createElement( "notewidget" );
     UMLWidget::saveToXMI( qDoc, noteElement );
     noteElement.setAttribute( "text", documentation() );
-    if (m_DiagramLink != Uml::id_None)
-        noteElement.setAttribute( "diagramlink", ID2STR(m_DiagramLink) );
-    noteElement.setAttribute( "noteType", m_NoteType);
+    if (m_diagramLink != Uml::id_None)
+        noteElement.setAttribute( "diagramlink", ID2STR(m_diagramLink) );
+    noteElement.setAttribute( "noteType", m_noteType);
     qElement.appendChild( noteElement );
 }
 
@@ -303,17 +303,17 @@
     int height = 30;
     const QFontMetrics &fm = getFontMetrics(FT_NORMAL);
     const int textWidth = fm.width(m_Text);
-    if (m_NoteType == PreCondition) {
+    if (m_noteType == PreCondition) {
         const int widthtemp = fm.width("<< precondition >>");
         width = textWidth > widthtemp ? textWidth : widthtemp;
         width += 10;
     }
-    else if (m_NoteType == PostCondition) {
+    else if (m_noteType == PostCondition) {
         const int widthtemp = fm.width("<< postcondition >>");
         width = textWidth > widthtemp ? textWidth : widthtemp;
         width += 10;
     }
-    else if (m_NoteType == Transformation) {
+    else if (m_noteType == Transformation) {
         const int widthtemp = fm.width("<< transformation >>");
         width = textWidth > widthtemp ? textWidth : widthtemp;
         width += 10;
--- trunk/KDE/kdesdk/umbrello/umbrello/widgets/notewidget.h #1268730:1268731
@@ -81,9 +81,9 @@
     void drawText(QPainter * p = NULL, int offsetX = 0, int offsetY = 0);
     void drawTextWordWrap(QPainter * p = NULL, int offsetX = 0, int offsetY = 0);
 
-    Uml::IDType m_DiagramLink;  ///< Data loaded/saved.
-    NoteType    m_NoteType;     ///< Type of note.
-    QString     l_Type;         ///< Label to see the note's type.
+    Uml::IDType m_diagramLink;  ///< Data loaded/saved.
+    NoteType    m_noteType;     ///< Type of note.
+    QString     m_type;         ///< Label to see the note's type.
 
 
 private: