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

[Laurent Montel]

SVN commit 662177 by mlaurent:

Fix compile with enable final argument


 M  +3 -3      php5writer.cpp  
 M  +3 -3      tclwriter.cpp  


--- trunk/KDE/kdesdk/umbrello/umbrello/codegenerators/php5writer.cpp #662176:662177
@@ -28,7 +28,7 @@
 #include "../operation.h"
 #include "../umlnamespace.h"
 
-static const char *words[] =
+static const char *php5words[] =
     {
         "abs",
         "abstract",
@@ -3407,8 +3407,8 @@
     static QStringList keywords;
 
     if (keywords.isEmpty()) {
-        for (int i = 0; words[i]; i++)
-            keywords.append(words[i]);
+        for (int i = 0; php5words[i]; i++)
+            keywords.append(php5words[i]);
     }
 
     return keywords;
--- trunk/KDE/kdesdk/umbrello/umbrello/codegenerators/tclwriter.cpp #662176:662177
@@ -33,7 +33,7 @@
 #include "../classifierlistitem.h"
 #include "../model_utils.h"
 
-static const char *words[] = {
+static const char *tclwords[] = {
                                  "body",
                                  "break",
                                  "case",
@@ -943,8 +943,8 @@
 
     if              (keywords.isEmpty())
     {
-        for (int i = 0; words[i]; i++)
-            keywords.append(words[i]);
+        for (int i = 0; tclwords[i]; i++)
+            keywords.append(tclwords[i]);
     }
     return          keywords;
 }