fix some warnings

Author: nytelytee

CMakeLists.txt

@@ -60,7 +60,11 @@ if (MSVC)
     "/wd4464"  # relative include path, in geode
   )
 else()
-  target_compile_options(${PROJECT_NAME} PUBLIC "-Wall" "-Wextra" "-Wpedantic" "-Wno-dollar-in-identifier-extension")
+  target_compile_options(
+    ${PROJECT_NAME} PUBLIC
+    "-Wall" "-Wextra" "-Wpedantic"
+    "-Wno-dollar-in-identifier-extension"
+  )
 endif()
 
 set_property(TARGET ${PROJECT_NAME} PROPERTY COMPILE_WARNING_AS_ERROR ON)

include/api/base.hpp

@@ -1,5 +1,15 @@
 #pragma once
 
+#ifdef __clang__
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wunused-parameter"
+#endif
+#include <Geode/loader/Dispatch.hpp>
+#ifdef __clang__
+#pragma clang diagnostic pop
+#endif
+
+
 #define ICON_KIT_FILTER_AND_SORT_ID "nytelyte.icon_kit_filter_and_sort"
 
 namespace nytelyte {

include/api/events.hpp

@@ -1,7 +1,15 @@
 #pragma once
 
+#ifdef __clang__
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wunused-parameter"
+#endif
 #include <Geode/loader/Dispatch.hpp>
 #include <Geode/loader/Mod.hpp>
+#ifdef __clang__
+#pragma clang diagnostic pop
+#endif
+
 #include <api/base.hpp>
 
 namespace nytelyte {

include/hooks/GJGarageLayer.hpp

@@ -2,10 +2,16 @@
 
 #include <Geode/Geode.hpp>
 
+#ifdef _MSC_VER
 #pragma warning(push)
 #pragma warning(disable: 4265)  // non-virtual destructor
+#endif
+
 #include <Geode/modify/GJGarageLayer.hpp>
+
+#ifdef _MSC_VER
 #pragma warning(pop)
+#endif
 
 using namespace geode::prelude;
 

include/hooks/GameManager.hpp

@@ -2,10 +2,16 @@
 
 #include <Geode/Geode.hpp>
 
+#ifdef _MSC_VER
 #pragma warning(push)
 #pragma warning(disable: 4265)  // non-virtual destructor
+#endif
+
 #include <Geode/modify/GameManager.hpp>
+
+#ifdef _MSC_VER
 #pragma warning(pop)
+#endif // MSVC
 
 using namespace geode::prelude;
 

include/hooks/PurchaseItemPopup.hpp

@@ -2,10 +2,16 @@
 
 #include <Geode/Geode.hpp>
 
+#ifdef _MSC_VER
 #pragma warning(push)
 #pragma warning(disable: 4265)  // non-virtual destructor
+#endif
+
 #include <Geode/modify/PurchaseItemPopup.hpp>
+
+#ifdef _MSC_VER
 #pragma warning(pop)
+#endif // MSVC
 
 #include <iconkit.hpp>
 #include <logic.hpp>

include/moreicons.hpp

@@ -0,0 +1,20 @@
+#ifdef _MSC_VER
+#pragma warning(push)
+#pragma warning(disable: 4061)  // enum exhaustiveness
+#endif
+
+#ifdef __clang__
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wunused-parameter"
+#pragma clang diagnostic ignored "-Wsign-compare"
+#endif
+
+#include <hiimjustin000.more_icons/include/MoreIcons.hpp>
+
+#ifdef _MSC_VER
+#pragma warning(pop)
+#endif
+
+#ifdef __clang__
+#pragma clang diagnostic pop
+#endif

src/api/api.cpp

@@ -1,12 +1,7 @@
 #include <api/api.hpp>
 #include <logic.hpp>
 #include <iconkit.hpp>
-
-#pragma warning(push)
-#pragma warning(disable: 4061)  // enum exhaustiveness
-#include <hiimjustin000.more_icons/include/MoreIcons.hpp>
-#pragma warning(pop)
-
+#include <moreicons.hpp>
 
 
 using namespace nytelyte::icon_kit_filter_and_sort;

src/hooks/GJGarageLayer.cpp

@@ -11,10 +11,7 @@
 #include <popups/DisplayOptionsPopup.hpp>
 #include <popups/FilterAndSortPopup.hpp>
 
-#pragma warning(push)
-#pragma warning(disable: 4061)  // enum exhaustiveness
-#include <hiimjustin000.more_icons/include/MoreIcons.hpp>
-#pragma warning(pop)
+#include <moreicons.hpp>
 
 using namespace geode::prelude;
 
@@ -182,7 +179,6 @@ void HookedGJGarageLayer::recalculateNavdotMenu(int currentPage, IconType iconTy
 
   m_navDotMenu->removeAllChildren();
   m_pageButtons->removeAllObjects();
-  CCSize winSize = CCDirector::sharedDirector()->getWinSize();
   // set the gap to 0, and then manually set every per-element gap to 6.f
   // axis layout doesn't let you specifically set a cross axis gap because fuck you
   // it just uses the layout gap regardless, i think it even ignores the per-element prev/next gap

src/logic.cpp

@@ -3,10 +3,7 @@
 #include <constants.hpp>
 #include <logic.hpp>
 #include <iconkit.hpp>
-#pragma warning(push)
-#pragma warning(disable: 4061)  // enum exhaustiveness
-#include <hiimjustin000.more_icons/include/MoreIcons.hpp>
-#pragma warning(pop)
+#include <moreicons.hpp>
 
 
 using namespace geode::prelude;