Move debug.{cpp,h}, Messages.{cpp,h} and gettext.{cpp,h} to support/.

Now support/* should have no dependencies on src/* anymore.



git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@21851 a592a061-630c-0410-9148-cb99ea01b6c8

src/ASpell.cpp

@@ -11,7 +11,7 @@
 
 #include <config.h>
 
-#include "debug.h"
+#include "support/debug.h"
 
 #include <aspell.h>
 

src/BiblioInfo.cpp

@@ -16,7 +16,6 @@
 #include "Buffer.h"
 #include "BufferParams.h"
 #include "buffer_funcs.h"
-#include "gettext.h"
 #include "InsetIterator.h"
 #include "Paragraph.h"
 
@@ -25,8 +24,9 @@
 #include "insets/InsetBibtex.h"
 #include "insets/InsetInclude.h"
 
-#include "support/lstrings.h"
 #include "support/docstream.h"
+#include "support/gettext.h"
+#include "support/lstrings.h"
 
 #include "boost/regex.hpp"
 

src/Buffer.cpp

@@ -23,7 +23,6 @@
 #include "Chktex.h"
 #include "Converter.h"
 #include "Counters.h"
-#include "debug.h"
 #include "DocIterator.h"
 #include "EmbeddedFiles.h"
 #include "Encoding.h"
@@ -31,7 +30,6 @@
 #include "Exporter.h"
 #include "Format.h"
 #include "FuncRequest.h"
-#include "gettext.h"
 #include "InsetIterator.h"
 #include "InsetList.h"
 #include "Language.h"
@@ -79,18 +77,20 @@
 
 #include "graphics/Previews.h"
 
-#include "support/types.h"
+#include "support/convert.h"
-#include "support/lyxalgo.h"
+#include "support/debug.h"
 #include "support/FileFilterList.h"
 #include "support/filetools.h"
 #include "support/Forkedcall.h"
+#include "support/gettext.h"
 #include "support/gzstream.h"
 #include "support/lstrings.h"
+#include "support/lyxalgo.h"
 #include "support/lyxlib.h"
 #include "support/os.h"
 #include "support/Path.h"
 #include "support/textutils.h"
-#include "support/convert.h"
+#include "support/types.h"
 
 #if !defined (HAVE_FORK)
 # define fork() -1

src/BufferList.cpp

@@ -15,8 +15,6 @@
 #include "Author.h"
 #include "Buffer.h"
 #include "BufferParams.h"
-#include "debug.h"
-#include "gettext.h"
 #include "Session.h"
 #include "LyX.h"
 #include "output_latex.h"
@@ -24,7 +22,9 @@
 
 #include "frontends/alert.h"
 
+#include "support/debug.h"
 #include "support/filetools.h"
+#include "support/gettext.h"
 #include "support/lstrings.h"
 #include "support/Package.h"
 

src/BufferParams.cpp

@@ -22,12 +22,9 @@
 #include "buffer_funcs.h"
 #include "Bullet.h"
 #include "Color.h"
-#include "debug.h"
 #include "Encoding.h"
-#include "gettext.h"
 #include "Language.h"
 #include "LaTeXFeatures.h"
-#include "Messages.h"
 #include "ModuleList.h"
 #include "Font.h"
 #include "Lexer.h"
@@ -40,12 +37,16 @@
 #include "PDFOptions.h"
 
 #include "frontends/alert.h"
+
 #include "insets/InsetListingsParams.h"
 
 #include "support/convert.h"
+#include "support/debug.h"
 #include "support/docstream.h"
 #include "support/FileName.h"
 #include "support/filetools.h"
+#include "support/gettext.h"
+#include "support/Messages.h"
 #include "support/Translator.h"
 #include "support/lstrings.h"
 

src/BufferView.cpp

@@ -23,7 +23,6 @@
 #include "CoordCache.h"
 #include "Cursor.h"
 #include "CutAndPaste.h"
-#include "debug.h"
 #include "DispatchResult.h"
 #include "EmbeddedFiles.h"
 #include "ErrorList.h"
@@ -31,7 +30,6 @@
 #include "FloatList.h"
 #include "FuncRequest.h"
 #include "FuncStatus.h"
-#include "gettext.h"
 #include "Intl.h"
 #include "InsetIterator.h"
 #include "Language.h"
@@ -69,9 +67,11 @@
 #include "graphics/Previews.h"
 
 #include "support/convert.h"
-#include "support/lstrings.h"
+#include "support/debug.h"
 #include "support/FileFilterList.h"
 #include "support/filetools.h"
+#include "support/gettext.h"
+#include "support/lstrings.h"
 #include "support/Package.h"
 #include "support/types.h"
 

src/Bullet.cpp

@@ -41,15 +41,12 @@ Bullet const ITEMIZE_DEFAULTS[4] = { Bullet(0, 8),//"\\(\\bullet\\)"
 Bullet::Bullet(int f, int c, int s)
 	: font(f), character(c), size(s), user_text(0)
 {
-	if (f < MIN || f >= FONTMAX) {
+	if (f < MIN || f >= FONTMAX)
 		font = MIN;
-	}
+	if (c < MIN || c >= CHARMAX)
-	if (c < MIN || c >= CHARMAX) {
 		character = MIN;
-	}
+	if (s < MIN || s >= SIZEMAX)
-	if (s < MIN || s >= SIZEMAX) {
 		size = MIN;
-	}
 	generateText();
 	testInvariant();
 }
@@ -65,11 +62,10 @@ Bullet::Bullet(docstring const & t)
 
 void Bullet::setCharacter(int c)
 {
-	if (c < MIN || c >= CHARMAX) {
+	if (c < MIN || c >= CHARMAX)
 		character = MIN;
-	} else {
+	else
 		character = c;
-	}
 	user_text = 0;
 	testInvariant();
 }
@@ -77,11 +73,10 @@ void Bullet::setCharacter(int c)
 
 void Bullet::setFont(int f)
 {
-	if (f < MIN || f >= FONTMAX) {
+	if (f < MIN || f >= FONTMAX)
 		font = MIN;
-	} else {
+	else
 		font = f;
-	}
 	user_text = 0;
 	testInvariant();
 }
@@ -89,11 +84,10 @@ void Bullet::setFont(int f)
 
 void Bullet::setSize(int s)
 {
-	if (s < MIN || s >= SIZEMAX) {
+	if (s < MIN || s >= SIZEMAX)
 		size = MIN;
-	} else {
+	else
 		size = s;
-	}
 	user_text = 0;
 	testInvariant();
 }
@@ -141,9 +135,8 @@ Bullet & Bullet::operator=(Bullet const & b)
 
 docstring const & Bullet::getText() const
 {
-	if (user_text == 0) {
+	if (user_text == 0)
 		generateText();
-	}
 	return text;
 }
 
@@ -154,12 +147,10 @@ bool operator==(const Bullet & b1, const Bullet & b2)
 
 	if (b1.user_text && b2.user_text) {
 		/* both have valid text */
