Apply suggestions from code review

BjoHart · Oct 31, 2020 · 5b71d57 · 5b71d57
1 parent c36ace1
commit 5b71d57
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/msvc-full-features/ObjectCreator-vcpkg-static.vcxproj b/msvc-full-features/ObjectCreator-vcpkg-static.vcxproj
@@ -81,7 +81,8 @@
       <DisableSpecificWarnings>4819;4146;26495;26444;26451;4068</DisableSpecificWarnings>
       <ForcedIncludeFiles>stdafx.h</ForcedIncludeFiles>
       <AdditionalOptions>/bigobj /utf-8 %(AdditionalOptions)</AdditionalOptions>
-      <PreprocessorDefinitions>_SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;WIN32_LEAN_AND_MEAN;_CONSOLE;LOCALIZE;USE_VCPKG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;WIN32_LEAN_AND_MEAN;_CONSOLE;LOCALIZE;USE_VCPKG;QT_NO_KEYWORDS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+
       <LanguageStandard>stdcpp14</LanguageStandard>
       <AdditionalIncludeDirectories>..\Qt\5.15.0\msvc2019\include;..\tools\format;..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>

diff --git a/object_creator/fake_spell_listbox.h b/object_creator/fake_spell_listbox.h
@@ -31,7 +31,7 @@ class fake_spell_listbox : public QListWidget
         void setText( const QString &str ) {
             id_label.setText( str );
         }
-    signals:
+    Q_SIGNALS:
         // emits a signal if any attached windows are modified
         void modified();
     private:

diff --git a/object_creator/fake_spell_window.h b/object_creator/fake_spell_window.h
@@ -40,7 +40,7 @@ class fake_spell_window : public QMainWindow
 
         // the index of this window in the windows vector in fake_spell_listbox
         int index = 0;
-    signals:
+    Q_SIGNALS:
         // emits a signal if any attached data is modified
         void modified();
     private: