renamed common.h file in DynamicElements

git-svn-id: http://svn.opengroupware.org/SOPE/trunk@639 e4a50df8-12e2-0310-a44c-efbce7f8a7e3

diff --git a/sope-appserver/NGObjWeb/ChangeLog b/sope-appserver/NGObjWeb/ChangeLog
index b467011f9decacb4fb35b380e3b197f80af0936e..8139b5c5ccfc5c65131fa3005aa084ea420c901e 100644 (file)
--- a/sope-appserver/NGObjWeb/ChangeLog
+++ b/sope-appserver/NGObjWeb/ChangeLog
@@ -1,3 +1,9 @@
+2005-03-08  Helge Hess  <helge.hess@skyrix.com>
+
+       * DynamicElements/common.h, DynamicElements/*.m: renamed to decommon.h
+         to avoid issues with Xcode, fixed broken compile due to missing
+         header file (v4.5.133)
+
 2005-03-07  Helge Hess  Marcus Mueller  <znek@mulle-kybernetik.com>
 
        * DynamicElements/common.h: added missing #include's for

diff --git a/sope-appserver/NGObjWeb/DynamicElements/WOActionURL.m b/sope-appserver/NGObjWeb/DynamicElements/WOActionURL.m
index 97d49ae3fe58b26615340dfc668b49229314b192..5d27367d0239464d8f20c7b2ff70138648451953 100644 (file)
--- a/sope-appserver/NGObjWeb/DynamicElements/WOActionURL.m
+++ b/sope-appserver/NGObjWeb/DynamicElements/WOActionURL.m
@@ -23,7 +23,7 @@
 #include "WOElement+private.h"
 #include <NGObjWeb/WOApplication.h>
 #include <NGObjWeb/WOResourceManager.h>
-#include "common.h"
+#include "decommon.h"
 
 /*
   WOActionURL associations:

diff --git a/sope-appserver/NGObjWeb/DynamicElements/WOBody.m b/sope-appserver/NGObjWeb/DynamicElements/WOBody.m
index d3ba1f29ff2bfa157deed0ed6669b2789da9513c..8bf43e3b0f79c9ae6522d7199c874124fd787131 100644 (file)
--- a/sope-appserver/NGObjWeb/DynamicElements/WOBody.m
+++ b/sope-appserver/NGObjWeb/DynamicElements/WOBody.m
@@ -23,7 +23,7 @@
 #include "WOHTMLDynamicElement.h"
 #include <NGObjWeb/WOApplication.h>
 #include <NGObjWeb/WOResourceManager.h>
-#include "common.h"
+#include "decommon.h"
 
 @class WOAssociation;
 

diff --git a/sope-appserver/NGObjWeb/DynamicElements/WOBrowser.m b/sope-appserver/NGObjWeb/DynamicElements/WOBrowser.m
index 42806326df45b921db038699781319f45947c39c..4261f6df647cb917c340748860713720700785a6 100644 (file)
--- a/sope-appserver/NGObjWeb/DynamicElements/WOBrowser.m
+++ b/sope-appserver/NGObjWeb/DynamicElements/WOBrowser.m
@@ -20,7 +20,7 @@
 */
 
 #include "WOInput.h"
