anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-12-22 05:16:21 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Small clean-up to debug support

Browse Source
This commit is contained in:
Jean-Marc Lasgouttes 2015-07-08 10:57:04 +02:00
parent 36b9b9737e
commit f41e423b30
5 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/scripts/bash_completion
View File

@ -16,7 +16,7 @@ _lyx()
local dbg_cmds=( "none info init key gui \
parser lyxrc kbmap latex mathed font tclass \
lyxvc lyxserver action lyxlex depend insets \
files workarea insettext graphics changes \
files workarea clipboard graphics changes \
external painting debug any undo scrolling \
macros rtl locale selection find" )

2
src/Cursor.cpp
View File

@ -386,7 +386,7 @@ void Cursor::saveBeforeDispatchPosXY()
void Cursor::dispatch(FuncRequest const & cmd0)
{
LYXERR(Debug::DEBUG, "cmd: " << cmd0 << '\n' << *this);
LYXERR(Debug::ACTION, "Cursor::dispatch: cmd: " << cmd0 << '\n' << *this);
if (empty())
return;

28
src/frontends/qt4/GuiClipboard.cpp
View File

@ -63,7 +63,7 @@ namespace frontend {
static QMimeData const * read_clipboard()
{
LYXERR(Debug::ACTION, "Getting Clipboard");
LYXERR(Debug::CLIPBOARD, "Getting Clipboard");
QMimeData const * source =
qApp->clipboard()->mimeData(QClipboard::Clipboard);
if (!source) {
@ -82,7 +82,7 @@ static QMimeData const * read_clipboard()
void CacheMimeData::update()
{
time_t const start_time = current_time();
LYXERR(Debug::ACTION, "Creating CacheMimeData object");
LYXERR(Debug::CLIPBOARD, "Creating CacheMimeData object");
cached_formats_ = read_clipboard()->formats();
// Qt times out after 5 seconds if it does not recieve a response.
@ -118,17 +118,17 @@ GuiClipboard::GuiClipboard()
string const GuiClipboard::getAsLyX() const
{
LYXERR(Debug::ACTION, "GuiClipboard::getAsLyX(): `");
LYXERR(Debug::CLIPBOARD, "GuiClipboard::getAsLyX(): `");
// We don't convert encodings here since the encoding of the
// clipboard contents is specified in the data itself
if (cache_.hasFormat(lyxMimeType())) {
// data from ourself or some other LyX instance
QByteArray const ar = cache_.data(lyxMimeType());
string const s(ar.data(), ar.count());
LYXERR(Debug::ACTION, s << "'");
LYXERR(Debug::CLIPBOARD, s << "'");
return s;
}
LYXERR(Debug::ACTION, "'");
LYXERR(Debug::CLIPBOARD, "'");
return string();
}
@ -267,7 +267,7 @@ FileName GuiClipboard::getAsGraphics(Cursor const & cur, GraphicsType type) cons
// get image from QImage from clipboard
QImage image = qApp->clipboard()->image();
if (image.isNull()) {
LYXERR(Debug::ACTION, "No image in clipboard");
LYXERR(Debug::CLIPBOARD, "No image in clipboard");
return FileName();
}
@ -300,12 +300,12 @@ FileName GuiClipboard::getAsGraphics(Cursor const & cur, GraphicsType type) cons
return FileName();
// data from ourself or some other LyX instance
QByteArray const ar = cache_.data(mime);
LYXERR(Debug::ACTION, "Getting from clipboard: mime = " << mime.constData()
LYXERR(Debug::CLIPBOARD, "Getting from clipboard: mime = " << mime.constData()
<< "length = " << ar.count());
QFile f(toqstr(filename.absFileName()));
if (!f.open(QIODevice::WriteOnly | QIODevice::Truncate)) {
LYXERR(Debug::ACTION, "Error opening file "
LYXERR(Debug::CLIPBOARD, "Error opening file "
<< filename.absFileName() << " for writing");
return FileName();
}
@ -405,7 +405,7 @@ docstring const GuiClipboard::getAsText(TextType type) const
break;
}
}
LYXERR(Debug::ACTION, "GuiClipboard::getAsText(" << type << "): `" << str << "'");
LYXERR(Debug::CLIPBOARD, "GuiClipboard::getAsText(" << type << "): `" << str << "'");
if (str.isNull())
return docstring();
@ -421,7 +421,7 @@ void GuiClipboard::put(string const & text) const
void GuiClipboard::put(string const & lyx, docstring const & html, docstring const & text)
{
LYXERR(Debug::ACTION, "GuiClipboard::put(`" << lyx << "' `"
LYXERR(Debug::CLIPBOARD, "GuiClipboard::put(`" << lyx << "' `"
<< to_utf8(html) << "' `" << to_utf8(text) << "')");
// We don't convert the encoding of lyx since the encoding of the
// clipboard contents is specified in the data itself
@ -496,9 +496,9 @@ bool GuiClipboard::hasGraphicsContents(Clipboard::GraphicsType type) const
// get mime data
QStringList const & formats = cache_.formats();
LYXERR(Debug::ACTION, "We found " << formats.size() << " formats");
LYXERR(Debug::CLIPBOARD, "We found " << formats.size() << " formats");
for (int i = 0; i < formats.size(); ++i)
LYXERR(Debug::ACTION, "Found format " << formats[i]);
LYXERR(Debug::CLIPBOARD, "Found format " << formats[i]);
// compute mime for type
QString mime;
@ -559,9 +559,9 @@ void GuiClipboard::on_dataChanged()
//to time-out waiting for the clipboard.
cache_.update();
QStringList l = cache_.formats();
LYXERR(Debug::ACTION, "Qt Clipboard changed. We found the following mime types:");
LYXERR(Debug::CLIPBOARD, "Qt Clipboard changed. We found the following mime types:");
for (int i = 0; i < l.count(); i++)
LYXERR(Debug::ACTION, l.value(i));
LYXERR(Debug::CLIPBOARD, l.value(i));
plaintext_clipboard_empty_ = qApp->clipboard()->
text(QClipboard::Clipboard).isEmpty();

2
src/support/debug.cpp
View File

@ -60,7 +60,7 @@ ErrorItem errorTags[] = {
{ Debug::INSETS, "insets", N_("LyX Insets")},
{ Debug::FILES, "files", N_("Files used by LyX")},
{ Debug::WORKAREA, "workarea", N_("Workarea events")},
{ Debug::INSETTEXT, "insettext", N_("Insettext/tabular messages")},
{ Debug::CLIPBOARD, "clipboard", N_("Clipboard handling")},
{ Debug::GRAPHICS, "graphics", N_("Graphics conversion and loading")},
{ Debug::CHANGES, "changes", N_("Change tracking")},
{ Debug::EXTERNAL, "external", N_("External template/inset messages")},

2
src/support/debug.h
View File

@ -81,7 +81,7 @@ namespace Debug {
///
WORKAREA = (1 << 19),
///
INSETTEXT = (1 << 20),
CLIPBOARD = (1 << 20),
///
GRAPHICS = (1 << 21),
/// change tracking