From fad47c0fe0a45da4ac4a395817a0ad73425ef275 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20P=C3=B6nitz?= <poenitz@gmx.net>
Date: Sun, 30 Sep 2007 15:47:00 +0000
Subject: [PATCH] boost/utility -> boost/noncopyable

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@20608 a592a061-630c-0410-9148-cb99ea01b6c8
---
 src/BufferList.h                 | 2 +-
 src/BufferView.h                 | 2 +-
 src/ConverterCache.h             | 2 +-
 src/LaTeX.h                      | 2 +-
 src/Lexer.cpp                    | 2 +-
 src/Lexer.h                      | 2 +-
 src/LyX.h                        | 2 +-
 src/LyXAction.h                  | 2 +-
 src/ModuleList.h                 | 2 +-
 src/Session.h                    | 2 +-
 src/TextClassList.h              | 2 +-
 src/frontends/Dialogs.h          | 2 +-
 src/frontends/LyXView.h          | 2 +-
 src/frontends/WorkArea.cpp       | 2 +-
 src/frontends/qt4/pch.h          | 2 +-
 src/graphics/GraphicsCache.h     | 2 +-
 src/graphics/GraphicsCacheItem.h | 2 +-
 src/graphics/GraphicsConverter.h | 2 +-
 src/graphics/PreviewLoader.h     | 2 +-
 src/graphics/Previews.h          | 2 +-
 src/insets/ExternalTemplate.h    | 2 +-
 src/paragraph_funcs.cpp          | 3 ++-
 src/pch.h                        | 2 +-
 src/support/FileMonitor.h        | 2 +-
 src/support/Path.h               | 2 +-
 src/support/RandomAccessList.h   | 5 -----
 src/support/pch.h                | 2 +-
 27 files changed, 27 insertions(+), 31 deletions(-)

diff --git a/src/BufferList.h b/src/BufferList.h
index cdba073c99..895dc46ee5 100644
--- a/src/BufferList.h
+++ b/src/BufferList.h
@@ -14,7 +14,7 @@
 
 #include "support/docstring.h"
 
-#include <boost/utility.hpp>
+#include <boost/noncopyable.hpp>
 
 #include <vector>
 
diff --git a/src/BufferView.h b/src/BufferView.h
index af7cbf8f80..5b726d8c5a 100644
--- a/src/BufferView.h
+++ b/src/BufferView.h
@@ -24,7 +24,7 @@
 #include "support/types.h"
 
 #include <boost/tuple/tuple.hpp>
-#include <boost/utility.hpp>
+#include <boost/noncopyable.hpp>
 #include <boost/signal.hpp>
 
 #include <utility>
diff --git a/src/ConverterCache.h b/src/ConverterCache.h
index 4a55810d6f..ccbc1befc6 100644
--- a/src/ConverterCache.h
+++ b/src/ConverterCache.h
@@ -21,7 +21,7 @@
 #ifndef CONVERTERCACHE_H
 #define CONVERTERCACHE_H
 
-#include <boost/utility.hpp>
+#include <boost/noncopyable.hpp>
 #include <boost/scoped_ptr.hpp>
 
 #include <string>
diff --git a/src/LaTeX.h b/src/LaTeX.h
index 52b8ff7a0a..25e83e8703 100644
--- a/src/LaTeX.h
+++ b/src/LaTeX.h
@@ -19,7 +19,7 @@
 #include "support/docstring.h"
 #include "support/FileName.h"
 
-#include <boost/utility.hpp>
+#include <boost/noncopyable.hpp>
 #include <boost/signal.hpp>
 
 #include <vector>
diff --git a/src/Lexer.cpp b/src/Lexer.cpp
index 4db980859f..ce8de70547 100644
--- a/src/Lexer.cpp
+++ b/src/Lexer.cpp
@@ -25,7 +25,7 @@
 #include "support/types.h"
 #include "support/unicode.h"
 
-#include <boost/utility.hpp>
+#include <boost/noncopyable.hpp>
 
 #include <functional>
 #include <istream>
diff --git a/src/Lexer.h b/src/Lexer.h
index 4088c75052..6418639266 100644
--- a/src/Lexer.h
+++ b/src/Lexer.h
@@ -19,7 +19,7 @@
 
 #include "support/docstring.h"
 
-#include <boost/utility.hpp>
+#include <boost/noncopyable.hpp>
 
 #include <iosfwd>
 
diff --git a/src/LyX.h b/src/LyX.h
index 534704957e..8347dba478 100644
--- a/src/LyX.h
+++ b/src/LyX.h
@@ -15,7 +15,7 @@
 #define LYX_H
 
 #include <boost/scoped_ptr.hpp>
-#include <boost/utility.hpp>
+#include <boost/noncopyable.hpp>
 
 #include <string>
 
