From 29190708c31aa8290217ac40f2453e96e380c3e6 Mon Sep 17 00:00:00 2001 From: Fabio Bas Date: Thu, 29 Jan 2015 14:11:15 +0100 Subject: [PATCH] Fix merge botch --- cockatrice/src/dlg_settings.cpp | 5 ----- 1 file changed, 5 deletions(-) diff --git a/cockatrice/src/dlg_settings.cpp b/cockatrice/src/dlg_settings.cpp index 7d29b48b..561bb973 100644 --- a/cockatrice/src/dlg_settings.cpp +++ b/cockatrice/src/dlg_settings.cpp @@ -50,11 +50,6 @@ GeneralSettingsPage::GeneralSettingsPage() pixmapCacheEdit.setSingleStep(64); pixmapCacheEdit.setValue(settingsCache->getPixmapCacheSize()); pixmapCacheEdit.setSuffix(" MB"); - pixmapCacheEdit.setMinimum(64); - pixmapCacheEdit.setMaximum(8192); - pixmapCacheEdit.setSingleStep(64); - pixmapCacheEdit.setValue(settingsCache->getPixmapCacheSize()); - pixmapCacheEdit.setSuffix(" MB"); picDownloadHqCheckBox.setChecked(settingsCache->getPicDownloadHq()); picDownloadCheckBox.setChecked(settingsCache->getPicDownload());