FreshRSS/rssguard
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Refactorings...

Browse Source
This commit is contained in:
Martin Rotter 2014-03-26 12:23:27 +01:00
parent cefbefda2a
commit 36a1f43c47
23 changed files with 42 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
CMakeLists.txt
View File

@ -307,10 +307,6 @@ set(APP_SOURCES
src/core/systemfactory.cpp src/core/systemfactory.cpp
src/core/localization.cpp src/core/localization.cpp
src/core/dynamicshortcuts.cpp src/core/dynamicshortcuts.cpp
src/core/basenetworkaccessmanager.cpp
src/core/webpage.cpp
src/core/webbrowsernetworkaccessmanager.cpp
src/core/silentnetworkaccessmanager.cpp
src/core/textfactory.cpp src/core/textfactory.cpp
src/core/databasefactory.cpp src/core/databasefactory.cpp
src/core/messagesmodel.cpp src/core/messagesmodel.cpp
@ -322,10 +318,16 @@ set(APP_SOURCES
src/core/feedsmodelfeed.cpp src/core/feedsmodelfeed.cpp
src/core/parsingfactory.cpp src/core/parsingfactory.cpp
src/core/feeddownloader.cpp src/core/feeddownloader.cpp
src/core/networkfactory.cpp
src/core/webfactory.cpp
# Basic application sources. # NETWORK-WEB sources.
src/network-web/basenetworkaccessmanager.cpp
src/network-web/webpage.cpp
src/network-web/webbrowsernetworkaccessmanager.cpp
src/network-web/silentnetworkaccessmanager.cpp
src/network-web/networkfactory.cpp
src/network-web/webfactory.cpp
# MAIN sources.
src/main.cpp src/main.cpp
) )
@ -371,10 +373,7 @@ set(APP_HEADERS
# CORE headers. # CORE headers.
src/core/settings.h src/core/settings.h
src/core/localization.h src/core/localization.h
src/core/basenetworkaccessmanager.h src/network-web/webpage.h
src/core/webbrowsernetworkaccessmanager.h
src/core/silentnetworkaccessmanager.h
src/core/webpage.h
src/core/systemfactory.h src/core/systemfactory.h
src/core/databasefactory.h src/core/databasefactory.h
src/core/messagesmodel.h src/core/messagesmodel.h
@ -382,7 +381,12 @@ set(APP_HEADERS
src/core/feedsmodel.h src/core/feedsmodel.h
src/core/feedsproxymodel.h src/core/feedsproxymodel.h
src/core/feeddownloader.h src/core/feeddownloader.h
src/core/webfactory.h
# NETWORK-WEB headers.
src/network-web/basenetworkaccessmanager.h
src/network-web/webbrowsernetworkaccessmanager.h
src/network-web/silentnetworkaccessmanager.h
src/network-web/webfactory.h
) )
# Add form files. # Add form files.
@ -452,6 +456,7 @@ endif(${USE_QT_5})
include_directories ( include_directories (
${CMAKE_CURRENT_SOURCE_DIR}/src ${CMAKE_CURRENT_SOURCE_DIR}/src
${CMAKE_CURRENT_SOURCE_DIR}/src/gui ${CMAKE_CURRENT_SOURCE_DIR}/src/gui
${CMAKE_CURRENT_SOURCE_DIR}/src/network-web
${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_CURRENT_BINARY_DIR}/src ${CMAKE_CURRENT_BINARY_DIR}/src
) )

2
src/core/feedsmodelfeed.cpp
View File

@ -21,8 +21,8 @@
#include "core/settings.h" #include "core/settings.h"
#include "core/parsingfactory.h" #include "core/parsingfactory.h"
#include "core/databasefactory.h" #include "core/databasefactory.h"
#include "core/networkfactory.h"
#include "core/textfactory.h" #include "core/textfactory.h"
#include "network-web/networkfactory.h"
#include "gui/iconfactory.h" #include "gui/iconfactory.h"
#include "gui/iconthemefactory.h" #include "gui/iconthemefactory.h"

2
src/core/parsingfactory.cpp
View File

@ -17,8 +17,8 @@
#include "core/parsingfactory.h" #include "core/parsingfactory.h"
#include "core/webfactory.h"
#include "core/textfactory.h" #include "core/textfactory.h"
#include "network-web/webfactory.h"
#include <QDomDocument> #include <QDomDocument>
#include <QDomElement> #include <QDomElement>

2
src/core/systemfactory.cpp
View File

@ -18,7 +18,7 @@
#include "core/systemfactory.h" #include "core/systemfactory.h"
#include "core/defs.h" #include "core/defs.h"
#include "core/networkfactory.h" #include "network-web/networkfactory.h"
#if defined(Q_OS_WIN) #if defined(Q_OS_WIN)
#include "qtsingleapplication/qtsingleapplication.h" #include "qtsingleapplication/qtsingleapplication.h"

