projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Rename HAVE_KDE define to HAVE_KDE4
[quassel.git]
/
src
/
qtui
/
settingspages
/
coreconnectionsettingspage.cpp
diff --git
a/src/qtui/settingspages/coreconnectionsettingspage.cpp
b/src/qtui/settingspages/coreconnectionsettingspage.cpp
index
4113a4e
..
a9d0bca
100644
(file)
--- a/
src/qtui/settingspages/coreconnectionsettingspage.cpp
+++ b/
src/qtui/settingspages/coreconnectionsettingspage.cpp
@@
-1,5
+1,5
@@
/***************************************************************************
/***************************************************************************
- * Copyright (C) 2005-201
2
by the Quassel Project *
+ * Copyright (C) 2005-201
5
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 *
@@
-24,7
+24,7
@@
CoreConnectionSettingsPage::CoreConnectionSettingsPage(QWidget *parent)
: SettingsPage(tr("Remote Cores"), tr("Connection"), parent)
{
ui.setupUi(this);
: SettingsPage(tr("Remote Cores"), tr("Connection"), parent)
{
ui.setupUi(this);
-#ifndef HAVE_KDE
+#ifndef HAVE_KDE
4
ui.useSolid->hide();
#endif
ui.useSolid->hide();
#endif
@@
-49,7
+49,7
@@
void CoreConnectionSettingsPage::widgetHasChanged()
void CoreConnectionSettingsPage::defaults()
{
void CoreConnectionSettingsPage::defaults()
{
-#ifdef HAVE_KDE
+#ifdef HAVE_KDE
4
setRadioButtons(CoreConnectionSettings::UseSolid);
#else
setRadioButtons(CoreConnectionSettings::UsePingTimeout);
setRadioButtons(CoreConnectionSettings::UseSolid);
#else
setRadioButtons(CoreConnectionSettings::UsePingTimeout);
@@
-80,7
+80,7
@@
void CoreConnectionSettingsPage::save()
void CoreConnectionSettingsPage::setRadioButtons(CoreConnectionSettings::NetworkDetectionMode mode)
{
switch (mode) {
void CoreConnectionSettingsPage::setRadioButtons(CoreConnectionSettings::NetworkDetectionMode mode)
{
switch (mode) {
-#ifdef HAVE_KDE
+#ifdef HAVE_KDE
4
case CoreConnectionSettings::UseSolid:
ui.useSolid->setChecked(true);
break;
case CoreConnectionSettings::UseSolid:
ui.useSolid->setChecked(true);
break;
@@
-96,7
+96,7
@@
void CoreConnectionSettingsPage::setRadioButtons(CoreConnectionSettings::Network
CoreConnectionSettings::NetworkDetectionMode CoreConnectionSettingsPage::modeFromRadioButtons() const
{
CoreConnectionSettings::NetworkDetectionMode CoreConnectionSettingsPage::modeFromRadioButtons() const
{
-#ifdef HAVE_KDE
+#ifdef HAVE_KDE
4
if (ui.useSolid->isChecked())
return CoreConnectionSettings::UseSolid;
#endif
if (ui.useSolid->isChecked())
return CoreConnectionSettings::UseSolid;
#endif