FreshRSS
/
rssguard
mirror of https://github.com/martinrotter/rssguard.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Refactoring.

This commit is contained in:
Martin Rotter 2014-11-13 19:06:00 +01:00
parent c5535fad4d
commit f9ecd6bfa2
5 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/definitions/definitions.h.in
View File

@ -60,6 +60,7 @@
#define ELLIPSIS_LENGTH 3
#define MIN_CATEGORY_NAME_LENGTH 3
#define INTERNAL_URL_NEWSPAPER "@APP_LOW_NAME@:newspaper"
#define INTERNAL_URL_EMPTY "@APP_LOW_NAME@:empty"
#define DEFAULT_AUTO_UPDATE_INTERVAL 15
#define AUTO_UPDATE_INTERVAL 60000
#define STARTUP_UPDATE_DELAY 1500
@ -111,7 +112,6 @@
#endif
#define APP_REVISION "@APP_REVISION@"
#define APP_QUIT_INSTANCE "app_quit"
#define APP_IS_RUNNING "app_is_running"
#define APP_SKIN_DEFAULT "base/vergilius.xml"

1
src/gui/feedmessageviewer.cpp
View File

@ -308,7 +308,6 @@ void FeedMessageViewer::initialize() {
// Downloader setup.
qRegisterMetaType<QList<FeedsModelFeed*> >("QList<FeedsModelFeed*>");
m_feedDownloader->moveToThread(m_feedDownloaderThread);
refreshVisualProperties();
}

2
src/miscellaneous/systemfactory.cpp
View File

@ -156,7 +156,7 @@ bool SystemFactory::setAutoStartStatus(const AutoStartStatus &new_status) {
#if defined(Q_OS_WIN)
bool SystemFactory::removeTrolltechJunkRegistryKeys() {
if (qApp->settings()->value(GROUP(General), "remove_trolltech_junk", false).toBool()) {
if (qApp->settings()->value(GROUP(General), SETTING(General::RemoveTrolltechJunk)).toBool()) {
QSettings registry_key("HKEY_CURRENT_USER\\Software\\TrollTech", QSettings::NativeFormat);
registry_key.remove("");

2
src/network-web/webbrowser.cpp
View File

@ -203,7 +203,7 @@ void WebBrowser::updateUrl(const QUrl &url) {
QString url_string = url.toString();
m_txtLocation->setText(url_string);
setNavigationBarVisible(url_string != "rssguard:empty" && url_string != INTERNAL_URL_NEWSPAPER);
setNavigationBarVisible(url_string != INTERNAL_URL_EMPTY && url_string != INTERNAL_URL_NEWSPAPER);
}
void WebBrowser::navigateToUrl(const QUrl &url) {

2
src/network-web/webbrowser.h
View File

@ -97,7 +97,7 @@ class WebBrowser : public TabContent {
// Clears contents.
inline void clear() {
if (m_webView->url() != QUrl()) {
m_webView->setHtml("<html><body></body></html>", QUrl("rssguard:empty"));
m_webView->setHtml("<html><body></body></html>", QUrl(INTERNAL_URL_EMPTY));
}
}