2
src/gui/formmain.cpp
View File

@ -21,7 +21,7 @@
#include "core/settings.h" #include "core/settings.h"
#include "core/systemfactory.h" #include "core/systemfactory.h"
#include "core/databasefactory.h" #include "core/databasefactory.h"
#include "core/webfactory.h" #include "network-web/webfactory.h"
#include "gui/formabout.h" #include "gui/formabout.h"
#include "gui/formsettings.h" #include "gui/formsettings.h"
#include "gui/feedsview.h" #include "gui/feedsview.h"

6
src/gui/formsettings.cpp
View File

@ -22,11 +22,11 @@
#include "core/databasefactory.h" #include "core/databasefactory.h"
#include "core/localization.h" #include "core/localization.h"
#include "core/systemfactory.h" #include "core/systemfactory.h"
#include "core/webfactory.h"
#include "core/feeddownloader.h" #include "core/feeddownloader.h"
#include "core/dynamicshortcuts.h" #include "core/dynamicshortcuts.h"
#include "core/webbrowsernetworkaccessmanager.h" #include "network-web/webfactory.h"
#include "core/silentnetworkaccessmanager.h" #include "network-web/webbrowsernetworkaccessmanager.h"
#include "network-web/silentnetworkaccessmanager.h"
#include "core/feedsmodel.h" #include "core/feedsmodel.h"
#include "gui/iconthemefactory.h" #include "gui/iconthemefactory.h"
#include "gui/skinfactory.h" #include "gui/skinfactory.h"

2
src/gui/formstandardfeeddetails.cpp
View File

@ -23,7 +23,7 @@
#include "core/feedsmodelrootitem.h" #include "core/feedsmodelrootitem.h"
#include "core/feedsmodelcategory.h" #include "core/feedsmodelcategory.h"
#include "core/feedsmodelfeed.h" #include "core/feedsmodelfeed.h"
#include "core/networkfactory.h" #include "network-web/networkfactory.h"
#include "gui/iconthemefactory.h" #include "gui/iconthemefactory.h"
#include "gui/baselineedit.h" #include "gui/baselineedit.h"
#include "gui/messagebox.h" #include "gui/messagebox.h"

4
src/gui/formupdate.cpp
View File

@ -19,8 +19,8 @@
#include "core/defs.h" #include "core/defs.h"
#include "core/systemfactory.h" #include "core/systemfactory.h"
#include "core/networkfactory.h" #include "network-web/networkfactory.h"
#include "core/webfactory.h" #include "network-web/webfactory.h"
#include "gui/iconthemefactory.h" #include "gui/iconthemefactory.h"
#include "gui/messagebox.h" #include "gui/messagebox.h"
#include "gui/systemtrayicon.h" #include "gui/systemtrayicon.h"

4
src/gui/messagesview.cpp
View File

@ -20,8 +20,8 @@
#include "core/messagesproxymodel.h" #include "core/messagesproxymodel.h"
#include "core/messagesmodel.h" #include "core/messagesmodel.h"
#include "core/settings.h" #include "core/settings.h"
#include "core/networkfactory.h" #include "network-web/networkfactory.h"
#include "core/webfactory.h" #include "network-web/webfactory.h"
#include "gui/formmain.h" #include "gui/formmain.h"
#include "gui/messagebox.h" #include "gui/messagebox.h"

4
src/gui/webbrowser.cpp
View File

@ -18,8 +18,8 @@
#include "gui/webbrowser.h" #include "gui/webbrowser.h"
#include "core/defs.h" #include "core/defs.h"
#include "core/webbrowsernetworkaccessmanager.h" #include "network-web/webbrowsernetworkaccessmanager.h"
#include "core/webpage.h" #include "network-web/webpage.h"
#include "gui/skinfactory.h" #include "gui/skinfactory.h"
#include "gui/webview.h" #include "gui/webview.h"
#include "gui/formmain.h" #include "gui/formmain.h"

2
src/gui/webview.cpp
View File

@ -19,7 +19,7 @@
#include "core/defs.h" #include "core/defs.h"
#include "core/settings.h" #include "core/settings.h"
#include "core/webpage.h" #include "network-web/webpage.h"
#include "gui/skinfactory.h" #include "gui/skinfactory.h"
#include "gui/iconthemefactory.h" #include "gui/iconthemefactory.h"

2
src/core/basenetworkaccessmanager.cpp → src/network-web/basenetworkaccessmanager.cpp
View File

