diff --git a/src/definitions/definitions.h.in b/src/definitions/definitions.h.in index 48f1c656a..73c5645a2 100755 --- a/src/definitions/definitions.h.in +++ b/src/definitions/definitions.h.in @@ -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" diff --git a/src/gui/feedmessageviewer.cpp b/src/gui/feedmessageviewer.cpp index 826a02299..4d4306cdf 100755 --- a/src/gui/feedmessageviewer.cpp +++ b/src/gui/feedmessageviewer.cpp @@ -308,7 +308,6 @@ void FeedMessageViewer::initialize() { // Downloader setup. qRegisterMetaType >("QList"); m_feedDownloader->moveToThread(m_feedDownloaderThread); - refreshVisualProperties(); } diff --git a/src/miscellaneous/systemfactory.cpp b/src/miscellaneous/systemfactory.cpp index 53ffb339d..77006440c 100755 --- a/src/miscellaneous/systemfactory.cpp +++ b/src/miscellaneous/systemfactory.cpp @@ -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(""); diff --git a/src/network-web/webbrowser.cpp b/src/network-web/webbrowser.cpp index 0a0a277ae..5571e4b09 100755 --- a/src/network-web/webbrowser.cpp +++ b/src/network-web/webbrowser.cpp @@ -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) { diff --git a/src/network-web/webbrowser.h b/src/network-web/webbrowser.h index 7da1afa9e..b6e992649 100755 --- a/src/network-web/webbrowser.h +++ b/src/network-web/webbrowser.h @@ -97,7 +97,7 @@ class WebBrowser : public TabContent { // Clears contents. inline void clear() { if (m_webView->url() != QUrl()) { - m_webView->setHtml("", QUrl("rssguard:empty")); + m_webView->setHtml("", QUrl(INTERNAL_URL_EMPTY)); } }