header cleanup

[lyx.git] / src / frontends / qt4 / BulletsModule.h

diff --git a/src/frontends/qt4/BulletsModule.h b/src/frontends/qt4/BulletsModule.h
index edb758cdde3f38bb16e1615d69eaad36e1993c21..b0577fb6c4e119818757f48dd6424c6ac834505a 100644 (file)
--- a/src/frontends/qt4/BulletsModule.h
+++ b/src/frontends/qt4/BulletsModule.h
@@ -13,20 +13,21 @@
 #define QBULLETSMODULE_H
 
 
-#include "ui/BulletsUi.h"
+#include "ui_BulletsUi.h"
 #include "Bullet.h"
-#include <boost/array.hpp>
 
 #include <QWidget>
 
+
+namespace lyx {
+
 class BulletsModule : public QWidget, public Ui::BulletsUi {
        Q_OBJECT
-public:
 
+public:
+       ///
        BulletsModule(QWidget * parent = 0, const char * name = 0, Qt::WFlags fl = 0);
 
-       ~BulletsModule();
-
        /// set a bullet
        void setBullet(int level, Bullet const & bullet);
        /// get bullet setting
@@ -38,22 +39,23 @@ Q_SIGNALS:
        void changed();
 
 protected Q_SLOTS:
-
        void on_bulletsizeCO_activated(int level);
-       void on_customCB_toggled(bool);
+       void on_customCB_clicked(bool);
        void on_customLE_textEdited(const QString &);
-       void bulletSelected(QListWidgetItem *, QListWidgetItem*);
+       void bulletSelected(QListWidgetItem *, QListWidgetItem *);
        void showLevel(int);
 
 private:
-       void unselectPreviousItem();
-       void setupPanel(QListWidget * lw, QString panelname, std::string fname);
-       void selectBullet(int level);
+       void selectItem(int font, int character, bool select);
+       void setupPanel(QListWidget * lw, QString const & panelname,
+               std::string const & fname);
 
        /// store results
-       boost::array<Bullet, 4> bullets_;
+       Bullet bullets_[4];
        int current_font_;
-       QListWidgetItem * current_item_;
+       int current_char_;
 };
 
+} // namespace lyx
+
 #endif // BULLETSMODULE_H