[Date Prev][Date Next][Thread Prev][Thread Next][Thread Index]
[XaraXtreme-commits] Commit Complete

From: subversion@xxxxxxxxxxxxxx
Date: Tue, 6 Jun 2006 12:58:30 +0100
Subject: [XaraXtreme-commits] Commit Complete
Commit by  : alex
Repository : xara
Revision   : 1261
Date       : Tue Jun  6 12:58:30 BST 2006

Changed paths:
   M /Trunk/XaraLX/Kernel/camfiltr.h
   M /Trunk/XaraLX/Kernel/cmdctrl.h
   M /Trunk/XaraLX/Kernel/docview.cpp
   M /Trunk/XaraLX/Kernel/docview.h
   M /Trunk/XaraLX/Kernel/fixed16.cpp
   M /Trunk/XaraLX/Kernel/fixed16.h
   M /Trunk/XaraLX/Kernel/fixed24.cpp
   M /Trunk/XaraLX/Kernel/node.h
   M /Trunk/XaraLX/Kernel/opdesc.h
   M /Trunk/XaraLX/Kernel/ophist.h
   M /Trunk/XaraLX/Kernel/ops.cpp
   M /Trunk/XaraLX/Kernel/opwiz.h
   M /Trunk/XaraLX/Kernel/printctl.h
   M /Trunk/XaraLX/Kernel/printing.h
   M /Trunk/XaraLX/Kernel/range.cpp
   M /Trunk/XaraLX/Kernel/scunit.h
   M /Trunk/XaraLX/Kernel/sglbase.h
   M /Trunk/XaraLX/Kernel/swfbuttn.h
   M /Trunk/XaraLX/Kernel/taglists.h
   M /Trunk/XaraLX/Kernel/units.h
   M /Trunk/XaraLX/Kernel/webaddr.h
   M /Trunk/XaraLX/Kernel/xlong.h
   M /Trunk/XaraLX/PreComp/camtypes.h
   M /Trunk/XaraLX/tools/pushtool.cpp
   M /Trunk/XaraLX/tools/zoomtool.cpp
   A /Trunk/XaraLX/wxOil/camstring.h (from /Trunk/XaraLX/wxOil/strings.h:1256)
   M /Trunk/XaraLX/wxOil/convert.h
   M /Trunk/XaraLX/wxOil/diagnost.cpp
   M /Trunk/XaraLX/wxOil/errors.cpp
   M /Trunk/XaraLX/wxOil/fileutil.h
   M /Trunk/XaraLX/wxOil/menupref.cpp
   M /Trunk/XaraLX/wxOil/pathname.h
   M /Trunk/XaraLX/wxOil/sgrmfile.cpp
   M /Trunk/XaraLX/wxOil/stemplate.h
   D /Trunk/XaraLX/wxOil/strings.h

Remove unnecessary inclusion of strings.h


Diff:
Index: Trunk/XaraLX/tools/pushtool.cpp
===================================================================
--- Trunk/XaraLX/tools/pushtool.cpp	(revision 1260)
+++ Trunk/XaraLX/tools/pushtool.cpp	(revision 1261)
@@ -103,7 +103,6 @@
 
 #include "camtypes.h"
 
-#include "strings.h"
 #include "docview.h"
 #include "ensure.h"
 #include "toollist.h"
Index: Trunk/XaraLX/tools/zoomtool.cpp
===================================================================
--- Trunk/XaraLX/tools/zoomtool.cpp	(revision 1260)
+++ Trunk/XaraLX/tools/zoomtool.cpp	(revision 1261)
@@ -106,7 +106,6 @@
 //#include "stockcol.h"
 //#include "lineattr.h"
 #include "ensure.h"
-#include "strings.h"
 //#include "resource.h"
 //#include "barsdlgs.h"
 //#include "errors.h"
Index: Trunk/XaraLX/Kernel/printing.h
===================================================================
--- Trunk/XaraLX/Kernel/printing.h	(revision 1260)
+++ Trunk/XaraLX/Kernel/printing.h	(revision 1261)
@@ -102,7 +102,6 @@
 #ifndef INC_PRINTING
 #define	INC_PRINTING
 
