projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Cleanup allowing for tags to be available at later points, adds TAGMSG
[quassel.git]
/
src
/
qtui
/
settingspages
/
coreconnectionsettingspage.cpp
diff --git
a/src/qtui/settingspages/coreconnectionsettingspage.cpp
b/src/qtui/settingspages/coreconnectionsettingspage.cpp
index
b5d5ffd
..
60bbeb9
100644
(file)
--- a/
src/qtui/settingspages/coreconnectionsettingspage.cpp
+++ b/
src/qtui/settingspages/coreconnectionsettingspage.cpp
@@
-1,5
+1,5
@@
/***************************************************************************
/***************************************************************************
- * Copyright (C) 2005-201
8
by the Quassel Project *
+ * Copyright (C) 2005-201
9
by the Quassel Project *
* devel@quassel-irc.org *
* *
* This program is free software; you can redistribute it and/or modify *
* devel@quassel-irc.org *
* *
* This program is free software; you can redistribute it and/or modify *
@@
-20,7
+20,7
@@
#include "coreconnectionsettingspage.h"
#include "coreconnectionsettingspage.h"
-CoreConnectionSettingsPage::CoreConnectionSettingsPage(QWidget
*
parent)
+CoreConnectionSettingsPage::CoreConnectionSettingsPage(QWidget
*
parent)
: SettingsPage(tr("Remote Cores"), tr("Connection"), parent)
{
ui.setupUi(this);
: SettingsPage(tr("Remote Cores"), tr("Connection"), parent)
{
ui.setupUi(this);
@@
-32,7
+32,6
@@
CoreConnectionSettingsPage::CoreConnectionSettingsPage(QWidget *parent)
connect(ui.useNoTimeout, &QAbstractButton::toggled, this, &CoreConnectionSettingsPage::widgetHasChanged);
}
connect(ui.useNoTimeout, &QAbstractButton::toggled, this, &CoreConnectionSettingsPage::widgetHasChanged);
}
-
void CoreConnectionSettingsPage::widgetHasChanged()
{
bool hasChanged = false;
void CoreConnectionSettingsPage::widgetHasChanged()
{
bool hasChanged = false;
@@
-43,7
+42,6
@@
void CoreConnectionSettingsPage::widgetHasChanged()
setChangedState(hasChanged);
}
setChangedState(hasChanged);
}
-
void CoreConnectionSettingsPage::defaults()
{
setRadioButtons(CoreConnectionSettings::UseQNetworkConfigurationManager);
void CoreConnectionSettingsPage::defaults()
{
setRadioButtons(CoreConnectionSettings::UseQNetworkConfigurationManager);
@@
-51,7
+49,6
@@
void CoreConnectionSettingsPage::defaults()
SettingsPage::defaults();
}
SettingsPage::defaults();
}
-
void CoreConnectionSettingsPage::load()
{
CoreConnectionSettings s;
void CoreConnectionSettingsPage::load()
{
CoreConnectionSettings s;
@@
-60,7
+57,6
@@
void CoreConnectionSettingsPage::load()
SettingsPage::load();
}
SettingsPage::load();
}
-
void CoreConnectionSettingsPage::save()
{
_detectionMode = modeFromRadioButtons();
void CoreConnectionSettingsPage::save()
{
_detectionMode = modeFromRadioButtons();
@@
-69,7
+65,6
@@
void CoreConnectionSettingsPage::save()
SettingsPage::save();
}
SettingsPage::save();
}
-
void CoreConnectionSettingsPage::setRadioButtons(CoreConnectionSettings::NetworkDetectionMode mode)
{
switch (mode) {
void CoreConnectionSettingsPage::setRadioButtons(CoreConnectionSettings::NetworkDetectionMode mode)
{
switch (mode) {
@@
-84,7
+79,6
@@
void CoreConnectionSettingsPage::setRadioButtons(CoreConnectionSettings::Network
}
}
}
}
-
CoreConnectionSettings::NetworkDetectionMode CoreConnectionSettingsPage::modeFromRadioButtons() const
{
if (ui.useQNetworkConfigurationManager->isChecked())
CoreConnectionSettings::NetworkDetectionMode CoreConnectionSettingsPage::modeFromRadioButtons() const
{
if (ui.useQNetworkConfigurationManager->isChecked())