#include "Buffer.h"
#include "BufferParams.h"
#include "BufferView.h"
+#include "Cursor.h"
#include "Encoding.h"
#include "FuncRequest.h"
/// name of unicode block, start and end code point
struct UnicodeBlocks {
- QString name;
+ char const * name;
char_type start;
char_type end;
};
// c falls into a covered area, and we can guess which
if (c >= unicode_blocks[lastBlock].start
&& c <= unicode_blocks[lastBlock].end)
- return unicode_blocks[lastBlock].name;
+ return qt_(unicode_blocks[lastBlock].name);
// c falls into an uncovered area, but we can guess which
if (c > unicode_blocks[lastBlock].end
return QString();
lastBlock = i;
//LYXERR0("fail: " << int(c) << ' ' << lastBlock);
- return unicode_blocks[lastBlock].name;
+ return qt_(unicode_blocks[lastBlock].name);
}
void GuiSymbols::scrollToItem(QString const & category)
{
- if (used_blocks.find(category) != used_blocks.end()) {
- int row = used_blocks[category];
- QModelIndex index = symbolsLW->model()->index(row, 0, QModelIndex());
- symbolsLW->scrollTo(index, QAbstractItemView::PositionAtTop);
- }
+ if (used_blocks.find(category) == used_blocks.end())
+ return;
+ int row = used_blocks[category];
+ QModelIndex index = symbolsLW->model()->index(row, 0, QModelIndex());
+ symbolsLW->scrollTo(index, QAbstractItemView::PositionAtTop);
}
+
void GuiSymbols::updateSymbolList(bool update_combo)
{
QString category = categoryCO->currentText();
if (!show_all) {
for (int i = 0 ; i < no_blocks; ++i)
- if (unicode_blocks[i].name == category) {
+ if (qt_(unicode_blocks[i].name) == category) {
range_start = unicode_blocks[i].start;
range_end = unicode_blocks[i].end;
break;
#if QT_VERSION >= 0x040300
QChar::Category const cat = QChar::category(uint(c));
#else
- QChar const qc = uint(c);
- QChar::Category const cat = qc.category();
+ QChar::Category const cat = QChar(uint(c)).category();
#endif
// we do not want control or space characters
if (cat == QChar::Other_Control || cat == QChar::Separator_Space)