-#include "strings.h"
 #include "ops.h"
 #include "opdesc.h"
 
Index: Trunk/XaraLX/Kernel/cmdctrl.h
===================================================================
--- Trunk/XaraLX/Kernel/cmdctrl.h	(revision 1260)
+++ Trunk/XaraLX/Kernel/cmdctrl.h	(revision 1261)
@@ -121,7 +121,6 @@
 
 #include "list.h"
 #include "listitem.h" 
-#include "strings.h"  
 #include "opdesc.h"
 
 /********************************************************************************************
Index: Trunk/XaraLX/Kernel/scunit.h
===================================================================
--- Trunk/XaraLX/Kernel/scunit.h	(revision 1260)
+++ Trunk/XaraLX/Kernel/scunit.h	(revision 1261)
@@ -103,7 +103,6 @@
 // Definition of the scale units class
 
 #include "list.h"
-#include "strings.h"
 
 /*********************************************************************************************
 
Index: Trunk/XaraLX/Kernel/camfiltr.h
===================================================================
--- Trunk/XaraLX/Kernel/camfiltr.h	(revision 1260)
+++ Trunk/XaraLX/Kernel/camfiltr.h	(revision 1261)
@@ -106,7 +106,6 @@
 #include "bmpprefs.h"	// SelectionType
 #include "doccoord.h"	
 #include "node.h"		// AttachNodeDirection 
-#include "strings.h"
 
 class CXaraFile;
 class CXaraFileRecord;
Index: Trunk/XaraLX/Kernel/units.h
===================================================================
--- Trunk/XaraLX/Kernel/units.h	(revision 1260)
+++ Trunk/XaraLX/Kernel/units.h	(revision 1261)
@@ -100,7 +100,6 @@
 #ifndef INC_UNITS
 #define INC_UNITS
 
-#include "strings.h"
 #include "list.h"
 #include "unittype.h"
 #include "pump.h"
Index: Trunk/XaraLX/Kernel/docview.cpp
===================================================================
--- Trunk/XaraLX/Kernel/docview.cpp	(revision 1260)
+++ Trunk/XaraLX/Kernel/docview.cpp	(revision 1261)
@@ -126,7 +126,6 @@
 #include "ccdc.h"
 #include "csrstack.h"
 #include "app.h"
-#include "strings.h"
 #include "document.h"
 #include "nodedoc.h"
 #include "chapter.h"
Index: Trunk/XaraLX/Kernel/docview.h
===================================================================
--- Trunk/XaraLX/Kernel/docview.h	(revision 1260)
+++ Trunk/XaraLX/Kernel/docview.h	(revision 1261)
@@ -116,7 +116,6 @@
 #include "ops.h"
 #include "monotime.h"
 #include "oilcoord.h"
-#include "strings.h"
 #include "rendtype.h"
 #include "quality.h"
 #include "docvmsg.h"
Index: Trunk/XaraLX/Kernel/opwiz.h
===================================================================
--- Trunk/XaraLX/Kernel/opwiz.h	(revision 1260)
+++ Trunk/XaraLX/Kernel/opwiz.h	(revision 1261)
@@ -111,7 +111,6 @@
 #ifndef INC_<THIS_FILE>
 #define	INC_<THIS_FILE>
 
-#include "strings.h"
 #include "ops.h"
 #include "opdesc.h"
 
Index: Trunk/XaraLX/Kernel/ophist.h
===================================================================
--- Trunk/XaraLX/Kernel/ophist.h	(revision 1260)
+++ Trunk/XaraLX/Kernel/ophist.h	(revision 1261)
@@ -117,7 +117,6 @@
 #include "list.h"
 #include "undoop.h"
 #include "opdesc.h"   
-#include "strings.h"
 
 #define OPTOKEN_UNDO _T("Undo")
 #define OPTOKEN_REDO _T("Redo")
Index: Trunk/XaraLX/Kernel/taglists.h
===================================================================
--- Trunk/XaraLX/Kernel/taglists.h	(revision 1260)
+++ Trunk/XaraLX/Kernel/taglists.h	(revision 1261)
@@ -103,7 +103,6 @@
 #include "cxftags.h"
 #include "list.h"
 #include "listitem.h"
-#include "strings.h"
 
 /***********************************************************************************************
 
Index: Trunk/XaraLX/Kernel/xlong.h
===================================================================
--- Trunk/XaraLX/Kernel/xlong.h	(revision 1260)
+++ Trunk/XaraLX/Kernel/xlong.h	(revision 1261)
@@ -117,8 +117,6 @@
 #ifndef INC_XLONG
 #define INC_XLONG
 
-#include "strings.h"
-
 class CCAPI fixed16;
 
 #if defined(USE_NATIVE_XLONG)
Index: Trunk/XaraLX/Kernel/printctl.h
===================================================================
--- Trunk/XaraLX/Kernel/printctl.h	(revision 1260)
+++ Trunk/XaraLX/Kernel/printctl.h	(revision 1261)
@@ -102,7 +102,6 @@
 #define INC_PRINTCTL
 
 #include "docrect.h"
-#include "strings.h"
 #include "list.h"
 #include "colplate.h"
 
Index: Trunk/XaraLX/Kernel/sglbase.h
===================================================================
--- Trunk/XaraLX/Kernel/sglbase.h	(revision 1260)
+++ Trunk/XaraLX/Kernel/sglbase.h	(revision 1261)
@@ -102,7 +102,6 @@
 
 #include "sgallery.h"
 #include "sgtree.h"
-#include "strings.h"
 #include "msg.h"
 #include "thumb.h"
 #include "sgscan.h"
Index: Trunk/XaraLX/Kernel/ops.cpp
===================================================================
--- Trunk/XaraLX/Kernel/ops.cpp	(revision 1260)
+++ Trunk/XaraLX/Kernel/ops.cpp	(revision 1261)
@@ -110,7 +110,7 @@
 
 */
 
