# HG changeset patch
# User Teemu Piippo <tsapii@utu.fi>
# Date 1433689866 -10800
# Node ID 5dc8b48f80b3746c5e91230629ddd83c5d031dc9
# Parent  7a27d14a4df16d3a3afabc78c534f0328a3cb1e4
Removed the not very useful apply button from the config window
Fixed compilation warnings under MSVC 2013

diff -r 7a27d14a4df1 -r 5dc8b48f80b3 CMakeLists.txt
--- a/CMakeLists.txt	Sun Jun 07 15:52:33 2015 +0300
+++ b/CMakeLists.txt	Sun Jun 07 18:11:06 2015 +0300
@@ -53,6 +53,8 @@
 if (NOT MSVC)
 	set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -W -Wall")
 else()
+	# Some Qt headers (QMap and QHash) trigger C4180, disable that.
+	add_definitions ("/wd4180 /D_CRT_SECURE_NO_WARNINGS /nologo")
 	set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /Za")
 endif()
 
diff -r 7a27d14a4df1 -r 5dc8b48f80b3 config/configwindow.cpp
--- a/config/configwindow.cpp	Sun Jun 07 15:52:33 2015 +0300
+++ b/config/configwindow.cpp	Sun Jun 07 18:11:06 2015 +0300
@@ -296,8 +296,4 @@
 	{
 		reject();
 	}
-	else if (btn == ui.buttonBox->button (QDialogButtonBox::Apply))
-	{
-		saveSettings();
-	}
 }
\ No newline at end of file
diff -r 7a27d14a4df1 -r 5dc8b48f80b3 ui/configbox.ui
--- a/ui/configbox.ui	Sun Jun 07 15:52:33 2015 +0300
+++ b/ui/configbox.ui	Sun Jun 07 18:11:06 2015 +0300
@@ -20,7 +20,7 @@
    <string>Dialog</string>
   </property>
   <property name="windowIcon">
-   <iconset resource="../zcinema.qrc">
+   <iconset>
     <normaloff>:/icons/zcinema.ico</normaloff>:/icons/zcinema.ico</iconset>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout">
@@ -239,15 +239,13 @@
       <enum>Qt::Horizontal</enum>
      </property>
      <property name="standardButtons">
-      <set>QDialogButtonBox::Apply|QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
+      <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
      </property>
     </widget>
    </item>
   </layout>
  </widget>
- <resources>
-  <include location="../zcinema.qrc"/>
- </resources>
+ <resources/>
  <connections>
   <connection>
    <sender>wad_clear</sender>