anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-28 12:26:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix some warnings

Browse Source
This commit is contained in:
Richard Kimberly Heck 2020-04-18 14:52:08 -04:00
parent d550774772
commit 3aae85edf1
1 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/LyX.cpp
View File

@ -141,7 +141,7 @@ string cl_user_support;
string geometryArg; string geometryArg;
LyX * singleton_ = 0; LyX * singleton_ = nullptr;
void showFileError(string const & error) void showFileError(string const & error)
{ {
@ -155,7 +155,9 @@ void showFileError(string const & error)
/// The main application class private implementation. /// The main application class private implementation.
struct LyX::Impl { struct LyX::Impl {
Impl() Impl()
: latexfonts_(0), spell_checker_(0), apple_spell_checker_(0), aspell_checker_(0), enchant_checker_(0), hunspell_checker_(0) : latexfonts_(nullptr), spell_checker_(nullptr),
apple_spell_checker_(nullptr), aspell_checker_(nullptr),
enchant_checker_(nullptr), hunspell_checker_(nullptr)
{} {}
~Impl() ~Impl()
@ -250,14 +252,14 @@ frontend::Application * theApp()
if (singleton_) if (singleton_)
return singleton_->pimpl_->application_.get(); return singleton_->pimpl_->application_.get();
else else
return 0; return nullptr;
} }
LyX::~LyX() LyX::~LyX()
{ {
delete pimpl_; delete pimpl_;
singleton_ = 0; singleton_ = nullptr;
} }
@ -397,11 +399,9 @@ int LyX::exec(int & argc, char * argv[])
if (!pimpl_->lyx_server_->deferredLoadingToOtherInstance()) if (!pimpl_->lyx_server_->deferredLoadingToOtherInstance())
exit_status = pimpl_->application_->exec(); exit_status = pimpl_->application_->exec();
else if (!pimpl_->files_to_load_.empty()) { else if (!pimpl_->files_to_load_.empty()) {
vector<string>::const_iterator it = pimpl_->files_to_load_.begin();
vector<string>::const_iterator end = pimpl_->files_to_load_.end();
lyxerr << _("The following files could not be loaded:") << endl; lyxerr << _("The following files could not be loaded:") << endl;
for (; it != end; ++it) for (auto const & f : pimpl_->files_to_load_)
lyxerr << *it << endl; lyxerr << f << endl;
} }
prepareExit(); prepareExit();
@ -1008,7 +1008,7 @@ bool LyX::init()
pimpl_->toplevel_keymap_.read("site"); pimpl_->toplevel_keymap_.read("site");
pimpl_->toplevel_keymap_.read(lyxrc.bind_file); pimpl_->toplevel_keymap_.read(lyxrc.bind_file);
// load user bind file user.bind // load user bind file user.bind
pimpl_->toplevel_keymap_.read("user", 0, KeyMap::MissingOK); pimpl_->toplevel_keymap_.read("user", nullptr, KeyMap::MissingOK);
if (lyxerr.debugging(Debug::LYXRC)) if (lyxerr.debugging(Debug::LYXRC))
lyxrc.print(); lyxrc.print();
@ -1639,7 +1639,7 @@ void setSpellChecker()
singleton_->pimpl_->apple_spell_checker_ = new AppleSpellChecker; singleton_->pimpl_->apple_spell_checker_ = new AppleSpellChecker;
singleton_->pimpl_->spell_checker_ = singleton_->pimpl_->apple_spell_checker_; singleton_->pimpl_->spell_checker_ = singleton_->pimpl_->apple_spell_checker_;
#else #else
singleton_->pimpl_->spell_checker_ = 0; singleton_->pimpl_->spell_checker_ = nullptr;
#endif #endif
} else if (lyxrc.spellchecker == "aspell") { } else if (lyxrc.spellchecker == "aspell") {
#if defined(USE_ASPELL) #if defined(USE_ASPELL)
@ -1647,7 +1647,7 @@ void setSpellChecker()
singleton_->pimpl_->aspell_checker_ = new AspellChecker; singleton_->pimpl_->aspell_checker_ = new AspellChecker;
singleton_->pimpl_->spell_checker_ = singleton_->pimpl_->aspell_checker_; singleton_->pimpl_->spell_checker_ = singleton_->pimpl_->aspell_checker_;
#else #else
singleton_->pimpl_->spell_checker_ = 0; singleton_->pimpl_->spell_checker_ = nullptr;
#endif #endif
} else if (lyxrc.spellchecker == "enchant") { } else if (lyxrc.spellchecker == "enchant") {
#if defined(USE_ENCHANT) #if defined(USE_ENCHANT)
@ -1655,7 +1655,7 @@ void setSpellChecker()
singleton_->pimpl_->enchant_checker_ = new EnchantChecker; singleton_->pimpl_->enchant_checker_ = new EnchantChecker;
singleton_->pimpl_->spell_checker_ = singleton_->pimpl_->enchant_checker_; singleton_->pimpl_->spell_checker_ = singleton_->pimpl_->enchant_checker_;
#else #else
singleton_->pimpl_->spell_checker_ = 0; singleton_->pimpl_->spell_checker_ = nullptr;
#endif #endif
} else if (lyxrc.spellchecker == "hunspell") { } else if (lyxrc.spellchecker == "hunspell") {
#if defined(USE_HUNSPELL) #if defined(USE_HUNSPELL)
@ -1663,10 +1663,10 @@ void setSpellChecker()
singleton_->pimpl_->hunspell_checker_ = new HunspellChecker; singleton_->pimpl_->hunspell_checker_ = new HunspellChecker;
singleton_->pimpl_->spell_checker_ = singleton_->pimpl_->hunspell_checker_; singleton_->pimpl_->spell_checker_ = singleton_->pimpl_->hunspell_checker_;
#else #else
singleton_->pimpl_->spell_checker_ = 0; singleton_->pimpl_->spell_checker_ = nullptr;
#endif #endif
} else { } else {
singleton_->pimpl_->spell_checker_ = 0; singleton_->pimpl_->spell_checker_ = nullptr;
} }
if (singleton_->pimpl_->spell_checker_) { if (singleton_->pimpl_->spell_checker_) {
singleton_->pimpl_->spell_checker_->changeNumber(speller_change_number); singleton_->pimpl_->spell_checker_->changeNumber(speller_change_number);