X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Ffrontends%2Fqt4%2FBulletsModule.cpp;h=c06904bf495b972282e9d1963b2baa4dbea662bb;hb=425d092204118ea6c24c28e85fdf03fcf2bb51a4;hp=20869f110d6c73f869d2d94dfd8d4d31f8667e60;hpb=33e397dff8792c2b89c28074ce8204e83d001b1b;p=lyx.git

diff --git a/src/frontends/qt4/BulletsModule.cpp b/src/frontends/qt4/BulletsModule.cpp
index 20869f110d..c06904bf49 100644
--- a/src/frontends/qt4/BulletsModule.cpp
+++ b/src/frontends/qt4/BulletsModule.cpp
@@ -16,10 +16,12 @@
 #include <QPixmap>
 #include <QPainter>
 
+using namespace std;
 
 namespace lyx {
 
-BulletsModule::BulletsModule(QWidget * , char const * , Qt::WFlags)
+BulletsModule::BulletsModule(QWidget * parent)
+    : QWidget(parent)
 {
 	setupUi(this);
 
@@ -51,7 +53,7 @@ BulletsModule::BulletsModule(QWidget * , char const * , Qt::WFlags)
 
 
 void BulletsModule::setupPanel(QListWidget * lw, QString const & panelname,
-	std::string const & fname)
+	string const & fname)
 {
 	connect(lw, SIGNAL(currentItemChanged(QListWidgetItem*, QListWidgetItem*)),
 		this, SLOT(bulletSelected(QListWidgetItem *, QListWidgetItem*)));
@@ -75,7 +77,7 @@ void BulletsModule::setupPanel(QListWidget * lw, QString const & panelname,
 	lw->setGridSize(QSize(w, h));
 	// the widening by 21 is needed to avoid wrapping
 	lw->resize(6 * w + 21, 6 * h);
-	bulletpaneSW->setMinimumSize(6 * w, 6 * h + 6);
+	bulletpaneSW->setMinimumSize(6 * w + 5, 6 * h + 6);
 
 	// get individual bullets from pixmap
 	for (int row = 0; row < 6; ++row) {
@@ -185,7 +187,7 @@ void BulletsModule::setBullet(int level, Bullet const & bullet)
 }
 
 
-Bullet const & BulletsModule::getBullet(int level) const
+Bullet const & BulletsModule::bullet(int level) const
 {
 	return bullets_[level];
 }
@@ -193,4 +195,4 @@ Bullet const & BulletsModule::getBullet(int level) const
 } // namespace lyx
 
 
-#include "BulletsModule_moc.cpp"
+#include "moc_BulletsModule.cpp"