Make compile on top of the current master branch

[quassel.git] / src / qtui / settingspages / generalsettingspage.cpp

diff --git a/src/qtui/settingspages/generalsettingspage.cpp b/src/qtui/settingspages/generalsettingspage.cpp
index 6139ad5..db21c39 100644 (file)
--- a/src/qtui/settingspages/generalsettingspage.cpp
+++ b/src/qtui/settingspages/generalsettingspage.cpp
@@ -149,8 +149,8 @@ void GeneralSettingsPage::save() {
 
   uiSettings.setValue("AnimateTrayIcon", ui.animateTrayIcon->isChecked());
 //<<< HEAD:src/qtui/settingspages/generalsettingspage.cpp
-  uiSettings.setValue("DisplayPopupMessages", ui.displayPopupMessages->isChecked());
-  uiSettings.setValue("CompletionSuffix", ui.completionSuffix->text());
+//  uiSettings.setValue("DisplayPopupMessages", ui.displayPopupMessages->isChecked());
+//  uiSettings.setValue("CompletionSuffix", ui.completionSuffix->text());
   
 //=======
   uiSettings.setValue("NotificationBubble", ui.bubbleBox->isChecked());