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

remove some unused stuff

Browse Source
This commit is contained in:
Martin Rotter 2021-08-25 08:23:57 +02:00
parent d9fb5cd115
commit a0215dcbf0
8 changed files with 4 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/librssguard/gui/settings/settingsgeneral.cpp
View File

@ -9,9 +9,9 @@ SettingsGeneral::SettingsGeneral(Settings* settings, QWidget* parent)
: SettingsPanel(settings, parent), m_ui(new Ui::SettingsGeneral) {
m_ui->setupUi(this);
m_ui->m_checkAutostart->setText(m_ui->m_checkAutostart->text().arg(APP_NAME));
connect(m_ui->m_checkAutostart, &QCheckBox::stateChanged, this, &SettingsGeneral::dirtifySettings);
connect(m_ui->m_checkForUpdatesOnStart, &QCheckBox::stateChanged, this, &SettingsGeneral::dirtifySettings);
connect(m_ui->m_checkRemoveTrolltechJunk, &QCheckBox::stateChanged, this, &SettingsGeneral::dirtifySettings);
}
SettingsGeneral::~SettingsGeneral() {
@ -40,12 +40,6 @@ void SettingsGeneral::loadSettings() {
break;
}
#if defined(Q_OS_WIN)
m_ui->m_checkRemoveTrolltechJunk->setVisible(true);
m_ui->m_checkRemoveTrolltechJunk->setChecked(settings()->value(GROUP(General), SETTING(General::RemoveTrolltechJunk)).toBool());
#else
m_ui->m_checkRemoveTrolltechJunk->setVisible(false);
#endif
onEndLoadSettings();
}
@ -61,6 +55,5 @@ void SettingsGeneral::saveSettings() {
}
settings()->setValue(GROUP(General), General::UpdateOnStartup, m_ui->m_checkForUpdatesOnStart->isChecked());
settings()->setValue(GROUP(General), General::RemoveTrolltechJunk, m_ui->m_checkRemoveTrolltechJunk->isChecked());
onEndSaveSettings();
}

9
src/librssguard/gui/settings/settingsgeneral.ui
View File

@ -37,14 +37,7 @@
</property>
</widget>
</item>
<item row="2" column="0">
<widget class="QCheckBox" name="m_checkRemoveTrolltechJunk">
<property name="text">
<string>Remove junk Trolltech registry key (HKCU\Software\Trolltech) when application quits (Use at your own risk!)</string>
</property>
</widget>
</item>
<item row="3" column="0" colspan="2">
<item row="2" column="0" colspan="2">
<spacer name="verticalSpacer">
<property name="orientation">
<enum>Qt::Vertical</enum>

4
src/librssguard/miscellaneous/application.cpp
View File

@ -518,10 +518,6 @@ void Application::onAboutToQuit() {
processEvents();
qDebugNN << LOGSEC_CORE << "Cleaning up resources and saving application state.";
#if defined(Q_OS_WIN)
system()->removeTrolltechJunkRegistryKeys();
#endif
if (locked_safely) {
// Application obtained permission to close in a safe way.
qDebugNN << LOGSEC_CORE << "Close lock was obtained safely.";

3
src/librssguard/miscellaneous/settings.cpp
View File

@ -235,9 +235,6 @@ DKEY General::ID = "main";
DKEY General::UpdateOnStartup = "update_on_start";
DVALUE(bool) General::UpdateOnStartupDef = true;
DKEY General::RemoveTrolltechJunk = "remove_trolltech_junk";
DVALUE(bool) General::RemoveTrolltechJunkDef = false;
DKEY General::FirstRun = "first_run";
DVALUE(bool) General::FirstRunDef = true;

8
src/librssguard/miscellaneous/settings.h
View File

@ -250,20 +250,14 @@ namespace GUI {
// General.
namespace General {
KEY ID;
KEY UpdateOnStartup;
KEY UpdateOnStartup;
VALUE(bool) UpdateOnStartupDef;
KEY RemoveTrolltechJunk;
VALUE(bool) RemoveTrolltechJunkDef;
KEY FirstRun;
VALUE(bool) FirstRunDef;
KEY Language;
VALUE(QString) LanguageDef;
}

16
src/librssguard/miscellaneous/systemfactory.cpp
View File

@ -170,22 +170,6 @@ bool SystemFactory::setAutoStartStatus(AutoStartStatus new_status) {
#endif
}
#if defined(Q_OS_WIN)
bool SystemFactory::removeTrolltechJunkRegistryKeys() {
if (qApp->settings()->value(GROUP(General), SETTING(General::RemoveTrolltechJunk)).toBool()) {
QSettings registry_key(QSL("HKEY_CURRENT_USER\\Software\\TrollTech"), QSettings::NativeFormat);
registry_key.remove(QString());
registry_key.sync();
return registry_key.status() == QSettings::Status::NoError;
}
else {
return false;
}
}
#endif
QString SystemFactory::loggedInUser() const {
QString name = qgetenv("USER");

4
src/librssguard/miscellaneous/systemfactory.h
View File

@ -55,10 +55,6 @@ class SystemFactory : public QObject {
// new status failed.
bool setAutoStartStatus(AutoStartStatus new_status);
#if defined(Q_OS_WIN)
bool removeTrolltechJunkRegistryKeys();
#endif
#if defined(Q_OS_LINUX)
// Returns standard location where auto-start .desktop files
// should be placed.

2
src/librssguard/network-web/basenetworkaccessmanager.cpp
View File

@ -50,7 +50,7 @@ QNetworkReply* BaseNetworkAccessManager::createRequest(QNetworkAccessManager::Op
#endif
new_request.setRawHeader(HTTP_HEADERS_COOKIE, QSL("JSESSIONID= ").toLocal8Bit());
new_request.setRawHeader(HTTP_HEADERS_USER_AGENT, QString(APP_USERAGENT).toLocal8Bit());
new_request.setRawHeader(HTTP_HEADERS_USER_AGENT, QSL(APP_USERAGENT).toLocal8Bit());
auto reply = QNetworkAccessManager::createRequest(op, new_request, outgoingData);
return reply;