small cosmetic cleanups:

* delete some comments
* use lyxerr instead of cout in PanelStack
* move PanelStack into lyx::frontend namespace

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

diff --git a/src/TocBackend.C b/src/TocBackend.C
index 25f8cf4c67378bf56f93d76f049dfa4392aa514f..b5c30304c87ba3466c21c3a08b59c8258c618791 100644 (file)
--- a/src/TocBackend.C
+++ b/src/TocBackend.C
@@ -39,7 +39,6 @@ using std::vector;
 using std::max;
 using std::ostream;
 using std::string;
-using std::cout;
 using std::endl;
 
 
@@ -205,8 +204,6 @@ void TocBackend::update()
                                tocstring = pit->asString(*buffer_, true);
                        Item const item(pit, toclevel - min_toclevel, tocstring);
                        tocs_["TOC"].push_back(item);
-                       //cout << "item inserted str " << item.str()
-                       //      << "  id " << item.id() << endl;
                }
        }
 

diff --git a/src/frontends/qt4/panelstack.C b/src/frontends/qt4/panelstack.C
index 8ed7f6df76e4f7794e587e1b7613f0adbfe49e28..48b40d1d254a95b98d7a650942276ec72dcd31eb 100644 (file)
--- a/src/frontends/qt4/panelstack.C
+++ b/src/frontends/qt4/panelstack.C
@@ -14,6 +14,8 @@
 
 #include "qt_helpers.h"
 
+#include "debug.h"
+
 #include <QStackedWidget>
 #include <QTreeWidget>
 #include <QHBoxLayout>
@@ -23,11 +25,13 @@
 
 #include <iostream>
 
-using lyx::docstring;
 
 using std::endl;
 using std::cout;
 
+namespace lyx {
+namespace frontend {
+
 
 PanelStack::PanelStack(QWidget * parent)
        : QWidget(parent)
@@ -55,7 +59,7 @@ void PanelStack::addCategory(docstring const & n, docstring const & parent)
        QString name;
        lyx::ucs4_to_qstring(n, name);
 
-       cout << "addCategory n= " << lyx::to_utf8(n) << "   parent= " << endl;
+       lyxerr[Debug::GUI] << "addCategory n= " << lyx::to_utf8(n) << "   parent= " << endl;
 
        if (parent.empty()) {
                item = new QTreeWidgetItem(list_);
@@ -121,4 +125,7 @@ QSize PanelStack::sizeHint() const
                qMax(list_->height(), stack_->height()));
 }
 
+} // namespace frontend
+} // namespace lyx
+
 #include "panelstack_moc.cpp"

diff --git a/src/frontends/qt4/panelstack.h b/src/frontends/qt4/panelstack.h
index 5184a811b917e63e9ce3b5d87c7b9efaa2b4cbca..8ea60c4b4ee7dba9375f78ce4cccde758a73edae 100644 (file)
--- a/src/frontends/qt4/panelstack.h
+++ b/src/frontends/qt4/panelstack.h
@@ -24,7 +24,9 @@ class QTreeWidget;
 class QTreeWidgetItem;
 class QStackedWidget;
 
-//namespace lyx {
+namespace lyx {
+namespace frontend {
+
 
 class PanelStack : public QWidget
 {
@@ -64,7 +66,7 @@ private:
        QStackedWidget * stack_;
 };
 
-
-//} // namespace lyx
+} // namespace frontend
+} // namespace lyx
 
 #endif // PANELSTACK_H

diff --git a/src/frontends/qt4/ui/QDocumentUi.ui b/src/frontends/qt4/ui/QDocumentUi.ui
index 0c5443a5413c738b6804c8781c987c7110b9ac85..32341470dbeda538adea4b5bff2d52340a7afce9 100644 (file)
--- a/src/frontends/qt4/ui/QDocumentUi.ui
+++ b/src/frontends/qt4/ui/QDocumentUi.ui
@@ -34,7 +34,7 @@
     <number>6</number>
    </property>
    <item>
-    <widget class="PanelStack" name="docPS" />
+    <widget class="lyx::frontend::PanelStack" name="docPS" />
    </item>
    <item>
     <layout class="QHBoxLayout" >
@@ -163,7 +163,7 @@
  <pixmapfunction></pixmapfunction>
  <customwidgets>
   <customwidget>
-   <class>PanelStack</class>
+   <class>lyx::frontend::PanelStack</class>
    <extends></extends>
    <header>panelstack.h</header>
    <container>1</container>

diff --git a/src/frontends/qt4/ui/QPrefsUi.ui b/src/frontends/qt4/ui/QPrefsUi.ui
index 52e4f42bfd2896c138b4084215b75298430411fa..9e82efde8be7fad5dd5aa569d4be8e4d24806cac 100644 (file)
--- a/src/frontends/qt4/ui/QPrefsUi.ui
+++ b/src/frontends/qt4/ui/QPrefsUi.ui
@@ -34,7 +34,7 @@
     <number>6</number>
    </property>
    <item>
-    <widget class="PanelStack" name="prefsPS" />
+    <widget class="lyx::frontend::PanelStack" name="prefsPS" />
    </item>
    <item>
     <layout class="QHBoxLayout" >
@@ -107,7 +107,7 @@
  <pixmapfunction></pixmapfunction>
  <customwidgets>
   <customwidget>
-   <class>PanelStack</class>
+   <class>lyx::frontend::PanelStack</class>
    <extends></extends>
    <header>panelstack.h</header>
    <container>1</container>

diff --git a/src/toc.C b/src/toc.C
index 7892295ce3ea561cdd980eab2f029938c0dcbbf4..acf40628b4dc29a43d2a61e98a3c5fff168b255e 100644 (file)
--- a/src/toc.C
+++ b/src/toc.C
@@ -40,7 +40,6 @@ using std::vector;
 using std::max;
 using std::ostream;
 using std::string;
-using std::cout;
 using std::endl;
 
 namespace lyx {