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
This commit is contained in:
Lars Gullik Bjønnes 2006-07-06 08:18:51 +00:00
parent a54d3e83bd
commit 1afb2a6b05
30 changed files with 173 additions and 149 deletions

View File

@ -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;
}

View File

@ -31,7 +31,7 @@ ControlViewSource::ControlViewSource(Dialog & parent)
{}
bool ControlViewSource::initialiseParams(string const & source)
bool ControlViewSource::initialiseParams(string const & /*source*/)
{
return true;
}

View File

@ -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;
}

View File

@ -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) {

View File

@ -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;

View File

@ -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"));

View File

@ -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);
}

View File

@ -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<Gnome::Glade::Xml>& refGlade)
const Glib::RefPtr<Gnome::Glade::Xml>& /*refGlade*/)
: Gtk::HBox(cobject), adj_(666.0, 0.0, 99999.0, 0.1, 1, 0.0), spin_(adj_, 0.1, 2)
{
populateUnitCombo (combo_, true);

View File

@ -141,8 +141,8 @@ void lyx_gui::parse_lyxrc()
int lyx_gui::start(string const & batch, std::vector<string> 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<GView &> (theApp->gui().view(view_id));

View File

@ -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;
}

View File

@ -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)));

View File

@ -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
@ -234,10 +236,10 @@ void BulletsModule::selected4()
}
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:

View File

@ -112,7 +112,7 @@ void GuiView::init()
LyXView::init();
}
void GuiView::updateMenu(QAction *action)
void GuiView::updateMenu(QAction * /*action*/)
{
menubar_->update();
}

View File

@ -104,7 +104,7 @@ 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_);
@ -116,13 +116,13 @@ void InsertTableWidget::mouseReleaseEvent(QMouseEvent * event)
}
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_)

View File

@ -15,8 +15,8 @@
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);

View File

@ -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,7 +180,7 @@ 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);

View File

@ -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);
}

View File

@ -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;

View File

@ -523,7 +523,8 @@ 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_;
@ -535,16 +536,16 @@ PrefColors::PrefColors(QPrefs * form, QWidget * parent)
}
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*/)
{
}
@ -874,12 +875,12 @@ PrefConverters::PrefConverters(QPrefs * form, QWidget * parent)
}
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();
}
@ -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();
}
@ -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;
}
@ -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();

View File

@ -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() {}

View File

@ -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);
}
}

View File

@ -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);
}
}

View File

@ -94,7 +94,7 @@ void QThesaurusDialog::selectionChanged()
}
void QThesaurusDialog::itemClicked(QTreeWidgetItem * item, int col)
void QThesaurusDialog::itemClicked(QTreeWidgetItem * /*item*/, int /*col*/)
{
selectionChanged();
}

View File

@ -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);

View File

@ -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);

View File

@ -204,7 +204,7 @@ int start(string const & batch, vector<string> const & files,
GuiView & view = static_cast<GuiView &> (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 File

@ -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())

View File

@ -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

View File

@ -325,7 +325,7 @@ 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()) {
@ -339,7 +339,7 @@ void readParToken(Buffer const & buf, Paragraph & par, LyXLex & lex,
} 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()) {

View File

@ -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.