remove desktop-affine.cpp

(bzr r7275)

3 files changed, 4 insertions, 65 deletions

diff --git a/src/Makefile_insert b/src/Makefile_insert
index 43a6295d6..7a43a59c5 100644
--- a/src/Makefile_insert
+++ b/src/Makefile_insert
@@ -39,7 +39,7 @@ libinkpre_a_SOURCES =	\
 	connection-pool.h \
 	console-output-undo-observer.h console-output-undo-observer.cpp \
 	context-fns.cpp context-fns.h \
-	desktop-affine.cpp desktop-affine.h	\
+	desktop-affine.h	\
 	desktop-events.cpp desktop-events.h	\
 	desktop-handles.cpp desktop-handles.h	\
 	desktop-style.cpp desktop-style.h	\
diff --git a/src/desktop-affine.cpp b/src/desktop-affine.cpp
deleted file mode 100644
index 707b1df8a..000000000
--- a/src/desktop-affine.cpp
+++ /dev/null
@@ -1,51 +0,0 @@
-#define __SP_DESKTOP_AFFINE_C__
-
-/*
- * Editable view and widget implementation
- *
- * Author:
- *   Lauris Kaplinski <lauris@kaplinski.com>
- *
- * Copyright (C) 1999-2002 Lauris Kaplinski
- * Copyright (C) 2000-2001 Ximian, Inc.
- *
- * Released under GNU GPL, read the file 'COPYING' for more information
- */
-
-#include "desktop.h"
-//#include "document.h"
-//#include "sp-root.h"
-
-Geom::Matrix const sp_desktop_dt2doc_affine (SPDesktop const *dt)
-{
-    return dt->doc2dt().inverse();
-}
-
-Geom::Point sp_desktop_dt2doc_xy_point(SPDesktop const *dt, Geom::Point const p)
-{
-    return p * sp_desktop_dt2doc_affine(dt);
-}
-
-#if 0
-Geom::Matrix const sp_desktop_root2dt_affine (SPDesktop const *dt)
-{
-    SPRoot const *root = SP_ROOT(SP_DOCUMENT_ROOT(dt->doc()));
-    return root->c2p * dt->doc2dt();
-}
-
-Geom::Matrix const sp_desktop_dt2root_affine (SPDesktop const *dt)
-{
-    return sp_desktop_root2dt_affine(dt).inverse();
-}
-
-Geom::Point sp_desktop_root2dt_xy_point(SPDesktop const *dt, Geom::Point const p)
-{
-    return p * sp_desktop_root2dt_affine(dt);
-}
-
-Geom::Point sp_desktop_dt2root_xy_point(SPDesktop const *dt, Geom::Point const p)
-{
-    return p * sp_desktop_dt2root_affine(dt);
-}
-#endif
-
diff --git a/src/desktop-affine.h b/src/desktop-affine.h
index 87d31c751..dda4e90ee 100644
--- a/src/desktop-affine.h
+++ b/src/desktop-affine.h
@@ -13,20 +13,10 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
-#include "forward.h"
-#include <2geom/forward.h>
+#include "desktop.h"
 
-Geom::Matrix const sp_desktop_dt2doc_affine (SPDesktop const *dt);
-
-Geom::Point sp_desktop_dt2doc_xy_point(SPDesktop const *dt, Geom::Point const p);
-
-#if 0
-Geom::Matrix const sp_desktop_root2dt_affine(SPDesktop const *dt);
-Geom::Matrix const sp_desktop_dt2root_affine(SPDesktop const *dt);
-
-Geom::Point sp_desktop_root2dt_xy_point(SPDesktop const *dt, const Geom::Point p);
-Geom::Point sp_desktop_dt2root_xy_point(SPDesktop const *dt, const Geom::Point p);
-#endif
+#define sp_desktop_dt2doc_affine(desktop)          desktop->dt2doc()
+#define sp_desktop_dt2doc_xy_point(desktop,point)  desktop->dt2doc(point)
 
 #endif