Commit dfd0ba32 authored by Martin Straka's avatar Martin Straka

Removed some includes and dependencies

parent f5b9b5e4
......@@ -25,13 +25,12 @@
#include <QUrl>
#include "src/accounts.h"
#include "src/common.h"
#include "src/dialogues/dialogues.h"
#include "src/net/isds_wrapper.h"
#include "src/models/accountmodel.h"
#include "src/net/isds_session.h"
#include "src/net/isds_wrapper.h"
#include "src/settings.h"
#include "src/sqlite/account_db.h"
#include "src/models/accountmodel.h"
#include "src/sqlite/message_db_container.h"
#include "src/sqlite/file_db_container.h"
......
......@@ -29,19 +29,19 @@
#include <QUrl>
#include <QQmlEngine> /* qmlRegisterType */
#include "ios/src/url_opener.h"
#include "src/auxiliaries/attachment_helper.h"
#include "src/common.h"
#include "src/dialogues/dialogues.h"
#include "src/files.h"
#include "src/settings.h"
#include "src/io/filesystem.h"
#include "ios/src/url_opener.h"
#include "src/models/accountmodel.h"
#include "src/net/xml_layer.h"
#include "src/qml_interaction/attachment_data.h"
#include "src/qml_interaction/message_envelope.h"
#include "src/settings.h"
#include "src/sqlite/file_db_container.h"
#include "src/sqlite/message_db_container.h"
#include "src/net/xml_layer.h"
#include "src/sqlite/dbs.h"
#ifndef Q_OS_WIN
......
......@@ -32,7 +32,6 @@
#include <QtXml>
#include "src/accounts.h"
#include "src/common.h"
#include "src/dialogues/qml_dialogue_helper.h"
#include "src/dialogues/qml_input_dialogue.h"
#include "src/dialogues/dialogues.h"
......
......@@ -27,19 +27,15 @@
#include <QQmlEngine> /* qmlRegisterType */
#include <QStorageInfo>
#include "src/common.h"
#include "src/dialogues/dialogues.h"
#include "src/messages.h"
#include "src/settings.h"
#include "src/models/accountmodel.h"
#include "src/models/databoxmodel.h"
#include "src/models/messagemodel.h"
#include "src/settings.h"
#include "src/sqlite/message_db_container.h"
#include "src/sqlite/file_db_container.h"
/* 1 MB free disk space is required for new database */
#define INITIAL_DB_SIZE_BYTES 1000000
void Messages::declareQML(void)
{
qmlRegisterType<Messages>("cz.nic.mobileDatovka.messages", 1, 0, "MessageType");
......@@ -450,8 +446,8 @@ int Messages::getAllDbSize(void)
int Messages::estimateAllDbSize(void)
{
return
2 * AccountListModel::globAccounts.size() * INITIAL_DB_SIZE_BYTES;
/* 1 MB free disk space is required for new database */
return 2 * AccountListModel::globAccounts.size() * 1000000;
}
bool Messages::relocateDatabases(const QString &newLocation,
......
......@@ -21,6 +21,7 @@
* the two.
*/
#include "src/common.h"
#include "src/isds/isds_conversion.h"
#include "src/models/accountmodel.h"
#include "src/net/db_wrapper.h"
......
......@@ -24,7 +24,6 @@
#include <QDebug>
#include <QFileInfo>
#include "src/common.h"
#include "src/models/accountmodel.h"
#include "src/net/isds_const.h"
#include "src/net/isds_session.h"
......
......@@ -28,7 +28,6 @@
#include <QSslConfiguration>
#include <QTimer>
#include "src/common.h"
#include "src/net/isds_const.h"
#include "src/net/net_layer.h"
......
......@@ -1571,9 +1571,9 @@ bool XmlLayer::parseFindDataBoxSoapResponse(const QByteArray &xmlData,
ret = XmlLayer::parseGetOwnerInfoFromLogin(xmlData, accountInfo, txt);
if (!ret) {
dbInfo.append(divStart);
dbInfo.append(strongInfoLine(tr("ISDS says"), txt));
dbInfo.append(divEnd);
dbInfo.append(tr("ISDS says"));
dbInfo.append(": ");
dbInfo.append(txt);
return ret;
}
......
......@@ -26,7 +26,6 @@
#include <QDir>
#include <QStandardPaths>
#include "src/common.h"
#include "src/io/filesystem.h"
#include "src/settings.h"
......
......@@ -33,14 +33,13 @@
#define LANGUAGE_SYSTEM "system"
#define LANGUAGE_CS "cs"
#define LANGUAGE_EN "en"
/* Default application font size (scale) */
#define DEFAULT_FONT_SIZE 16
/* Default value which define how long will have
* attachment files stored in local database (in days)*/
#define DEFAULT_MSG_LIFETIME 90
#define DEFAULT_FILE_LIFETIME 10
#define DEFAULT_ZFO_LIMIT_MB 200
#define DEFAULT_PIN_INACT_TIMEOUT 0
#define DEFAULT_FONT_SIZE 16
/* Names of setting items in GLOBALS group in the datovka.conf file */
#define SETTINGS_GLOBAL_GROUP "GLOBALS"
#define SETTINGS_ONLY_NEW_MSGS "only_new_msgs"
......@@ -48,7 +47,6 @@
#define SETTINGS_MSG_LIFETIME_IN_DAYS "msg_lifetime"
#define SETTINGS_FILE_LIFETIME_IN_DAYS "file_lifetime"
#define SETTINGS_ZFO_LIMIT_MB "zfo_db_max_size"
//#define SETTINGS_PIN_VAL "pin_val" // Don't store readable PIN value into settings.
#define SETTINGS_PIN_ALG "pin_alg"
#define SETTINGS_PIN_SALT "pin_salt"
#define SETTINGS_PIN_CODE "pin_code"
......
......@@ -29,6 +29,7 @@
#include <QSqlRecord>
#include <QStandardPaths>
#include "src/common.h"
#include "src/io/filesystem.h"
#include "src/isds/isds_conversion.h"
#include "src/sqlite/account_db.h"
......
......@@ -27,7 +27,6 @@
#include <QList>
#include <QString>
#include "src/common.h"
#include "src/files.h"
#include "src/io/sqlite/db.h"
#include "src/messages.h"
......
......@@ -21,14 +21,12 @@
* the two.
*/
#ifndef _MESSAGE_DB_H_
#define _MESSAGE_DB_H_
#include <QList>
#include <QString>
#include "src/common.h"
#include "src/io/sqlite/db.h"
#include "src/messages.h"
#include "src/models/databoxmodel.h"
......
......@@ -28,7 +28,6 @@
#include <QString>
#include "src/io/sqlite/db.h"
#include "src/common.h"
/* Zfo db filename */
#define ZFO_DB_NAME "zfo.db"
......
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