diff --git a/src/LyXAction.h b/src/LyXAction.h
index 4411b16269..87254b53c5 100644
--- a/src/LyXAction.h
+++ b/src/LyXAction.h
@@ -15,7 +15,7 @@
 
 #include "lfuns.h"
 
-#include <boost/utility.hpp>
+#include <boost/noncopyable.hpp>
 
 #include <map>
 #include <string>
diff --git a/src/ModuleList.h b/src/ModuleList.h
index 0965ab544b..f2db0eb4de 100644
--- a/src/ModuleList.h
+++ b/src/ModuleList.h
@@ -15,7 +15,7 @@
 #include <vector>
 #include "support/FileName.h"
 
-#include <boost/utility.hpp>
+#include <boost/noncopyable.hpp>
 
 #include <map>
 
diff --git a/src/Session.h b/src/Session.h
index e0b1d98197..119b2a47af 100644
--- a/src/Session.h
+++ b/src/Session.h
@@ -16,7 +16,7 @@
 #include "support/FileName.h"
 #include "support/types.h"
 
-#include <boost/utility.hpp>
+#include <boost/noncopyable.hpp>
 #include <boost/tuple/tuple.hpp>
 
 #include <string>
diff --git a/src/TextClassList.h b/src/TextClassList.h
index 2931bab695..dcbae50358 100644
--- a/src/TextClassList.h
+++ b/src/TextClassList.h
@@ -16,7 +16,7 @@
 
 #include "support/types.h"
 
-#include <boost/utility.hpp>
+#include <boost/noncopyable.hpp>
 
 #include <string>
 #include <vector>
diff --git a/src/frontends/Dialogs.h b/src/frontends/Dialogs.h
index ae08680401..e13039f372 100644
--- a/src/frontends/Dialogs.h
+++ b/src/frontends/Dialogs.h
@@ -14,7 +14,7 @@
 #define DIALOGS_H
 
 #include <boost/signal.hpp>
-#include <boost/utility.hpp>
+#include <boost/noncopyable.hpp>
 
 #include <map>
 
diff --git a/src/frontends/LyXView.h b/src/frontends/LyXView.h
index ec76fdf364..0c24f5ec1a 100644
--- a/src/frontends/LyXView.h
+++ b/src/frontends/LyXView.h
@@ -18,7 +18,7 @@
 
 #include <boost/signal.hpp>
 #include <boost/signals/trackable.hpp>
-#include <boost/utility.hpp>
+#include <boost/noncopyable.hpp>
 
 #include <vector>
 
diff --git a/src/frontends/WorkArea.cpp b/src/frontends/WorkArea.cpp
index 9078ad0132..933bada2b9 100644
--- a/src/frontends/WorkArea.cpp
+++ b/src/frontends/WorkArea.cpp
@@ -38,7 +38,7 @@
 #include "support/ForkedcallsController.h"
 #include "support/FileName.h"
 
-#include <boost/utility.hpp>
+#include <boost/noncopyable.hpp>
 #include <boost/bind.hpp>
 #include <boost/current_function.hpp>
 
diff --git a/src/frontends/qt4/pch.h b/src/frontends/qt4/pch.h
index f509dc9fe5..f687c93caf 100644
--- a/src/frontends/qt4/pch.h
+++ b/src/frontends/qt4/pch.h
@@ -10,7 +10,7 @@
 #include <boost/signals/trackable.hpp>
 #include <boost/signal.hpp>
 #include <boost/tuple/tuple.hpp>
-#include <boost/utility.hpp>
+#include <boost/noncopyable.hpp>
 
 #include <algorithm>
 #include <cmath>
diff --git a/src/graphics/GraphicsCache.h b/src/graphics/GraphicsCache.h
index 478e7a83e8..bf4a4ffe80 100644
--- a/src/graphics/GraphicsCache.h
+++ b/src/graphics/GraphicsCache.h
@@ -20,7 +20,7 @@
 #ifndef GRAPHICSCACHE_H
 #define GRAPHICSCACHE_H
 
-#include <boost/utility.hpp>
+#include <boost/noncopyable.hpp>
 #include <boost/scoped_ptr.hpp>
 #include <boost/shared_ptr.hpp>
 
diff --git a/src/graphics/GraphicsCacheItem.h b/src/graphics/GraphicsCacheItem.h
index 298ef172fa..12b86de64d 100644
--- a/src/graphics/GraphicsCacheItem.h
+++ b/src/graphics/GraphicsCacheItem.h
@@ -30,7 +30,7 @@
 
 #include "GraphicsTypes.h"
 
-#include <boost/utility.hpp>
+#include <boost/noncopyable.hpp>
 #include <boost/scoped_ptr.hpp>
 #include <boost/signal.hpp>
 
