cosmetics

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

diff --git a/src/frontends/qt4/GuiAlert.cpp b/src/frontends/qt4/GuiAlert.cpp
index 88bdce163064b84329b55ef8216d9124999001a1..f52070fd11ccabee1896df883942555b94533775 100644 (file)
--- a/src/frontends/qt4/GuiAlert.cpp
+++ b/src/frontends/qt4/GuiAlert.cpp
@@ -29,6 +29,8 @@
 #include <QLineEdit>
 #include <QInputDialog>
 
+#include <iomanip>
+
 using std::endl;
 
 

diff --git a/src/frontends/qt4/GuiClipboard.cpp b/src/frontends/qt4/GuiClipboard.cpp
index 7798228a21c878ac87c885cf82a2ad06c4cb6d1d..0bad26412df02e5fff5e96f88242d26c4363f6c1 100644 (file)
--- a/src/frontends/qt4/GuiClipboard.cpp
+++ b/src/frontends/qt4/GuiClipboard.cpp
@@ -27,7 +27,6 @@
 using lyx::support::internalLineEnding;
 using lyx::support::externalLineEnding;
 
-using std::endl;
 using std::string;
 
 static char const * const mime_type = "application/x-lyx";

diff --git a/src/frontends/qt4/GuiDialog.cpp b/src/frontends/qt4/GuiDialog.cpp
index 5034373cce484f218f9deb02d18178dc7d0b2fee..9729464c86e066289311ce70b2269f0e76074931 100644 (file)
--- a/src/frontends/qt4/GuiDialog.cpp
+++ b/src/frontends/qt4/GuiDialog.cpp
@@ -169,9 +169,8 @@ void GuiDialog::showData(string const & data)
                return;
 
        if (!initialiseParams(data)) {
-               lyxerr << "Dialog \"" << name()
-                      << "\" failed to translate the data "
-                       "string passed to show()" << std::endl;
+               LYXERR(Debug::ANY, "Dialog \"" << name()
+                       << "\" failed to translate the data string passed to show()");
                return;
        }
 
@@ -188,8 +187,8 @@ void GuiDialog::updateData(string const & data)
                return;
 
        if (!initialiseParams(data)) {
-               lyxerr << "Dialog \"" << name()
-                      << "\" could not be initialized" << std::endl;
+               LYXERR(Debug::ANY, "Dialog \"" << name()
+                      << "\" could not be initialized");
                return;
        }
 

diff --git a/src/frontends/qt4/GuiErrorList.cpp b/src/frontends/qt4/GuiErrorList.cpp
index 968e11e4e440213a3e629bb5b51e6f9d76da3ece..627374f3e25a138506ab818806e8eee00e9cacca 100644 (file)
--- a/src/frontends/qt4/GuiErrorList.cpp
+++ b/src/frontends/qt4/GuiErrorList.cpp
@@ -28,7 +28,6 @@
 #include <QPushButton>
 #include <QCloseEvent>
 
-using std::endl;
 using std::string;
 
 
@@ -115,7 +114,7 @@ void GuiErrorList::goTo(int item)
        ParIterator pit = buf.getParFromID(err.par_id);
 
        if (pit == buf.par_iterator_end()) {
-               lyxerr << "par id " << err.par_id << " not found" << endl;
+               LYXERR(Debug::ANY, "par id " << err.par_id << " not found");
                return;
        }
 

diff --git a/src/frontends/qt4/GuiFontLoader.cpp b/src/frontends/qt4/GuiFontLoader.cpp
index b6b03be610f2313e76d01e7ade8d82400aee8c34..d0c8eb4cc91a4899b7a44664e8ea9210243deacf 100644 (file)
--- a/src/frontends/qt4/GuiFontLoader.cpp
+++ b/src/frontends/qt4/GuiFontLoader.cpp
@@ -29,7 +29,6 @@
 #include <QFontInfo>
 #include <QFontDatabase>
 
-using std::endl;
 using std::make_pair;
 
 using std::pair;

