pogmommy/rssguard
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add astylerc to distfiles.

Browse source
This commit is contained in:
Martin Rotter 2017-07-21 07:14:18 +02:00
parent 84998b46bd
commit fbff4ce555
4 changed files with 866 additions and 864 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.astylerc
View file

@ -9,7 +9,6 @@
--max-continuation-indent=100 --max-continuation-indent=100
--break-blocks=all --break-blocks=all
--unpad-paren --unpad-paren
--delete-empty-lines
--pad-oper --pad-oper
--pad-comma --pad-comma
--pad-header --pad-header

2
rssguard.pro
View file

@ -185,6 +185,8 @@ win32 {
} }
} }
DISTFILES += .astylerc
MOC_DIR = $$OUT_PWD/moc MOC_DIR = $$OUT_PWD/moc
RCC_DIR = $$OUT_PWD/rcc RCC_DIR = $$OUT_PWD/rcc
UI_DIR = $$OUT_PWD/ui UI_DIR = $$OUT_PWD/ui

3
src/miscellaneous/application.cpp
View file

@ -49,9 +49,11 @@
Application::Application(const QString& id, int& argc, char** argv) Application::Application(const QString& id, int& argc, char** argv)
: QtSingleApplication(id, argc, argv), : QtSingleApplication(id, argc, argv),
#if defined(USE_WEBENGINE) #if defined(USE_WEBENGINE)
m_urlInterceptor(new NetworkUrlInterceptor(this)), m_urlInterceptor(new NetworkUrlInterceptor(this)),
#endif #endif
m_feedReader(nullptr), m_feedReader(nullptr),
m_updateFeedsLock(nullptr), m_userActions(QList<QAction*>()), m_mainForm(nullptr), m_updateFeedsLock(nullptr), m_userActions(QList<QAction*>()), m_mainForm(nullptr),
m_trayIcon(nullptr), m_settings(nullptr), m_system(nullptr), m_skins(nullptr), m_trayIcon(nullptr), m_settings(nullptr), m_system(nullptr), m_skins(nullptr),
@ -59,6 +61,7 @@ Application::Application(const QString& id, int& argc, char** argv)
connect(this, &Application::aboutToQuit, this, &Application::onAboutToQuit); connect(this, &Application::aboutToQuit, this, &Application::onAboutToQuit);
connect(this, &Application::commitDataRequest, this, &Application::onCommitData); connect(this, &Application::commitDataRequest, this, &Application::onCommitData);
connect(this, &Application::saveStateRequest, this, &Application::onSaveState); connect(this, &Application::saveStateRequest, this, &Application::onSaveState);
#if defined(USE_WEBENGINE) #if defined(USE_WEBENGINE)
connect(QWebEngineProfile::defaultProfile(), &QWebEngineProfile::downloadRequested, this, &Application::downloadRequested); connect(QWebEngineProfile::defaultProfile(), &QWebEngineProfile::downloadRequested, this, &Application::downloadRequested);
QWebEngineProfile::defaultProfile()->setRequestInterceptor(m_urlInterceptor); QWebEngineProfile::defaultProfile()->setRequestInterceptor(m_urlInterceptor);

2
src/miscellaneous/databasefactory.cpp
View file

@ -257,7 +257,6 @@ QSqlDatabase DatabaseFactory::sqliteInitializeInMemoryDatabase() {
// Attach database. // Attach database.
copy_contents.exec(QString("ATTACH DATABASE '%1' AS 'storage';").arg(file_database.databaseName())); copy_contents.exec(QString("ATTACH DATABASE '%1' AS 'storage';").arg(file_database.databaseName()));
// Copy all stuff. // Copy all stuff.
// WARNING: All tables belong here.
QStringList tables; QStringList tables;
if (copy_contents.exec(QSL("SELECT name FROM storage.sqlite_master WHERE type='table';"))) { if (copy_contents.exec(QSL("SELECT name FROM storage.sqlite_master WHERE type='table';"))) {
@ -534,7 +533,6 @@ void DatabaseFactory::sqliteSaveMemoryDatabase() {
// Attach database. // Attach database.
copy_contents.exec(QString(QSL("ATTACH DATABASE '%1' AS 'storage';")).arg(file_database.databaseName())); copy_contents.exec(QString(QSL("ATTACH DATABASE '%1' AS 'storage';")).arg(file_database.databaseName()));
// Copy all stuff. // Copy all stuff.
// WARNING: All tables belong here.
QStringList tables; QStringList tables;
if (copy_contents.exec(QSL("SELECT name FROM storage.sqlite_master WHERE type='table';"))) { if (copy_contents.exec(QSL("SELECT name FROM storage.sqlite_master WHERE type='table';"))) {