-#include "camtypes.h" 
+#include "camtypes.h"
 //#include "inetop.h"
 
 DECLARE_SOURCE("$Revision$");
@@ -121,15 +121,14 @@
 #endif
 
 #include "ops.h"
-#include "range.h"                        
-#include "strings.h"     
-#include "document.h"  
-#include "ophist.h"     
-#include "ensure.h"     
+#include "range.h"
+#include "document.h"
+#include "ophist.h"
+#include "ensure.h"
 #include "docview.h" 
 //#include "resource.h" 
 //#include "simon.h"
-#include "errors.h"   
+#include "errors.h"
 #include "selstate.h"
 #include "noderect.h"
 #include "tranform.h"
Index: Trunk/XaraLX/Kernel/fixed16.h
===================================================================
--- Trunk/XaraLX/Kernel/fixed16.h	(revision 1260)
+++ Trunk/XaraLX/Kernel/fixed16.h	(revision 1261)
@@ -96,6 +96,8 @@
 =================================XARAHEADEREND============================
  */
 
+class StringBase;
+
 /*
  */ 
 
Index: Trunk/XaraLX/Kernel/fixed24.cpp
===================================================================
--- Trunk/XaraLX/Kernel/fixed24.cpp	(revision 1260)
+++ Trunk/XaraLX/Kernel/fixed24.cpp	(revision 1261)
@@ -111,9 +111,7 @@
 
 #include "camtypes.h"
 #include "fixed24.h"
-#include "strings.h"
 
-
 // this is a temporary kludge for the 32-bit MS compiler
 #define	F24ASSIGN( it )		it
 #define	F24ASSIGNTHIS		*this
Index: Trunk/XaraLX/Kernel/fixed16.cpp
===================================================================
--- Trunk/XaraLX/Kernel/fixed16.cpp	(revision 1260)
+++ Trunk/XaraLX/Kernel/fixed16.cpp	(revision 1261)
@@ -99,7 +99,6 @@
 
 #include "camtypes.h"
 #include "fixed16.h"
-#include "strings.h"
 
 DECLARE_SOURCE("$Revision$");
 
