anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2025-01-21 23:09:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

a bit of compilation unbreaking

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@24631 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Jean-Marc Lasgouttes 2008-05-06 10:22:25 +00:00
parent 14257be476
commit 265e047484
4 changed files with 23 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/FontInfo.cpp
View File

@ -79,16 +79,16 @@ FontInfo & FontInfo::decSize()
case FONT_SIZE_SCRIPT: size_ = FONT_SIZE_TINY; break;
case FONT_SIZE_TINY: break;
case FONT_SIZE_INCREASE:
lyxerr << "Can't FontInfo::decSize on FONT_SIZE_INCREASE" << endl;
LYXERR0("Can't FontInfo::decSize on FONT_SIZE_INCREASE");
break;
case FONT_SIZE_DECREASE:
lyxerr <<"Can't FontInfo::decSize on FONT_SIZE_DECREASE" << endl;
LYXERR0("Can't FontInfo::decSize on FONT_SIZE_DECREASE");
break;
case FONT_SIZE_INHERIT:
lyxerr <<"Can't FontInfo::decSize on FONT_SIZE_INHERIT" << endl;
LYXERR0("Can't FontInfo::decSize on FONT_SIZE_INHERIT");
break;
case FONT_SIZE_IGNORE:
lyxerr <<"Can't FontInfo::decSize on FONT_SIZE_IGNORE" << endl;
LYXERR0("Can't FontInfo::decSize on FONT_SIZE_IGNORE");
break;
}
return *this;
@ -110,16 +110,16 @@ FontInfo & FontInfo::incSize()
case FONT_SIZE_SCRIPT: size_ = FONT_SIZE_FOOTNOTE; break;
case FONT_SIZE_TINY: size_ = FONT_SIZE_SCRIPT; break;
case FONT_SIZE_INCREASE:
lyxerr <<"Can't FontInfo::incSize on FONT_SIZE_INCREASE" << endl;
LYXERR0("Can't FontInfo::incSize on FONT_SIZE_INCREASE");
break;
case FONT_SIZE_DECREASE:
lyxerr <<"Can't FontInfo::incSize on FONT_SIZE_DECREASE" << endl;
LYXERR0("Can't FontInfo::incSize on FONT_SIZE_DECREASE");
break;
case FONT_SIZE_INHERIT:
lyxerr <<"Can't FontInfo::incSize on FONT_SIZE_INHERIT" << endl;
LYXERR0("Can't FontInfo::incSize on FONT_SIZE_INHERIT");
break;
case FONT_SIZE_IGNORE:
lyxerr <<"Can't FontInfo::incSize on FONT_SIZE_IGNORE" << endl;
LYXERR0("Can't FontInfo::incSize on FONT_SIZE_IGNORE");
break;
}
return *this;

20
src/ModuleList.cpp
View File

@ -82,27 +82,23 @@ bool ModuleList::load()
LYXERR(Debug::TCLASS, "Reading modules from `" << real_file << '\'');
if (real_file.empty()) {
lyxerr << "ModuleList::load(): unable to find "
"modules file `"
<< to_utf8(makeDisplayPath(real_file.absFilename(), 1000))
<< "'.\nNo modules will be available." << endl;
LYXERR0("unable to find modules file `"
<< to_utf8(makeDisplayPath(real_file.absFilename(), 1000))
<< "'.\nNo modules will be available.");
return false;
}
Lexer lex;
if (!lex.setFile(real_file)) {
lyxerr << "ModuleList::load():"
"lyxlex was not able to set file: "
<< real_file << ".\nNo modules will be available." << endl;
LYXERR0("lyxlex was not able to set file: "
<< real_file << ".\nNo modules will be available.");
return false;
}
if (!lex.isOK()) {
lyxerr << "ModuleList::load():" <<
"unable to open modules file `"
<< to_utf8(makeDisplayPath(real_file.absFilename(), 1000))
<< "'\nNo modules will be available."
<< endl;
LYXERR0("unable to open modules file `"
<< to_utf8(makeDisplayPath(real_file.absFilename(), 1000))
<< "'\nNo modules will be available.");
return false;
}

4
src/ServerSocket.cpp
View File

@ -30,6 +30,7 @@
#include <boost/bind.hpp>
#include <cerrno>
#include <ostream>
#if defined (_WIN32)
# include <io.h>
@ -79,7 +80,8 @@ ServerSocket::~ServerSocket()
theApp()->unregisterSocketCallback(fd_);
if (::close(fd_) != 0)
lyxerr << "lyx: Server socket " << fd_
<< " IO error on closing: " << strerror(errno);
<< " IO error on closing: " << strerror(errno)
<< endl;
}
address_.removeFile();
LYXERR(Debug::LYXSERVER, "lyx: Server socket quitting");

9
src/frontends/qt4/Menus.cpp
View File

@ -567,14 +567,13 @@ void MenuDefinition::checkShortcuts() const
LYXERR0("Menu warning: menu entry \""
<< it1->label()
<< "\" does not contain shortcut `"
<< shortcut << "'." << endl);
<< shortcut << "'.");
for (const_iterator it2 = begin(); it2 != it1 ; ++it2) {
if (!it2->shortcut().compare(shortcut, Qt::CaseInsensitive)) {
LYXERR0("Menu warning: menu entries "
<< '"' << it1->fulllabel()
<< "\" and \"" << it2->fulllabel()
<< "\" share the same shortcut."
<< endl);
<< "\" share the same shortcut.");
}
}
}
@ -1436,7 +1435,7 @@ MenuDefinition const & Menus::Impl::getMenu(QString const & name) const
const_iterator cit = find_if(menulist_.begin(), menulist_.end(),
MenuNamesEqual(name));
if (cit == menulist_.end())
lyxerr << "No submenu named " << name << endl;
LYXERR0("No submenu named " << name);
LASSERT(cit != menulist_.end(), /**/);
return (*cit);
}
@ -1447,7 +1446,7 @@ MenuDefinition & Menus::Impl::getMenu(QString const & name)
iterator it = find_if(menulist_.begin(), menulist_.end(),
MenuNamesEqual(name));
if (it == menulist_.end())
lyxerr << "No submenu named " << name << endl;
LYXERR0("No submenu named " << name);
LASSERT(it != menulist_.end(), /**/);
return (*it);
}