-		if (b1.text == b2.text) {
+		if (b1.text == b2.text)
 			result = true;
-		}
+	} else if (b1.character == b2.character && b1.font == b2.font &&
-	} else if (((b1.character == b2.character) &&
+			 b1.size == b2.size) {
-			  (b1.font == b2.font)) &&
-			 (b1.size == b2.size)) {
 		result = true;
 	}
 	return result;
@@ -185,9 +176,8 @@ void Bullet::generateText() const
 
 	if ((font >= 0) && (character >= 0)) {
 		text = bulletEntry(font, character);
-		if (size >= 0) {
+		if (size >= 0)
 			text = bulletSize(size) + text;
-		}
 		user_text = -1;
 		// text is now defined and doesn't need to be recalculated
 		// unless font/character or text is modified

src/Changes.cpp

@@ -14,11 +14,12 @@
 #include <config.h>
 
 #include "Changes.h"
-#include "debug.h"
 #include "Author.h"
 #include "BufferParams.h"
 #include "LaTeXFeatures.h"
 
+#include "support/debug.h"
+
 #include <boost/assert.hpp>
 
 #include <ostream>

src/Chktex.cpp

@@ -11,13 +11,13 @@
 #include <config.h>
 
 #include "Chktex.h"
-#include "gettext.h"
 
 #include "LaTeX.h" // TeXErrors
 
 #include "support/convert.h"
 #include "support/docstream.h"
 #include "support/filetools.h"
+#include "support/gettext.h"
 #include "support/lstrings.h"
 #include "support/Systemcall.h"
 

src/CmdDef.cpp

@@ -13,9 +13,9 @@
 #include "CmdDef.h"
 
 #include "LyXAction.h"
-#include "debug.h"
 #include "Lexer.h"
 
+#include "support/debug.h"
 #include "support/filetools.h"
 #include "support/lstrings.h"
 

src/Color.cpp

@@ -18,9 +18,8 @@
 
 #include "Color.h"
 
-#include "debug.h"
+#include "support/debug.h"
-#include "gettext.h"
+#include "support/gettext.h"
-
 #include "support/lstrings.h"
 
 #include <boost/assert.hpp>

src/Converter.cpp

@@ -16,17 +16,17 @@
 #include "Buffer.h"
 #include "buffer_funcs.h"
 #include "BufferParams.h"
-#include "debug.h"
 #include "ErrorList.h"
 #include "Format.h"
-#include "gettext.h"
 #include "Language.h"
 #include "LaTeX.h"
 #include "Mover.h"
 
 #include "frontends/alert.h"
 
+#include "support/debug.h"
 #include "support/filetools.h"
+#include "support/gettext.h"
 #include "support/lstrings.h"
 #include "support/lyxlib.h"
 #include "support/os.h"

src/ConverterCache.cpp

@@ -18,9 +18,9 @@
 #include "Lexer.h"
 #include "LyXRC.h"
 #include "Mover.h"
-#include "debug.h"
 
 #include "support/convert.h"
+#include "support/debug.h"
 #include "support/filetools.h"
 #include "support/lyxlib.h"
 #include "support/lyxtime.h"

src/CoordCache.cpp

@@ -11,9 +11,9 @@
 
 #include "CoordCache.h"
 
-#include "debug.h"
 #include "Text.h"
 
+#include "support/debug.h"
 #include "support/docstring.h"
 
 #include "insets/Inset.h"

src/Counters.cpp

@@ -14,10 +14,10 @@
 #include <config.h>
 
 #include "Counters.h"
-#include "debug.h"
 
-#include "support/lstrings.h"
 #include "support/convert.h"
+#include "support/debug.h"
+#include "support/lstrings.h"
 
 #include <boost/assert.hpp>
 

src/Cursor.cpp

@@ -19,7 +19,6 @@
 #include "Cursor.h"
 #include "CoordCache.h"
 #include "CutAndPaste.h"
-#include "debug.h"
 #include "DispatchResult.h"
 #include "Encoding.h"
 #include "FuncRequest.h"
@@ -35,6 +34,7 @@
 #include "ParIterator.h"
 #include "TextMetrics.h"
 
+#include "support/debug.h"
 #include "support/docstream.h"
 
 #include "insets/InsetTabular.h"

src/CursorSlice.cpp

@@ -15,10 +15,11 @@
 
 #include "CursorSlice.h"
 
-#include "debug.h"
 #include "Text.h"
 #include "Paragraph.h"
 
+#include "support/debug.h"
+
 #include "insets/Inset.h"
 
 #include "mathed/InsetMath.h"

src/CutAndPaste.cpp

@@ -21,10 +21,8 @@
 #include "BufferView.h"
 #include "Changes.h"
 #include "Cursor.h"
-#include "debug.h"
 #include "ErrorList.h"
 #include "FuncRequest.h"
-#include "gettext.h"
 #include "InsetIterator.h"
 #include "InsetList.h"
 #include "Language.h"
@@ -46,9 +44,11 @@
 #include "mathed/InsetMath.h"
 #include "mathed/MathSupport.h"
 
+#include "support/debug.h"
+#include "support/docstream.h"
+#include "support/gettext.h"
 #include "support/limited_stack.h"
 #include "support/lstrings.h"
-#include "support/docstream.h"
 
 #include "frontends/Clipboard.h"
 #include "frontends/Selection.h"

src/DepTable.cpp

@@ -14,8 +14,7 @@
 
 #include "DepTable.h"
 
-#include "debug.h"
+#include "support/debug.h"
-
 #include "support/lyxlib.h"
 #include "support/filetools.h"
 #include "support/lstrings.h"

src/DocIterator.cpp

@@ -14,7 +14,7 @@
 
 #include "DocIterator.h"
 
-#include "debug.h"
+#include "support/debug.h"
 #include "InsetList.h"
 #include "Paragraph.h"
 #include "Text.h"

src/EmbeddedFiles.cpp

@@ -13,26 +13,26 @@
 #include <config.h>
 
 #include "EmbeddedFiles.h"
+
 #include "Buffer.h"
 #include "BufferParams.h"
-#include "Paragraph.h"
-#include "InsetIterator.h"
-#include "debug.h"
-#include "gettext.h"
-#include "Format.h"
-#include "Lexer.h"
 #include "ErrorList.h"
+#include "Format.h"
+#include "InsetIterator.h"
+#include "Lexer.h"
+#include "LyX.h"
+#include "Paragraph.h"
+#include "Session.h"
 
 #include "frontends/alert.h"
 
+#include "support/debug.h"
 #include "support/filetools.h"
+#include "support/gettext.h"
 #include "support/convert.h"
 #include "support/lyxlib.h"
 #include "support/lstrings.h"
 
-#include "LyX.h"
-#include "Session.h"
-
 #include <sstream>
 #include <fstream>
 #include <utility>

src/Encoding.cpp

@@ -14,11 +14,11 @@
 
 #include "Encoding.h"
 
-#include "debug.h"
 #include "LaTeXFeatures.h"
 #include "Lexer.h"
 #include "LyXRC.h"
 
+#include "support/debug.h"
 #include "support/FileName.h"
 #include "support/lstrings.h"
 #include "support/unicode.h"

src/Exporter.cpp

@@ -18,11 +18,12 @@
 
 #include "Exporter.h"
 
-#include "gettext.h"
 #include "Mover.h"
+
 #include "frontends/alert.h"
 
 #include "support/filetools.h"
+#include "support/gettext.h"
 #include "support/lstrings.h"
 #include "support/Package.h"
 

src/Font.cpp

@@ -18,9 +18,7 @@
 
 #include "BufferParams.h" // stateText
 #include "Color.h"
-#include "debug.h"
 #include "Encoding.h"
-#include "gettext.h"
 #include "Language.h"
 #include "LaTeXFeatures.h"
 #include "Lexer.h"
@@ -29,6 +27,8 @@
 #include "OutputParams.h"
 
 #include "support/convert.h"
+#include "support/debug.h"
+#include "support/gettext.h"
 #include "support/lstrings.h"
 
 using std::endl;

src/FontInfo.cpp

@@ -16,7 +16,7 @@
 
 #include "FontInfo.h"
 
-#include "debug.h"
+#include "support/debug.h"
 
 #include <ostream>
 
@@ -202,8 +202,8 @@ static FontState setMisc(FontState newfont,
 		else if (org == FONT_OFF)
 			return FONT_ON;
 		else {
-			lyxerr <<"Font::setMisc: Need state"
+			LYXERR0("Font::setMisc: Need state"
-				" FONT_ON or FONT_OFF to toggle. Setting to FONT_ON" << endl;
+				" FONT_ON or FONT_OFF to toggle. Setting to FONT_ON");
 			return FONT_ON;
 		}
 	} else if (newfont == FONT_IGNORE)

src/FontIterator.cpp

@@ -9,7 +9,6 @@
  *
  */
 
-
 #include <config.h>
 
 #include "FontIterator.h"

src/Format.cpp

@@ -14,13 +14,13 @@
 #include "Buffer.h"
 #include "BufferParams.h"
 #include "LyXRC.h"
-#include "debug.h"
-#include "gettext.h"
 #include "ServerSocket.h"
 
 #include "frontends/alert.h" //to be removed?
 
+#include "support/debug.h"
 #include "support/filetools.h"
+#include "support/gettext.h"
 #include "support/lstrings.h"
 #include "support/os.h"
 #include "support/Systemcall.h"

src/ISpell.cpp

@@ -15,9 +15,9 @@
 #include "ISpell.h"
 
 #include "BufferParams.h"
-#include "debug.h"
+#include "support/debug.h"
 #include "Encoding.h"
-#include "gettext.h"
+#include "support/gettext.h"
 #include "Language.h"
 #include "LyXRC.h"
 #include "WordLangTuple.h"

src/InsetList.cpp

@@ -16,7 +16,7 @@
 #include "Buffer.h"
 #include "BufferParams.h"
 #include "BranchList.h"
-#include "debug.h"
+#include "support/debug.h"
 
 #include "insets/InsetBranch.h"
 

src/Intl.cpp

@@ -14,7 +14,7 @@
 #include <config.h>
 
 #include "Intl.h"
-#include "debug.h"
+#include "support/debug.h"
 #include "LyXRC.h"
 
 

src/KeyMap.cpp

@@ -15,7 +15,7 @@
 
 #include "KeyMap.h"
 
-#include "debug.h"
+#include "support/debug.h"
 #include "KeySequence.h"
 #include "LyXAction.h"
 #include "Lexer.h"

src/KeySequence.cpp

@@ -14,7 +14,7 @@
 
 #include "KeySequence.h"
 
-#include "gettext.h"
+#include "support/gettext.h"
 #include "KeyMap.h"
 #include "lfuns.h"
 

src/LaTeX.cpp

@@ -17,9 +17,9 @@
 
 #include "BufferList.h"
 #include "LaTeX.h"
-#include "gettext.h"
+#include "support/gettext.h"
 #include "LyXRC.h"
-#include "debug.h"
+#include "support/debug.h"
 #include "DepTable.h"
 
 #include "support/filetools.h"

src/LaTeXFeatures.cpp

@@ -18,7 +18,7 @@
 
 #include "Color.h"
 #include "BufferParams.h"
-#include "debug.h"
+#include "support/debug.h"
 #include "Encoding.h"
 #include "Floating.h"
 #include "FloatList.h"

src/Language.cpp

@@ -14,7 +14,7 @@
 
 #include "Language.h"
 
-#include "debug.h"
+#include "support/debug.h"
 #include "Encoding.h"
 #include "Lexer.h"
 #include "LyXRC.h"

src/Layout.cpp

@@ -15,7 +15,7 @@
 #include "Layout.h"
 #include "TextClass.h"
 #include "Lexer.h"
-#include "debug.h"
+#include "support/debug.h"
 
 #include "support/lstrings.h"
 

src/Lexer.cpp

@@ -15,7 +15,7 @@
 
 #include "Lexer.h"
 
-#include "debug.h"
+#include "support/debug.h"
 
 #include "support/convert.h"
 #include "support/filetools.h"

src/LyX.cpp

@@ -17,43 +17,43 @@
 
 #include "LyX.h"
 
+#include "buffer_funcs.h"
+#include "Buffer.h"
+#include "BufferList.h"
+#include "CmdDef.h"
 #include "Color.h"
 #include "ConverterCache.h"
-#include "Buffer.h"
-#include "buffer_funcs.h"
-#include "BufferList.h"
 #include "Converter.h"
 #include "CutAndPaste.h"
-#include "debug.h"
 #include "Encoding.h"
 #include "ErrorList.h"
 #include "Format.h"
-#include "gettext.h"
 #include "KeyMap.h"
-#include "CmdDef.h"
 #include "Language.h"
-#include "Session.h"
+#include "Lexer.h"
 #include "LyXAction.h"
 #include "LyXFunc.h"
-#include "Lexer.h"
 #include "LyXRC.h"
+#include "MenuBackend.h"
 #include "ModuleList.h"
+#include "Mover.h"
 #include "Server.h"
 #include "ServerSocket.h"
+#include "Session.h"
 #include "TextClassList.h"
-#include "MenuBackend.h"
-#include "Messages.h"
-#include "Mover.h"
 #include "ToolbarBackend.h"
 
 #include "frontends/alert.h"
 #include "frontends/Application.h"
 
+#include "support/debug.h"
 #include "support/environment.h"
+#include "support/ExceptionMessage.h"
 #include "support/filetools.h"
+#include "support/gettext.h"
 #include "support/lstrings.h"
 #include "support/lyxlib.h"
-#include "support/ExceptionMessage.h"
+#include "support/Messages.h"
 #include "support/os.h"
 #include "support/Package.h"
 #include "support/Path.h"

src/LyXAction.cpp

@@ -15,7 +15,7 @@
 
 #include "LyXAction.h"
 
-#include "debug.h"
+#include "support/debug.h"
 #include "FuncRequest.h"
 
 #include "support/lstrings.h"

src/LyXFunc.cpp

@@ -33,14 +33,14 @@
 #include "Converter.h"
 #include "Cursor.h"
 #include "CutAndPaste.h"
-#include "debug.h"
+#include "support/debug.h"
 #include "DispatchResult.h"
 #include "Encoding.h"
 #include "ErrorList.h"
 #include "Format.h"
 #include "FuncRequest.h"
 #include "FuncStatus.h"
-#include "gettext.h"
+#include "support/gettext.h"
 #include "InsetIterator.h"
 #include "Intl.h"
 #include "KeyMap.h"

src/LyXRC.cpp

@@ -21,11 +21,11 @@
 
 #include "LyXRC.h"
 
-#include "debug.h"
+#include "support/debug.h"
 #include "Color.h"
 #include "Converter.h"
 #include "Format.h"
-#include "gettext.h"
+#include "support/gettext.h"
 #include "Session.h"
 #include "Lexer.h"
 #include "FontEnums.h"

src/LyXVC.cpp

@@ -17,9 +17,9 @@
 
 #include "LyXVC.h"
 #include "VCBackend.h"
-#include "debug.h"
+#include "support/debug.h"
 #include "Buffer.h"
-#include "gettext.h"
+#include "support/gettext.h"
 
 #include "frontends/alert.h"
 

src/Makefile.am

@@ -97,7 +97,6 @@ SOURCEFILESCORE = \
 	Cursor.cpp \
 	CursorSlice.cpp \
 	CutAndPaste.cpp \
-	debug.cpp \
 	DepTable.cpp \
 	DocIterator.cpp \
 	EmbeddedFiles.cpp \
@@ -114,7 +113,6 @@ SOURCEFILESCORE = \
 	Format.cpp \
 	FuncRequest.cpp \
 	FuncStatus.cpp \
-	gettext.cpp \
 	Graph.cpp \
 	InsetIterator.cpp \
 	InsetList.cpp \
@@ -133,7 +131,6 @@ SOURCEFILESCORE = \
 	LyXRC.cpp \
 	LyXVC.cpp \
 	MenuBackend.cpp \
-	Messages.cpp \
 	MetricsInfo.cpp \
 	ModuleList.cpp \
 	Mover.cpp \
@@ -195,7 +192,6 @@ HEADERFILESCORE = \
 	Cursor.h \
 	CursorSlice.h \
 	CutAndPaste.h \
-	debug.h \
 	DepTable.h \
 	DispatchResult.h \
 	DocIterator.h \
@@ -214,7 +210,6 @@ HEADERFILESCORE = \
 	Format.h \
 	FuncRequest.h \
 	FuncStatus.h \
-	gettext.h \
 	Graph.h \
 	InsetIterator.h \
 	InsetList.h \
@@ -237,7 +232,6 @@ HEADERFILESCORE = \
 	LyXRC.h \
 	LyXVC.h \
 	MenuBackend.h \
-	Messages.h \
 	MetricsInfo.h \
 	ModuleList.h \
 	Mover.h \

src/MenuBackend.cpp

@@ -23,11 +23,11 @@
 #include "BufferParams.h"
 #include "Converter.h"
 #include "CutAndPaste.h"
-#include "debug.h"
+#include "support/debug.h"
 #include "Floating.h"
 #include "FloatList.h"
 #include "Format.h"
-#include "gettext.h"
+#include "support/gettext.h"
 #include "KeyMap.h"
 #include "Session.h"
 #include "LyXAction.h"

src/ModuleList.cpp

@@ -13,7 +13,7 @@
 
 #include "ModuleList.h"
 
-#include "debug.h"
+#include "support/debug.h"
 #include "Lexer.h"
 
 #include "support/filetools.h"

src/PDFOptions.cpp

@@ -14,7 +14,7 @@
 
 #include "support/convert.h"
 #include "support/lstrings.h"
-#include "debug.h"
+#include "support/debug.h"
 #include "Lexer.h"
 
 #include <sstream>

src/PSpell.cpp

@@ -11,7 +11,7 @@
 
 #include <config.h>
 
-#include "debug.h"
+#include "support/debug.h"
 
 #define USE_ORIGINAL_MANAGER_FUNCS 1
 // new aspell pspell missing extern "C"

src/Paragraph.cpp

@@ -24,8 +24,6 @@
 #include "Changes.h"
 #include "Counters.h"
 #include "Encoding.h"
-#include "debug.h"
-#include "gettext.h"
 #include "InsetList.h"
 #include "Language.h"
 #include "LaTeXFeatures.h"
@@ -34,7 +32,6 @@
 #include "Font.h"
 #include "FontList.h"
 #include "LyXRC.h"
-#include "Messages.h"
 #include "OutputParams.h"
 #include "output_latex.h"
 #include "paragraph_funcs.h"
@@ -50,9 +47,12 @@
 #include "insets/InsetBibitem.h"
 #include "insets/InsetLabel.h"
 
-#include "support/lstrings.h"
-#include "support/textutils.h"
 #include "support/convert.h"
+#include "support/debug.h"
+#include "support/gettext.h"
+#include "support/lstrings.h"
+#include "support/Messages.h"
+#include "support/textutils.h"
 #include "support/unicode.h"
 
 #include <sstream>

src/ParagraphMetrics.cpp

@@ -24,8 +24,8 @@
 #include "BufferView.h"
 #include "Counters.h"
 #include "Encoding.h"
-#include "debug.h"
+#include "support/debug.h"
-#include "gettext.h"
+#include "support/gettext.h"
 #include "Language.h"
 #include "LaTeXFeatures.h"
 #include "Layout.h"

src/ParagraphParameters.cpp

@@ -17,7 +17,7 @@
 #include "ParagraphParameters.h"
 
 #include "Buffer.h"
-#include "gettext.h"
+#include "support/gettext.h"
 #include "Layout.h"
 #include "Lexer.h"
 #include "Text.h"

src/Row.cpp

@@ -17,7 +17,7 @@
 #include <config.h>
 
 #include "Row.h"
-#include "debug.h"
+#include "support/debug.h"
 
 
 namespace lyx {

src/Server.cpp

@@ -40,7 +40,7 @@
 #include <config.h>
 
 #include "Server.h"
-#include "debug.h"
+#include "support/debug.h"
 #include "FuncRequest.h"
 #include "LyXAction.h"
 #include "LyXFunc.h"

src/ServerSocket.cpp

@@ -16,7 +16,7 @@
 
 #include "ServerSocket.h"
 
-#include "debug.h"
+#include "support/debug.h"
 #include "FuncRequest.h"
 #include "LyXAction.h"
 #include "LyXFunc.h"

src/Session.cpp

@@ -12,7 +12,7 @@
 #include <config.h>
 
 #include "Session.h"
-#include "debug.h"
+#include "support/debug.h"
 #include "support/Package.h"
 #include "support/filetools.h"
 

src/SpellBase.cpp

@@ -12,7 +12,7 @@
 #include <config.h>
 
 #include "SpellBase.h"
-#include "gettext.h"
+#include "support/gettext.h"
 #include "support/docstring.h"
 
 

src/TexRow.cpp

@@ -13,7 +13,7 @@
 #include <config.h>
 
 #include "TexRow.h"
-#include "debug.h"
+#include "support/debug.h"
 
 #include <algorithm>
 

src/Text.cpp

@@ -29,14 +29,14 @@
 #include "Cursor.h"
 #include "ParIterator.h"
 #include "CutAndPaste.h"
-#include "debug.h"
+#include "support/debug.h"
 #include "DispatchResult.h"
 #include "Encoding.h"
 #include "ErrorList.h"
 #include "FuncRequest.h"
 #include "factory.h"
 #include "FontIterator.h"
-#include "gettext.h"
+#include "support/gettext.h"
 #include "Language.h"
 #include "Length.h"
 #include "Lexer.h"

src/Text2.cpp

@@ -31,11 +31,11 @@
 #include "Changes.h"
 #include "Cursor.h"
 #include "CutAndPaste.h"
-#include "debug.h"
+#include "support/debug.h"
 #include "DispatchResult.h"
 #include "ErrorList.h"
 #include "FuncRequest.h"
-#include "gettext.h"
+#include "support/gettext.h"
 #include "Language.h"
 #include "Layout.h"
 #include "Lexer.h"

src/Text3.cpp

@@ -27,12 +27,12 @@
 #include "BufferView.h"
 #include "Cursor.h"
 #include "CutAndPaste.h"
-#include "debug.h"
+#include "support/debug.h"
 #include "DispatchResult.h"
 #include "ErrorList.h"
 #include "factory.h"
 #include "FuncRequest.h"
-#include "gettext.h"
+#include "support/gettext.h"
 #include "InsetList.h"
 #include "Intl.h"
 #include "Language.h"

src/TextClass.cpp

@@ -18,8 +18,8 @@
 
 #include "Color.h"
 #include "Counters.h"
-#include "debug.h"
+#include "support/debug.h"
-#include "gettext.h"
+#include "support/gettext.h"
 #include "Floating.h"
 #include "FloatList.h"
 #include "Layout.h"

src/TextClassList.cpp

@@ -13,7 +13,7 @@
 
 #include "TextClassList.h"
 #include "TextClass.h"
-#include "debug.h"
+#include "support/debug.h"
 #include "Lexer.h"
 
 #include "support/filetools.h"

src/TextMetrics.cpp

@@ -27,7 +27,7 @@
 #include "CoordCache.h"
 #include "Cursor.h"
 #include "CutAndPaste.h"
-#include "debug.h"
+#include "support/debug.h"
 #include "FontIterator.h"
 #include "FuncRequest.h"
 #include "InsetList.h"

src/Thesaurus.cpp

@@ -12,7 +12,7 @@
 
 #include "Thesaurus.h"
 
-#include "gettext.h"
+#include "support/gettext.h"
 
 #include "support/lstrings.h"
 

src/TocBackend.cpp

@@ -16,7 +16,7 @@
 
 #include "Buffer.h"
 #include "BufferParams.h"
-#include "debug.h"
+#include "support/debug.h"
 #include "FloatList.h"
 #include "FuncRequest.h"
 #include "InsetList.h"

src/ToolbarBackend.cpp

@@ -14,8 +14,8 @@
 #include "ToolbarBackend.h"
 #include "FuncRequest.h"
 #include "Lexer.h"
-#include "debug.h"
+#include "support/debug.h"
-#include "gettext.h"
+#include "support/gettext.h"
 #include "LyXAction.h"
 #include "support/lstrings.h"
 

src/Trans.cpp

@@ -17,7 +17,7 @@
 #include "BufferView.h"
 #include "Cursor.h"
 #include "CutAndPaste.h"
-#include "debug.h"
+#include "support/debug.h"
 #include "Lexer.h"
 #include "LyXRC.h"
 #include "Text.h"

src/Undo.cpp

@@ -20,7 +20,7 @@
 #include "Buffer.h"
 #include "BufferParams.h"
 #include "buffer_funcs.h"
-#include "debug.h"
+#include "support/debug.h"
 #include "DocIterator.h"
 #include "Paragraph.h"
 #include "ParagraphList.h"

src/VCBackend.cpp

@@ -11,7 +11,7 @@
 #include <config.h>
 
 #include "VCBackend.h"
-#include "debug.h"
+#include "support/debug.h"
 #include "Buffer.h"
 
 #include "support/Path.h"

src/VSpace.cpp

@@ -15,7 +15,7 @@
 #include "Buffer.h"
 #include "BufferParams.h"
 #include "BufferView.h"
-#include "gettext.h"
+#include "support/gettext.h"
 #include "Length.h"
 #include "Text.h"
 #include "TextMetrics.h" // for defaultRowHeight()

src/boost.cpp

@@ -11,7 +11,8 @@
 #include <config.h>
 
 #include "LyX.h"
-#include "debug.h"
+
+#include "support/debug.h"
 #include "support/lyxlib.h"
 
 #include <boost/assert.hpp>

src/buffer_funcs.cpp

@@ -16,13 +16,11 @@
 #include "Buffer.h"
 #include "BufferList.h"
 #include "BufferParams.h"
-#include "debug.h"
 #include "DocIterator.h"
 #include "Counters.h"
 #include "ErrorList.h"
 #include "Floating.h"
 #include "FloatList.h"
-#include "gettext.h"
 #include "InsetList.h"
 #include "InsetIterator.h"
 #include "Language.h"
@@ -46,9 +44,11 @@
 #include "insets/InsetBibitem.h"
 #include "insets/InsetInclude.h"
 
+#include "support/debug.h"
 #include "support/filetools.h"
-#include "support/lyxlib.h"
+#include "support/gettext.h"
 #include "support/lstrings.h"
+#include "support/lyxlib.h"
 
 
 namespace lyx {

src/client/Messages.cpp

@@ -10,7 +10,7 @@
 #include <config.h>
 
 #include "Messages.h"
-#include "debug.h"
+#include "support/debug.h"
 #include "support/filetools.h"
 #include "support/Package.h"
 #include "support/unicode.h"

src/client/boost.cpp

@@ -11,7 +11,7 @@
 #include <config.h>
 
 #include "LyX.h"
-#include "debug.h"
+#include "support/debug.h"
 #include "support/lyxlib.h"
 
 #include <boost/assert.hpp>

src/client/client.cpp

@@ -12,7 +12,7 @@
 
 #include <config.h>
 
-#include "debug.h"
+#include "support/debug.h"
 #include "support/FileName.h"
 #include "support/unicode.h"
 #include "support/lstrings.h"

src/client/debug.cpp

@@ -11,8 +11,8 @@
 
 #include <config.h>
 
-#include "debug.h"
+#include "support/debug.h"
-#include "gettext.h"
+#include "support/gettext.h"
 
 #include "support/convert.h"
 #include "support/lstrings.h"

src/client/gettext.cpp

@@ -11,7 +11,7 @@
 
 #include <config.h>
 
-#include "gettext.h"
+#include "support/gettext.h"
 #include "Messages.h"
 
 

src/factory.cpp

@@ -14,7 +14,6 @@
 
 #include "Buffer.h"
 #include "BufferParams.h"
-#include "debug.h"
 #include "FloatList.h"
 #include "FuncRequest.h"
 #include "Lexer.h"
@@ -60,6 +59,7 @@
 
 #include "frontends/alert.h"
 
+#include "support/debug.h"
 #include "support/lstrings.h"
 #include "support/ExceptionMessage.h"
 

src/frontends/qt4/Action.cpp

@@ -12,7 +12,7 @@
 
 #include "Action.h"
 
-#include "debug.h"
+#include "support/debug.h"
 #include "FuncRequest.h"
 #include "FuncStatus.h"
 #include "GuiView.h"

src/frontends/qt4/ButtonController.cpp

@@ -11,7 +11,7 @@
 #include <config.h>
 
 #include "ButtonController.h"
-#include "debug.h"
+#include "support/debug.h"
 #include "qt_helpers.h"
 
 #include <QPushButton>

src/frontends/qt4/ButtonController.h

@@ -14,7 +14,7 @@
 
 #include "ButtonPolicy.h"
 
-#include "gettext.h"
+#include "support/gettext.h"
 
 #include <list>
 

src/frontends/qt4/ButtonPolicy.cpp

@@ -11,7 +11,7 @@
 #include <config.h>
 
 #include "ButtonPolicy.h"
-#include "debug.h"
+#include "support/debug.h"
 
 #include <iostream>
 

src/frontends/qt4/DialogView.h

@@ -15,7 +15,7 @@
 #include "Dialog.h"
 #include "GuiView.h"
 #include "qt_helpers.h"
-#include "debug.h"
+#include "support/debug.h"
 
 #include <QCloseEvent>
 #include <QDialog>

src/frontends/qt4/DockView.h

@@ -15,7 +15,7 @@
 #include "Dialog.h"
 #include "GuiView.h"
 #include "qt_helpers.h"
-#include "debug.h"
+#include "support/debug.h"
 
 #include <QDockWidget>
 

src/frontends/qt4/FileDialog.cpp

@@ -16,8 +16,8 @@
 #include "LyXFileDialog.h"
 #include "qt_helpers.h"
 
-#include "debug.h"
+#include "support/debug.h"
-#include "gettext.h"
+#include "support/gettext.h"
 
 #include "support/FileFilterList.h"
 #include "support/os.h"

src/frontends/qt4/GuiAbout.cpp

@@ -13,7 +13,7 @@
 #include "GuiAbout.h"
 
 #include "qt_helpers.h"
-#include "gettext.h"
+#include "support/gettext.h"
 #include "version.h"
 
 #include "support/filetools.h"

src/frontends/qt4/GuiAlert.cpp

@@ -16,10 +16,10 @@
 #include "frontends/Application.h"
 
 #include "qt_helpers.h"
-#include "debug.h"
+#include "support/debug.h"
 #include "LyX.h" // for lyx::use_gui
 #include "ui_AskForTextUi.h"
-#include "gettext.h"
+#include "support/gettext.h"
 
 #include "support/docstring.h"
 #include "support/lstrings.h"

src/frontends/qt4/GuiApplication.cpp

@@ -34,11 +34,11 @@
 #include "Buffer.h"
 #include "BufferList.h"
 #include "BufferView.h"
-#include "debug.h"
+#include "support/debug.h"
 #include "Font.h"
 #include "FuncRequest.h"
 #include "FuncStatus.h"
-#include "gettext.h"
+#include "support/gettext.h"
 #include "LyX.h"
 #include "LyXFunc.h"
 #include "LyXRC.h"

src/frontends/qt4/GuiBibtex.cpp

@@ -17,12 +17,12 @@
 
 #include "Buffer.h"
 #include "BufferParams.h"
-#include "debug.h"
+#include "support/debug.h"
 #include "ui_BibtexAddUi.h"
 #include "qt_helpers.h"
 #include "Validator.h"
 #include "LyXRC.h"
-#include "gettext.h"
+#include "support/gettext.h"
 
 #include "ButtonPolicy.h"
 

src/frontends/qt4/GuiBox.cpp

@@ -15,7 +15,7 @@
 #include "GuiBox.h"
 
 #include "FuncRequest.h"
-#include "gettext.h"
+#include "support/gettext.h"
 
 #include "LengthCombo.h"
 #include "Length.h"

src/frontends/qt4/GuiCitation.cpp

@@ -15,8 +15,8 @@
 
 #include "GuiCitation.h"
 
-#include "debug.h"
+#include "support/debug.h"
-#include "gettext.h"
+#include "support/gettext.h"
 #include "qt_helpers.h"
 #include "Buffer.h"
 #include "BufferParams.h"

src/frontends/qt4/GuiClipboard.cpp

@@ -15,7 +15,7 @@
 #include "GuiClipboard.h"
 #include "qt_helpers.h"
 
-#include "debug.h"
+#include "support/debug.h"
 
 #include <QApplication>
 #include <QClipboard>

src/frontends/qt4/GuiDelimiter.cpp

@@ -16,7 +16,7 @@
 #include "GuiView.h"
 
 #include "qt_helpers.h"
-#include "gettext.h"
+#include "support/gettext.h"
 
 #include <QPixmap>
 #include <QCheckBox>

src/frontends/qt4/GuiDialog.cpp

@@ -12,7 +12,7 @@
 
 #include "GuiDialog.h"
 #include "GuiView.h"
-#include "debug.h"
+#include "support/debug.h"
 #include "qt_helpers.h"
 
 #include <QCloseEvent>

src/frontends/qt4/GuiDocument.cpp

@@ -23,7 +23,7 @@
 #include "Encoding.h"
 #include "FloatPlacement.h"
 #include "FuncRequest.h"
-#include "gettext.h"
+#include "support/gettext.h"
 #include "GuiBranches.h"
 #include "Language.h"
 #include "LaTeXFeatures.h"

src/frontends/qt4/GuiERT.cpp

@@ -13,7 +13,7 @@
 #include <config.h>
 
 #include "GuiERT.h"
-#include "gettext.h"
+#include "support/gettext.h"
 #include "FuncRequest.h"
 
 #include <QRadioButton>

src/frontends/qt4/GuiErrorList.cpp

@@ -14,8 +14,8 @@
 
 #include "Buffer.h"
 #include "BufferView.h"
-#include "debug.h"
+#include "support/debug.h"
-#include "gettext.h"
+#include "support/gettext.h"
 #include "Text.h"
 #include "ParIterator.h"
 

src/frontends/qt4/GuiExternal.cpp

@@ -15,7 +15,7 @@
 #include "GuiExternal.h"
 
 #include "FuncRequest.h"
-#include "gettext.h"
+#include "support/gettext.h"
 #include "Length.h"
 #include "LyXRC.h"
 

src/frontends/qt4/GuiFontLoader.cpp

@@ -14,7 +14,7 @@
 #include "GuiFontLoader.h"
 #include "qt_helpers.h"
 
-#include "debug.h"
+#include "support/debug.h"
 #include "LyXRC.h"
 
 #include "support/convert.h"

src/frontends/qt4/GuiGraphics.cpp

@@ -16,7 +16,7 @@
 
 #include "GuiGraphics.h"
 
-#include "debug.h"
+#include "support/debug.h"
 #include "LengthCombo.h"
 #include "Length.h"
 #include "LyXRC.h"
@@ -24,7 +24,7 @@
 #include "Validator.h"
 
 #include "FuncRequest.h"
-#include "gettext.h"
+#include "support/gettext.h"
 
 #include "graphics/GraphicsCache.h"
 #include "graphics/GraphicsCacheItem.h"

src/frontends/qt4/GuiImage.cpp

@@ -14,7 +14,7 @@
 #include "GuiImage.h"
 #include "qt_helpers.h"
 
-#include "debug.h"
+#include "support/debug.h"
 #include "Format.h"
 
 #include "graphics/GraphicsParams.h"