diff --git a/src/graphics/GraphicsConverter.h b/src/graphics/GraphicsConverter.h
index d69c13fcef..0f0dec559e 100644
--- a/src/graphics/GraphicsConverter.h
+++ b/src/graphics/GraphicsConverter.h
@@ -19,7 +19,7 @@
 
 #include <boost/scoped_ptr.hpp>
 #include <boost/signal.hpp>
-#include <boost/utility.hpp>
+#include <boost/noncopyable.hpp>
 
 namespace lyx {
 
diff --git a/src/graphics/PreviewLoader.h b/src/graphics/PreviewLoader.h
index 5ce25847ec..97c8879e06 100644
--- a/src/graphics/PreviewLoader.h
+++ b/src/graphics/PreviewLoader.h
@@ -18,7 +18,7 @@
 #ifndef PREVIEWLOADER_H
 #define PREVIEWLOADER_H
 
-#include <boost/utility.hpp>
+#include <boost/noncopyable.hpp>
 #include <boost/scoped_ptr.hpp>
 #include <boost/signal.hpp>
 
diff --git a/src/graphics/Previews.h b/src/graphics/Previews.h
index 116984df7d..13aaef9c30 100644
--- a/src/graphics/Previews.h
+++ b/src/graphics/Previews.h
@@ -15,7 +15,7 @@
 #ifndef PREVIEWS_H
 #define PREVIEWS_H
 
-#include <boost/utility.hpp>
+#include <boost/noncopyable.hpp>
 #include <boost/scoped_ptr.hpp>
 
 namespace lyx {
diff --git a/src/insets/ExternalTemplate.h b/src/insets/ExternalTemplate.h
index cb3f8f93b3..7afc65715b 100644
--- a/src/insets/ExternalTemplate.h
+++ b/src/insets/ExternalTemplate.h
@@ -15,7 +15,7 @@
 
 #include "ExternalTransforms.h"
 
-#include <boost/utility.hpp>
+#include <boost/noncopyable.hpp>
 
 namespace lyx {
 
diff --git a/src/paragraph_funcs.cpp b/src/paragraph_funcs.cpp
index cad97a93c4..7514a1a436 100644
--- a/src/paragraph_funcs.cpp
+++ b/src/paragraph_funcs.cpp
@@ -19,10 +19,11 @@
 #include "Paragraph.h"
 #include "ParagraphParameters.h"
 
+#include <boost/next_prior.hpp>
+
 
 namespace lyx {
 
-using std::string;
 using std::endl;
 
 
diff --git a/src/pch.h b/src/pch.h
index 986c992520..715ce37abd 100644
--- a/src/pch.h
+++ b/src/pch.h
@@ -18,7 +18,7 @@
 #include <boost/signals/trackable.hpp>
 #include <boost/tokenizer.hpp>
 #include <boost/tuple/tuple.hpp>
-#include <boost/utility.hpp>
+#include <boost/noncopyable.hpp>
 #include <boost/version.hpp>
 
 #include <algorithm>
diff --git a/src/support/FileMonitor.h b/src/support/FileMonitor.h
index 9523bf1e7d..2c21310251 100644
--- a/src/support/FileMonitor.h
+++ b/src/support/FileMonitor.h
@@ -15,7 +15,7 @@
 #ifndef FILEMONITOR_H
 #define FILEMONITOR_H
 
-#include <boost/utility.hpp>
+#include <boost/noncopyable.hpp>
 #include <boost/scoped_ptr.hpp>
 #include <boost/signal.hpp>
 
diff --git a/src/support/Path.h b/src/support/Path.h
index 82901b3fac..8f78c0e300 100644
--- a/src/support/Path.h
+++ b/src/support/Path.h
@@ -14,7 +14,7 @@
 
 #include "support/FileName.h"
 
-#include <boost/utility.hpp>
+#include <boost/noncopyable.hpp>
 
 #include <string>
 
diff --git a/src/support/RandomAccessList.h b/src/support/RandomAccessList.h
index 22c0572e19..fa37be9fd3 100644
--- a/src/support/RandomAccessList.h
+++ b/src/support/RandomAccessList.h
@@ -13,13 +13,8 @@
 #ifndef RANDOM_ACESS_LIST_H
 #define RANDOM_ACESS_LIST_H
 
-//#include "debug.h"
-
-#include <boost/utility.hpp>
-
 #include <vector>
 #include <list>
-#include <algorithm>
 
 
 namespace lyx {
diff --git a/src/support/pch.h b/src/support/pch.h
index 0e6d3fbf94..497eef13ae 100644
--- a/src/support/pch.h
+++ b/src/support/pch.h
@@ -19,7 +19,7 @@
 #endif
 
 #include <boost/tokenizer.hpp>
-#include <boost/utility.hpp>
+#include <boost/noncopyable.hpp>
 
 #include <fcntl.h>
 #ifdef HAVE_SYS_STAT_H