code cosmetics whitespace, unneeded lyx:: qualification, indentation, unneeded destru...

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

diff --git a/src/frontends/qt4/BulletsModule.C b/src/frontends/qt4/BulletsModule.C
index 80f2fb31ca3bb46ab61cf7976858a81d333be4dc..7704b80261c2a231affd23c6dc4a3202e5b4f7dd 100644 (file)
--- a/src/frontends/qt4/BulletsModule.C
+++ b/src/frontends/qt4/BulletsModule.C
@@ -22,7 +22,7 @@
 
 namespace lyx {
 
-using lyx::support::libFileSearch;
+using support::libFileSearch;
 
 using std::string;
 
@@ -30,9 +30,9 @@ BulletsModule::BulletsModule(QWidget * , char const * , Qt::WFlags)
 {
        setupUi(this);
 
-       for (int iter = 0; iter < 4; ++iter) {
+       for (int iter = 0; iter < 4; ++iter)
                bullets_[iter] = ITEMIZE_DEFAULTS[iter];
-       }
+
        current_font_ = -1;
        current_char_ = 0;
 
@@ -50,17 +50,15 @@ BulletsModule::BulletsModule(QWidget * , char const * , Qt::WFlags)
        setupPanel(new QListWidget(bulletpaneSW), qt_("Dings 3"), "psnfss3");
        setupPanel(new QListWidget(bulletpaneSW), qt_("Dings 4"), "psnfss4");
 
-       connect(levelLW, SIGNAL(currentRowChanged(int)), this, SLOT(showLevel(int)));
-       connect(bulletpaneCO, SIGNAL(activated(int)), bulletpaneSW, SLOT(setCurrentIndex(int)));
-}
-
-
-BulletsModule::~BulletsModule()
-{
+       connect(levelLW, SIGNAL(currentRowChanged(int)),
+               this, SLOT(showLevel(int)));
+       connect(bulletpaneCO, SIGNAL(activated(int)), bulletpaneSW,
+               SLOT(setCurrentIndex(int)));
 }
 
 
-void BulletsModule::setupPanel(QListWidget * lw, QString panelname, std::string fname)
+void BulletsModule::setupPanel(QListWidget * lw, QString const & panelname,
+       std::string const & fname)
 {
        connect(lw, SIGNAL(currentItemChanged(QListWidgetItem*, QListWidgetItem*)),
                this, SLOT(bulletSelected(QListWidgetItem *, QListWidgetItem*)));
@@ -70,6 +68,7 @@ void BulletsModule::setupPanel(QListWidget * lw, QString panelname, std::string
 
        // get pixmap with bullets
        QPixmap pixmap = QPixmap(toqstr(libFileSearch("images", fname, "xpm").absFilename()));
+
        int const w = pixmap.width() / 6;
        int const h = pixmap.height() / 6;
 
@@ -80,9 +79,10 @@ void BulletsModule::setupPanel(QListWidget * lw, QString panelname, std::string
        lw->setFlow(QListView::LeftToRight);
        lw->setMovement(QListView::Static);
        lw->setUniformItemSizes(true);
-       lw->setGridSize( QSize(w , h) );
-       lw->resize( 6 * w + 6 , 6 * h);
-       bulletpaneSW->setMinimumSize( 6 * w + 6 , 6 * h);
+       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);
 
        // get individual bullets from pixmap
        for (int row = 0; row < 6; ++row) {
@@ -197,10 +197,7 @@ Bullet const & BulletsModule::getBullet(int level) const
        return bullets_[level];
 }
 
-
 } // namespace lyx
 
 
 #include "BulletsModule_moc.cpp"
-
-