@ -15,7 +15,7 @@
// You should have received a copy of the GNU General Public License // You should have received a copy of the GNU General Public License
// along with RSS Guard. If not, see <http://www.gnu.org/licenses/>. // along with RSS Guard. If not, see <http://www.gnu.org/licenses/>.
#include "core/basenetworkaccessmanager.h" #include "network-web/basenetworkaccessmanager.h"
#include "core/defs.h" #include "core/defs.h"
#include "core/settings.h" #include "core/settings.h"

0
src/core/basenetworkaccessmanager.h → src/network-web/basenetworkaccessmanager.h
View File

4
src/core/networkfactory.cpp → src/network-web/networkfactory.cpp
View File

@ -15,11 +15,11 @@
// You should have received a copy of the GNU General Public License // You should have received a copy of the GNU General Public License
// along with RSS Guard. If not, see <http://www.gnu.org/licenses/>. // along with RSS Guard. If not, see <http://www.gnu.org/licenses/>.
#include "core/networkfactory.h" #include "network-web/networkfactory.h"
#include "core/defs.h" #include "core/defs.h"
#include "core/silentnetworkaccessmanager.h"
#include "core/settings.h" #include "core/settings.h"
#include "network-web/silentnetworkaccessmanager.h"
#include <QEventLoop> #include <QEventLoop>
#include <QTimer> #include <QTimer>

0
src/core/networkfactory.h → src/network-web/networkfactory.h
View File

2
src/core/silentnetworkaccessmanager.cpp → src/network-web/silentnetworkaccessmanager.cpp
View File

@ -15,7 +15,7 @@
// You should have received a copy of the GNU General Public License // You should have received a copy of the GNU General Public License
// along with RSS Guard. If not, see <http://www.gnu.org/licenses/>. // along with RSS Guard. If not, see <http://www.gnu.org/licenses/>.
#include "core/silentnetworkaccessmanager.h" #include "network-web/silentnetworkaccessmanager.h"
#include <QNetworkReply> #include <QNetworkReply>
#include <QAuthenticator> #include <QAuthenticator>

2
src/core/silentnetworkaccessmanager.h → src/network-web/silentnetworkaccessmanager.h
View File

@ -18,7 +18,7 @@
#ifndef SILENTNETWORKACCESSMANAGER_H #ifndef SILENTNETWORKACCESSMANAGER_H
#define SILENTNETWORKACCESSMANAGER_H #define SILENTNETWORKACCESSMANAGER_H
#include "core/basenetworkaccessmanager.h" #include "network-web/basenetworkaccessmanager.h"
#include <QPointer> #include <QPointer>

2
src/core/webbrowsernetworkaccessmanager.cpp → src/network-web/webbrowsernetworkaccessmanager.cpp
View File

@ -15,7 +15,7 @@
// You should have received a copy of the GNU General Public License // You should have received a copy of the GNU General Public License
// along with RSS Guard. If not, see <http://www.gnu.org/licenses/>. // along with RSS Guard. If not, see <http://www.gnu.org/licenses/>.
#include "core/webbrowsernetworkaccessmanager.h" #include "network-web/webbrowsernetworkaccessmanager.h"
#include <QNetworkReply> #include <QNetworkReply>
#include <QApplication> #include <QApplication>

2
src/core/webbrowsernetworkaccessmanager.h → src/network-web/webbrowsernetworkaccessmanager.h
View File

@ -18,7 +18,7 @@
#ifndef WEBBROWSERNETWORKACCESSMANAGER_H #ifndef WEBBROWSERNETWORKACCESSMANAGER_H
#define WEBBROWSERNETWORKACCESSMANAGER_H #define WEBBROWSERNETWORKACCESSMANAGER_H
#include "core/basenetworkaccessmanager.h" #include "network-web/basenetworkaccessmanager.h"
#include <QPointer> #include <QPointer>

2
src/core/webfactory.cpp → src/network-web/webfactory.cpp
View File

@ -1,4 +1,4 @@
#include "core/webfactory.h" #include "network-web/webfactory.h"
#include "core/defs.h" #include "core/defs.h"
#include "core/settings.h" #include "core/settings.h"

0
src/core/webfactory.h → src/network-web/webfactory.h
View File

4
src/core/webpage.cpp → src/network-web/webpage.cpp
View File

@ -15,9 +15,9 @@
// You should have received a copy of the GNU General Public License // You should have received a copy of the GNU General Public License
// along with RSS Guard. If not, see <http://www.gnu.org/licenses/>. // along with RSS Guard. If not, see <http://www.gnu.org/licenses/>.
#include "core/webpage.h" #include "network-web/webpage.h"
#include "core/webbrowsernetworkaccessmanager.h" #include "network-web/webbrowsernetworkaccessmanager.h"
#include "gui/webbrowser.h" #include "gui/webbrowser.h"
#include <QNetworkReply> #include <QNetworkReply>

0
src/core/webpage.h → src/network-web/webpage.h
View File