Commit 8b9c748a authored by con's avatar con
Browse files

Merge remote branch 'origin/1.3'

parents 36b6810c 42f849c4
......@@ -10,7 +10,7 @@
<style name="CurrentLineNumber" foreground="#aaaaaa" bold="true"/>
<style name="DiffFile" foreground="#55ff55"/>
<style name="DiffLocation" foreground="#ffff55"/>
<style name="DisabledCode" foreground="#777777"/>
<style name="DisabledCode" foreground="#777777" background="#222222"/>
<style name="Doxygen.Comment" foreground="#55ffff"/>
<style name="Doxygen.Tag" foreground="#00a0a0"/>
<style name="Keyword" foreground="#ffff55"/>
......
......@@ -1735,13 +1735,8 @@ Sollen sie überschrieben werden?</translation>
</context>
<context>
<name>Core::Internal::EditorView</name>
<message id="===============EditorView====================">
<location filename="../../../src/plugins/coreplugin/editormanager/editorview.cpp" line="-442"/>
<source>Go Back</source>
<translation>Vorheriges</translation>
</message>
<message>
<location line="+0"/>
<location filename="../../../src/plugins/coreplugin/editormanager/editorview.cpp" line="-442"/>
<source>Go Back</source>
<translation>Vorheriges</translation>
</message>
......
......@@ -1437,7 +1437,7 @@ Ali jih želite nadomestiti?</translation>
</context>
<context>
<name>Core::Internal::EditorView</name>
<message id="===============EditorView====================">
<message>
<location filename="../../../src/plugins/coreplugin/editormanager/editorview.cpp" line="-442"/>
<source>Go Back</source>
<translation>Pojdi nazaj</translation>
......
......@@ -746,6 +746,9 @@ bool Preprocessor::markGeneratedTokens(bool markGeneratedTokens,
else
out(*it);
}
if (! markGeneratedTokens && dot->newline())
processNewline(/*force = */ true);
}
return previous;
......
......@@ -145,15 +145,14 @@ bool SearchSymbols::visit(Declaration *symbol)
bool SearchSymbols::visit(Class *symbol)
{
if (!(symbolsToSearchFor & Classes))
return false;
QString name = symbolName(symbol);
QString scopedName = scopedSymbolName(name);
QString previousScope = switchScope(scopedName);
appendItem(separateScope ? name : scopedName,
separateScope ? previousScope : QString(),
ModelItemInfo::Class, symbol);
if (symbolsToSearchFor & Classes) {
appendItem(separateScope ? name : scopedName,
separateScope ? previousScope : QString(),
ModelItemInfo::Class, symbol);
}
Scope *members = symbol->members();
for (unsigned i = 0; i < members->symbolCount(); ++i) {
accept(members->symbolAt(i));
......
......@@ -467,7 +467,7 @@ void Launcher::closeRemoteFile(bool failed)
{
QByteArray ba;
appendInt(&ba, d->m_copyState.copyFileHandle, TargetByteOrder);
appendInt(&ba, QDateTime::currentDateTime().toTime_t(), TargetByteOrder);
appendDateTime(&ba, QDateTime::currentDateTime(), TargetByteOrder);
d->m_device->sendTrkMessage(TrkCloseFile,
failed ? TrkCallback() : TrkCallback(this, &Launcher::handleFileCopied),
ba);
......
......@@ -32,6 +32,9 @@
#include <QtCore/QCoreApplication>
#include <QtCore/QDebug>
#include <QtCore/QDate>
#include <QtCore/QDateTime>
#include <QtCore/QTime>
#define logMessage(s) do { qDebug() << "TRKCLIENT: " << s; } while (0)
......@@ -400,6 +403,18 @@ void appendString(QByteArray *ba, const QByteArray &str, Endianness endian, bool
ba->append('\0');
}
void appendDateTime(QByteArray *ba, QDateTime dateTime, Endianness endian)
{
// convert the QDateTime to UTC and append its representation to QByteArray
// format is the same as in FAT file system
dateTime = dateTime.toUTC();
const QTime utcTime = dateTime.time();
const QDate utcDate = dateTime.date();
uint fatDateTime = (utcTime.hour() << 11 | utcTime.minute() << 5 | utcTime.second()/2) << 16;
fatDateTime |= (utcDate.year()-1980) << 9 | utcDate.month() << 5 | utcDate.day();
appendInt(ba, fatDateTime, endian);
}
QByteArray errorMessage(byte code)
{
switch (code) {
......
......@@ -37,6 +37,8 @@
typedef unsigned char byte;
class QDateTime;
namespace trk {
enum Command {
......@@ -92,6 +94,7 @@ void appendByte(QByteArray *ba, byte b);
void appendShort(QByteArray *ba, ushort s, Endianness = TargetByteOrder);
void appendInt(QByteArray *ba, uint i, Endianness = TargetByteOrder);
void appendString(QByteArray *ba, const QByteArray &str, Endianness = TargetByteOrder, bool appendNullTerminator = true);
void appendDateTime(QByteArray *ba, QDateTime dateTime, Endianness = TargetByteOrder);
struct Library
{
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment