diff --git a/src/librssguard/gui/dialogs/formmain.cpp b/src/librssguard/gui/dialogs/formmain.cpp index 92839b334..90ad68f3c 100755 --- a/src/librssguard/gui/dialogs/formmain.cpp +++ b/src/librssguard/gui/dialogs/formmain.cpp @@ -31,7 +31,7 @@ #include "network-web/webfactory.h" #include "services/abstract/recyclebin.h" #include "services/abstract/serviceroot.h" -#include "services/owncloud/network/owncloudnetworkfactory.h" +#include "services/owncloud/owncloudnetworkfactory.h" #include "services/standard/gui/formstandardimportexport.h" #if defined(USE_WEBENGINE) diff --git a/src/librssguard/librssguard.pro b/src/librssguard/librssguard.pro index ad2a04d4a..8e43d8a47 100644 --- a/src/librssguard/librssguard.pro +++ b/src/librssguard/librssguard.pro @@ -76,11 +76,15 @@ HEADERS += core/feeddownloader.h \ gui/labelwithstatus.h \ gui/lineeditwithstatus.h \ gui/messagebox.h \ + gui/messagepreviewer.h \ gui/messagessearchlineedit.h \ gui/messagestoolbar.h \ gui/messagesview.h \ + gui/networkproxydetails.h \ + gui/newspaperpreviewer.h \ gui/nonclosablemenu.h \ gui/plaintoolbutton.h \ + gui/searchtextwidget.h \ gui/settings/settingsbrowsermail.h \ gui/settings/settingsdatabase.h \ gui/settings/settingsdownloads.h \ @@ -101,7 +105,6 @@ HEADERS += core/feeddownloader.h \ gui/toolbareditor.h \ gui/treeviewcolumnsmenu.h \ gui/widgetwithstatus.h \ - gui/networkproxydetails.h \ miscellaneous/application.h \ miscellaneous/autosaver.h \ miscellaneous/databasecleaner.h \ @@ -124,8 +127,10 @@ HEADERS += core/feeddownloader.h \ network-web/basenetworkaccessmanager.h \ network-web/downloader.h \ network-web/downloadmanager.h \ + network-web/httpresponse.h \ network-web/networkfactory.h \ network-web/oauth2service.h \ + network-web/oauthhttphandler.h \ network-web/silentnetworkaccessmanager.h \ network-web/webfactory.h \ qtsingleapplication/qtlocalpeer.h \ @@ -136,6 +141,7 @@ HEADERS += core/feeddownloader.h \ services/abstract/cacheforserviceroot.h \ services/abstract/category.h \ services/abstract/feed.h \ + services/abstract/gui/authenticationdetails.h \ services/abstract/gui/formaccountdetails.h \ services/abstract/gui/formfeeddetails.h \ services/abstract/importantnode.h \ @@ -155,11 +161,13 @@ HEADERS += core/feeddownloader.h \ services/gmail/definitions.h \ services/gmail/gmailentrypoint.h \ services/gmail/gmailfeed.h \ + services/gmail/gmailnetworkfactory.h \ services/gmail/gmailserviceroot.h \ services/gmail/gui/emailrecipientcontrol.h \ + services/gmail/gui/formaddeditemail.h \ + services/gmail/gui/formdownloadattachment.h \ services/gmail/gui/formeditgmailaccount.h \ services/gmail/gui/gmailaccountdetails.h \ - services/gmail/network/gmailnetworkfactory.h \ services/greader/definitions.h \ services/greader/greaderentrypoint.h \ services/greader/greaderfeed.h \ @@ -172,19 +180,18 @@ HEADERS += core/feeddownloader.h \ services/inoreader/gui/inoreaderaccountdetails.h \ services/inoreader/inoreaderentrypoint.h \ services/inoreader/inoreaderfeed.h \ + services/inoreader/inoreadernetworkfactory.h \ services/inoreader/inoreaderserviceroot.h \ - services/inoreader/network/inoreadernetworkfactory.h \ services/owncloud/definitions.h \ services/owncloud/gui/formeditowncloudaccount.h \ services/owncloud/gui/owncloudaccountdetails.h \ - services/owncloud/network/owncloudnetworkfactory.h \ services/owncloud/owncloudfeed.h \ + services/owncloud/owncloudnetworkfactory.h \ services/owncloud/owncloudserviceentrypoint.h \ services/owncloud/owncloudserviceroot.h \ services/standard/atomparser.h \ services/standard/definitions.h \ services/standard/feedparser.h \ - services/abstract/gui/authenticationdetails.h \ services/standard/gui/formeditstandardaccount.h \ services/standard/gui/formstandardcategorydetails.h \ services/standard/gui/formstandardfeeddetails.h \ @@ -203,17 +210,10 @@ HEADERS += core/feeddownloader.h \ services/tt-rss/gui/formttrssfeeddetails.h \ services/tt-rss/gui/ttrssaccountdetails.h \ services/tt-rss/gui/ttrssfeeddetails.h \ - services/tt-rss/network/ttrssnetworkfactory.h \ services/tt-rss/ttrssfeed.h \ + services/tt-rss/ttrssnetworkfactory.h \ services/tt-rss/ttrssserviceentrypoint.h \ - services/tt-rss/ttrssserviceroot.h \ - network-web/httpresponse.h \ - services/gmail/gui/formdownloadattachment.h \ - services/gmail/gui/formaddeditemail.h \ - gui/searchtextwidget.h \ - network-web/oauthhttphandler.h \ - gui/messagepreviewer.h \ - gui/newspaperpreviewer.h + services/tt-rss/ttrssserviceroot.h SOURCES += core/feeddownloader.cpp \ core/feedsmodel.cpp \ @@ -257,11 +257,15 @@ SOURCES += core/feeddownloader.cpp \ gui/labelwithstatus.cpp \ gui/lineeditwithstatus.cpp \ gui/messagebox.cpp \ + gui/messagepreviewer.cpp \ gui/messagessearchlineedit.cpp \ gui/messagestoolbar.cpp \ gui/messagesview.cpp \ + gui/networkproxydetails.cpp \ + gui/newspaperpreviewer.cpp \ gui/nonclosablemenu.cpp \ gui/plaintoolbutton.cpp \ + gui/searchtextwidget.cpp \ gui/settings/settingsbrowsermail.cpp \ gui/settings/settingsdatabase.cpp \ gui/settings/settingsdownloads.cpp \ @@ -282,7 +286,6 @@ SOURCES += core/feeddownloader.cpp \ gui/toolbareditor.cpp \ gui/treeviewcolumnsmenu.cpp \ gui/widgetwithstatus.cpp \ - gui/networkproxydetails.cpp \ miscellaneous/application.cpp \ miscellaneous/autosaver.cpp \ miscellaneous/databasecleaner.cpp \ @@ -303,8 +306,10 @@ SOURCES += core/feeddownloader.cpp \ network-web/basenetworkaccessmanager.cpp \ network-web/downloader.cpp \ network-web/downloadmanager.cpp \ + network-web/httpresponse.cpp \ network-web/networkfactory.cpp \ network-web/oauth2service.cpp \ + network-web/oauthhttphandler.cpp \ network-web/silentnetworkaccessmanager.cpp \ network-web/webfactory.cpp \ qtsingleapplication/qtlocalpeer.cpp \ @@ -315,6 +320,7 @@ SOURCES += core/feeddownloader.cpp \ services/abstract/cacheforserviceroot.cpp \ services/abstract/category.cpp \ services/abstract/feed.cpp \ + services/abstract/gui/authenticationdetails.cpp \ services/abstract/gui/formaccountdetails.cpp \ services/abstract/gui/formfeeddetails.cpp \ services/abstract/importantnode.cpp \ @@ -331,11 +337,13 @@ SOURCES += core/feeddownloader.cpp \ services/feedly/gui/formeditfeedlyaccount.cpp \ services/gmail/gmailentrypoint.cpp \ services/gmail/gmailfeed.cpp \ + services/gmail/gmailnetworkfactory.cpp \ services/gmail/gmailserviceroot.cpp \ services/gmail/gui/emailrecipientcontrol.cpp \ + services/gmail/gui/formaddeditemail.cpp \ + services/gmail/gui/formdownloadattachment.cpp \ services/gmail/gui/formeditgmailaccount.cpp \ services/gmail/gui/gmailaccountdetails.cpp \ - services/gmail/network/gmailnetworkfactory.cpp \ services/greader/greaderentrypoint.cpp \ services/greader/greaderfeed.cpp \ services/greader/greadernetwork.cpp \ @@ -346,17 +354,16 @@ SOURCES += core/feeddownloader.cpp \ services/inoreader/gui/inoreaderaccountdetails.cpp \ services/inoreader/inoreaderentrypoint.cpp \ services/inoreader/inoreaderfeed.cpp \ + services/inoreader/inoreadernetworkfactory.cpp \ services/inoreader/inoreaderserviceroot.cpp \ - services/inoreader/network/inoreadernetworkfactory.cpp \ services/owncloud/gui/formeditowncloudaccount.cpp \ services/owncloud/gui/owncloudaccountdetails.cpp \ - services/owncloud/network/owncloudnetworkfactory.cpp \ services/owncloud/owncloudfeed.cpp \ + services/owncloud/owncloudnetworkfactory.cpp \ services/owncloud/owncloudserviceentrypoint.cpp \ services/owncloud/owncloudserviceroot.cpp \ services/standard/atomparser.cpp \ services/standard/feedparser.cpp \ - services/abstract/gui/authenticationdetails.cpp \ services/standard/gui/formeditstandardaccount.cpp \ services/standard/gui/formstandardcategorydetails.cpp \ services/standard/gui/formstandardfeeddetails.cpp \ @@ -374,17 +381,10 @@ SOURCES += core/feeddownloader.cpp \ services/tt-rss/gui/formttrssfeeddetails.cpp \ services/tt-rss/gui/ttrssaccountdetails.cpp \ services/tt-rss/gui/ttrssfeeddetails.cpp \ - services/tt-rss/network/ttrssnetworkfactory.cpp \ services/tt-rss/ttrssfeed.cpp \ + services/tt-rss/ttrssnetworkfactory.cpp \ services/tt-rss/ttrssserviceentrypoint.cpp \ - services/tt-rss/ttrssserviceroot.cpp \ - network-web/httpresponse.cpp \ - services/gmail/gui/formdownloadattachment.cpp \ - services/gmail/gui/formaddeditemail.cpp \ - gui/searchtextwidget.cpp \ - network-web/oauthhttphandler.cpp \ - gui/messagepreviewer.cpp \ - gui/newspaperpreviewer.cpp + services/tt-rss/ttrssserviceroot.cpp mac { OBJECTIVE_SOURCES += miscellaneous/disablewindowtabbing.mm @@ -400,6 +400,9 @@ FORMS += gui/dialogs/formabout.ui \ gui/dialogs/formrestoredatabasesettings.ui \ gui/dialogs/formsettings.ui \ gui/dialogs/formupdate.ui \ + gui/networkproxydetails.ui \ + gui/newspaperpreviewer.ui \ + gui/searchtextwidget.ui \ gui/settings/settingsbrowsermail.ui \ gui/settings/settingsdatabase.ui \ gui/settings/settingsdownloads.ui \ @@ -409,13 +412,14 @@ FORMS += gui/dialogs/formabout.ui \ gui/settings/settingslocalization.ui \ gui/settings/settingsshortcuts.ui \ gui/toolbareditor.ui \ - gui/networkproxydetails.ui \ network-web/downloaditem.ui \ network-web/downloadmanager.ui \ + services/abstract/gui/authenticationdetails.ui \ services/abstract/gui/formaccountdetails.ui \ services/abstract/gui/formfeeddetails.ui \ - services/abstract/gui/authenticationdetails.ui \ services/feedly/gui/feedlyaccountdetails.ui \ + services/gmail/gui/formaddeditemail.ui \ + services/gmail/gui/formdownloadattachment.ui \ services/gmail/gui/gmailaccountdetails.ui \ services/greader/gui/greaderaccountdetails.ui \ services/inoreader/gui/inoreaderaccountdetails.ui \ @@ -423,13 +427,10 @@ FORMS += gui/dialogs/formabout.ui \ services/standard/gui/formstandardcategorydetails.ui \ services/standard/gui/formstandardimportexport.ui \ services/standard/gui/standardfeeddetails.ui \ - services/gmail/gui/formdownloadattachment.ui \ - services/gmail/gui/formaddeditemail.ui \ - gui/searchtextwidget.ui \ - gui/newspaperpreviewer.ui \ services/tt-rss/gui/ttrssaccountdetails.ui \ services/tt-rss/gui/ttrssfeeddetails.ui + equals(USE_WEBENGINE, true) { HEADERS += gui/locationlineedit.h \ gui/webviewer.h \ diff --git a/src/librssguard/miscellaneous/databasequeries.cpp b/src/librssguard/miscellaneous/databasequeries.cpp index 0cc612dac..a3ea11647 100755 --- a/src/librssguard/miscellaneous/databasequeries.cpp +++ b/src/librssguard/miscellaneous/databasequeries.cpp @@ -8,30 +8,9 @@ #include "miscellaneous/iconfactory.h" #include "network-web/oauth2service.h" #include "services/abstract/category.h" -#include "services/feedly/definitions.h" -#include "services/feedly/feedlynetwork.h" -#include "services/feedly/feedlyserviceroot.h" -#include "services/gmail/definitions.h" -#include "services/gmail/gmailfeed.h" -#include "services/gmail/gmailserviceroot.h" -#include "services/gmail/network/gmailnetworkfactory.h" -#include "services/greader/definitions.h" -#include "services/greader/greadernetwork.h" -#include "services/greader/greaderserviceroot.h" -#include "services/inoreader/definitions.h" -#include "services/inoreader/inoreaderfeed.h" -#include "services/inoreader/inoreaderserviceroot.h" -#include "services/inoreader/network/inoreadernetworkfactory.h" -#include "services/owncloud/definitions.h" -#include "services/owncloud/network/owncloudnetworkfactory.h" -#include "services/owncloud/owncloudfeed.h" -#include "services/owncloud/owncloudserviceroot.h" #include "services/standard/standardcategory.h" #include "services/standard/standardfeed.h" #include "services/standard/standardserviceroot.h" -#include "services/tt-rss/network/ttrssnetworkfactory.h" -#include "services/tt-rss/ttrssfeed.h" -#include "services/tt-rss/ttrssserviceroot.h" #include #include diff --git a/src/librssguard/services/gmail/gmailfeed.cpp b/src/librssguard/services/gmail/gmailfeed.cpp index 5ec5ddb3e..94f8996c5 100644 --- a/src/librssguard/services/gmail/gmailfeed.cpp +++ b/src/librssguard/services/gmail/gmailfeed.cpp @@ -5,8 +5,8 @@ #include "miscellaneous/application.h" #include "miscellaneous/iconfactory.h" #include "services/gmail/definitions.h" +#include "services/gmail/gmailnetworkfactory.h" #include "services/gmail/gmailserviceroot.h" -#include "services/gmail/network/gmailnetworkfactory.h" GmailFeed::GmailFeed(RootItem* parent) : Feed(parent) {} diff --git a/src/librssguard/services/gmail/network/gmailnetworkfactory.cpp b/src/librssguard/services/gmail/gmailnetworkfactory.cpp old mode 100644 new mode 100755 similarity index 97% rename from src/librssguard/services/gmail/network/gmailnetworkfactory.cpp rename to src/librssguard/services/gmail/gmailnetworkfactory.cpp index 1b42757e1..bdd4f6cda --- a/src/librssguard/services/gmail/network/gmailnetworkfactory.cpp +++ b/src/librssguard/services/gmail/gmailnetworkfactory.cpp @@ -1,6 +1,6 @@ // For license of this file, see /LICENSE.md. -#include "services/gmail/network/gmailnetworkfactory.h" +#include "services/gmail/gmailnetworkfactory.h" #include "definitions/definitions.h" #include "exceptions/applicationexception.h" diff --git a/src/librssguard/services/gmail/network/gmailnetworkfactory.h b/src/librssguard/services/gmail/gmailnetworkfactory.h old mode 100644 new mode 100755 similarity index 100% rename from src/librssguard/services/gmail/network/gmailnetworkfactory.h rename to src/librssguard/services/gmail/gmailnetworkfactory.h diff --git a/src/librssguard/services/gmail/gmailserviceroot.cpp b/src/librssguard/services/gmail/gmailserviceroot.cpp index 431116ba0..050a6b75d 100644 --- a/src/librssguard/services/gmail/gmailserviceroot.cpp +++ b/src/librssguard/services/gmail/gmailserviceroot.cpp @@ -11,10 +11,10 @@ #include "services/gmail/definitions.h" #include "services/gmail/gmailentrypoint.h" #include "services/gmail/gmailfeed.h" +#include "services/gmail/gmailnetworkfactory.h" #include "services/gmail/gui/formaddeditemail.h" #include "services/gmail/gui/formdownloadattachment.h" #include "services/gmail/gui/formeditgmailaccount.h" -#include "services/gmail/network/gmailnetworkfactory.h" #include diff --git a/src/librssguard/services/gmail/gui/formaddeditemail.cpp b/src/librssguard/services/gmail/gui/formaddeditemail.cpp index 63ca70816..c7e8a8f32 100644 --- a/src/librssguard/services/gmail/gui/formaddeditemail.cpp +++ b/src/librssguard/services/gmail/gui/formaddeditemail.cpp @@ -9,9 +9,9 @@ #include "miscellaneous/application.h" #include "miscellaneous/databasequeries.h" #include "miscellaneous/iconfactory.h" +#include "services/gmail/gmailnetworkfactory.h" #include "services/gmail/gmailserviceroot.h" #include "services/gmail/gui/emailrecipientcontrol.h" -#include "services/gmail/network/gmailnetworkfactory.h" #include diff --git a/src/librssguard/services/gmail/gui/formeditgmailaccount.h b/src/librssguard/services/gmail/gui/formeditgmailaccount.h index 475dd2d37..a2ab2fd93 100644 --- a/src/librssguard/services/gmail/gui/formeditgmailaccount.h +++ b/src/librssguard/services/gmail/gui/formeditgmailaccount.h @@ -5,7 +5,7 @@ #include "services/abstract/gui/formaccountdetails.h" -#include "services/gmail/network/gmailnetworkfactory.h" +#include "services/gmail/gmailnetworkfactory.h" class GmailServiceRoot; class GmailAccountDetails; diff --git a/src/librssguard/services/gmail/gui/gmailaccountdetails.cpp b/src/librssguard/services/gmail/gui/gmailaccountdetails.cpp index 8f50397cd..ac849148c 100644 --- a/src/librssguard/services/gmail/gui/gmailaccountdetails.cpp +++ b/src/librssguard/services/gmail/gui/gmailaccountdetails.cpp @@ -7,7 +7,7 @@ #include "network-web/oauth2service.h" #include "network-web/webfactory.h" #include "services/gmail/definitions.h" -#include "services/gmail/network/gmailnetworkfactory.h" +#include "services/gmail/gmailnetworkfactory.h" GmailAccountDetails::GmailAccountDetails(QWidget* parent) : QWidget(parent), m_oauth(nullptr) { diff --git a/src/librssguard/services/inoreader/gui/formeditinoreaderaccount.cpp b/src/librssguard/services/inoreader/gui/formeditinoreaderaccount.cpp index 57533649a..be76e11e5 100644 --- a/src/librssguard/services/inoreader/gui/formeditinoreaderaccount.cpp +++ b/src/librssguard/services/inoreader/gui/formeditinoreaderaccount.cpp @@ -9,8 +9,8 @@ #include "network-web/webfactory.h" #include "services/inoreader/definitions.h" #include "services/inoreader/gui/inoreaderaccountdetails.h" +#include "services/inoreader/inoreadernetworkfactory.h" #include "services/inoreader/inoreaderserviceroot.h" -#include "services/inoreader/network/inoreadernetworkfactory.h" #include diff --git a/src/librssguard/services/inoreader/gui/inoreaderaccountdetails.cpp b/src/librssguard/services/inoreader/gui/inoreaderaccountdetails.cpp index 978290f8a..c78e0a3ba 100755 --- a/src/librssguard/services/inoreader/gui/inoreaderaccountdetails.cpp +++ b/src/librssguard/services/inoreader/gui/inoreaderaccountdetails.cpp @@ -7,7 +7,7 @@ #include "network-web/oauth2service.h" #include "network-web/webfactory.h" #include "services/inoreader/definitions.h" -#include "services/inoreader/network/inoreadernetworkfactory.h" +#include "services/inoreader/inoreadernetworkfactory.h" InoreaderAccountDetails::InoreaderAccountDetails(QWidget* parent) : QWidget(parent), m_oauth(nullptr) { diff --git a/src/librssguard/services/inoreader/inoreaderentrypoint.cpp b/src/librssguard/services/inoreader/inoreaderentrypoint.cpp index 1167d9bf0..3b996672e 100644 --- a/src/librssguard/services/inoreader/inoreaderentrypoint.cpp +++ b/src/librssguard/services/inoreader/inoreaderentrypoint.cpp @@ -8,8 +8,8 @@ #include "miscellaneous/iconfactory.h" #include "services/inoreader/definitions.h" #include "services/inoreader/gui/formeditinoreaderaccount.h" +#include "services/inoreader/inoreadernetworkfactory.h" #include "services/inoreader/inoreaderserviceroot.h" -#include "services/inoreader/network/inoreadernetworkfactory.h" #include diff --git a/src/librssguard/services/inoreader/inoreaderfeed.cpp b/src/librssguard/services/inoreader/inoreaderfeed.cpp index 06c417057..878bdee25 100644 --- a/src/librssguard/services/inoreader/inoreaderfeed.cpp +++ b/src/librssguard/services/inoreader/inoreaderfeed.cpp @@ -4,8 +4,8 @@ #include "miscellaneous/application.h" #include "miscellaneous/iconfactory.h" +#include "services/inoreader/inoreadernetworkfactory.h" #include "services/inoreader/inoreaderserviceroot.h" -#include "services/inoreader/network/inoreadernetworkfactory.h" InoreaderFeed::InoreaderFeed(RootItem* parent) : Feed(parent) {} diff --git a/src/librssguard/services/inoreader/network/inoreadernetworkfactory.cpp b/src/librssguard/services/inoreader/inoreadernetworkfactory.cpp old mode 100644 new mode 100755 similarity index 97% rename from src/librssguard/services/inoreader/network/inoreadernetworkfactory.cpp rename to src/librssguard/services/inoreader/inoreadernetworkfactory.cpp index 3db230524..aad7669f0 --- a/src/librssguard/services/inoreader/network/inoreadernetworkfactory.cpp +++ b/src/librssguard/services/inoreader/inoreadernetworkfactory.cpp @@ -1,6 +1,6 @@ // For license of this file, see /LICENSE.md. -#include "services/inoreader/network/inoreadernetworkfactory.h" +#include "services/inoreader/inoreadernetworkfactory.h" #include "3rd-party/boolinq/boolinq.h" #include "definitions/definitions.h" diff --git a/src/librssguard/services/inoreader/network/inoreadernetworkfactory.h b/src/librssguard/services/inoreader/inoreadernetworkfactory.h old mode 100644 new mode 100755 similarity index 100% rename from src/librssguard/services/inoreader/network/inoreadernetworkfactory.h rename to src/librssguard/services/inoreader/inoreadernetworkfactory.h diff --git a/src/librssguard/services/inoreader/inoreaderserviceroot.cpp b/src/librssguard/services/inoreader/inoreaderserviceroot.cpp index 8c288580b..3810abb72 100644 --- a/src/librssguard/services/inoreader/inoreaderserviceroot.cpp +++ b/src/librssguard/services/inoreader/inoreaderserviceroot.cpp @@ -12,7 +12,7 @@ #include "services/inoreader/gui/formeditinoreaderaccount.h" #include "services/inoreader/inoreaderentrypoint.h" #include "services/inoreader/inoreaderfeed.h" -#include "services/inoreader/network/inoreadernetworkfactory.h" +#include "services/inoreader/inoreadernetworkfactory.h" #include diff --git a/src/librssguard/services/owncloud/gui/formeditowncloudaccount.cpp b/src/librssguard/services/owncloud/gui/formeditowncloudaccount.cpp index 5cb265740..cf97811a8 100644 --- a/src/librssguard/services/owncloud/gui/formeditowncloudaccount.cpp +++ b/src/librssguard/services/owncloud/gui/formeditowncloudaccount.cpp @@ -7,7 +7,7 @@ #include "network-web/networkfactory.h" #include "services/owncloud/definitions.h" #include "services/owncloud/gui/owncloudaccountdetails.h" -#include "services/owncloud/network/owncloudnetworkfactory.h" +#include "services/owncloud/owncloudnetworkfactory.h" #include "services/owncloud/owncloudserviceroot.h" FormEditOwnCloudAccount::FormEditOwnCloudAccount(QWidget* parent) diff --git a/src/librssguard/services/owncloud/gui/owncloudaccountdetails.cpp b/src/librssguard/services/owncloud/gui/owncloudaccountdetails.cpp index 1afc3050c..3acb28f0f 100755 --- a/src/librssguard/services/owncloud/gui/owncloudaccountdetails.cpp +++ b/src/librssguard/services/owncloud/gui/owncloudaccountdetails.cpp @@ -6,7 +6,7 @@ #include "gui/guiutilities.h" #include "miscellaneous/systemfactory.h" #include "services/owncloud/definitions.h" -#include "services/owncloud/network/owncloudnetworkfactory.h" +#include "services/owncloud/owncloudnetworkfactory.h" OwnCloudAccountDetails::OwnCloudAccountDetails(QWidget* parent) : QWidget(parent) { m_ui.setupUi(this); diff --git a/src/librssguard/services/owncloud/owncloudfeed.cpp b/src/librssguard/services/owncloud/owncloudfeed.cpp index 5891d9714..7336f157a 100644 --- a/src/librssguard/services/owncloud/owncloudfeed.cpp +++ b/src/librssguard/services/owncloud/owncloudfeed.cpp @@ -4,7 +4,7 @@ #include "miscellaneous/databasequeries.h" #include "miscellaneous/iconfactory.h" -#include "services/owncloud/network/owncloudnetworkfactory.h" +#include "services/owncloud/owncloudnetworkfactory.h" #include "services/owncloud/owncloudserviceroot.h" #include diff --git a/src/librssguard/services/owncloud/network/owncloudnetworkfactory.cpp b/src/librssguard/services/owncloud/owncloudnetworkfactory.cpp old mode 100644 new mode 100755 similarity index 99% rename from src/librssguard/services/owncloud/network/owncloudnetworkfactory.cpp rename to src/librssguard/services/owncloud/owncloudnetworkfactory.cpp index 26b54eba4..9e60a2cb5 --- a/src/librssguard/services/owncloud/network/owncloudnetworkfactory.cpp +++ b/src/librssguard/services/owncloud/owncloudnetworkfactory.cpp @@ -1,6 +1,6 @@ // For license of this file, see /LICENSE.md. -#include "services/owncloud/network/owncloudnetworkfactory.h" +#include "services/owncloud/owncloudnetworkfactory.h" #include "miscellaneous/application.h" #include "miscellaneous/settings.h" diff --git a/src/librssguard/services/owncloud/network/owncloudnetworkfactory.h b/src/librssguard/services/owncloud/owncloudnetworkfactory.h old mode 100644 new mode 100755 similarity index 100% rename from src/librssguard/services/owncloud/network/owncloudnetworkfactory.h rename to src/librssguard/services/owncloud/owncloudnetworkfactory.h diff --git a/src/librssguard/services/owncloud/owncloudserviceroot.cpp b/src/librssguard/services/owncloud/owncloudserviceroot.cpp index 6ea1b0fd9..5fdeae63b 100644 --- a/src/librssguard/services/owncloud/owncloudserviceroot.cpp +++ b/src/librssguard/services/owncloud/owncloudserviceroot.cpp @@ -11,8 +11,8 @@ #include "services/abstract/importantnode.h" #include "services/abstract/recyclebin.h" #include "services/owncloud/gui/formeditowncloudaccount.h" -#include "services/owncloud/network/owncloudnetworkfactory.h" #include "services/owncloud/owncloudfeed.h" +#include "services/owncloud/owncloudnetworkfactory.h" #include "services/owncloud/owncloudserviceentrypoint.h" OwnCloudServiceRoot::OwnCloudServiceRoot(RootItem* parent) diff --git a/src/librssguard/services/tt-rss/gui/formeditttrssaccount.cpp b/src/librssguard/services/tt-rss/gui/formeditttrssaccount.cpp index aec7db2cf..7cfae985c 100644 --- a/src/librssguard/services/tt-rss/gui/formeditttrssaccount.cpp +++ b/src/librssguard/services/tt-rss/gui/formeditttrssaccount.cpp @@ -5,7 +5,7 @@ #include "miscellaneous/iconfactory.h" #include "services/tt-rss/definitions.h" #include "services/tt-rss/gui/ttrssaccountdetails.h" -#include "services/tt-rss/network/ttrssnetworkfactory.h" +#include "services/tt-rss/ttrssnetworkfactory.h" #include "services/tt-rss/ttrssserviceroot.h" FormEditTtRssAccount::FormEditTtRssAccount(QWidget* parent) diff --git a/src/librssguard/services/tt-rss/gui/formttrssfeeddetails.cpp b/src/librssguard/services/tt-rss/gui/formttrssfeeddetails.cpp index 4d3bedf7d..805639cfe 100755 --- a/src/librssguard/services/tt-rss/gui/formttrssfeeddetails.cpp +++ b/src/librssguard/services/tt-rss/gui/formttrssfeeddetails.cpp @@ -7,8 +7,8 @@ #include "services/abstract/gui/authenticationdetails.h" #include "services/tt-rss/definitions.h" #include "services/tt-rss/gui/ttrssfeeddetails.h" -#include "services/tt-rss/network/ttrssnetworkfactory.h" #include "services/tt-rss/ttrssfeed.h" +#include "services/tt-rss/ttrssnetworkfactory.h" #include "services/tt-rss/ttrssserviceroot.h" #include diff --git a/src/librssguard/services/tt-rss/gui/ttrssaccountdetails.cpp b/src/librssguard/services/tt-rss/gui/ttrssaccountdetails.cpp index 5f95a2e3b..c9f066d95 100644 --- a/src/librssguard/services/tt-rss/gui/ttrssaccountdetails.cpp +++ b/src/librssguard/services/tt-rss/gui/ttrssaccountdetails.cpp @@ -5,7 +5,7 @@ #include "gui/guiutilities.h" #include "network-web/networkfactory.h" #include "services/tt-rss/definitions.h" -#include "services/tt-rss/network/ttrssnetworkfactory.h" +#include "services/tt-rss/ttrssnetworkfactory.h" TtRssAccountDetails::TtRssAccountDetails(QWidget* parent) : QWidget(parent) { m_ui.setupUi(this); diff --git a/src/librssguard/services/tt-rss/ttrssfeed.cpp b/src/librssguard/services/tt-rss/ttrssfeed.cpp index 73dfea66e..ea8f35ea4 100644 --- a/src/librssguard/services/tt-rss/ttrssfeed.cpp +++ b/src/librssguard/services/tt-rss/ttrssfeed.cpp @@ -8,7 +8,7 @@ #include "miscellaneous/iconfactory.h" #include "miscellaneous/textfactory.h" #include "services/tt-rss/definitions.h" -#include "services/tt-rss/network/ttrssnetworkfactory.h" +#include "services/tt-rss/ttrssnetworkfactory.h" #include "services/tt-rss/ttrssserviceroot.h" #include diff --git a/src/librssguard/services/tt-rss/network/ttrssnetworkfactory.cpp b/src/librssguard/services/tt-rss/ttrssnetworkfactory.cpp old mode 100644 new mode 100755 similarity index 99% rename from src/librssguard/services/tt-rss/network/ttrssnetworkfactory.cpp rename to src/librssguard/services/tt-rss/ttrssnetworkfactory.cpp index d0a0e6db3..a29fd3483 --- a/src/librssguard/services/tt-rss/network/ttrssnetworkfactory.cpp +++ b/src/librssguard/services/tt-rss/ttrssnetworkfactory.cpp @@ -1,6 +1,6 @@ // For license of this file, see /LICENSE.md. -#include "services/tt-rss/network/ttrssnetworkfactory.h" +#include "services/tt-rss/ttrssnetworkfactory.h" #include "3rd-party/boolinq/boolinq.h" #include "definitions/definitions.h" diff --git a/src/librssguard/services/tt-rss/network/ttrssnetworkfactory.h b/src/librssguard/services/tt-rss/ttrssnetworkfactory.h old mode 100644 new mode 100755 similarity index 100% rename from src/librssguard/services/tt-rss/network/ttrssnetworkfactory.h rename to src/librssguard/services/tt-rss/ttrssnetworkfactory.h diff --git a/src/librssguard/services/tt-rss/ttrssserviceroot.cpp b/src/librssguard/services/tt-rss/ttrssserviceroot.cpp index ded8558b9..ef17dd6b3 100644 --- a/src/librssguard/services/tt-rss/ttrssserviceroot.cpp +++ b/src/librssguard/services/tt-rss/ttrssserviceroot.cpp @@ -15,8 +15,8 @@ #include "services/tt-rss/definitions.h" #include "services/tt-rss/gui/formeditttrssaccount.h" #include "services/tt-rss/gui/formttrssfeeddetails.h" -#include "services/tt-rss/network/ttrssnetworkfactory.h" #include "services/tt-rss/ttrssfeed.h" +#include "services/tt-rss/ttrssnetworkfactory.h" #include "services/tt-rss/ttrssserviceentrypoint.h" #include