X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Ffrontends%2Fqt4%2FBulletsModule.h;h=8feeb22b908f2c53ecbcdbd59416605282f77625;hb=425d092204118ea6c24c28e85fdf03fcf2bb51a4;hp=edb758cdde3f38bb16e1615d69eaad36e1993c21;hpb=1a08a29b0ffdd8a2900597a73298a22ca18e64df;p=lyx.git

diff --git a/src/frontends/qt4/BulletsModule.h b/src/frontends/qt4/BulletsModule.h
index edb758cdde..8feeb22b90 100644
--- a/src/frontends/qt4/BulletsModule.h
+++ b/src/frontends/qt4/BulletsModule.h
@@ -9,28 +9,29 @@
  * Full author contact details are available in file CREDITS.
  */
 
-#ifndef QBULLETSMODULE_H
-#define QBULLETSMODULE_H
+#ifndef BULLETSMODULE_H
+#define BULLETSMODULE_H
 
-
-#include "ui/BulletsUi.h"
+#include "ui_BulletsUi.h"
 #include "Bullet.h"
-#include <boost/array.hpp>
 
 #include <QWidget>
 
-class BulletsModule : public QWidget, public Ui::BulletsUi {
-	Q_OBJECT
-public:
 
-	BulletsModule(QWidget * parent = 0, const char * name = 0, Qt::WFlags fl = 0);
+namespace lyx {
+
+class BulletsModule : public QWidget, public Ui::BulletsUi
+{
+	Q_OBJECT
 
-	~BulletsModule();
+public:
+	///
+	BulletsModule(QWidget * parent = 0);
 
 	/// set a bullet
 	void setBullet(int level, Bullet const & bullet);
 	/// get bullet setting
-	Bullet const & getBullet(int level) const;
+	Bullet const & bullet(int level) const;
 	/// update 1st level
 	void init();
 
@@ -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