I belive this one is safe. (I'll commit after work tomorrow(today))
Index: src/mathed/math_nestinset.C
===================================================================
--- src/mathed/math_nestinset.C (revision 14329)
+++ src/mathed/math_nestinset.C (working copy)
@@ -350,7 +350,7 @@
}
-void MathNestInset::notifyCursorLeaves(LCursor & cur)
+void MathNestInset::notifyCursorLeaves(LCursor & /*cur*/)
{
#ifdef WITH_WARNINGS
#warning look here
Index: src/text2.C
===================================================================
--- src/text2.C (revision 14329)
+++ src/text2.C (working copy)
@@ -212,7 +212,7 @@
break;
}
// Realize against environment font information
- if (pit < pars_.size())
+ if (pit < pit_type(pars_.size()))
font.realize(outerFont(pit, pars_));
// Realize with the fonts of lesser depth.
Index: src/frontends/gtk/lyx_gui.C
===================================================================
--- src/frontends/gtk/lyx_gui.C (revision 14329)
+++ src/frontends/gtk/lyx_gui.C (working copy)
@@ -141,7 +141,8 @@
void 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));
Index: src/frontends/gtk/GTexinfo.C
===================================================================
--- src/frontends/gtk/GTexinfo.C (revision 14329)
+++ src/frontends/gtk/GTexinfo.C (working copy)
@@ -112,7 +112,7 @@
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);
}
Index: src/frontends/gtk/GNote.C
===================================================================
--- src/frontends/gtk/GNote.C (revision 14329)
+++ src/frontends/gtk/GNote.C (working copy)
@@ -65,11 +65,20 @@
void GNote::update()
{
+#warning This needs fixeing. Framed and Shaded not handled.
applylock_ = true;
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;
Index: src/frontends/gtk/GBibtex.C
===================================================================
--- src/frontends/gtk/GBibtex.C (revision 14329)
+++ src/frontends/gtk/GBibtex.C (working copy)
@@ -245,7 +245,7 @@
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) {
Index: src/frontends/gtk/GTabular.C
===================================================================
--- src/frontends/gtk/GTabular.C (revision 14329)
+++ src/frontends/gtk/GTabular.C (working copy)
@@ -352,7 +352,7 @@
//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"));
Index: src/frontends/gtk/GtkLengthEntry.C
===================================================================
--- src/frontends/gtk/GtkLengthEntry.C (revision 14329)
+++ src/frontends/gtk/GtkLengthEntry.C (working copy)
@@ -71,7 +70,7 @@
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);
Index: src/frontends/gtk/Dialogs.C
===================================================================
--- src/frontends/gtk/Dialogs.C (revision 14329)
+++ src/frontends/gtk/Dialogs.C (working copy)
@@ -575,4 +575,5 @@
bool Dialogs::tooltipsEnabled()
{
// return Tooltips::enabled();
+ return true;
}
Index: src/frontends/qt3/QNote.C
===================================================================
--- src/frontends/qt3/QNote.C (revision 14329)
+++ src/frontends/qt3/QNote.C (working copy)
@@ -84,6 +84,9 @@
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;
}
Index: src/frontends/qt4/QBranches.C
===================================================================
--- src/frontends/qt4/QBranches.C (revision 14329)
+++ src/frontends/qt4/QBranches.C (working copy)
@@ -127,7 +127,7 @@
}
-void QBranches::on_branchesTW_itemDoubleClicked(QTreeWidgetItem * item, int col)
+void QBranches::on_branchesTW_itemDoubleClicked(QTreeWidgetItem * item, int /*col*/)
{
toggleBranch(item);
}
Index: src/frontends/qt4/lyx_gui.C
===================================================================
--- src/frontends/qt4/lyx_gui.C (revision 14329)
+++ src/frontends/qt4/lyx_gui.C (working copy)
@@ -203,7 +203,7 @@
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);
Index: src/frontends/qt4/QThesaurusDialog.C
===================================================================
--- src/frontends/qt4/QThesaurusDialog.C (revision 14329)
+++ src/frontends/qt4/QThesaurusDialog.C (working copy)
@@ -94,7 +94,7 @@
}
-void QThesaurusDialog::itemClicked(QTreeWidgetItem * item, int col)
+void QThesaurusDialog::itemClicked(QTreeWidgetItem * /*item*/, int /*col*/)
{
selectionChanged();
}
Index: src/frontends/qt4/QAboutDialog.C
===================================================================
--- src/frontends/qt4/QAboutDialog.C (revision 14329)
+++ src/frontends/qt4/QAboutDialog.C (working copy)
@@ -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);
Index: src/frontends/qt4/QBibtexDialog.C
===================================================================
--- src/frontends/qt4/QBibtexDialog.C (revision 14329)
+++ src/frontends/qt4/QBibtexDialog.C (working copy)
@@ -148,7 +148,7 @@
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 @@
// 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);
Index: src/frontends/qt4/floatplacement.C
===================================================================
--- src/frontends/qt4/floatplacement.C (revision 14329)
+++ src/frontends/qt4/floatplacement.C (working copy)
@@ -31,7 +31,7 @@
// 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);
Index: src/frontends/qt4/QPrefsDialog.C
===================================================================
--- src/frontends/qt4/QPrefsDialog.C (revision 14329)
+++ src/frontends/qt4/QPrefsDialog.C (working copy)
@@ -523,7 +523,8 @@
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 @@
}
-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 @@
}
-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 @@
}
-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 @@
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 @@
}
-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 @@
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();
Index: src/frontends/qt4/InsertTableWidget.C
===================================================================
--- src/frontends/qt4/InsertTableWidget.C (revision 14329)
+++ src/frontends/qt4/InsertTableWidget.C (working copy)
@@ -104,7 +104,7 @@
}
-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::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_)
Index: src/frontends/qt4/QTocDialog.C
===================================================================
--- src/frontends/qt4/QTocDialog.C (revision 14329)
+++ src/frontends/qt4/QTocDialog.C (working copy)
@@ -60,10 +60,11 @@
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);
Index: src/frontends/qt4/QPrefsDialog.h
===================================================================
--- src/frontends/qt4/QPrefsDialog.h (revision 14329)
+++ src/frontends/qt4/QPrefsDialog.h (working copy)
@@ -61,7 +61,7 @@
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() {}
Index: src/frontends/qt4/QRef.C
===================================================================
--- src/frontends/qt4/QRef.C (revision 14329)
+++ src/frontends/qt4/QRef.C (working copy)
@@ -198,11 +198,10 @@
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);
-
}
}
Index: src/frontends/qt4/BulletsModule.C
===================================================================
--- src/frontends/qt4/BulletsModule.C (revision 14329)
+++ src/frontends/qt4/BulletsModule.C (working copy)
@@ -30,7 +30,8 @@
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,12 @@
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);
+ /*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 +235,10 @@
}
-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:
Index: src/frontends/qt4/Action.C
===================================================================
--- src/frontends/qt4/Action.C (revision 14329)
+++ src/frontends/qt4/Action.C (working copy)
@@ -41,7 +41,7 @@
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 & 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)));
Index: src/frontends/qt4/QNote.C
===================================================================
--- src/frontends/qt4/QNote.C (revision 14329)
+++ src/frontends/qt4/QNote.C (working copy)
@@ -46,9 +46,18 @@
void QNote::update_contents()
{
+#warning 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;
Index: src/frontends/qt4/QSpellcheckerDialog.C
===================================================================
--- src/frontends/qt4/QSpellcheckerDialog.C (revision 14329)
+++ src/frontends/qt4/QSpellcheckerDialog.C (working copy)
@@ -80,14 +80,12 @@
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);
+ }
}
Index: src/frontends/qt4/GuiView.C
===================================================================
--- src/frontends/qt4/GuiView.C (revision 14329)
+++ src/frontends/qt4/GuiView.C (working copy)
@@ -112,7 +112,7 @@
LyXView::init();
}
-void GuiView::updateMenu(QAction *action)
+void GuiView::updateMenu(QAction * /*action*/)
{
menubar_->update();
}
Index: src/frontends/qt4/panelstack.C
===================================================================
--- src/frontends/qt4/panelstack.C (revision 14329)
+++ src/frontends/qt4/panelstack.C (working copy)
@@ -130,7 +130,8 @@
}
-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())
Index: src/frontends/LyXView.C
===================================================================
--- src/frontends/LyXView.C (revision 14329)
+++ src/frontends/LyXView.C (working copy)
@@ -68,14 +68,14 @@
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;
}
Index: src/frontends/controllers/ControlViewSource.C
===================================================================
--- src/frontends/controllers/ControlViewSource.C (revision 14329)
+++ src/frontends/controllers/ControlViewSource.C (working copy)
@@ -31,7 +31,7 @@
{}
-bool ControlViewSource::initialiseParams(string const & source)
+bool ControlViewSource::initialiseParams(string const & /*source*/)
{
return true;
}
Index: src/text.C
===================================================================
--- src/text.C (revision 14329)
+++ src/text.C (working copy)
@@ -325,7 +325,7 @@
} 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 @@
} 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()) {
--
Lgb