Index: Trunk/XaraLX/Kernel/webaddr.h
===================================================================
--- Trunk/XaraLX/Kernel/webaddr.h	(revision 1260)
+++ Trunk/XaraLX/Kernel/webaddr.h	(revision 1261)
@@ -98,8 +98,7 @@
 
 #ifndef INC_WEBADDRESS
 #define INC_WEBADDRESS
- 
-#include "strings.h"
+
 #include "webflags.h"	//Class WebCorrectFlags
 #include "pathname.h"	//Class PathName
 
Index: Trunk/XaraLX/Kernel/opdesc.h
===================================================================
--- Trunk/XaraLX/Kernel/opdesc.h	(revision 1260)
+++ Trunk/XaraLX/Kernel/opdesc.h	(revision 1261)
@@ -104,7 +104,6 @@
 
 #include "listitem.h"
 #include "list.h"
-#include "strings.h"
 #include "pump.h"
 #include "msg.h"
 
Index: Trunk/XaraLX/Kernel/node.h
===================================================================
--- Trunk/XaraLX/Kernel/node.h	(revision 1260)
+++ Trunk/XaraLX/Kernel/node.h	(revision 1261)
@@ -118,13 +118,7 @@
 
 // All include files here
 #include <assert.h>
-#include "docrect.h"
-#include "ccobject.h"
-#include "strings.h"
-#include "basestr.h"
-#include "fixst256.h"
 //#include "binds.h"
-#include "range.h" // To be moved to noderend.cpp (currently locked)
 #include "release.h"
 
 class CCAPI NodeRenderablePaper;
Index: Trunk/XaraLX/Kernel/swfbuttn.h
===================================================================
--- Trunk/XaraLX/Kernel/swfbuttn.h	(revision 1260)
+++ Trunk/XaraLX/Kernel/swfbuttn.h	(revision 1261)
@@ -98,13 +98,11 @@
 #ifndef INC_FLASH_BUTTON_RECORD
 #define INC_FLASH_BUTTON_RECORD
 
