From 1afb2a6b05b22c681aa21780134d3ed922f9498f Mon Sep 17 00:00:00 2001 From: =?utf8?q?Lars=20Gullik=20Bj=C3=B8nnes?= Date: Thu, 6 Jul 2006 08:18:51 +0000 Subject: [PATCH] Remove quite a few compiler warnings: - Change unsigned -> signed - Change signed -> unsigned - Add a cast or two (really few of those) - Remove/comment out unused variables - Comment out unused arguments - Add missing cases to switches. git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14344 a592a061-630c-0410-9148-cb99ea01b6c8 --- src/frontends/LyXView.C | 6 +- src/frontends/controllers/ControlViewSource.C | 8 +-- src/frontends/gtk/Dialogs.C | 5 +- src/frontends/gtk/GBibtex.C | 2 +- src/frontends/gtk/GNote.C | 10 ++- src/frontends/gtk/GTabular.C | 2 +- src/frontends/gtk/GTexinfo.C | 2 +- src/frontends/gtk/GtkLengthEntry.C | 3 +- src/frontends/gtk/lyx_gui.C | 4 +- src/frontends/qt3/QNote.C | 3 + src/frontends/qt4/Action.C | 4 +- src/frontends/qt4/BulletsModule.C | 32 +++++---- src/frontends/qt4/GuiView.C | 12 ++-- src/frontends/qt4/InsertTableWidget.C | 12 ++-- src/frontends/qt4/QAboutDialog.C | 6 +- src/frontends/qt4/QBibtexDialog.C | 34 ++++----- src/frontends/qt4/QBranches.C | 4 +- src/frontends/qt4/QNote.C | 9 +++ src/frontends/qt4/QPrefsDialog.C | 69 ++++++++++--------- src/frontends/qt4/QPrefsDialog.h | 4 +- src/frontends/qt4/QRef.C | 7 +- src/frontends/qt4/QSpellcheckerDialog.C | 24 +++---- src/frontends/qt4/QThesaurusDialog.C | 16 ++--- src/frontends/qt4/QTocDialog.C | 7 +- src/frontends/qt4/floatplacement.C | 4 +- src/frontends/qt4/lyx_gui.C | 10 +-- src/frontends/qt4/panelstack.C | 3 +- src/mathed/math_nestinset.C | 6 +- src/text.C | 10 +-- src/text2.C | 4 +- 30 files changed, 173 insertions(+), 149 deletions(-) diff --git a/src/frontends/LyXView.C b/src/frontends/LyXView.C index 9b4408ae0d..8581ac2ec3 100644 --- a/src/frontends/LyXView.C +++ b/src/frontends/LyXView.C @@ -68,14 +68,14 @@ Gui & LyXView::gui() LyXView::LyXView(Gui & owner) - : owner_(owner), + : work_area_(0), + owner_(owner), toolbars_(new Toolbars(*this)), intl_(new Intl), autosave_timeout_(new Timeout(5000)), lyxfunc_(new LyXFunc(this)), dialogs_(new Dialogs(*this)), - controlcommand_(new ControlCommandBuffer(*this)), - work_area_(0) + controlcommand_(new ControlCommandBuffer(*this)) { lyxerr[Debug::INIT] << "Initializing LyXFunc" << endl; } diff --git a/src/frontends/controllers/ControlViewSource.C b/src/frontends/controllers/ControlViewSource.C index 7b50b844cb..3c6000b82e 100644 --- a/src/frontends/controllers/ControlViewSource.C +++ b/src/frontends/controllers/ControlViewSource.C @@ -31,14 +31,14 @@ ControlViewSource::ControlViewSource(Dialog & parent) {} -bool ControlViewSource::initialiseParams(string const & source) +bool ControlViewSource::initialiseParams(string const & /*source*/) { return true; } string const ControlViewSource::updateContent() -{ - // get the *top* level paragraphs that contain the cursor, +{ + // get the *top* level paragraphs that contain the cursor, // or the selected text lyx::pit_type par_begin; lyx::pit_type par_end; @@ -67,7 +67,7 @@ void ControlViewSource::clearParams() string const ControlViewSource::title() const { string source_type; - + Kernel::DocType doctype = kernel().docType(); switch (doctype) { case Kernel::LATEX: diff --git a/src/frontends/gtk/Dialogs.C b/src/frontends/gtk/Dialogs.C index ddc645d329..7321a2ef72 100644 --- a/src/frontends/gtk/Dialogs.C +++ b/src/frontends/gtk/Dialogs.C @@ -567,12 +567,13 @@ void Dialogs::toggleTooltips() { // Turning off tooltips is not necessary and will // not be implemented by me - jcs -// Tooltips::toggleEnabled(); + //Tooltips::toggleEnabled(); } /// Are the tooltips on or off? bool Dialogs::tooltipsEnabled() { -// return Tooltips::enabled(); + //return Tooltips::enabled(); + return true; } diff --git a/src/frontends/gtk/GBibtex.C b/src/frontends/gtk/GBibtex.C index 4bc61f9630..d1a3398651 100644 --- a/src/frontends/gtk/GBibtex.C +++ b/src/frontends/gtk/GBibtex.C @@ -245,7 +245,7 @@ void GBibtex::browse() string const filen = changeExtension(file, ""); bool present = false; - for (int i = 0; i < stylecombo_.get_model()->children().size(); ++i) { + for (unsigned int i = 0; i < stylecombo_.get_model()->children().size(); ++i) { stylecombo_.set_active(i); Glib::ustring const item = stylecombo_.get_active_text (); if (item == filen) { diff --git a/src/frontends/gtk/GNote.C b/src/frontends/gtk/GNote.C index 4dd0df1b2d..65a622154c 100644 --- a/src/frontends/gtk/GNote.C +++ b/src/frontends/gtk/GNote.C @@ -70,6 +70,14 @@ void GNote::update() bc().refreshReadOnly(); switch (controller().params().type) { + case InsetNoteParams::Framed: + //framedradio_->set_active(true); + greyedoutradio_->set_active(true); + break; + case InsetNoteParams::Shaded: + //shadedradio_->set_active(true); + greyedoutradio_->set_active(true); + break; case InsetNoteParams::Note: lyxnoteradio_->set_active(true); break; @@ -79,7 +87,7 @@ void GNote::update() case InsetNoteParams::Greyedout: greyedoutradio_->set_active(true); break; - // FIXME add Framed, Shaded + // FIXME: Framed and Shaded not handled properly } applylock_ = false; diff --git a/src/frontends/gtk/GTabular.C b/src/frontends/gtk/GTabular.C index eb5c1463f9..f68c1482a3 100644 --- a/src/frontends/gtk/GTabular.C +++ b/src/frontends/gtk/GTabular.C @@ -352,7 +352,7 @@ void GTabular::updateHorzAlignCombo(bool extraoption) //FIXME: check if we really need to completely rewrite combo data // Deprecated in favor of clear_items in gtkmm >= 2.8 - int const oldselection = horzaligncombo_->get_active_row_number(); + unsigned int const oldselection = horzaligncombo_->get_active_row_number(); horzaligncombo_->clear(); horzaligncombo_->append_text(_("Left")); horzaligncombo_->append_text(_("Center")); diff --git a/src/frontends/gtk/GTexinfo.C b/src/frontends/gtk/GTexinfo.C index 5e3616e17b..1a4c5941f0 100644 --- a/src/frontends/gtk/GTexinfo.C +++ b/src/frontends/gtk/GTexinfo.C @@ -112,7 +112,7 @@ void GTexinfo::onItemActivate( file = getTexFileFromList(data[choice], controller().getFileType(activeStyle)); - if (choice >= 0 && choice <= data.size() - 1) + if (choice >= 0 && choice <= int(data.size() - 1)) controller().viewFile(file); } diff --git a/src/frontends/gtk/GtkLengthEntry.C b/src/frontends/gtk/GtkLengthEntry.C index bed6e77d06..8195007c97 100644 --- a/src/frontends/gtk/GtkLengthEntry.C +++ b/src/frontends/gtk/GtkLengthEntry.C @@ -1,4 +1,3 @@ - /** * \file GtkLengthEntry.C * This file is part of LyX, the document processor. @@ -71,7 +70,7 @@ void populateUnitCombo(Gtk::ComboBoxText & combo, bool const userelative) GtkLengthEntry::GtkLengthEntry( BaseObjectType* cobject, - const Glib::RefPtr& refGlade) + const Glib::RefPtr& /*refGlade*/) : Gtk::HBox(cobject), adj_(666.0, 0.0, 99999.0, 0.1, 1, 0.0), spin_(adj_, 0.1, 2) { populateUnitCombo (combo_, true); diff --git a/src/frontends/gtk/lyx_gui.C b/src/frontends/gtk/lyx_gui.C index 12675095ea..d775e8e15f 100644 --- a/src/frontends/gtk/lyx_gui.C +++ b/src/frontends/gtk/lyx_gui.C @@ -141,8 +141,8 @@ void lyx_gui::parse_lyxrc() int lyx_gui::start(string const & batch, std::vector const & files, - unsigned int width, unsigned int height, int posx, - int posy, bool) + unsigned int width, unsigned int height, + int /*posx*/, int /*posy*/, bool) { int view_id = theApp->gui().newView(width, height); GView & view = static_cast (theApp->gui().view(view_id)); diff --git a/src/frontends/qt3/QNote.C b/src/frontends/qt3/QNote.C index 48436ac5c1..6e3f9f9a6f 100644 --- a/src/frontends/qt3/QNote.C +++ b/src/frontends/qt3/QNote.C @@ -84,6 +84,9 @@ void QNote::apply() type = InsetNoteParams::Framed; else if (dialog_->shadedRB->isChecked()) type = InsetNoteParams::Shaded; + else + // Something bad in the gui, nothing set + type = InsetNoteParams::Note; controller().params().type = type; } diff --git a/src/frontends/qt4/Action.C b/src/frontends/qt4/Action.C index edfc308f19..7f34a09026 100644 --- a/src/frontends/qt4/Action.C +++ b/src/frontends/qt4/Action.C @@ -41,7 +41,7 @@ int const statusbar_timer_value = 3000; Action::Action(LyXView & lyxView, string const & text, FuncRequest const & func, string const & tooltip) - : QAction(this), lyxView_(lyxView), func_(func) + : QAction(this), func_(func), lyxView_(lyxView) { setText(tr(toqstr(text))); setToolTip(tr(toqstr(tooltip))); @@ -52,7 +52,7 @@ Action::Action(LyXView & lyxView, string const & text, Action::Action(LyXView & lyxView, string const & icon, string const & text, FuncRequest const & func, string const & tooltip) - : QAction(this), lyxView_(lyxView), func_(func) + : QAction(this), func_(func), lyxView_(lyxView) { setIcon(QPixmap(icon.c_str())); setText(tr(toqstr(text))); diff --git a/src/frontends/qt4/BulletsModule.C b/src/frontends/qt4/BulletsModule.C index 9aabcbdff3..733172becd 100644 --- a/src/frontends/qt4/BulletsModule.C +++ b/src/frontends/qt4/BulletsModule.C @@ -30,7 +30,8 @@ using lyx::support::libFileSearch; using std::string; -BulletsModule::BulletsModule(QWidget * parent, const char * name, Qt::WFlags fl) +BulletsModule::BulletsModule(QWidget * /*parent*/, + char const * /*name*/, Qt::WFlags /*fl*/) : bullet_pressed_(0) { setupUi(this); @@ -41,12 +42,13 @@ BulletsModule::BulletsModule(QWidget * parent, const char * name, Qt::WFlags fl QMenu * pm = new QMenu(this); - QMenu * pm1 = new QMenu(pm); - QMenu * pm2 = new QMenu(pm); - QMenu * pm3 = new QMenu(pm); - QMenu * pm4 = new QMenu(pm); - QMenu * pm5 = new QMenu(pm); - QMenu * pm6 = new QMenu(pm); + // FIXME: Need to verify that this does not leak memory. + /*QMenu * pm1 =*/ new QMenu(pm); + /*QMenu * pm2 =*/ new QMenu(pm); + /*QMenu * pm3 =*/ new QMenu(pm); + /*QMenu * pm4 =*/ new QMenu(pm); + /*QMenu * pm5 =*/ new QMenu(pm); + /*QMenu * pm6 =*/ new QMenu(pm); // FIXME: We need a Qt4 compatible browsebox type widget // which can act as a popup to a toolbutton @@ -149,7 +151,7 @@ BulletsModule::~BulletsModule() void BulletsModule::updateSizes() { - // emit signal + // emit signal changed(); // -1 apparently means default... @@ -193,7 +195,7 @@ void BulletsModule::selected1() tmpbulletset = false; bullets_[0] = tmpbullet; setBullet(bullet1PB, bulletsize1CO, bullets_[0]); - // emit signal + // emit signal changed(); } @@ -205,7 +207,7 @@ void BulletsModule::selected2() tmpbulletset = false; bullets_[1] = tmpbullet; setBullet(bullet2PB, bulletsize2CO, bullets_[1]); - // emit signal + // emit signal changed(); } @@ -217,7 +219,7 @@ void BulletsModule::selected3() tmpbulletset = false; bullets_[2] = tmpbullet; setBullet(bullet3PB, bulletsize3CO, bullets_[2]); - // emit signal + // emit signal changed(); } @@ -229,15 +231,15 @@ void BulletsModule::selected4() tmpbulletset = false; bullets_[3] = tmpbullet; setBullet(bullet4PB, bulletsize4CO, bullets_[3]); - // emit signal + // emit signal changed(); } -QPixmap BulletsModule::getPixmap(int font, int character) +QPixmap BulletsModule::getPixmap(int /*font*/, int /*character*/) { - int col = character % 6; - int row = (character - col) / 6; + //int col = character % 6; + //int row = (character - col) / 6; /* switch (font) { case 0: diff --git a/src/frontends/qt4/GuiView.C b/src/frontends/qt4/GuiView.C index 67837e9605..f80a56eca1 100644 --- a/src/frontends/qt4/GuiView.C +++ b/src/frontends/qt4/GuiView.C @@ -108,11 +108,11 @@ void GuiView::init() // make sure the buttons are disabled if needed updateToolbars(); - + LyXView::init(); } -void GuiView::updateMenu(QAction *action) +void GuiView::updateMenu(QAction * /*action*/) { menubar_->update(); } @@ -183,7 +183,7 @@ bool GuiView::hasFocus() const } -void GuiView::updateFloatingGeometry() +void GuiView::updateFloatingGeometry() { if (!isMaximized()) floatingGeometry_ = QRect(x(), y(), width(), height()); @@ -204,7 +204,7 @@ void GuiView::moveEvent(QMoveEvent *) void GuiView::closeEvent(QCloseEvent *) { - // FIXME: + // FIXME: // change the ifdef to 'geometry = normalGeometry();' only // when Trolltech has fixed the broken normalGeometry on X11: // http://www.trolltech.com/developer/task-tracker/index_html?id=119684+&method=entry @@ -215,9 +215,9 @@ void GuiView::closeEvent(QCloseEvent *) QRect geometry = normalGeometry(); #else updateFloatingGeometry(); - QRect geometry = floatingGeometry_; + QRect geometry = floatingGeometry_; #endif - + // save windows size and position Session & session = LyX::ref().session(); session.saveSessionInfo("WindowWidth", convert(geometry.width())); diff --git a/src/frontends/qt4/InsertTableWidget.C b/src/frontends/qt4/InsertTableWidget.C index 61a9961fb4..424b5dbb1f 100644 --- a/src/frontends/qt4/InsertTableWidget.C +++ b/src/frontends/qt4/InsertTableWidget.C @@ -55,7 +55,7 @@ void InsertTableWidget::show(bool show) init(); resetGeometry(); setVisible(true); - // emit signal + // emit signal visible(true); } @@ -63,7 +63,7 @@ void InsertTableWidget::show(bool show) void InsertTableWidget::resetGeometry() { QPoint p = parentWidget()->mapToGlobal(parentWidget()->geometry().bottomLeft()); - setGeometry(p.x() - parentWidget()->pos().x(), + setGeometry(p.x() - parentWidget()->pos().x(), p.y() - parentWidget()->pos().y(), cols_ * colwidth_ + 1, rows_ * rowheight_ + 1); } @@ -104,25 +104,25 @@ void InsertTableWidget::mouseMoveEvent(QMouseEvent * event) } -void InsertTableWidget::mouseReleaseEvent(QMouseEvent * event) +void InsertTableWidget::mouseReleaseEvent(QMouseEvent * /*event*/) { if (underMouse_) { QString const data = QString("%1 %2").arg(bottom_).arg(right_); lyxView_.getLyXFunc().dispatch(FuncRequest(LFUN_TABULAR_INSERT, fromqstr(data))); } - // emit signal + // emit signal visible(false); close(); } -void InsertTableWidget::mousePressEvent(QMouseEvent * event) +void InsertTableWidget::mousePressEvent(QMouseEvent * /*event*/) { // swallow this one } -void InsertTableWidget::paintEvent(QPaintEvent * event) +void InsertTableWidget::paintEvent(QPaintEvent * /*event*/) { drawGrid(rows_, cols_, Qt::white); if (underMouse_) diff --git a/src/frontends/qt4/QAboutDialog.C b/src/frontends/qt4/QAboutDialog.C index 81d364d970..388d401722 100644 --- a/src/frontends/qt4/QAboutDialog.C +++ b/src/frontends/qt4/QAboutDialog.C @@ -15,12 +15,12 @@ namespace lyx { namespace frontend { -QAboutDialog::QAboutDialog(QWidget * parent, const char * name, - bool modal, Qt::WFlags fl) +QAboutDialog::QAboutDialog(QWidget * /*parent*/, char const * /*name*/, + bool /*modal*/, Qt::WFlags /*fl*/) { setupUi(this); - connect( closePB, SIGNAL( clicked() ), + connect( closePB, SIGNAL( clicked() ), this, SLOT( reject() ) ); } diff --git a/src/frontends/qt4/QBibtexDialog.C b/src/frontends/qt4/QBibtexDialog.C index 3fa3875617..f52c9fae25 100644 --- a/src/frontends/qt4/QBibtexDialog.C +++ b/src/frontends/qt4/QBibtexDialog.C @@ -45,23 +45,23 @@ QBibtexDialog::QBibtexDialog(QBibtex * form) setupUi(this); QDialog::setModal(true); - connect(okPB, SIGNAL(clicked()), + connect(okPB, SIGNAL(clicked()), form, SLOT(slotOK())); - connect(closePB, SIGNAL(clicked()), + connect(closePB, SIGNAL(clicked()), form, SLOT(slotClose())); - connect(stylePB, SIGNAL( clicked() ), + connect(stylePB, SIGNAL( clicked() ), this, SLOT( browsePressed() ) ); - connect(deletePB, SIGNAL( clicked() ), + connect(deletePB, SIGNAL( clicked() ), this, SLOT( deletePressed() ) ); - connect(styleCB, SIGNAL( textChanged(const QString&) ), + connect(styleCB, SIGNAL( textChanged(const QString&) ), this, SLOT( change_adaptor() ) ); - connect(databaseLW, SIGNAL( selectionChanged() ), + connect(databaseLW, SIGNAL( selectionChanged() ), this, SLOT( databaseChanged() ) ); - connect(bibtocCB, SIGNAL( toggled(bool) ), + connect(bibtocCB, SIGNAL( toggled(bool) ), this, SLOT( change_adaptor() ) ); - connect(btPrintCO, SIGNAL( activated(int) ), + connect(btPrintCO, SIGNAL( activated(int) ), this, SLOT( change_adaptor() ) ); - connect(addBibPB, SIGNAL( clicked() ), + connect(addBibPB, SIGNAL( clicked() ), this, SLOT( addPressed() ) ); add_ = new UiDialog(this, true); @@ -78,9 +78,9 @@ QBibtexDialog::QBibtexDialog(QBibtex * form) connect(add_->bibED, SIGNAL(textChanged(const QString&)), this, SLOT(bibEDChanged())); - connect(add_->addPB, SIGNAL(clicked()), + connect(add_->addPB, SIGNAL(clicked()), this, SLOT(addDatabase())); - connect(add_->addPB, SIGNAL(clicked()), + connect(add_->addPB, SIGNAL(clicked()), add_, SLOT(accept()) ); connect(add_->bibLW, SIGNAL(itemActivated(QListWidgetItem *)), this, SLOT(addDatabase())); @@ -88,9 +88,9 @@ QBibtexDialog::QBibtexDialog(QBibtex * form) add_, SLOT(accept())); connect(add_->bibLW, SIGNAL(itemChanged(QListWidgetItem *)), this, SLOT(availableChanged())); - connect(add_->browsePB, SIGNAL(clicked()), + connect(add_->browsePB, SIGNAL(clicked()), this, SLOT(browseBibPressed())); - connect(add_->closePB, SIGNAL( clicked() ), + connect(add_->closePB, SIGNAL( clicked() ), add_, SLOT( reject() ) ); } @@ -148,7 +148,7 @@ void QBibtexDialog::browseBibPressed() QString const f = toqstr(changeExtension(file, "")); bool present = false; - for (unsigned int i = 0; i != add_->bibLW->count(); i++) { + for (int i = 0; i < add_->bibLW->count(); ++i) { if (add_->bibLW->item(i)->text() == f) present = true; } @@ -180,11 +180,11 @@ void QBibtexDialog::addDatabase() // Add the selected browser_bib keys to browser_database // multiple selections are possible - for (unsigned int i = 0; i != add_->bibLW->count(); i++) { + for (int i = 0; i != add_->bibLW->count(); ++i) { QListWidgetItem * const item = add_->bibLW->item(i); if (add_->bibLW->isItemSelected(item)) { add_->bibLW->setItemSelected(item, false); - QList matches = + QList matches = databaseLW->findItems(item->text(), Qt::MatchExactly); if (matches.empty()) databaseLW->addItem(item->text()); @@ -194,7 +194,7 @@ void QBibtexDialog::addDatabase() if (!file.empty()) { add_->bibED->clear(); QString const f = toqstr(changeExtension(file, "")); - QList matches = + QList matches = databaseLW->findItems(f, Qt::MatchExactly); if (matches.empty()) databaseLW->addItem(f); diff --git a/src/frontends/qt4/QBranches.C b/src/frontends/qt4/QBranches.C index e0f1c1275f..afec31febc 100644 --- a/src/frontends/qt4/QBranches.C +++ b/src/frontends/qt4/QBranches.C @@ -86,7 +86,7 @@ void QBranches::update() if (bname == sel_branch) branchesTW->setItemSelected(newItem, true); } - // emit signal + // emit signal changed(); } @@ -127,7 +127,7 @@ void QBranches::on_activatePB_pressed() } -void QBranches::on_branchesTW_itemDoubleClicked(QTreeWidgetItem * item, int col) +void QBranches::on_branchesTW_itemDoubleClicked(QTreeWidgetItem * item, int /*col*/) { toggleBranch(item); } diff --git a/src/frontends/qt4/QNote.C b/src/frontends/qt4/QNote.C index fb005d3857..6d49ae2f4b 100644 --- a/src/frontends/qt4/QNote.C +++ b/src/frontends/qt4/QNote.C @@ -46,9 +46,18 @@ void QNote::build_dialog() void QNote::update_contents() { + // FIXME: This needs fixing. Framed and Shaded is not working. QRadioButton * rb = 0; switch (controller().params().type) { + case InsetNoteParams::Framed: + //rb = dialog_->framedRB; + rb = dialog_->greyedoutRB; + break; + case InsetNoteParams::Shaded: + //rb = dialog_->shadedRB; + rb = dialog_->greyedoutRB; + break; case InsetNoteParams::Note: rb = dialog_->noteRB; break; diff --git a/src/frontends/qt4/QPrefsDialog.C b/src/frontends/qt4/QPrefsDialog.C index 4b04e673eb..ca070cf02f 100644 --- a/src/frontends/qt4/QPrefsDialog.C +++ b/src/frontends/qt4/QPrefsDialog.C @@ -523,28 +523,29 @@ PrefColors::PrefColors(QPrefs * form, QWidget * parent) prefcolors_.push_back(color.name()); QPixmap coloritem(32, 32); coloritem.fill(color); - QListWidgetItem * newItem = new QListWidgetItem(QIcon(coloritem), +#warning Is this a leak or not? (Lgb) + /*QListWidgetItem * newItem =*/ new QListWidgetItem(QIcon(coloritem), toqstr(lcolor.getGUIName(lc)), lyxObjectsLW); } newcolors_ = prefcolors_; - connect(colorChangePB, SIGNAL(clicked()), + connect(colorChangePB, SIGNAL(clicked()), this, SLOT(change_color())); - connect(lyxObjectsLW, SIGNAL(itemActivated(QListWidgetItem*)), + connect(lyxObjectsLW, SIGNAL(itemActivated(QListWidgetItem*)), this, SLOT(change_color())); } -void PrefColors::apply(LyXRC & rc) const +void PrefColors::apply(LyXRC & /*rc*/) const { - for (int i = 0; i < lcolors_.size(); ++i) { + for (unsigned int i = 0; i < lcolors_.size(); ++i) { if (prefcolors_[i]!=newcolors_[i]) form_->controller().setColor(lcolors_[i], fromqstr(newcolors_[i])); } } -void PrefColors::update(LyXRC const & rc) +void PrefColors::update(LyXRC const & /*rc*/) { } @@ -552,7 +553,7 @@ void PrefColors::change_color() { int const row = lyxObjectsLW->currentRow(); QString color = newcolors_[row]; - QColor c(QColorDialog::getColor(QColor(color), + QColor c(QColorDialog::getColor(QColor(color), qApp->focusWidget() ? qApp->focusWidget() : qApp->mainWidget())); if (c.name()!=color) { @@ -560,7 +561,7 @@ void PrefColors::change_color() QPixmap coloritem(32, 32); coloritem.fill(c); lyxObjectsLW->currentItem()->setIcon(QIcon(coloritem)); - // emit signal + // emit signal changed(); } } @@ -849,37 +850,37 @@ PrefConverters::PrefConverters(QPrefs * form, QWidget * parent) { setupUi(this); - connect(converterNewPB, SIGNAL(clicked()), + connect(converterNewPB, SIGNAL(clicked()), this, SLOT(new_converter())); - connect(converterRemovePB, SIGNAL(clicked()), + connect(converterRemovePB, SIGNAL(clicked()), this, SLOT(remove_converter())); - connect(converterModifyPB, SIGNAL(clicked()), + connect(converterModifyPB, SIGNAL(clicked()), this, SLOT(modify_converter())); - connect(convertersLW, SIGNAL(currentRowChanged(int)), + connect(convertersLW, SIGNAL(currentRowChanged(int)), this, SLOT(switch_converter(int))); - connect(converterFromCO, SIGNAL(activated(const QString&)), + connect(converterFromCO, SIGNAL(activated(const QString&)), this, SLOT(converter_changed())); - connect(converterToCO, SIGNAL(activated(const QString&)), + connect(converterToCO, SIGNAL(activated(const QString&)), this, SLOT(converter_changed())); - connect(converterED, SIGNAL(textChanged(const QString&)), + connect(converterED, SIGNAL(textChanged(const QString&)), this, SLOT(converter_changed())); - connect(converterFlagED, SIGNAL(textChanged(const QString&)), + connect(converterFlagED, SIGNAL(textChanged(const QString&)), this, SLOT(converter_changed())); - connect(converterNewPB, SIGNAL(clicked()), + connect(converterNewPB, SIGNAL(clicked()), this, SIGNAL(changed())); - connect(converterRemovePB, SIGNAL(clicked()), + connect(converterRemovePB, SIGNAL(clicked()), this, SIGNAL(changed())); - connect(converterModifyPB, SIGNAL(clicked()), + connect(converterModifyPB, SIGNAL(clicked()), this, SIGNAL(changed())); } -void PrefConverters::apply(LyXRC & rc) const +void PrefConverters::apply(LyXRC & /*rc*/) const { } -void PrefConverters::update(LyXRC const & rc) +void PrefConverters::update(LyXRC const & /*rc*/) { updateGui(); } @@ -915,7 +916,7 @@ void PrefConverters::updateGui() // restore selection if (!current.isEmpty()) { - QList const item = + QList const item = convertersLW->findItems(current, Qt::MatchExactly); if (item.size()>0) convertersLW->setCurrentItem(item.at(0)); @@ -1041,7 +1042,7 @@ PrefCopiers::PrefCopiers(QPrefs * form, QWidget * parent) connect(copierNewPB, SIGNAL(clicked()), this, SLOT(new_copier())); connect(copierRemovePB, SIGNAL(clicked()), this, SLOT(remove_copier())); connect(copierModifyPB, SIGNAL(clicked()), this, SLOT(modify_copier())); - connect(AllCopiersLW, SIGNAL(currentRowChanged(int)), + connect(AllCopiersLW, SIGNAL(currentRowChanged(int)), this, SLOT(switch_copierLB(int))); connect(copierFormatCO, SIGNAL(activated(int)), this, SLOT(switch_copierCO(int))); connect(copierNewPB, SIGNAL(clicked()), @@ -1055,12 +1056,12 @@ PrefCopiers::PrefCopiers(QPrefs * form, QWidget * parent) } -void PrefCopiers::apply(LyXRC & rc) const +void PrefCopiers::apply(LyXRC & /*rc*/) const { } -void PrefCopiers::update(LyXRC const & rc) +void PrefCopiers::update(LyXRC const & /*rc*/) { update(); } @@ -1095,7 +1096,7 @@ void PrefCopiers::update() // restore selection if (!current.isEmpty()) { - QList item = + QList item = AllCopiersLW->findItems(current, Qt::MatchExactly); if (item.size()>0) AllCopiersLW->setCurrentItem(item.at(0)); @@ -1202,7 +1203,7 @@ void PrefCopiers::updateButtons() QString selected = copierFormatCO->currentText(); bool known = false; - for (unsigned int i = 0; i != AllCopiersLW->count(); i++) { + for (int i = 0; i < AllCopiersLW->count(); ++i) { if (AllCopiersLW->item(i)->text() == selected) known = true; } @@ -1284,7 +1285,7 @@ PrefFileformats::PrefFileformats(QPrefs * form, QWidget * parent) connect(formatNewPB, SIGNAL(clicked()), this, SLOT(new_format())); connect(formatRemovePB, SIGNAL(clicked()), this, SLOT(remove_format())); connect(formatModifyPB, SIGNAL(clicked()), this, SLOT(modify_format())); - connect(formatsLW, SIGNAL(currentRowChanged(int)), + connect(formatsLW, SIGNAL(currentRowChanged(int)), this, SLOT(switch_format(int))); connect(formatED, SIGNAL(textChanged(const QString&)), this, SLOT(fileformat_changed())); connect(guiNameED, SIGNAL(textChanged(const QString&)), this, SLOT(fileformat_changed())); @@ -1302,12 +1303,12 @@ PrefFileformats::PrefFileformats(QPrefs * form, QWidget * parent) } -void PrefFileformats::apply(LyXRC & rc) const +void PrefFileformats::apply(LyXRC & /*rc*/) const { } -void PrefFileformats::update(LyXRC const & rc) +void PrefFileformats::update(LyXRC const & /*rc*/) { update(); } @@ -1376,7 +1377,7 @@ void PrefFileformats::updateButtons() int const sel = form_->formats().getNumber(fromqstr(format)); bool gui_name_known = false; int where = sel; - for (unsigned int i = 0; i != formatsLW->count(); i++) { + for (int i = 0; i < formatsLW->count(); ++i) { if (formatsLW->item(i)->text() == gui_name) { gui_name_known = true; where = formatsLW->item(i)->type(); @@ -1432,7 +1433,7 @@ void PrefFileformats::new_format() bool const document = documentCB->isChecked(); form_->formats().add(name, extension, prettyname, shortcut, viewer, - editor, document); + editor, document); form_->formats().sort(); update(); @@ -1467,7 +1468,7 @@ void PrefFileformats::modify_format() bool const document = documentCB->isChecked(); form_->formats().add(name, extension, prettyname, shortcut, viewer, - editor, document); + editor, document); form_->formats().sort(); formatsLW->setUpdatesEnabled(false); @@ -1817,7 +1818,7 @@ QPrefsDialog::QPrefsDialog(QPrefs * form) add(formats); add(new PrefCopiers(form_)); - + add(new PrefLanguage); add(new PrefPrinter); add(new PrefUserInterface(form_)); diff --git a/src/frontends/qt4/QPrefsDialog.h b/src/frontends/qt4/QPrefsDialog.h index d86e7eb4bd..b8da815eb2 100644 --- a/src/frontends/qt4/QPrefsDialog.h +++ b/src/frontends/qt4/QPrefsDialog.h @@ -61,7 +61,7 @@ class PrefModule : public QWidget Q_OBJECT public: PrefModule(std::string const & cat, std::string const & t, QPrefs * form = 0, QWidget * parent = 0) - : category_(cat), title_(t), form_(form), QWidget(parent) + : QWidget(parent), category_(cat), title_(t), form_(form) { } virtual ~PrefModule() {} @@ -395,7 +395,7 @@ protected: private: void add(PrefModule * module); -private: +private: QPrefs * form_; std::vector modules_; }; diff --git a/src/frontends/qt4/QRef.C b/src/frontends/qt4/QRef.C index fbf1a61d9b..4ac629e84e 100644 --- a/src/frontends/qt4/QRef.C +++ b/src/frontends/qt4/QRef.C @@ -198,11 +198,10 @@ void QRef::redoRefs() dialog_->refsLW->setCurrentRow(lastref); dialog_->refsLW->clearSelection(); } else - for (unsigned int i = 0; i < dialog_->refsLW->count(); ++i) { - if (tmp == dialog_->refsLW->item(i)->text()) { - QListWidgetItem * const item = dialog_->refsLW->item(i); + for (int i = 0; i < dialog_->refsLW->count(); ++i) { + QListWidgetItem * item = dialog_->refsLW->item(i); + if (tmp == item->text()) { dialog_->refsLW->setItemSelected(item, true); - } } diff --git a/src/frontends/qt4/QSpellcheckerDialog.C b/src/frontends/qt4/QSpellcheckerDialog.C index 015103006b..3efe847bf8 100644 --- a/src/frontends/qt4/QSpellcheckerDialog.C +++ b/src/frontends/qt4/QSpellcheckerDialog.C @@ -28,19 +28,19 @@ QSpellcheckerDialog::QSpellcheckerDialog(QSpellchecker * form) connect(closePB, SIGNAL(clicked()), form, SLOT(slotClose())); - connect( replaceCO, SIGNAL( highlighted(const QString&) ), + connect( replaceCO, SIGNAL( highlighted(const QString&) ), this, SLOT( replaceChanged(const QString &) ) ); - connect( replacePB, SIGNAL( clicked() ), + connect( replacePB, SIGNAL( clicked() ), this, SLOT( replaceClicked() ) ); - connect( ignorePB, SIGNAL( clicked() ), + connect( ignorePB, SIGNAL( clicked() ), this, SLOT( ignoreClicked() ) ); - connect( replacePB_3, SIGNAL( clicked() ), + connect( replacePB_3, SIGNAL( clicked() ), this, SLOT( acceptClicked() ) ); - connect( addPB, SIGNAL( clicked() ), + connect( addPB, SIGNAL( clicked() ), this, SLOT( addClicked() ) ); - connect( suggestionsLW, SIGNAL( itemDoubleClicked(QListWidgetItem*) ), + connect( suggestionsLW, SIGNAL( itemDoubleClicked(QListWidgetItem*) ), this, SLOT( replaceClicked() ) ); - connect( suggestionsLW, SIGNAL( itemClicked(QListWidgetItem*) ), + connect( suggestionsLW, SIGNAL( itemClicked(QListWidgetItem*) ), this, SLOT( suggestionChanged(QListWidgetItem*) ) ); } @@ -80,14 +80,12 @@ void QSpellcheckerDialog::replaceChanged(const QString & str) if (suggestionsLW->currentItem()->text() == str) return; - unsigned int i = 0; - for (; i < suggestionsLW->count(); ++i) { - if (suggestionsLW->item(i)->text() == str) + for (int i = 0; i < suggestionsLW->count(); ++i) { + if (suggestionsLW->item(i)->text() == str) { + suggestionsLW->setCurrentRow(i); break; + } } - - if (i != suggestionsLW->count()) - suggestionsLW->setCurrentRow(i); } diff --git a/src/frontends/qt4/QThesaurusDialog.C b/src/frontends/qt4/QThesaurusDialog.C index 064a189bb2..0f51317c1d 100644 --- a/src/frontends/qt4/QThesaurusDialog.C +++ b/src/frontends/qt4/QThesaurusDialog.C @@ -40,19 +40,19 @@ QThesaurusDialog::QThesaurusDialog(QThesaurus * form) connect(closePB, SIGNAL(clicked()), form, SLOT(slotClose())); - connect( replaceED, SIGNAL( returnPressed() ), + connect( replaceED, SIGNAL( returnPressed() ), this, SLOT( replaceClicked() ) ); - connect( replaceED, SIGNAL( textChanged(const QString&) ), + connect( replaceED, SIGNAL( textChanged(const QString&) ), this, SLOT( change_adaptor() ) ); - connect( entryED, SIGNAL( returnPressed() ), + connect( entryED, SIGNAL( returnPressed() ), this, SLOT( entryChanged() ) ); - connect( replacePB, SIGNAL( clicked() ), + connect( replacePB, SIGNAL( clicked() ), this, SLOT( replaceClicked() ) ); - connect( meaningsTV, SIGNAL( itemClicked(QTreeWidgetItem * , int) ), + connect( meaningsTV, SIGNAL( itemClicked(QTreeWidgetItem * , int) ), this, SLOT( itemClicked(QTreeWidgetItem * , int) ) ); - connect( meaningsTV, SIGNAL( itemSelectionChanged() ), + connect( meaningsTV, SIGNAL( itemSelectionChanged() ), this, SLOT( selectionChanged() ) ); - connect( meaningsTV, SIGNAL( itemActivated(QTreeWidgetItem * , int) ), + connect( meaningsTV, SIGNAL( itemActivated(QTreeWidgetItem * , int) ), this, SLOT( selectionClicked(QTreeWidgetItem *, int) ) ); } @@ -94,7 +94,7 @@ void QThesaurusDialog::selectionChanged() } -void QThesaurusDialog::itemClicked(QTreeWidgetItem * item, int col) +void QThesaurusDialog::itemClicked(QTreeWidgetItem * /*item*/, int /*col*/) { selectionChanged(); } diff --git a/src/frontends/qt4/QTocDialog.C b/src/frontends/qt4/QTocDialog.C index 2e15f12c28..04753d8219 100644 --- a/src/frontends/qt4/QTocDialog.C +++ b/src/frontends/qt4/QTocDialog.C @@ -60,10 +60,11 @@ QTocDialog::~QTocDialog() void QTocDialog::selectionChanged(const QModelIndex & current, - const QModelIndex & previous) + const QModelIndex & /*previous*/) { lyxerr[Debug::GUI] - << "selectionChanged index " << current.row() << ", " << current.column() + << "selectionChanged index " << current.row() + << ", " << current.column() << endl; form_->goTo(current); @@ -189,7 +190,7 @@ void QTocDialog::updateGui() tocTV->setModel(form_->tocModel()); tocTV->showColumn(0); // hide the pointless QHeader for now - // in the future, new columns may appear + // in the future, new columns may appear // like labels, bookmarks, etc... // tocTV->header()->hide(); tocTV->header()->setVisible(true); diff --git a/src/frontends/qt4/floatplacement.C b/src/frontends/qt4/floatplacement.C index 3151a7f008..9b14d6aba8 100644 --- a/src/frontends/qt4/floatplacement.C +++ b/src/frontends/qt4/floatplacement.C @@ -31,7 +31,7 @@ using std::string; // FIXME: set disabled doesn't work properly // should be fixed now (jspitzm) -FloatPlacement::FloatPlacement(QWidget * parent, char * name) +FloatPlacement::FloatPlacement(QWidget * parent, char * /*name*/) : QWidget(parent) { QHBoxLayout * toplayout = new QHBoxLayout(this, 11, 6); @@ -104,7 +104,7 @@ void FloatPlacement::useSideways() void FloatPlacement::changedSlot() { - // emit signal + // emit signal changed(); } diff --git a/src/frontends/qt4/lyx_gui.C b/src/frontends/qt4/lyx_gui.C index 63b1abaa96..7e572d765d 100644 --- a/src/frontends/qt4/lyx_gui.C +++ b/src/frontends/qt4/lyx_gui.C @@ -109,16 +109,16 @@ namespace lyx_gui { bool use_gui = true; int exec(int & argc, char * argv[]) -{ +{ /* FIXME : Abdel 29/05/2006 (younes.a@free.fr) reorganize this code. In particular make sure that this advice from Qt documentation is respected: - + Since the QApplication object does so much initialization, it must be created before any other objects related to the user interface are created. - + Right now this is not the case, I suspect that a number of global variables contains Qt object that are initialized before the passage through parse_init(). This might also explain the message displayed by Qt @@ -204,13 +204,13 @@ int start(string const & batch, vector const & files, GuiView & view = static_cast (theApp->gui().view(view_id)); // FIXME: for now we assume that there is only one LyXView with id = 0. - int workArea_id_ = theApp->gui().newWorkArea(width, height, 0); + /*int workArea_id_ =*/ theApp->gui().newWorkArea(width, height, 0); //WorkArea * workArea_ = & theApp->gui().workArea(workArea_id_); LyX::ref().addLyXView(&view); view.init(); - + // only true when the -geometry option was NOT used if (width != 0 && height != 0) { if (posx != -1 && posy != -1) { diff --git a/src/frontends/qt4/panelstack.C b/src/frontends/qt4/panelstack.C index e971849117..1ca8ada1c3 100644 --- a/src/frontends/qt4/panelstack.C +++ b/src/frontends/qt4/panelstack.C @@ -130,7 +130,8 @@ void PanelStack::setCurrentPanel(string const & name) } -void PanelStack::switchPanel(QTreeWidgetItem * item, QTreeWidgetItem* previous) +void PanelStack::switchPanel(QTreeWidgetItem * item, + QTreeWidgetItem * /*previous*/) { WidgetMap::const_iterator cit = widget_map_.find(item); if (cit == widget_map_.end()) diff --git a/src/mathed/math_nestinset.C b/src/mathed/math_nestinset.C index fe37369bc0..273347ea6c 100644 --- a/src/mathed/math_nestinset.C +++ b/src/mathed/math_nestinset.C @@ -350,7 +350,7 @@ int MathNestInset::latex(Buffer const &, std::ostream & os, } -void MathNestInset::notifyCursorLeaves(LCursor & cur) +void MathNestInset::notifyCursorLeaves(LCursor & /*cur*/) { #ifdef WITH_WARNINGS #warning look here @@ -874,10 +874,10 @@ void MathNestInset::doDispatch(LCursor & cur, FuncRequest & cmd) string const rdelim = cmd.getArg(3); latexkeys const * l = in_word_set(lname); bool const have_l = l && l->inset == "big" && - MathBigInset::isBigInsetDelim(ldelim); + MathBigInset::isBigInsetDelim(ldelim); l = in_word_set(rname); bool const have_r = l && l->inset == "big" && - MathBigInset::isBigInsetDelim(rdelim); + MathBigInset::isBigInsetDelim(rdelim); // We mimic LFUN_MATH_DELIM in case we have an empty left // or right delimiter. if (have_l || have_r) { diff --git a/src/text.C b/src/text.C index 7392ed672c..9417876162 100644 --- a/src/text.C +++ b/src/text.C @@ -325,28 +325,28 @@ void readParToken(Buffer const & buf, Paragraph & par, LyXLex & lex, } else if (token == "\\change_inserted") { lex.eatLine(); std::istringstream is(lex.getString()); - int aid; + unsigned int aid; lyx::time_type ct; is >> aid >> ct; if (aid >= bp.author_map.size()) { buf.error(ErrorItem(_("Change tracking error"), bformat(_("Unknown author index for insertion: %1$d\n"), aid), par.id(), 0, par.size())); - + change = Change(Change::UNCHANGED); } else change = Change(Change::INSERTED, bp.author_map[aid], ct); } else if (token == "\\change_deleted") { lex.eatLine(); std::istringstream is(lex.getString()); - int aid; + unsigned int aid; lyx::time_type ct; is >> aid >> ct; if (aid >= bp.author_map.size()) { buf.error(ErrorItem(_("Change tracking error"), bformat(_("Unknown author index for deletion: %1$d\n"), aid), par.id(), 0, par.size())); - + change = Change(Change::UNCHANGED); } else change = Change(Change::DELETED, bp.author_map[aid], ct); @@ -521,7 +521,7 @@ int LyXText::leftMargin(pit_type const pit, pos_type const pos) const switch (layout->margintype) { case MARGIN_DYNAMIC: if (!layout->leftmargin.empty()) - l_margin += font_metrics::signedWidth(layout->leftmargin, + l_margin += font_metrics::signedWidth(layout->leftmargin, params.getFont()); if (!par.getLabelstring().empty()) { l_margin += font_metrics::signedWidth(layout->labelindent, diff --git a/src/text2.C b/src/text2.C index 5166ac1ee9..68d04bd112 100644 --- a/src/text2.C +++ b/src/text2.C @@ -212,7 +212,9 @@ LyXFont LyXText::getFont(Paragraph const & par, pos_type const pos) const break; } // Realize against environment font information - if (pit < pars_.size()) + // NOTE: the cast to pit_type should be removed when pit_type + // changes to a unsigned integer. + if (pit < pit_type(pars_.size())) font.realize(outerFont(pit, pars_)); // Realize with the fonts of lesser depth. -- 2.39.5