[app] Added BooksPos::List::fromVariant() and toVariantList()
Also moved BooksPos::fromVariant() and toVariant() to the .cpp file. They seem to be a bit too large for inline functions.
This commit is contained in:
parent
209280a3e4
commit
4f293dd7ff
4 changed files with 108 additions and 46 deletions
|
@ -116,6 +116,7 @@ SOURCES += \
|
||||||
src/BooksPaintContext.cpp \
|
src/BooksPaintContext.cpp \
|
||||||
src/BooksPathModel.cpp \
|
src/BooksPathModel.cpp \
|
||||||
src/BooksPolicyPlugin.cpp \
|
src/BooksPolicyPlugin.cpp \
|
||||||
|
src/BooksPos.cpp \
|
||||||
src/BooksSaveTimer.cpp \
|
src/BooksSaveTimer.cpp \
|
||||||
src/BooksSettings.cpp \
|
src/BooksSettings.cpp \
|
||||||
src/BooksShelf.cpp \
|
src/BooksShelf.cpp \
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
/*
|
/*
|
||||||
* Copyright (C) 2015-2017 Jolla Ltd.
|
* Copyright (C) 2015-2018 Jolla Ltd.
|
||||||
* Contact: Slava Monich <slava.monich@jolla.com>
|
* Copyright (C) 2015-2018 Slava Monich <slava.monich@jolla.com>
|
||||||
*
|
*
|
||||||
* You may use this file under the terms of the BSD license as follows:
|
* You may use this file under the terms of the BSD license as follows:
|
||||||
*
|
*
|
||||||
|
@ -343,14 +343,7 @@ BooksBook::BooksBook(const BooksStorage& aStorage, QString aRelativePath,
|
||||||
iPageStack.append(bookPos);
|
iPageStack.append(bookPos);
|
||||||
} else {
|
} else {
|
||||||
// New format (list of positions)
|
// New format (list of positions)
|
||||||
QVariantList list(position.toList());
|
iPageStack = BooksPos::List::fromVariant(position);
|
||||||
const int count = list.count();
|
|
||||||
for (int k=0; k<count; k++) {
|
|
||||||
bookPos = BooksPos::fromVariant(list.at(k));
|
|
||||||
if (bookPos.valid()) {
|
|
||||||
iPageStack.append(bookPos);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -581,10 +574,7 @@ void BooksBook::saveState()
|
||||||
if (!iStateFilePath.isEmpty()) {
|
if (!iStateFilePath.isEmpty()) {
|
||||||
QVariantMap state;
|
QVariantMap state;
|
||||||
HarbourJson::load(iStateFilePath, state);
|
HarbourJson::load(iStateFilePath, state);
|
||||||
QVariantList positions;
|
state.insert(BOOK_STATE_POSITION, iPageStack.toVariantList());
|
||||||
const int n = iPageStack.count();
|
|
||||||
for (int i=0; i<n; i++) positions.append(iPageStack.at(i).toVariant());
|
|
||||||
state.insert(BOOK_STATE_POSITION, positions);
|
|
||||||
state.insert(BOOK_STATE_FONT_SIZE_ADJUST, iFontSizeAdjust);
|
state.insert(BOOK_STATE_FONT_SIZE_ADJUST, iFontSizeAdjust);
|
||||||
#ifdef BOOK_STATE_PAGE_STACK_INDEX
|
#ifdef BOOK_STATE_PAGE_STACK_INDEX
|
||||||
state.insert(BOOK_STATE_PAGE_STACK_INDEX, iPageStackPos);
|
state.insert(BOOK_STATE_PAGE_STACK_INDEX, iPageStackPos);
|
||||||
|
|
90
app/src/BooksPos.cpp
Normal file
90
app/src/BooksPos.cpp
Normal file
|
@ -0,0 +1,90 @@
|
||||||
|
/*
|
||||||
|
* Copyright (C) 2015-2018 Jolla Ltd.
|
||||||
|
* Copyright (C) 2015-2018 Slava Monich <slava.monich@jolla.com>
|
||||||
|
*
|
||||||
|
* You may use this file under the terms of the BSD license as follows:
|
||||||
|
*
|
||||||
|
* Redistribution and use in source and binary forms, with or without
|
||||||
|
* modification, are permitted provided that the following conditions
|
||||||
|
* are met:
|
||||||
|
*
|
||||||
|
* * Redistributions of source code must retain the above copyright
|
||||||
|
* notice, this list of conditions and the following disclaimer.
|
||||||
|
* * Redistributions in binary form must reproduce the above copyright
|
||||||
|
* notice, this list of conditions and the following disclaimer in
|
||||||
|
* the documentation and/or other materials provided with the
|
||||||
|
* distribution.
|
||||||
|
* * Neither the name of Jolla Ltd nor the names of its contributors
|
||||||
|
* may be used to endorse or promote products derived from this
|
||||||
|
* software without specific prior written permission.
|
||||||
|
*
|
||||||
|
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
|
||||||
|
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
|
||||||
|
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
|
||||||
|
* A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
|
||||||
|
* OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
|
||||||
|
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
|
||||||
|
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
|
||||||
|
* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
|
||||||
|
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
||||||
|
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
|
||||||
|
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||||
|
*/
|
||||||
|
|
||||||
|
#include "BooksPos.h"
|
||||||
|
|
||||||
|
QVariant BooksPos::toVariant() const
|
||||||
|
{
|
||||||
|
QVariantList list;
|
||||||
|
list.append(iParagraphIndex);
|
||||||
|
list.append(iElementIndex);
|
||||||
|
list.append(iCharIndex);
|
||||||
|
return QVariant::fromValue(list);
|
||||||
|
}
|
||||||
|
|
||||||
|
BooksPos BooksPos::fromVariant(QVariant aVariant)
|
||||||
|
{
|
||||||
|
if (aVariant.isValid()) {
|
||||||
|
QVariantList list = aVariant.toList();
|
||||||
|
if (list.count() == 3) {
|
||||||
|
bool ok = false;
|
||||||
|
int paraIndex = list.at(0).toInt(&ok);
|
||||||
|
if (ok) {
|
||||||
|
int elemIndex = list.at(1).toInt(&ok);
|
||||||
|
if (ok) {
|
||||||
|
int charIndex = list.at(2).toInt(&ok);
|
||||||
|
if (ok) {
|
||||||
|
return BooksPos(paraIndex, elemIndex, charIndex);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return BooksPos();
|
||||||
|
}
|
||||||
|
|
||||||
|
QVariantList BooksPos::List::toVariantList() const
|
||||||
|
{
|
||||||
|
QVariantList result;
|
||||||
|
const int n = count();
|
||||||
|
for (int i = 0; i < n; i++) {
|
||||||
|
result.append(at(i).toVariant());
|
||||||
|
}
|
||||||
|
return result;
|
||||||
|
}
|
||||||
|
|
||||||
|
BooksPos::List BooksPos::List::fromVariant(QVariant aVariant, bool aStrict)
|
||||||
|
{
|
||||||
|
List result;
|
||||||
|
QVariantList list(aVariant.toList());
|
||||||
|
const int n = list.count();
|
||||||
|
for (int i = 0; i < n; i++) {
|
||||||
|
BooksPos pos(BooksPos::fromVariant(list.at(i)));
|
||||||
|
if (pos.valid()) {
|
||||||
|
result.append(pos);
|
||||||
|
} else if (aStrict) {
|
||||||
|
return List();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return result;
|
||||||
|
}
|
|
@ -1,6 +1,6 @@
|
||||||
/*
|
/*
|
||||||
* Copyright (C) 2015-2017 Jolla Ltd.
|
* Copyright (C) 2015-2018 Jolla Ltd.
|
||||||
* Contact: Slava Monich <slava.monich@jolla.com>
|
* Copyright (C) 2015-2018 Slava Monich <slava.monich@jolla.com>
|
||||||
*
|
*
|
||||||
* You may use this file under the terms of the BSD license as follows:
|
* You may use this file under the terms of the BSD license as follows:
|
||||||
*
|
*
|
||||||
|
@ -44,7 +44,15 @@
|
||||||
struct BooksPos {
|
struct BooksPos {
|
||||||
int iParagraphIndex, iElementIndex, iCharIndex;
|
int iParagraphIndex, iElementIndex, iCharIndex;
|
||||||
|
|
||||||
typedef QList<BooksPos> List;
|
class List : public QList<BooksPos> {
|
||||||
|
public:
|
||||||
|
List() : QList<BooksPos>() {}
|
||||||
|
List(const List& aList) : QList<BooksPos>(aList) {}
|
||||||
|
|
||||||
|
QVariantList toVariantList() const;
|
||||||
|
static List fromVariant(QVariant aVariant, bool aStrict = true);
|
||||||
|
};
|
||||||
|
|
||||||
typedef QList<BooksPos>::iterator Iterator;
|
typedef QList<BooksPos>::iterator Iterator;
|
||||||
typedef QList<BooksPos>::const_iterator ConstIterator;
|
typedef QList<BooksPos>::const_iterator ConstIterator;
|
||||||
struct Stack { List iList; int iPos; };
|
struct Stack { List iList; int iPos; };
|
||||||
|
@ -89,35 +97,8 @@ struct BooksPos {
|
||||||
iCharIndex = aCharIndex;
|
iCharIndex = aCharIndex;
|
||||||
}
|
}
|
||||||
|
|
||||||
QVariant toVariant() const
|
QVariant toVariant() const;
|
||||||
{
|
static BooksPos fromVariant(QVariant aVariant);
|
||||||
QVariantList list;
|
|
||||||
list.append(iParagraphIndex);
|
|
||||||
list.append(iElementIndex);
|
|
||||||
list.append(iCharIndex);
|
|
||||||
return QVariant::fromValue(list);
|
|
||||||
}
|
|
||||||
|
|
||||||
static BooksPos fromVariant(QVariant aVariant)
|
|
||||||
{
|
|
||||||
if (aVariant.isValid()) {
|
|
||||||
QVariantList list = aVariant.toList();
|
|
||||||
if (list.count() == 3) {
|
|
||||||
bool ok = false;
|
|
||||||
int paraIndex = list.at(0).toInt(&ok);
|
|
||||||
if (ok) {
|
|
||||||
int elemIndex = list.at(1).toInt(&ok);
|
|
||||||
if (ok) {
|
|
||||||
int charIndex = list.at(2).toInt(&ok);
|
|
||||||
if (ok) {
|
|
||||||
return BooksPos(paraIndex, elemIndex, charIndex);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return BooksPos();
|
|
||||||
}
|
|
||||||
|
|
||||||
const BooksPos& operator = (const BooksPos& aPos)
|
const BooksPos& operator = (const BooksPos& aPos)
|
||||||
{
|
{
|
||||||
|
|
Loading…
Reference in a new issue