-#include "ccobject.h"
-#include "strings.h"
 #include "swfplace.h"
 
 /********************************************************************************************
 
->	class FlashButtonRecord : public CObject
+>	class FlashButtonRecord : public CCObject
 
 	Author:		Graeme_Sutherland (Xara Group Ltd) <camelotdev@xxxxxxxx>
 	Created:	8/12/99
Index: Trunk/XaraLX/Kernel/range.cpp
===================================================================
--- Trunk/XaraLX/Kernel/range.cpp	(revision 1260)
+++ Trunk/XaraLX/Kernel/range.cpp	(revision 1261)
@@ -112,7 +112,6 @@
 #include "range.h"   
 #include "rndrgn.h"
 //#include "simon.h"
-#include "strings.h" 
 #include "ink.h"
 #include "spread.h"
 //#include "dlgbar.h"
Index: Trunk/XaraLX/wxOil/camstring.h
===================================================================
--- Trunk/XaraLX/wxOil/camstring.h	(revision 0)
+++ Trunk/XaraLX/wxOil/camstring.h	(revision 1261)
@@ -0,0 +1,123 @@
+// $Id$
+/* @@tag:xara-cn@@ DO NOT MODIFY THIS LINE
+================================XARAHEADERSTART===========================
+ 
+               Xara LX, a vector drawing and manipulation program.
+                    Copyright (C) 1993-2006 Xara Group Ltd.
+       Copyright on certain contributions may be held in joint with their
+              respective authors. See AUTHORS file for details.
+
+LICENSE TO USE AND MODIFY SOFTWARE
+----------------------------------
+
+This file is part of Xara LX.
+
+Xara LX is free software; you can redistribute it and/or modify it
+under the terms of the GNU General Public License version 2 as published
+by the Free Software Foundation.
+
+Xara LX and its component source files are distributed in the hope
+that it will be useful, but WITHOUT ANY WARRANTY; without even the
+implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+See the GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License along
+with Xara LX (see the file GPL in the root directory of the
+distribution); if not, write to the Free Software Foundation, Inc., 51
+Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+
+
+ADDITIONAL RIGHTS
+-----------------
+
+Conditional upon your continuing compliance with the GNU General Public
+License described above, Xara Group Ltd grants to you certain additional
+rights. 
+
+The additional rights are to use, modify, and distribute the software
+together with the wxWidgets library, the wxXtra library, and the "CDraw"
+library and any other such library that any version of Xara LX relased
+by Xara Group Ltd requires in order to compile and execute, including
+the static linking of that library to XaraLX. In the case of the
+"CDraw" library, you may satisfy obligation under the GNU General Public
+License to provide source code by providing a binary copy of the library
+concerned and a copy of the license accompanying it.
+
+Nothing in this section restricts any of the rights you have under
+the GNU General Public License.
+
+
+SCOPE OF LICENSE
+----------------
+
+This license applies to this program (XaraLX) and its constituent source
+files only, and does not necessarily apply to other Xara products which may
+in part share the same code base, and are subject to their own licensing
+terms.
+
+This license does not apply to files in the wxXtra directory, which
+are built into a separate library, and are subject to the wxWindows
+license contained within that directory in the file "WXXTRA-LICENSE".
+
+This license does not apply to the binary libraries (if any) within
+the "libs" directory, which are subject to a separate license contained
+within that directory in the file "LIBS-LICENSE".
+
+
+ARRANGEMENTS FOR CONTRIBUTION OF MODIFICATIONS
+----------------------------------------------
+
+Subject to the terms of the GNU Public License (see above), you are
+free to do whatever you like with your modifications. However, you may
+(at your option) wish contribute them to Xara's source tree. You can
+find details of how to do this at:
+  http://www.xaraxtreme.org/developers/
+
+Prior to contributing your modifications, you will need to complete our
+contributor agreement. This can be found at:
+  http://www.xaraxtreme.org/developers/contribute/
+
+Please note that Xara will not accept modifications which modify any of
+the text between the start and end of this header (marked
+XARAHEADERSTART and XARAHEADEREND).
+
+
+MARKS
+-----
+
+Xara, Xara LX, Xara X, Xara X/Xtreme, Xara Xtreme, the Xtreme and Xara
+designs are registered or unregistered trademarks, design-marks, and/or
+service marks of Xara Group Ltd. All rights in these marks are reserved.
+
+
+      Xara Group Ltd, Gaddesden Place, Hemel Hempstead, HP2 6EX, UK.
+                        http://www.xara.com/
+
+=================================XARAHEADEREND============================
+ */
+/*
+	
+*/
+
+#ifndef INC__CAMSTRING
+#define INC__CAMSTRING
+
+// The base class variable-length Strings.
+#include "basestr.h"
+
+// Various sizes of fixed-length Strings, created by "template".
+#include "fixstr8.h"
+#include "fixstr16.h"
+#include "fixstr32.h"
+#include "fixstr64.h"
+#include "fixst128.h"
+#include "fixst256.h"
+
+// The new self-sizing variable-length String
+#include "varstr.h"
+
+// If compiling under the 16-bit Microsoft compiler then use a pre-processor #define
+// as typedef doesn't work properly. And also the 32-bit compiler.
+#define String String_32
+
+#endif	// INC__STRING

Property changes on: Trunk/XaraLX/wxOil/camstring.h
___________________________________________________________________
Name: svn:keywords
   + Id Revision
Name: svn:eol-style
   + LF

Index: Trunk/XaraLX/wxOil/sgrmfile.cpp
===================================================================
--- Trunk/XaraLX/wxOil/sgrmfile.cpp	(revision 1260)
+++ Trunk/XaraLX/wxOil/sgrmfile.cpp	(revision 1261)
@@ -102,7 +102,6 @@
 
 #include "product.h"	// for PRODUCT_BASENAME
 #include "sgliboil.h"
-#include "strings.h"
 #include "pathname.h"
 #include "sgscan.h"		// Generate code with hourglass...
 //#include "nev.h"
