From aabb5bb05a97e7414fd6f0204178788800871151 Mon Sep 17 00:00:00 2001 From: "Jon A. Cruz" Date: Sat, 28 May 2011 03:36:31 -0700 Subject: Port of 0.48.x branch revision 9781. Cleanup of legacy code and casting that was breaking 64-bit gradient use. Fixes bug #743530 and bug #778441. Fixed bugs: - https://launchpad.net/bugs/743530 - https://launchpad.net/bugs/778441 (bzr r10242) --- src/id-clash.cpp | 1 + 1 file changed, 1 insertion(+) (limited to 'src/id-clash.cpp') diff --git a/src/id-clash.cpp b/src/id-clash.cpp index 67e27e2f0..d305b5a9f 100644 --- a/src/id-clash.cpp +++ b/src/id-clash.cpp @@ -22,6 +22,7 @@ #include "id-clash.h" #include "sp-object.h" #include "style.h" +#include "sp-paint-server.h" #include "xml/node.h" #include "xml/repr.h" -- cgit v1.2.3 From 3638efba5bec8a6afc9211aa6bbe289767d20b38 Mon Sep 17 00:00:00 2001 From: "Jon A. Cruz" Date: Fri, 3 Jun 2011 19:45:55 -0700 Subject: Removed outdated/unsafe SP_DOCUMENT_DEFS macro and reduced usage of SP_ROOT() gtk type function/macro. (bzr r10254) --- src/id-clash.cpp | 1 + 1 file changed, 1 insertion(+) (limited to 'src/id-clash.cpp') diff --git a/src/id-clash.cpp b/src/id-clash.cpp index d305b5a9f..d5740c0ba 100644 --- a/src/id-clash.cpp +++ b/src/id-clash.cpp @@ -25,6 +25,7 @@ #include "sp-paint-server.h" #include "xml/node.h" #include "xml/repr.h" +#include "sp-root.h" typedef enum { REF_HREF, REF_STYLE, REF_URL, REF_CLIPBOARD } ID_REF_TYPE; -- cgit v1.2.3 From 2633767789e4264b13ef91a684accf734fb4e94f Mon Sep 17 00:00:00 2001 From: "Jon A. Cruz" Date: Wed, 26 Oct 2011 21:55:51 -0700 Subject: Fixing more broken and split doc comments. (bzr r10697) --- src/id-clash.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/id-clash.cpp') diff --git a/src/id-clash.cpp b/src/id-clash.cpp index d5740c0ba..e5a40868b 100644 --- a/src/id-clash.cpp +++ b/src/id-clash.cpp @@ -1,4 +1,4 @@ -/** \file +/* * Routines for resolving ID clashes when importing or pasting. * * Authors: -- cgit v1.2.3