diff --git a/src/frontends/qt4/GuiKeySymbol.cpp b/src/frontends/qt4/GuiKeySymbol.cpp
index 8a69a443088ad154e001af7316fc9febc0da7646..c961d38fdf17f9b73446cdbd3ba7993ada60fc53 100644 (file)
--- a/src/frontends/qt4/GuiKeySymbol.cpp
+++ b/src/frontends/qt4/GuiKeySymbol.cpp
@@ -1,5 +1,5 @@
 /**
- * \file qt4/KeySymbolFactory.cpp
+ * \file qt4/GuiKeySymbol.cpp
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
@@ -17,10 +17,6 @@
 
 #include "debug.h"
 
-#include "support/lstrings.h"
-#include "support/environment.h"
-#include "support/unicode.h"
-
 #include "Encoding.h"
 #include "Language.h"
 
@@ -29,17 +25,15 @@
 #include <QEvent>
 #include <QTextCodec>
 
+#include "boost/assert.hpp"
+
 #include <map>
 
 
-namespace lyx {
-
-using std::endl;
 using std::string;
 using std::map;
-using lyx::support::contains;
-using lyx::support::getEnv;
 
+namespace lyx {
 
 #if 0
 static char encode(string const & encoding, QString const & str)

diff --git a/src/frontends/qt4/GuiMenubar.cpp b/src/frontends/qt4/GuiMenubar.cpp
index 2574c9ed33d7ed8b116e3470846d3873ababc54d..4e56213707654c5800770ddf0830add669f635ea 100644 (file)
--- a/src/frontends/qt4/GuiMenubar.cpp
+++ b/src/frontends/qt4/GuiMenubar.cpp
@@ -19,7 +19,6 @@
 #include "GuiPopupMenu.h"
 
 #include "qt_helpers.h"
-#include "support/lstrings.h"
 
 #include "MenuBackend.h"
 
@@ -28,9 +27,6 @@
 #include <QCursor>
 #include <QMenuBar>
 
-using std::pair;
-using std::string;
-using std::endl;
 
 namespace lyx {
 namespace frontend {

diff --git a/src/frontends/qt4/GuiPopupMenu.cpp b/src/frontends/qt4/GuiPopupMenu.cpp
index 7c383d6adc4b41382658d2b8039dced2e6be6746..8528f72bdf8ef711d8d25b686521ac0130425d99 100644 (file)
--- a/src/frontends/qt4/GuiPopupMenu.cpp
+++ b/src/frontends/qt4/GuiPopupMenu.cpp
@@ -24,12 +24,6 @@
 #include "debug.h"
 
 
-using std::make_pair;
-using std::string;
-using std::pair;
-using std::endl;
-
-
 namespace lyx {
 namespace frontend {
 

diff --git a/src/frontends/qt4/GuiSelection.cpp b/src/frontends/qt4/GuiSelection.cpp
index 241d9422b997e96867984f4aebd9f7b8a0992cb3..e53c8b6cc8406dbb1bacb748a01a7d5acd72cee3 100644 (file)
--- a/src/frontends/qt4/GuiSelection.cpp
+++ b/src/frontends/qt4/GuiSelection.cpp
@@ -24,8 +24,6 @@
 #include <QString>
 
 
-using std::endl;
-
 namespace lyx {
 namespace frontend {
 

diff --git a/src/frontends/qt4/GuiSpellchecker.cpp b/src/frontends/qt4/GuiSpellchecker.cpp
index daff427e85e51096ba85cf9daba6416dbf7f40e0..0ca45a6fc16547f80e0bbf714730f089738203c0 100644 (file)
--- a/src/frontends/qt4/GuiSpellchecker.cpp
+++ b/src/frontends/qt4/GuiSpellchecker.cpp
@@ -30,15 +30,7 @@
 #include "support/docstring.h"
 #include "support/lstrings.h"
 
-#include <QProgressBar>
-#include <QLineEdit>
-#include <QPushButton>
-#include <QListWidget>
 #include <QListWidgetItem>
-#include <QCloseEvent>
-#include <QSyntaxHighlighter>
-#include <QTextCharFormat>
-#include <QTextDocument>
 
 #if defined(USE_ASPELL)
 # include "ASpell_local.h"
@@ -54,9 +46,6 @@
 
 #include "frontends/alert.h"
 
-using std::advance;
-using std::distance;
-using std::endl;
 using std::string;
 
 

diff --git a/src/frontends/qt4/GuiToc.cpp b/src/frontends/qt4/GuiToc.cpp
index f366a1ffcce792c586e3156857633a097af667d6..526584e6a3daa14db1bb63666f80e9bb9ffd8c8d 100644 (file)
--- a/src/frontends/qt4/GuiToc.cpp
+++ b/src/frontends/qt4/GuiToc.cpp
@@ -35,7 +35,6 @@
 
 #include <algorithm>
 
-using std::endl;
 using std::string;
 
 

diff --git a/src/frontends/qt4/GuiToolbars.cpp b/src/frontends/qt4/GuiToolbars.cpp
index 20fc1fcbd60237461ff3a7446eec1086ead9f4df..9d8a3acd8bc6e9b0b56bec1337714b8b03dbc49f 100644 (file)
--- a/src/frontends/qt4/GuiToolbars.cpp
+++ b/src/frontends/qt4/GuiToolbars.cpp
@@ -31,7 +31,6 @@
 #include "ToolbarBackend.h"
 
 
-using std::endl;
 using std::string;
 
 namespace lyx {

diff --git a/src/frontends/qt4/TocModel.cpp b/src/frontends/qt4/TocModel.cpp
index adc580bc99f4785aa26fe71221ef8284b5663491..6ee11a31050b75c0ba3f910b4010d3ab1579dc37 100644 (file)
--- a/src/frontends/qt4/TocModel.cpp
+++ b/src/frontends/qt4/TocModel.cpp
@@ -17,8 +17,6 @@
 
 #include <boost/assert.hpp>
 
-using std::endl;
-using std::map;
 using std::max;
 using std::min;
 

diff --git a/src/frontends/qt4/TocWidget.cpp b/src/frontends/qt4/TocWidget.cpp
index ec1fa42eecb0f6f8fe1b59e1e42b80f98a748691..10d0efe493dccc1c15816a7488dccd967012099f 100644 (file)
--- a/src/frontends/qt4/TocWidget.cpp
+++ b/src/frontends/qt4/TocWidget.cpp
@@ -19,14 +19,9 @@
 #include "debug.h"
 
 #include <QHeaderView>
-#include <QPushButton>
-#include <QTreeWidgetItem>
 
 #include <vector>
 
-using std::endl;
-using std::vector;
-
 
 namespace lyx {
 namespace frontend {
@@ -219,7 +214,7 @@ void TocWidget::updateView()
 
 void TocWidget::updateGui()
 {
-       vector<docstring> const & type_names = form_.typeNames();
+       std::vector<docstring> const & type_names = form_.typeNames();
        if (type_names.empty()) {
                enableControls(false);
                typeCO->clear();