Index: Trunk/XaraLX/wxOil/diagnost.cpp
===================================================================
--- Trunk/XaraLX/wxOil/diagnost.cpp	(revision 1260)
+++ Trunk/XaraLX/wxOil/diagnost.cpp	(revision 1261)
@@ -103,7 +103,6 @@
 #include "camtypes.h"
 #include "diagnost.h"
 #include "app.h"
-#include "strings.h"
 #include "camelot.h"
 
 static INT32 OutputDiagnostics = 0;
Index: Trunk/XaraLX/wxOil/fileutil.h
===================================================================
--- Trunk/XaraLX/wxOil/fileutil.h	(revision 1260)
+++ Trunk/XaraLX/wxOil/fileutil.h	(revision 1261)
@@ -101,8 +101,6 @@
 #ifndef INC_FILEUTIL
 #define INC_FILEUTIL
 
-#include "strings.h"
-
 class PathName;
 
 
Index: Trunk/XaraLX/wxOil/menupref.cpp
===================================================================
--- Trunk/XaraLX/wxOil/menupref.cpp	(revision 1260)
+++ Trunk/XaraLX/wxOil/menupref.cpp	(revision 1261)
@@ -101,7 +101,6 @@
 
 
 #include "camtypes.h"
-#include "strings.h"            
 #include "menuitem.h"
 #include "menucmds.h"
 #include "menupref.h"
Index: Trunk/XaraLX/wxOil/errors.cpp
===================================================================
--- Trunk/XaraLX/wxOil/errors.cpp	(revision 1260)
+++ Trunk/XaraLX/wxOil/errors.cpp	(revision 1261)
@@ -107,8 +107,6 @@
 
 #include "errors.h"
 #include "camelot.h"
-#include "strings.h"
-#include "basestr.h"
 #include "ensure.h"
 #if !defined(EXCLUDE_FROM_XARLIB)
 #include "tool.h"
Index: Trunk/XaraLX/wxOil/pathname.h
===================================================================
--- Trunk/XaraLX/wxOil/pathname.h	(revision 1260)
+++ Trunk/XaraLX/wxOil/pathname.h	(revision 1261)
@@ -99,9 +99,6 @@
 #ifndef INC_PathName
 #define INC_PathName
  
-#include "strings.h"
-                        
-
 /*********************************************************************************************
 
 >	class PathName : public CCObject
Index: Trunk/XaraLX/wxOil/stemplate.h
===================================================================
--- Trunk/XaraLX/wxOil/stemplate.h	(revision 1260)
+++ Trunk/XaraLX/wxOil/stemplate.h	(revision 1261)
@@ -99,7 +99,6 @@
 #ifndef INC_WEBADDRESS
 #define INC_WEBADDRESS
  
-#include "strings.h"
 #include "webflags.h"	//Class WebCorrectFlags
 #include "pathname.h"	//Class PathName
 
Index: Trunk/XaraLX/wxOil/convert.h
===================================================================
--- Trunk/XaraLX/wxOil/convert.h	(revision 1260)
+++ Trunk/XaraLX/wxOil/convert.h	(revision 1261)
@@ -106,7 +106,6 @@
 #ifndef INC_CONVERT
 #define INC_CONVERT
 
-#include "strings.h"
 #include "unittype.h"
 
 class Node;
Index: Trunk/XaraLX/wxOil/strings.h (deleted)
===================================================================
Index: Trunk/XaraLX/PreComp/camtypes.h
===================================================================
--- Trunk/XaraLX/PreComp/camtypes.h	(revision 1260)
+++ Trunk/XaraLX/PreComp/camtypes.h	(revision 1261)
@@ -139,7 +139,7 @@
 // Try to speed up compilation times
 #include "ccobject.h"
 #include "errors.h"
-#include "strings.h"
+#include "camstring.h"
 #if !defined(EXCLUDE_FROM_XARLIB)
 #include "app.h"
 


Xara
Prev by Date: [XaraXtreme-commits] Commit Complete
Next by Date: [XaraXtreme-commits] Commit Complete
Previous by thread: [XaraXtreme-commits] Commit Complete
Next by thread: [XaraXtreme-commits] Commit Complete
Index(es):
- Thread