Move around files to remove some vanity directories.

Also remove the obsolete IDL file stub.

(bzr r9194)

7 files changed, 1 insertions, 25 deletions

diff --git a/src/traits/CMakeLists.txt b/src/traits/CMakeLists.txt
deleted file mode 100644
index 791f9cd85..000000000
--- a/src/traits/CMakeLists.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-SET(traits_SRC
-)
diff --git a/src/traits/Makefile_insert b/src/traits/Makefile_insert
deleted file mode 100644
index 4290ac2dd..000000000
--- a/src/traits/Makefile_insert
+++ /dev/null
@@ -1,5 +0,0 @@
-
-traits/all:
-
-traits/clean:
-
diff --git a/src/traits/makefile.in b/src/traits/makefile.in
deleted file mode 100644
index c0f07d432..000000000
--- a/src/traits/makefile.in
+++ /dev/null
@@ -1,17 +0,0 @@
-# Convenience stub makefile to call the real Makefile.
-
-@SET_MAKE@
-
-OBJEXT = @OBJEXT@
-
-# Explicit so that it's the default rule.
-all:
-	cd .. && $(MAKE) traits/all
-
-clean %.a %.$(OBJEXT):
-	cd .. && $(MAKE) traits/$@
-
-.PHONY: all clean
-
-.SUFFIXES:
-.SUFFIXES: .a .$(OBJEXT)
diff --git a/src/traits/copy.h b/src/util/copy.h
index 27038ff2d..27038ff2d 100644
--- a/src/traits/copy.h
+++ b/src/util/copy.h
diff --git a/src/traits/function.h b/src/util/function.h
index d0dd5d87c..d0dd5d87c 100644
--- a/src/traits/function.h
+++ b/src/util/function.h
diff --git a/src/traits/list-copy.h b/src/util/list-copy.h
index 9d99c4f29..811f93b77 100644
--- a/src/traits/list-copy.h
+++ b/src/util/list-copy.h
@@ -13,7 +13,7 @@
 #define SEEN_INKSCAPE_TRAITS_LIST_COPY_H
 
 #include <iterator>
-#include "traits/copy.h"
+#include "util/copy.h"
 #include "util/list.h"
 
 namespace Inkscape {
diff --git a/src/traits/reference.h b/src/util/reference.h
index 199ae8929..199ae8929 100644
--- a/src/traits/reference.h
+++ b/src/util/reference.h