-#include "common.h"
+#include "decommon.h"
 
 @interface WOBrowser : WOInput
 {

diff --git a/sope-appserver/NGObjWeb/DynamicElements/WOCheckBox.m b/sope-appserver/NGObjWeb/DynamicElements/WOCheckBox.m
index 70c7f17ba48835ec2ac2c0a2fee432a4d67edc66..5510870fbf8ded1b2b81ba12b85dd21f76604b6f 100644 (file)
--- a/sope-appserver/NGObjWeb/DynamicElements/WOCheckBox.m
+++ b/sope-appserver/NGObjWeb/DynamicElements/WOCheckBox.m
@@ -20,7 +20,7 @@
 */
 
 #include "WOInput.h"
-#include "common.h"
+#include "decommon.h"
 
 @interface WOCheckBox : WOInput
 {

diff --git a/sope-appserver/NGObjWeb/DynamicElements/WOCheckBoxList.m b/sope-appserver/NGObjWeb/DynamicElements/WOCheckBoxList.m
index 077f95fcc19c944066896d3ba0e84089f0bbed6c..06c48a06930ca827bb504c1e2f62e801f90e3715 100644 (file)
--- a/sope-appserver/NGObjWeb/DynamicElements/WOCheckBoxList.m
+++ b/sope-appserver/NGObjWeb/DynamicElements/WOCheckBoxList.m
@@ -20,7 +20,7 @@
 */
 
 #include "WOInput.h"
-#include "common.h"
+#include "decommon.h"
 
 @interface WOCheckBoxList : WOInput
 {

diff --git a/sope-appserver/NGObjWeb/DynamicElements/WOComponentContent.m b/sope-appserver/NGObjWeb/DynamicElements/WOComponentContent.m
index 0e228782de69d121eceb4d1095168bc7baed4224..cebac548aa80efb90238d2f9772c23152a1b3aee 100644 (file)
--- a/sope-appserver/NGObjWeb/DynamicElements/WOComponentContent.m
+++ b/sope-appserver/NGObjWeb/DynamicElements/WOComponentContent.m
@@ -23,7 +23,7 @@
 #include "WOContext+private.h"
 #include <NGObjWeb/WOComponent.h>
 #include <NGObjWeb/WOResponse.h>
-#include "common.h"
+#include "decommon.h"
 
 @interface WOContext(ComponentStackCount)
 - (unsigned)componentStackCount;

diff --git a/sope-appserver/NGObjWeb/DynamicElements/WOComponentReference.m b/sope-appserver/NGObjWeb/DynamicElements/WOComponentReference.m
index 2389234596085d787ebc3cc9724fc9325a197796..bf8f5c26eee85ea7515c2cac4105ec8beaaa1416 100644 (file)
--- a/sope-appserver/NGObjWeb/DynamicElements/WOComponentReference.m
+++ b/sope-appserver/NGObjWeb/DynamicElements/WOComponentReference.m
@@ -23,7 +23,7 @@
 #include "WOElement+private.h"
 #include "WOContext+private.h"
 #include "WOComponent+private.h"
-#include "common.h"
+#include "decommon.h"
 
 @interface WOContext(ComponentStackCount)
 - (unsigned)componentStackCount;

diff --git a/sope-appserver/NGObjWeb/DynamicElements/WOCompoundElement.m b/sope-appserver/NGObjWeb/DynamicElements/WOCompoundElement.m
index 5c4eaca72d1a0ff8aeef1f71c9926c9936fec829..0b1a5634d966a7ed451d610e7361e52f43986901 100644 (file)
--- a/sope-appserver/NGObjWeb/DynamicElements/WOCompoundElement.m
+++ b/sope-appserver/NGObjWeb/DynamicElements/WOCompoundElement.m
@@ -22,7 +22,7 @@
 #include "WOCompoundElement.h"
 #include "WOElement+private.h"
 #include <NGObjWeb/WOContext.h>
-#include "common.h"
+#include "decommon.h"
 
 #if APPLE_RUNTIME || NeXT_RUNTIME
 #  include <objc/objc-class.h>

diff --git a/sope-appserver/NGObjWeb/DynamicElements/WOConditional.m b/sope-appserver/NGObjWeb/DynamicElements/WOConditional.m
index 68753497bb6f364ab825742f69767b2434f8131f..8264dfbf8b1209b790c7d6b6e63475de77981321 100644 (file)
--- a/sope-appserver/NGObjWeb/DynamicElements/WOConditional.m
+++ b/sope-appserver/NGObjWeb/DynamicElements/WOConditional.m
@@ -43,7 +43,7 @@
 
 #include <DOM/EDOM.h>
 #include <NGObjWeb/WOxElemBuilder.h>
-#include "common.h"
+#include "decommon.h"
 #include "WOElement+private.h"
 
 // TODO: make that a class cluster for improved performance

diff --git a/sope-appserver/NGObjWeb/DynamicElements/WOEmbeddedObject.m b/sope-appserver/NGObjWeb/DynamicElements/WOEmbeddedObject.m
index 4a24a336bb946989ba8a9b2c208f4ee701398dcc..26e6f03503d687632d7aa8c4e822fe4dccb46af2 100644 (file)
--- a/sope-appserver/NGObjWeb/DynamicElements/WOEmbeddedObject.m
+++ b/sope-appserver/NGObjWeb/DynamicElements/WOEmbeddedObject.m
@@ -23,7 +23,7 @@
 #include "WOElement+private.h"
 #include <NGObjWeb/WOResourceManager.h>
 #include <NGObjWeb/WOApplication.h>
-#include "common.h"
+#include "decommon.h"
 
 @interface WOEmbeddedObject : WOHTMLDynamicElement
 {

diff --git a/sope-appserver/NGObjWeb/DynamicElements/WOEntity.m b/sope-appserver/NGObjWeb/DynamicElements/WOEntity.m
index 19e27285e56dda839f66576e2a7981a670a082c6..4d699a01d12abc5f8d9f2c6f9d919fec4517a697 100644 (file)
--- a/sope-appserver/NGObjWeb/DynamicElements/WOEntity.m
+++ b/sope-appserver/NGObjWeb/DynamicElements/WOEntity.m
@@ -25,7 +25,7 @@
 #include <NGObjWeb/WOApplication.h>
 #include <NGObjWeb/WOxElemBuilder.h>
 #include <DOM/DOMProtocols.h>
-#include "common.h"
+#include "decommon.h"
 
 @interface WOEntity : WOHTMLDynamicElement
 {

diff --git a/sope-appserver/NGObjWeb/DynamicElements/WOFileUpload.m b/sope-appserver/NGObjWeb/DynamicElements/WOFileUpload.m
index a0fd3decb8199879c2dc1deb7b742e65f2a6ce65..693eaf5df1d2b038841f2dde6b5a8e24f2733b32 100644 (file)
--- a/sope-appserver/NGObjWeb/DynamicElements/WOFileUpload.m
+++ b/sope-appserver/NGObjWeb/DynamicElements/WOFileUpload.m
@@ -35,7 +35,7 @@
 
 @end /* WOFileUpload */
 
-#include "common.h"
+#include "decommon.h"
 #include <NGMime/NGMime.h>
 #include <NGHttp/NGHttp.h>
 

diff --git a/sope-appserver/NGObjWeb/DynamicElements/WOForm.m b/sope-appserver/NGObjWeb/DynamicElements/WOForm.m
index e9e878aac3c768324b73f2fbf90186c9ee21b6ea..b4e18a485e86561ff412373bfd806674cb4e1329 100644 (file)
--- a/sope-appserver/NGObjWeb/DynamicElements/WOForm.m
+++ b/sope-appserver/NGObjWeb/DynamicElements/WOForm.m
@@ -24,7 +24,7 @@
 #include "WOInput.h"
 #include "WOContext+private.h"
 #include <NGObjWeb/WOApplication.h>
-#include "common.h"
+#include "decommon.h"
 
 @implementation WOForm
 

diff --git a/sope-appserver/NGObjWeb/DynamicElements/WOFrame.m b/sope-appserver/NGObjWeb/DynamicElements/WOFrame.m
index 30ad7654b06236bec6b8cc5258701ad62d654aeb..5cc90d0e83560ae785a2eeae308193ee65aa42cb 100644 (file)
--- a/sope-appserver/NGObjWeb/DynamicElements/WOFrame.m
+++ b/sope-appserver/NGObjWeb/DynamicElements/WOFrame.m
@@ -24,7 +24,7 @@
 #include <NGObjWeb/WOApplication.h>
 #include <NGObjWeb/WOResourceManager.h>
 #include <NGObjWeb/WODynamicElement.h>
-#include "common.h"
+#include "decommon.h"
 
 #define FRAME_TYPE_None  0
 #define FRAME_TYPE_Page  1

diff --git a/sope-appserver/NGObjWeb/DynamicElements/WOGenericContainer.m b/sope-appserver/NGObjWeb/DynamicElements/WOGenericContainer.m
index fea0b521e0a6bd0337b338e900aff6569a3ed3df..39d99eef7beba99371a601a579c43af2c5692117 100644 (file)
--- a/sope-appserver/NGObjWeb/DynamicElements/WOGenericContainer.m
+++ b/sope-appserver/NGObjWeb/DynamicElements/WOGenericContainer.m
@@ -32,8 +32,8 @@
 
 @end
 
-#import "WOElement+private.h"
-#import "common.h"
+#include "WOElement+private.h"
+#include "decommon.h"
 
 // TODO(perf): ASCII Tags (appendContentCString)
 // TODO(perf): constant tags

diff --git a/sope-appserver/NGObjWeb/DynamicElements/WOGenericElement.m b/sope-appserver/NGObjWeb/DynamicElements/WOGenericElement.m
index 429efb014d28fef04688a51316b47c61239ad7b0..290b025cc9760f5b8c5106ef69fe31a861fd8fac 100644 (file)
--- a/sope-appserver/NGObjWeb/DynamicElements/WOGenericElement.m
+++ b/sope-appserver/NGObjWeb/DynamicElements/WOGenericElement.m
@@ -21,7 +21,7 @@
 
 #include "WOGenericElement.h"
 #include "WOElement+private.h"
-#include "common.h"
+#include "decommon.h"
 #include <NGObjWeb/WOxElemBuilder.h>
 #include <DOM/DOMProtocols.h>
 

diff --git a/sope-appserver/NGObjWeb/DynamicElements/WOHTMLDynamicElement.m b/sope-appserver/NGObjWeb/DynamicElements/WOHTMLDynamicElement.m
index f425d0118effd2294a44197d8f464ecfcf0e5d69..ae8c0e72d3357728551cbcffcffa5cecd289b007 100644 (file)
--- a/sope-appserver/NGObjWeb/DynamicElements/WOHTMLDynamicElement.m
+++ b/sope-appserver/NGObjWeb/DynamicElements/WOHTMLDynamicElement.m
@@ -21,7 +21,7 @@
 
 #include "WOHTMLDynamicElement.h"
 #include "WOElement+private.h"
-#include "common.h"
+#include "decommon.h"
 
 @implementation WOHTMLDynamicElement
 

diff --git a/sope-appserver/NGObjWeb/DynamicElements/WOHiddenField.m b/sope-appserver/NGObjWeb/DynamicElements/WOHiddenField.m
index c4f8316e599f93ddbaa284c20f8fa2c8257a2e55..f50b260b9435f2340cd9e7232cc661e496211eee 100644 (file)
--- a/sope-appserver/NGObjWeb/DynamicElements/WOHiddenField.m
+++ b/sope-appserver/NGObjWeb/DynamicElements/WOHiddenField.m
@@ -20,7 +20,7 @@
 */
 
 #include "WOInput.h"
-#include "common.h"
+#include "decommon.h"
 
 @interface WOHiddenField : WOInput
 {

diff --git a/sope-appserver/NGObjWeb/DynamicElements/WOHtml.m b/sope-appserver/NGObjWeb/DynamicElements/WOHtml.m
index b49c2c9b1ab2807636a4407760955c81259e1682..81a111315ca722237bf3a4286e3a4ca66facf7e8 100644 (file)
--- a/sope-appserver/NGObjWeb/DynamicElements/WOHtml.m
+++ b/sope-appserver/NGObjWeb/DynamicElements/WOHtml.m
@@ -35,7 +35,7 @@
 #include "WOElement+private.h"
 #include <NGObjWeb/WOApplication.h>
 #include <NGObjWeb/WOResourceManager.h>
-#include "common.h"
+#include "decommon.h"
 
 @implementation WOHtml
 

diff --git a/sope-appserver/NGObjWeb/DynamicElements/WOHyperlink.m b/sope-appserver/NGObjWeb/DynamicElements/WOHyperlink.m
index 0dcf6a7170778139009816c9b30c311a1d2ae154..dd851a0eaf134bcb6b36a54eef52988de8e5e8ce 100644 (file)
--- a/sope-appserver/NGObjWeb/DynamicElements/WOHyperlink.m
+++ b/sope-appserver/NGObjWeb/DynamicElements/WOHyperlink.m
@@ -26,7 +26,7 @@
 #include <NGObjWeb/WOApplication.h>
 #include <NGObjWeb/WOResourceManager.h>
 #include <NGExtensions/NSString+Ext.h>
-#include "common.h"
+#include "decommon.h"
 
 #define PROFILE_CLUSTERS 0
 

diff --git a/sope-appserver/NGObjWeb/DynamicElements/WOHyperlinkInfo.m b/sope-appserver/NGObjWeb/DynamicElements/WOHyperlinkInfo.m
index 1d61b692bf2187aa74d0744012f5cf1245997a31..696cae9856f3e11aefac9eee1a9bdfabffa14683 100644 (file)
--- a/sope-appserver/NGObjWeb/DynamicElements/WOHyperlinkInfo.m
+++ b/sope-appserver/NGObjWeb/DynamicElements/WOHyperlinkInfo.m
@@ -22,7 +22,7 @@
 #include "WOHyperlinkInfo.h"
 #include "WOElement+private.h"
 #include "WOHTMLDynamicElement.h"
-#include "common.h"
+#include "decommon.h"
 
 @implementation WOHyperlinkInfo
 

diff --git a/sope-appserver/NGObjWeb/DynamicElements/WOIFrame.m b/sope-appserver/NGObjWeb/DynamicElements/WOIFrame.m
index 0ecba49c9058c184ef1f7114285455b75c597a9e..4fe8168c74f94b6dca23dce16f866a2488beab15 100644 (file)
--- a/sope-appserver/NGObjWeb/DynamicElements/WOIFrame.m
+++ b/sope-appserver/NGObjWeb/DynamicElements/WOIFrame.m
@@ -24,7 +24,7 @@
 #include <NGObjWeb/WOApplication.h>
 #include <NGObjWeb/WOResourceManager.h>
 #include <NGObjWeb/WODynamicElement.h>
-#include "common.h"
+#include "decommon.h"
 
 #define FRAME_TYPE_None  0
 #define FRAME_TYPE_Page  1

diff --git a/sope-appserver/NGObjWeb/DynamicElements/WOImage.m b/sope-appserver/NGObjWeb/DynamicElements/WOImage.m
index b483d8d9acc3240da854523e6c5d49ad7513ebba..7d81b4b92ec58e6096282bd6a5d84ccb325724f0 100644 (file)
--- a/sope-appserver/NGObjWeb/DynamicElements/WOImage.m
+++ b/sope-appserver/NGObjWeb/DynamicElements/WOImage.m
@@ -53,7 +53,7 @@
 #include "WOElement+private.h"
 #include <NGObjWeb/WOApplication.h>
 #include <NGObjWeb/WOResourceManager.h>
-#include "common.h"
+#include "decommon.h"
 
 #if NeXT_Foundation_LIBRARY || APPLE_FOUNDATION_LIBRARY
 @interface NSObject(Miss)

diff --git a/sope-appserver/NGObjWeb/DynamicElements/WOImageButton.m b/sope-appserver/NGObjWeb/DynamicElements/WOImageButton.m
index 77d25d3dc5ec63af3121aa9f9809f9c8770a5196..e28e3538c46ed9291e0bc62bff68bbe39662cc7f 100644 (file)
--- a/sope-appserver/NGObjWeb/DynamicElements/WOImageButton.m
+++ b/sope-appserver/NGObjWeb/DynamicElements/WOImageButton.m
@@ -52,7 +52,7 @@
 
 #include <NGObjWeb/WOApplication.h>
 #include <NGObjWeb/WOResourceManager.h>
-#include "common.h"
+#include "decommon.h"
 
 @implementation WOImageButton
 

diff --git a/sope-appserver/NGObjWeb/DynamicElements/WOInput.m b/sope-appserver/NGObjWeb/DynamicElements/WOInput.m
index c0198945d99640b7a3a9630d6de54982ca82858d..075d74499725df752bf7d266addd3336c08cd2de 100644 (file)
--- a/sope-appserver/NGObjWeb/DynamicElements/WOInput.m
+++ b/sope-appserver/NGObjWeb/DynamicElements/WOInput.m
@@ -21,7 +21,7 @@
 
 #include "WOInput.h"
 #include "WOElement+private.h"
-#include "common.h"
+#include "decommon.h"
 
 @implementation WOInput
 

diff --git a/sope-appserver/NGObjWeb/DynamicElements/WOJavaScript.m b/sope-appserver/NGObjWeb/DynamicElements/WOJavaScript.m
index af5f5d707834e3cb9457353d78b80f6a60026135..16fa79825911a68fef533df3536c22bfd2222917 100644 (file)
--- a/sope-appserver/NGObjWeb/DynamicElements/WOJavaScript.m
+++ b/sope-appserver/NGObjWeb/DynamicElements/WOJavaScript.m
@@ -37,7 +37,7 @@
 #include "WOElement+private.h"
 #include <NGObjWeb/WOResourceManager.h>
 #include <NGObjWeb/WOApplication.h>
-#include "common.h"
+#include "decommon.h"
 
 @implementation WOJavaScript
 

diff --git a/sope-appserver/NGObjWeb/DynamicElements/WOMetaRefresh.m b/sope-appserver/NGObjWeb/DynamicElements/WOMetaRefresh.m
index 83fa4c4b65bc941001b99b0fc76f0453203bf918..206de0d6f2045a413da6296cf4770c214efba536 100644 (file)
--- a/sope-appserver/NGObjWeb/DynamicElements/WOMetaRefresh.m
+++ b/sope-appserver/NGObjWeb/DynamicElements/WOMetaRefresh.m
@@ -27,7 +27,7 @@
 #include <NGObjWeb/WOSession.h>
 #include <NGObjWeb/WORequest.h>
 #include <NGObjWeb/WOResponse.h>
-#include "common.h"
+#include "decommon.h"
 
 /*
   WOMetaRefresh associations:

diff --git a/sope-appserver/NGObjWeb/DynamicElements/WONestedList.m b/sope-appserver/NGObjWeb/DynamicElements/WONestedList.m
index e369377682ffd454a6cd03e0913ff847bdc214a6..b50a7a954af2df448f209a446f68818c8d6f6ae5 100644 (file)
--- a/sope-appserver/NGObjWeb/DynamicElements/WONestedList.m
+++ b/sope-appserver/NGObjWeb/DynamicElements/WONestedList.m
@@ -21,7 +21,7 @@
 
 #include "WOHTMLDynamicElement.h"
 #include "WOElement+private.h"
-#include "common.h"
+#include "decommon.h"
 
 @interface WONestedList : WOHTMLDynamicElement
 {

diff --git a/sope-appserver/NGObjWeb/DynamicElements/WOPasswordField.m b/sope-appserver/NGObjWeb/DynamicElements/WOPasswordField.m
index f76d1976c12ef0af127c8e35d5afec925764fb21..76a2394423af8b8fc0f4683828d99abd0debd729 100644 (file)
--- a/sope-appserver/NGObjWeb/DynamicElements/WOPasswordField.m
+++ b/sope-appserver/NGObjWeb/DynamicElements/WOPasswordField.m
@@ -20,7 +20,7 @@
 */
 
 #include "WOInput.h"
-#include "common.h"
+#include "decommon.h"
 
 @interface WOPasswordField : WOInput
 {

diff --git a/sope-appserver/NGObjWeb/DynamicElements/WOPopUpButton.m b/sope-appserver/NGObjWeb/DynamicElements/WOPopUpButton.m
index 2f4c071ecd898b63cb3d41ab7fea14fb68855593..664d2a0f35270975a8788f04308f287c85640189 100644 (file)
--- a/sope-appserver/NGObjWeb/DynamicElements/WOPopUpButton.m
+++ b/sope-appserver/NGObjWeb/DynamicElements/WOPopUpButton.m
@@ -49,7 +49,7 @@
   inContext:(WOContext *)_ctx;
 @end
 
-#include "common.h"
+#include "decommon.h"
 
 #ifdef DEBUG
 static int profElements  = -1;

diff --git a/sope-appserver/NGObjWeb/DynamicElements/WOQuickTime.m b/sope-appserver/NGObjWeb/DynamicElements/WOQuickTime.m
index 4b64ab4fee1c4a0bb9c2a246ce5ce2e2a6d4ac36..ff2369f135af7fc9c11c0de579c0c341e17f59d7 100644 (file)
--- a/sope-appserver/NGObjWeb/DynamicElements/WOQuickTime.m
+++ b/sope-appserver/NGObjWeb/DynamicElements/WOQuickTime.m
@@ -23,7 +23,7 @@
 #include "WOElement+private.h"
 #include <NGObjWeb/WOApplication.h>
 #include <NGObjWeb/WOResourceManager.h>
-#include "common.h"
+#include "decommon.h"
 
 /*
   A QuickTime movie, picture, ...

diff --git a/sope-appserver/NGObjWeb/DynamicElements/WORadioButton.m b/sope-appserver/NGObjWeb/DynamicElements/WORadioButton.m
index b5b479c04fdbe536ff10165567e98a34184a8922..84282001c551ee497c0b465368645f16bf41dfbc 100644 (file)
--- a/sope-appserver/NGObjWeb/DynamicElements/WORadioButton.m
+++ b/sope-appserver/NGObjWeb/DynamicElements/WORadioButton.m
@@ -20,7 +20,7 @@
 */
 
 #include "WOInput.h"
-#include "common.h"
+#include "decommon.h"
 
 @interface WORadioButton : WOInput
 {

diff --git a/sope-appserver/NGObjWeb/DynamicElements/WORadioButtonList.m b/sope-appserver/NGObjWeb/DynamicElements/WORadioButtonList.m
index 8c8980c2b44323ba3ca77387026f488551ad2918..8cc254fdace197de71d194e033cf58e9630cfecd 100644 (file)
--- a/sope-appserver/NGObjWeb/DynamicElements/WORadioButtonList.m
+++ b/sope-appserver/NGObjWeb/DynamicElements/WORadioButtonList.m
@@ -39,7 +39,7 @@
 
 @end /* WORadioButtonList */
 
-#include "common.h"
+#include "decommon.h"
 
 // TODO: add support for template? (does WO provide this?)
 

diff --git a/sope-appserver/NGObjWeb/DynamicElements/WORepetition.m b/sope-appserver/NGObjWeb/DynamicElements/WORepetition.m
index f0f56c5f8f59aab88efc3efbc99318ebc2606a09..2a9a9e628231b314fe2e9b413a757adcd6582fcb 100644 (file)
--- a/sope-appserver/NGObjWeb/DynamicElements/WORepetition.m
+++ b/sope-appserver/NGObjWeb/DynamicElements/WORepetition.m
@@ -22,7 +22,7 @@
 #include <NGObjWeb/WODynamicElement.h>
 #include "WOElement+private.h"
 #include <NGExtensions/NSString+misc.h>
-#include "common.h"
+#include "decommon.h"
 
 @interface WORepetition : WODynamicElement
 {

diff --git a/sope-appserver/NGObjWeb/DynamicElements/WOResetButton.m b/sope-appserver/NGObjWeb/DynamicElements/WOResetButton.m
index e6cab87ff8dcf61bda5117dd6c825d386ab8d2c7..bb6522a930d3529c773e5138ac64032de230a6cd 100644 (file)
--- a/sope-appserver/NGObjWeb/DynamicElements/WOResetButton.m
+++ b/sope-appserver/NGObjWeb/DynamicElements/WOResetButton.m
@@ -21,7 +21,7 @@
 
 #include "WOInput.h"
 #include "WOElement+private.h"
-#include "common.h"
+#include "decommon.h"
 
 @interface WOResetButton : WOInput
 {

diff --git a/sope-appserver/NGObjWeb/DynamicElements/WOResourceURL.m b/sope-appserver/NGObjWeb/DynamicElements/WOResourceURL.m
index 2c4ce8789050d24d1a3c514ed4f553e9906b6cee..5b370e0b3161dd099dc5890545aee73dd41b762e 100644 (file)
--- a/sope-appserver/NGObjWeb/DynamicElements/WOResourceURL.m
+++ b/sope-appserver/NGObjWeb/DynamicElements/WOResourceURL.m
@@ -39,7 +39,7 @@
 #include "WOElement+private.h"
 #include <NGObjWeb/WOApplication.h>
 #include <NGObjWeb/WOResourceManager.h>
-#include "common.h"
+#include "decommon.h"
 
 @implementation WOResourceURL
 

diff --git a/sope-appserver/NGObjWeb/DynamicElements/WOSetCursor.m b/sope-appserver/NGObjWeb/DynamicElements/WOSetCursor.m
index 9752d43b679554b212d5ce4c9b460a7af3519ee9..87dffee4f82b789c126fa6d299bedf91c0a04375 100644 (file)
--- a/sope-appserver/NGObjWeb/DynamicElements/WOSetCursor.m
+++ b/sope-appserver/NGObjWeb/DynamicElements/WOSetCursor.m
@@ -33,7 +33,7 @@
 
 @end
 
-#include "common.h"
+#include "decommon.h"
 
 @implementation WOSetCursor
 

diff --git a/sope-appserver/NGObjWeb/DynamicElements/WOString.m b/sope-appserver/NGObjWeb/DynamicElements/WOString.m
index 4dbd5e89d66736c807dd5ccc01fa702552c4010b..f3ff62592a0e0ccbe1c371f04a4feda80ba61fee 100644 (file)
--- a/sope-appserver/NGObjWeb/DynamicElements/WOString.m
+++ b/sope-appserver/NGObjWeb/DynamicElements/WOString.m
@@ -21,7 +21,7 @@
 
 #include "WOHTMLDynamicElement.h"
 #include "WOElement+private.h"
-#include "common.h"
+#include "decommon.h"
 #import <Foundation/NSNumberFormatter.h>
 #import <Foundation/NSDateFormatter.h>
 

diff --git a/sope-appserver/NGObjWeb/DynamicElements/WOSubmitButton.m b/sope-appserver/NGObjWeb/DynamicElements/WOSubmitButton.m
index 6314dd6cc9b526ea9bfa03356ac5629d2ebea1f0..05abea48e0ca7ab74271fb87d23ae5f8359acbc1 100644 (file)
--- a/sope-appserver/NGObjWeb/DynamicElements/WOSubmitButton.m
+++ b/sope-appserver/NGObjWeb/DynamicElements/WOSubmitButton.m
@@ -21,7 +21,7 @@
 
 #include "WOInput.h"
 #include <NGObjWeb/WOApplication.h>
-#include "common.h"
+#include "decommon.h"
 
 @interface WOSubmitButton : WOInput
 {

diff --git a/sope-appserver/NGObjWeb/DynamicElements/WOSwitchComponent.m b/sope-appserver/NGObjWeb/DynamicElements/WOSwitchComponent.m
index 5b1cc3fac562eff4321cf5f341e35b015df6ddef..8b18d5b6b7ea28a2e6abb86eea558b0db48bd9e3 100644 (file)
--- a/sope-appserver/NGObjWeb/DynamicElements/WOSwitchComponent.m
+++ b/sope-appserver/NGObjWeb/DynamicElements/WOSwitchComponent.m
@@ -39,10 +39,10 @@
 #include <NGObjWeb/WOComponent.h>
 #include <NGObjWeb/WOAssociation.h>
 #include <NGObjWeb/WOContext.h>
-#import "WOElement+private.h"
-#import "WOContext+private.h"
-#import "WOComponent+private.h"
-#include "common.h"
+#include "WOElement+private.h"
+#include "WOContext+private.h"
+#include "WOComponent+private.h"
+#include "decommon.h"
 
 @implementation WOSwitchComponent
 

diff --git a/sope-appserver/NGObjWeb/DynamicElements/WOText.m b/sope-appserver/NGObjWeb/DynamicElements/WOText.m
index a74dff5c5fef6a5e5b5dd20fac52c717fae50943..fb76149250a2acb654013486004e2c8665349995 100644 (file)
--- a/sope-appserver/NGObjWeb/DynamicElements/WOText.m
+++ b/sope-appserver/NGObjWeb/DynamicElements/WOText.m
@@ -20,7 +20,7 @@
 */
 
 #include "WOInput.h"
-#include "common.h"
+#include "decommon.h"
 #import <Foundation/NSNumberFormatter.h>
 #import <Foundation/NSDateFormatter.h>
 

diff --git a/sope-appserver/NGObjWeb/DynamicElements/WOTextField.m b/sope-appserver/NGObjWeb/DynamicElements/WOTextField.m
index 72aad322704e4121f9dd8b9ea84c3678711e7cea..a4eb1530233fc1ebb24ac7f61b49f25966f20984 100644 (file)
--- a/sope-appserver/NGObjWeb/DynamicElements/WOTextField.m
+++ b/sope-appserver/NGObjWeb/DynamicElements/WOTextField.m
@@ -20,7 +20,7 @@
 */
 
 #include "WOInput.h"
-#include "common.h"
+#include "decommon.h"
 #import <Foundation/NSNumberFormatter.h>
 #import <Foundation/NSDateFormatter.h>
 

diff --git a/sope-appserver/NGObjWeb/DynamicElements/WOVBScript.m b/sope-appserver/NGObjWeb/DynamicElements/WOVBScript.m
index 4058f886b08e65ad108b9d40eccf9d7ceeeebabc..88a57c87f7aa15083eea54ac8f2608eecb0b6614 100644 (file)
--- a/sope-appserver/NGObjWeb/DynamicElements/WOVBScript.m
+++ b/sope-appserver/NGObjWeb/DynamicElements/WOVBScript.m
@@ -23,7 +23,7 @@
 #include "WOElement+private.h"
 #include <NGObjWeb/WOResourceManager.h>
 #include <NGObjWeb/WOApplication.h>
-#include "common.h"
+#include "decommon.h"
 
 @interface WOVBScript : WOHTMLDynamicElement
 {

diff --git a/sope-appserver/NGObjWeb/DynamicElements/WOxControlElemBuilder.m b/sope-appserver/NGObjWeb/DynamicElements/WOxControlElemBuilder.m
index 750496ea0a5392e6a3cd209dbfe8d5aea1d9caf1..4c45607765ddaa13f9c937f185d0f4e61d4bd3bd 100644 (file)
--- a/sope-appserver/NGObjWeb/DynamicElements/WOxControlElemBuilder.m
+++ b/sope-appserver/NGObjWeb/DynamicElements/WOxControlElemBuilder.m
@@ -39,7 +39,7 @@
 @end
 
 #include <SaxObjC/XMLNamespaces.h>
-#include "common.h"
+#include "decommon.h"
 
 @implementation WOxControlElemBuilder
 

diff --git a/sope-appserver/NGObjWeb/DynamicElements/WOxHTMLElemBuilder.m b/sope-appserver/NGObjWeb/DynamicElements/WOxHTMLElemBuilder.m
index 23acf87cb88eaecd9ec869f404d23345889f5b03..2de3dc235f620daa7433405fec9daf6a05aa640d 100644 (file)
--- a/sope-appserver/NGObjWeb/DynamicElements/WOxHTMLElemBuilder.m
+++ b/sope-appserver/NGObjWeb/DynamicElements/WOxHTMLElemBuilder.m
@@ -61,7 +61,7 @@
 @end
 
 #include "WOCompoundElement.h"
-#include "common.h"
+#include "decommon.h"
 #include <SaxObjC/XMLNamespaces.h>
 
 @implementation WOxHTMLElemBuilder

diff --git a/sope-appserver/NGObjWeb/DynamicElements/WOxMiscElemBuilder.m b/sope-appserver/NGObjWeb/DynamicElements/WOxMiscElemBuilder.m
index 1ad878e6893d6bebb81f15f316a5eb88425cde10..88c42a76ab07d51a24cd63bdf928feeb72419644 100644 (file)
--- a/sope-appserver/NGObjWeb/DynamicElements/WOxMiscElemBuilder.m
+++ b/sope-appserver/NGObjWeb/DynamicElements/WOxMiscElemBuilder.m
@@ -46,7 +46,7 @@
 @end
 
 #include <SaxObjC/XMLNamespaces.h>
-#include "common.h"
+#include "decommon.h"
 
 @implementation WOxMiscElemBuilder
 

diff --git a/sope-appserver/NGObjWeb/DynamicElements/WOxXULElemBuilder.m b/sope-appserver/NGObjWeb/DynamicElements/WOxXULElemBuilder.m
index 41a230a9602b575e458ea1dc7cb8004c2ce89e19..32a9438376f3d50c18c7fbf55353fd86b97ee299 100644 (file)
--- a/sope-appserver/NGObjWeb/DynamicElements/WOxXULElemBuilder.m
+++ b/sope-appserver/NGObjWeb/DynamicElements/WOxXULElemBuilder.m
@@ -40,7 +40,7 @@
 
 @end
 
-#include "common.h"
+#include "decommon.h"
 #include <SaxObjC/XMLNamespaces.h>
 
 @implementation WOxXULElemBuilder

diff --git a/sope-appserver/NGObjWeb/DynamicElements/_WOCommonStaticDAHyperlink.m b/sope-appserver/NGObjWeb/DynamicElements/_WOCommonStaticDAHyperlink.m
index df75e14dd135186157d237c67f9ad5a8540fcec1..5787a7e051df20b9234c3816b69a57122894a82a 100644 (file)
--- a/sope-appserver/NGObjWeb/DynamicElements/_WOCommonStaticDAHyperlink.m
+++ b/sope-appserver/NGObjWeb/DynamicElements/_WOCommonStaticDAHyperlink.m
@@ -45,7 +45,7 @@
 #include "WOElement+private.h"
 #include <NGObjWeb/WOApplication.h>
 #include <NGObjWeb/WOAssociation.h>
-#include "common.h"
+#include "decommon.h"
 
 @implementation _WOCommonStaticDAHyperlink
 

diff --git a/sope-appserver/NGObjWeb/DynamicElements/_WOComplexHyperlink.m b/sope-appserver/NGObjWeb/DynamicElements/_WOComplexHyperlink.m
index 2509c16e37d072c3905b733c3afc969e0f904c8d..058fee763510b36002b85263d445616cf19ea02b 100644 (file)
--- a/sope-appserver/NGObjWeb/DynamicElements/_WOComplexHyperlink.m
+++ b/sope-appserver/NGObjWeb/DynamicElements/_WOComplexHyperlink.m
@@ -89,7 +89,7 @@
 #include <NGObjWeb/WOApplication.h>
 #include <NGObjWeb/WOResourceManager.h>
 #include <NGExtensions/NSString+Ext.h>
-#include "common.h"
+#include "decommon.h"
 
 static Class NSURLClass = Nil;
 

diff --git a/sope-appserver/NGObjWeb/DynamicElements/_WOConstResourceImage.m b/sope-appserver/NGObjWeb/DynamicElements/_WOConstResourceImage.m
index 12da3b705828b0e6488802a091d21268eb0e9a98..6803d14b41edcf7a09fd1795fbf4de5d4642469b 100644 (file)
--- a/sope-appserver/NGObjWeb/DynamicElements/_WOConstResourceImage.m
+++ b/sope-appserver/NGObjWeb/DynamicElements/_WOConstResourceImage.m
@@ -30,7 +30,7 @@
 #include "WOElement+private.h"
 #include <NGObjWeb/WOApplication.h>
 #include <NGObjWeb/WOResourceManager.h>
-#include "common.h"
+#include "decommon.h"
 
 @implementation _WOConstResourceImage
 

diff --git a/sope-appserver/NGObjWeb/DynamicElements/_WOResourceImage.m b/sope-appserver/NGObjWeb/DynamicElements/_WOResourceImage.m
index 18578c73aa216ee674469cf002d4439896ca9d36..3ac12929af3f180d92b8693144dc84a23d2129fb 100644 (file)
--- a/sope-appserver/NGObjWeb/DynamicElements/_WOResourceImage.m
+++ b/sope-appserver/NGObjWeb/DynamicElements/_WOResourceImage.m
@@ -31,7 +31,7 @@
 #include "WOElement+private.h"
 #include <NGObjWeb/WOApplication.h>
 #include <NGObjWeb/WOResourceManager.h>
-#include "common.h"
+#include "decommon.h"
 
 @implementation _WOResourceImage
 

diff --git a/sope-appserver/NGObjWeb/DynamicElements/_WOSimpleActionHyperlink.m b/sope-appserver/NGObjWeb/DynamicElements/_WOSimpleActionHyperlink.m
index 3da8ea10076dc3a05d9ec54e1dae1affb0a927ff..9ee6cc4d3ca0d62993466d96215d4c37e447778a 100644 (file)
--- a/sope-appserver/NGObjWeb/DynamicElements/_WOSimpleActionHyperlink.m
+++ b/sope-appserver/NGObjWeb/DynamicElements/_WOSimpleActionHyperlink.m
@@ -45,7 +45,7 @@
 #include "WOHyperlinkInfo.h"
 #include "WOElement+private.h"
 #include <NGObjWeb/WOAssociation.h>
-#include "common.h"
+#include "decommon.h"
 
 @implementation _WOSimpleActionHyperlink
 

diff --git a/sope-appserver/NGObjWeb/DynamicElements/_WOTemporaryHyperlink.m b/sope-appserver/NGObjWeb/DynamicElements/_WOTemporaryHyperlink.m
index 8c76161605855225f3f8931a398441a5422f8f4d..01d9fb295849a23fb9490b4dd12cc10a319bc9fb 100644 (file)
--- a/sope-appserver/NGObjWeb/DynamicElements/_WOTemporaryHyperlink.m
+++ b/sope-appserver/NGObjWeb/DynamicElements/_WOTemporaryHyperlink.m
@@ -23,7 +23,7 @@
 #include "WOHyperlinkInfo.h"
 #include "WOCompoundElement.h"
 #include <NGObjWeb/WOAssociation.h>
-#include "common.h"
+#include "decommon.h"
 
 @implementation _WOTemporaryHyperlink
 

diff --git a/sope-appserver/NGObjWeb/DynamicElements/common.h b/sope-appserver/NGObjWeb/DynamicElements/decommon.h
similarity index 94%
rename from sope-appserver/NGObjWeb/DynamicElements/common.h
rename to sope-appserver/NGObjWeb/DynamicElements/decommon.h
index 04df2efe79f601a380241db36b596102829b848b..b365ef5c467bc7c3fac0f5609867fa236956ae89 100644 (file)
--- a/sope-appserver/NGObjWeb/DynamicElements/common.h
+++ b/sope-appserver/NGObjWeb/DynamicElements/decommon.h
@@ -38,11 +38,11 @@
 
 #include <NGExtensions/NGExtensions.h>
 #include "WOResponse+private.h"
-#include "WOContext.h"
+#include <NGObjWeb/WOContext.h>
 
-static inline void WOResponse_AddEmptyCloseParens(WOResponse *r, WOContext *ctx) 
+static inline void WOResponse_AddEmptyCloseParens(WOResponse *r, WOContext *c) 
 {
-  if (ctx->wcFlags.xmlStyleEmptyElements) {
+  if (c->wcFlags.xmlStyleEmptyElements) {
     WOResponse_AddCString(r, " />");
   }
   else {

diff --git a/sope-appserver/NGObjWeb/Version b/sope-appserver/NGObjWeb/Version
index 94604ec91c3039dc0f5c51d6eea05b96e8261d66..fba1773a4e9d81634bde2ae8219368cb745b777a 100644 (file)
--- a/sope-appserver/NGObjWeb/Version
+++ b/sope-appserver/NGObjWeb/Version
@@ -1,6 +1,6 @@
 # version file
 
-SUBMINOR_VERSION:=132
+SUBMINOR_VERSION:=133
 
 # v4.5.122 requires libNGExtensions v4.5.153
 # v4.5.91  requires libNGExtensions v4.5.134