diff options
Diffstat (limited to 'src')
61 files changed, 188 insertions, 188 deletions
diff --git a/src/being/localplayer.cpp b/src/being/localplayer.cpp index 17aa4e2e3..564e17cb9 100644 --- a/src/being/localplayer.cpp +++ b/src/being/localplayer.cpp @@ -1168,8 +1168,8 @@ void LocalPlayer::attributeChanged(const AttributesT id, const int oldVal, const int newVal) { - PRAGMA45("GCC diagnostic push") - PRAGMA45("GCC diagnostic ignored \"-Wswitch-enum\"") + PRAGMA45(GCC diagnostic push) + PRAGMA45(GCC diagnostic ignored "-Wswitch-enum") switch (id) { case Attributes::EXP: @@ -1193,7 +1193,7 @@ void LocalPlayer::attributeChanged(const AttributesT id, default: break; } - PRAGMA45("GCC diagnostic pop") + PRAGMA45(GCC diagnostic pop) } void LocalPlayer::move(const int dX, const int dY) diff --git a/src/dyetool/client.cpp b/src/dyetool/client.cpp index 30dccd228..610617c34 100644 --- a/src/dyetool/client.cpp +++ b/src/dyetool/client.cpp @@ -587,8 +587,8 @@ int Client::gameExec() BLOCK_END("Client::gameExec 7") BLOCK_START("Client::gameExec 8") - PRAGMA45("GCC diagnostic push") - PRAGMA45("GCC diagnostic ignored \"-Wswitch-enum\"") + PRAGMA45(GCC diagnostic push) + PRAGMA45(GCC diagnostic ignored "-Wswitch-enum") switch (mState) { case State::GAME: @@ -641,7 +641,7 @@ int Client::gameExec() mState = State::FORCE_QUIT; break; } - PRAGMA45("GCC diagnostic pop") + PRAGMA45(GCC diagnostic pop) BLOCK_END("Client::gameExec 8") } PROFILER_END(); diff --git a/src/enums/simpletypes/advanced.h b/src/enums/simpletypes/advanced.h index 0e8c8e4a3..f27406c57 100644 --- a/src/enums/simpletypes/advanced.h +++ b/src/enums/simpletypes/advanced.h @@ -23,11 +23,11 @@ #include "enums/simpletypes/booldefines.h" -PRAGMA6("GCC diagnostic push") -PRAGMA6("GCC diagnostic ignored \"-Wunused-const-variable\"") +PRAGMA6(GCC diagnostic push) +PRAGMA6(GCC diagnostic ignored "-Wunused-const-variable") defBoolEnum(Advanced); -PRAGMA6("GCC diagnostic pop") +PRAGMA6(GCC diagnostic pop) #endif // ENUMS_SIMPLETYPES_ADVANCED_H diff --git a/src/enums/simpletypes/allowquit.h b/src/enums/simpletypes/allowquit.h index 22663b1c4..036930cf3 100644 --- a/src/enums/simpletypes/allowquit.h +++ b/src/enums/simpletypes/allowquit.h @@ -23,11 +23,11 @@ #include "enums/simpletypes/booldefines.h" -PRAGMA6("GCC diagnostic push") -PRAGMA6("GCC diagnostic ignored \"-Wunused-const-variable\"") +PRAGMA6(GCC diagnostic push) +PRAGMA6(GCC diagnostic ignored "-Wunused-const-variable") defBoolEnum(AllowQuit); -PRAGMA6("GCC diagnostic pop") +PRAGMA6(GCC diagnostic pop) #endif // ENUMS_SIMPLETYPES_ALLOWQUIT_H diff --git a/src/enums/simpletypes/allowsort.h b/src/enums/simpletypes/allowsort.h index 23d28b102..4fece9f17 100644 --- a/src/enums/simpletypes/allowsort.h +++ b/src/enums/simpletypes/allowsort.h @@ -23,11 +23,11 @@ #include "enums/simpletypes/booldefines.h" -PRAGMA6("GCC diagnostic push") -PRAGMA6("GCC diagnostic ignored \"-Wunused-const-variable\"") +PRAGMA6(GCC diagnostic push) +PRAGMA6(GCC diagnostic ignored "-Wunused-const-variable") defBoolEnum(AllowSort); -PRAGMA6("GCC diagnostic pop") +PRAGMA6(GCC diagnostic pop) #endif // ENUMS_SIMPLETYPES_ALLOWSORT_H diff --git a/src/enums/simpletypes/allplayers.h b/src/enums/simpletypes/allplayers.h index f93c216f2..de598ae88 100644 --- a/src/enums/simpletypes/allplayers.h +++ b/src/enums/simpletypes/allplayers.h @@ -23,11 +23,11 @@ #include "enums/simpletypes/booldefines.h" -PRAGMA6("GCC diagnostic push") -PRAGMA6("GCC diagnostic ignored \"-Wunused-const-variable\"") +PRAGMA6(GCC diagnostic push) +PRAGMA6(GCC diagnostic ignored "-Wunused-const-variable") defBoolEnum(AllPlayers); -PRAGMA6("GCC diagnostic pop") +PRAGMA6(GCC diagnostic pop) #endif // ENUMS_SIMPLETYPES_ALLPLAYERS_H diff --git a/src/enums/simpletypes/append.h b/src/enums/simpletypes/append.h index c50ac81d5..9e5c7f05d 100644 --- a/src/enums/simpletypes/append.h +++ b/src/enums/simpletypes/append.h @@ -23,11 +23,11 @@ #include "enums/simpletypes/booldefines.h" -PRAGMA6("GCC diagnostic push") -PRAGMA6("GCC diagnostic ignored \"-Wunused-const-variable\"") +PRAGMA6(GCC diagnostic push) +PRAGMA6(GCC diagnostic ignored "-Wunused-const-variable") defBoolEnum(Append); -PRAGMA6("GCC diagnostic pop") +PRAGMA6(GCC diagnostic pop) #endif // ENUMS_SIMPLETYPES_APPEND_H diff --git a/src/enums/simpletypes/autorelease.h b/src/enums/simpletypes/autorelease.h index c10952172..3823f465e 100644 --- a/src/enums/simpletypes/autorelease.h +++ b/src/enums/simpletypes/autorelease.h @@ -23,11 +23,11 @@ #include "enums/simpletypes/booldefines.h" -PRAGMA6("GCC diagnostic push") -PRAGMA6("GCC diagnostic ignored \"-Wunused-const-variable\"") +PRAGMA6(GCC diagnostic push) +PRAGMA6(GCC diagnostic ignored "-Wunused-const-variable") defBoolEnum(AutoRelease); -PRAGMA6("GCC diagnostic pop") +PRAGMA6(GCC diagnostic pop) #endif // ENUMS_SIMPLETYPES_AUTORELEASE_H diff --git a/src/enums/simpletypes/autotarget.h b/src/enums/simpletypes/autotarget.h index b6f7148ca..a5e47aaed 100644 --- a/src/enums/simpletypes/autotarget.h +++ b/src/enums/simpletypes/autotarget.h @@ -23,11 +23,11 @@ #include "enums/simpletypes/booldefines.h" -PRAGMA6("GCC diagnostic push") -PRAGMA6("GCC diagnostic ignored \"-Wunused-const-variable\"") +PRAGMA6(GCC diagnostic push) +PRAGMA6(GCC diagnostic ignored "-Wunused-const-variable") defBoolEnum(AutoTarget); -PRAGMA6("GCC diagnostic pop") +PRAGMA6(GCC diagnostic pop) #endif // ENUMS_SIMPLETYPES_AUTOTARGET_H diff --git a/src/enums/simpletypes/beingid.h b/src/enums/simpletypes/beingid.h index 51822ed15..895f44c53 100644 --- a/src/enums/simpletypes/beingid.h +++ b/src/enums/simpletypes/beingid.h @@ -23,12 +23,12 @@ #include "enums/simpletypes/intdefines.h" -PRAGMA6("GCC diagnostic push") -PRAGMA6("GCC diagnostic ignored \"-Wunused-const-variable\"") +PRAGMA6(GCC diagnostic push) +PRAGMA6(GCC diagnostic ignored "-Wunused-const-variable") defIntEnum(BeingId, int); defIntEnumNeg(BeingId); -PRAGMA6("GCC diagnostic pop") +PRAGMA6(GCC diagnostic pop) #endif // ENUMS_SIMPLETYPES_BEINGID_H diff --git a/src/enums/simpletypes/beingtypeid.h b/src/enums/simpletypes/beingtypeid.h index e3c24593c..a00b0aa75 100644 --- a/src/enums/simpletypes/beingtypeid.h +++ b/src/enums/simpletypes/beingtypeid.h @@ -23,12 +23,12 @@ #include "enums/simpletypes/intdefines.h" -PRAGMA6("GCC diagnostic push") -PRAGMA6("GCC diagnostic ignored \"-Wunused-const-variable\"") +PRAGMA6(GCC diagnostic push) +PRAGMA6(GCC diagnostic ignored "-Wunused-const-variable") defIntEnum(BeingTypeId, int); defIntEnumNeg(BeingTypeId); -PRAGMA6("GCC diagnostic pop") +PRAGMA6(GCC diagnostic pop) #endif // ENUMS_SIMPLETYPES_BEINGTYPEID_H diff --git a/src/enums/simpletypes/damaged.h b/src/enums/simpletypes/damaged.h index 73329f78a..88ded75de 100644 --- a/src/enums/simpletypes/damaged.h +++ b/src/enums/simpletypes/damaged.h @@ -23,11 +23,11 @@ #include "enums/simpletypes/booldefines.h" -PRAGMA6("GCC diagnostic push") -PRAGMA6("GCC diagnostic ignored \"-Wunused-const-variable\"") +PRAGMA6(GCC diagnostic push) +PRAGMA6(GCC diagnostic ignored "-Wunused-const-variable") defBoolEnum(Damaged); -PRAGMA6("GCC diagnostic pop") +PRAGMA6(GCC diagnostic pop) #endif // ENUMS_SIMPLETYPES_DAMAGED_H diff --git a/src/enums/simpletypes/donotalign.h b/src/enums/simpletypes/donotalign.h index d59cb57a7..343ae92db 100644 --- a/src/enums/simpletypes/donotalign.h +++ b/src/enums/simpletypes/donotalign.h @@ -23,11 +23,11 @@ #include "enums/simpletypes/booldefines.h" -PRAGMA6("GCC diagnostic push") -PRAGMA6("GCC diagnostic ignored \"-Wunused-const-variable\"") +PRAGMA6(GCC diagnostic push) +PRAGMA6(GCC diagnostic ignored "-Wunused-const-variable") defBoolEnum(DoNotAlign); -PRAGMA6("GCC diagnostic pop") +PRAGMA6(GCC diagnostic pop) #endif // ENUMS_SIMPLETYPES_DONOTALIGN_H diff --git a/src/enums/simpletypes/enable.h b/src/enums/simpletypes/enable.h index 4c8b933ce..1f07ee406 100644 --- a/src/enums/simpletypes/enable.h +++ b/src/enums/simpletypes/enable.h @@ -23,11 +23,11 @@ #include "enums/simpletypes/booldefines.h" -PRAGMA6("GCC diagnostic push") -PRAGMA6("GCC diagnostic ignored \"-Wunused-const-variable\"") +PRAGMA6(GCC diagnostic push) +PRAGMA6(GCC diagnostic ignored "-Wunused-const-variable") defBoolEnum(Enable); -PRAGMA6("GCC diagnostic pop") +PRAGMA6(GCC diagnostic pop) #endif // ENUMS_SIMPLETYPES_ENABLE_H diff --git a/src/enums/simpletypes/equipm.h b/src/enums/simpletypes/equipm.h index 2bfd5b22b..ab5dcd75d 100644 --- a/src/enums/simpletypes/equipm.h +++ b/src/enums/simpletypes/equipm.h @@ -23,11 +23,11 @@ #include "enums/simpletypes/booldefines.h" -PRAGMA6("GCC diagnostic push") -PRAGMA6("GCC diagnostic ignored \"-Wunused-const-variable\"") +PRAGMA6(GCC diagnostic push) +PRAGMA6(GCC diagnostic ignored "-Wunused-const-variable") defBoolEnum(Equipm); -PRAGMA6("GCC diagnostic pop") +PRAGMA6(GCC diagnostic pop) #endif // ENUMS_SIMPLETYPES_EQUIPM_H diff --git a/src/enums/simpletypes/equipped.h b/src/enums/simpletypes/equipped.h index 18ef2f363..02a62f24c 100644 --- a/src/enums/simpletypes/equipped.h +++ b/src/enums/simpletypes/equipped.h @@ -23,11 +23,11 @@ #include "enums/simpletypes/booldefines.h" -PRAGMA6("GCC diagnostic push") -PRAGMA6("GCC diagnostic ignored \"-Wunused-const-variable\"") +PRAGMA6(GCC diagnostic push) +PRAGMA6(GCC diagnostic ignored "-Wunused-const-variable") defBoolEnum(Equipped); -PRAGMA6("GCC diagnostic pop") +PRAGMA6(GCC diagnostic pop) #endif // ENUMS_SIMPLETYPES_EQUIPPED_H diff --git a/src/enums/simpletypes/favorite.h b/src/enums/simpletypes/favorite.h index 498420d41..22cd4aa68 100644 --- a/src/enums/simpletypes/favorite.h +++ b/src/enums/simpletypes/favorite.h @@ -23,11 +23,11 @@ #include "enums/simpletypes/booldefines.h" -PRAGMA6("GCC diagnostic push") -PRAGMA6("GCC diagnostic ignored \"-Wunused-const-variable\"") +PRAGMA6(GCC diagnostic push) +PRAGMA6(GCC diagnostic ignored "-Wunused-const-variable") defBoolEnum(Favorite); -PRAGMA6("GCC diagnostic pop") +PRAGMA6(GCC diagnostic pop) #endif // ENUMS_SIMPLETYPES_FAVORITE_H diff --git a/src/enums/simpletypes/forcedisplay.h b/src/enums/simpletypes/forcedisplay.h index 053dc72f1..8fc1b6d16 100644 --- a/src/enums/simpletypes/forcedisplay.h +++ b/src/enums/simpletypes/forcedisplay.h @@ -23,11 +23,11 @@ #include "enums/simpletypes/booldefines.h" -PRAGMA6("GCC diagnostic push") -PRAGMA6("GCC diagnostic ignored \"-Wunused-const-variable\"") +PRAGMA6(GCC diagnostic push) +PRAGMA6(GCC diagnostic ignored "-Wunused-const-variable") defBoolEnum(ForceDisplay); -PRAGMA6("GCC diagnostic pop") +PRAGMA6(GCC diagnostic pop) #endif // ENUMS_SIMPLETYPES_FORCEDISPLAY_H diff --git a/src/enums/simpletypes/forcequantity.h b/src/enums/simpletypes/forcequantity.h index 8efb3baa0..b0832257f 100644 --- a/src/enums/simpletypes/forcequantity.h +++ b/src/enums/simpletypes/forcequantity.h @@ -23,11 +23,11 @@ #include "enums/simpletypes/booldefines.h" -PRAGMA6("GCC diagnostic push") -PRAGMA6("GCC diagnostic ignored \"-Wunused-const-variable\"") +PRAGMA6(GCC diagnostic push) +PRAGMA6(GCC diagnostic ignored "-Wunused-const-variable") defBoolEnum(ForceQuantity); -PRAGMA6("GCC diagnostic pop") +PRAGMA6(GCC diagnostic pop) #endif // ENUMS_SIMPLETYPES_FORCEQUANTITY_H diff --git a/src/enums/simpletypes/identified.h b/src/enums/simpletypes/identified.h index 17c86d21d..37d87c4cf 100644 --- a/src/enums/simpletypes/identified.h +++ b/src/enums/simpletypes/identified.h @@ -23,11 +23,11 @@ #include "enums/simpletypes/booldefines.h" -PRAGMA6("GCC diagnostic push") -PRAGMA6("GCC diagnostic ignored \"-Wunused-const-variable\"") +PRAGMA6(GCC diagnostic push) +PRAGMA6(GCC diagnostic ignored "-Wunused-const-variable") defBoolEnum(Identified); -PRAGMA6("GCC diagnostic pop") +PRAGMA6(GCC diagnostic pop) #endif // ENUMS_SIMPLETYPES_IDENTIFIED_H diff --git a/src/enums/simpletypes/ignorerecord.h b/src/enums/simpletypes/ignorerecord.h index fe3dc0b2f..2a0ce1866 100644 --- a/src/enums/simpletypes/ignorerecord.h +++ b/src/enums/simpletypes/ignorerecord.h @@ -23,11 +23,11 @@ #include "enums/simpletypes/booldefines.h" -PRAGMA6("GCC diagnostic push") -PRAGMA6("GCC diagnostic ignored \"-Wunused-const-variable\"") +PRAGMA6(GCC diagnostic push) +PRAGMA6(GCC diagnostic ignored "-Wunused-const-variable") defBoolEnum(IgnoreRecord); -PRAGMA6("GCC diagnostic pop") +PRAGMA6(GCC diagnostic pop) #endif // ENUMS_SIMPLETYPES_IGNORERECORD_H diff --git a/src/enums/simpletypes/issell.h b/src/enums/simpletypes/issell.h index 3a3a2db36..270733943 100644 --- a/src/enums/simpletypes/issell.h +++ b/src/enums/simpletypes/issell.h @@ -23,11 +23,11 @@ #include "enums/simpletypes/booldefines.h" -PRAGMA6("GCC diagnostic push") -PRAGMA6("GCC diagnostic ignored \"-Wunused-const-variable\"") +PRAGMA6(GCC diagnostic push) +PRAGMA6(GCC diagnostic ignored "-Wunused-const-variable") defBoolEnum(IsSell); -PRAGMA6("GCC diagnostic pop") +PRAGMA6(GCC diagnostic pop) #endif // ENUMS_SIMPLETYPES_ISSELL_H diff --git a/src/enums/simpletypes/itemcolor.h b/src/enums/simpletypes/itemcolor.h index b2079e64e..1ee7201cb 100644 --- a/src/enums/simpletypes/itemcolor.h +++ b/src/enums/simpletypes/itemcolor.h @@ -23,11 +23,11 @@ #include "enums/simpletypes/intdefines.h" -PRAGMA6("GCC diagnostic push") -PRAGMA6("GCC diagnostic ignored \"-Wunused-const-variable\"") +PRAGMA6(GCC diagnostic push) +PRAGMA6(GCC diagnostic ignored "-Wunused-const-variable") defIntEnum(ItemColor, uint16_t); -PRAGMA6("GCC diagnostic pop") +PRAGMA6(GCC diagnostic pop) #endif // ENUMS_SIMPLETYPES_ITEMCOLOR_H diff --git a/src/enums/simpletypes/keep.h b/src/enums/simpletypes/keep.h index 9c8cee9dc..406870ee8 100644 --- a/src/enums/simpletypes/keep.h +++ b/src/enums/simpletypes/keep.h @@ -23,11 +23,11 @@ #include "enums/simpletypes/booldefines.h" -PRAGMA6("GCC diagnostic push") -PRAGMA6("GCC diagnostic ignored \"-Wunused-const-variable\"") +PRAGMA6(GCC diagnostic push) +PRAGMA6(GCC diagnostic ignored "-Wunused-const-variable") defBoolEnum(Keep); -PRAGMA6("GCC diagnostic pop") +PRAGMA6(GCC diagnostic pop) #endif // ENUMS_SIMPLETYPES_KEEP_H diff --git a/src/enums/simpletypes/mainconfig.h b/src/enums/simpletypes/mainconfig.h index 8272a307c..5512e52fe 100644 --- a/src/enums/simpletypes/mainconfig.h +++ b/src/enums/simpletypes/mainconfig.h @@ -23,11 +23,11 @@ #include "enums/simpletypes/booldefines.h" -PRAGMA6("GCC diagnostic push") -PRAGMA6("GCC diagnostic ignored \"-Wunused-const-variable\"") +PRAGMA6(GCC diagnostic push) +PRAGMA6(GCC diagnostic ignored "-Wunused-const-variable") defBoolEnum(MainConfig); -PRAGMA6("GCC diagnostic pop") +PRAGMA6(GCC diagnostic pop) #endif // ENUMS_SIMPLETYPES_MAINCONFIG_H diff --git a/src/enums/simpletypes/modal.h b/src/enums/simpletypes/modal.h index 5e9db03ec..553a8fc56 100644 --- a/src/enums/simpletypes/modal.h +++ b/src/enums/simpletypes/modal.h @@ -23,11 +23,11 @@ #include "enums/simpletypes/booldefines.h" -PRAGMA6("GCC diagnostic push") -PRAGMA6("GCC diagnostic ignored \"-Wunused-const-variable\"") +PRAGMA6(GCC diagnostic push) +PRAGMA6(GCC diagnostic ignored "-Wunused-const-variable") defBoolEnum(Modal); -PRAGMA6("GCC diagnostic pop") +PRAGMA6(GCC diagnostic pop) #endif // ENUMS_SIMPLETYPES_MODAL_H diff --git a/src/enums/simpletypes/modifiable.h b/src/enums/simpletypes/modifiable.h index d7b29eecb..41f3ec273 100644 --- a/src/enums/simpletypes/modifiable.h +++ b/src/enums/simpletypes/modifiable.h @@ -23,11 +23,11 @@ #include "enums/simpletypes/booldefines.h" -PRAGMA6("GCC diagnostic push") -PRAGMA6("GCC diagnostic ignored \"-Wunused-const-variable\"") +PRAGMA6(GCC diagnostic push) +PRAGMA6(GCC diagnostic ignored "-Wunused-const-variable") defBoolEnum(Modifiable); -PRAGMA6("GCC diagnostic pop") +PRAGMA6(GCC diagnostic pop) #endif // ENUMS_SIMPLETYPES_MODIFIABLE_H diff --git a/src/enums/simpletypes/move.h b/src/enums/simpletypes/move.h index 0975a3a0b..5b0674306 100644 --- a/src/enums/simpletypes/move.h +++ b/src/enums/simpletypes/move.h @@ -23,11 +23,11 @@ #include "enums/simpletypes/booldefines.h" -PRAGMA6("GCC diagnostic push") -PRAGMA6("GCC diagnostic ignored \"-Wunused-const-variable\"") +PRAGMA6(GCC diagnostic push) +PRAGMA6(GCC diagnostic ignored "-Wunused-const-variable") defBoolEnum(Move); -PRAGMA6("GCC diagnostic pop") +PRAGMA6(GCC diagnostic pop) #endif // ENUMS_SIMPLETYPES_MOVE_H diff --git a/src/enums/simpletypes/notify.h b/src/enums/simpletypes/notify.h index 95728dc27..be3f18afa 100644 --- a/src/enums/simpletypes/notify.h +++ b/src/enums/simpletypes/notify.h @@ -23,11 +23,11 @@ #include "enums/simpletypes/booldefines.h" -PRAGMA6("GCC diagnostic push") -PRAGMA6("GCC diagnostic ignored \"-Wunused-const-variable\"") +PRAGMA6(GCC diagnostic push) +PRAGMA6(GCC diagnostic ignored "-Wunused-const-variable") defBoolEnum(Notify); -PRAGMA6("GCC diagnostic pop") +PRAGMA6(GCC diagnostic pop) #endif // ENUMS_SIMPLETYPES_NOTIFY_H diff --git a/src/enums/simpletypes/npcnames.h b/src/enums/simpletypes/npcnames.h index f0206d8b4..f34409093 100644 --- a/src/enums/simpletypes/npcnames.h +++ b/src/enums/simpletypes/npcnames.h @@ -23,11 +23,11 @@ #include "enums/simpletypes/booldefines.h" -PRAGMA6("GCC diagnostic push") -PRAGMA6("GCC diagnostic ignored \"-Wunused-const-variable\"") +PRAGMA6(GCC diagnostic push) +PRAGMA6(GCC diagnostic ignored "-Wunused-const-variable") defBoolEnum(NpcNames); -PRAGMA6("GCC diagnostic pop") +PRAGMA6(GCC diagnostic pop) #endif // ENUMS_SIMPLETYPES_NPCNAMES_H diff --git a/src/enums/simpletypes/online.h b/src/enums/simpletypes/online.h index 4f824d651..561125a2a 100644 --- a/src/enums/simpletypes/online.h +++ b/src/enums/simpletypes/online.h @@ -23,11 +23,11 @@ #include "enums/simpletypes/booldefines.h" -PRAGMA6("GCC diagnostic push") -PRAGMA6("GCC diagnostic ignored \"-Wunused-const-variable\"") +PRAGMA6(GCC diagnostic push) +PRAGMA6(GCC diagnostic ignored "-Wunused-const-variable") defBoolEnum(Online); -PRAGMA6("GCC diagnostic pop") +PRAGMA6(GCC diagnostic pop) #endif // ENUMS_SIMPLETYPES_ONLINE_H diff --git a/src/enums/simpletypes/onthefly.h b/src/enums/simpletypes/onthefly.h index 8972fb07a..6c0c80d77 100644 --- a/src/enums/simpletypes/onthefly.h +++ b/src/enums/simpletypes/onthefly.h @@ -23,11 +23,11 @@ #include "enums/simpletypes/booldefines.h" -PRAGMA6("GCC diagnostic push") -PRAGMA6("GCC diagnostic ignored \"-Wunused-const-variable\"") +PRAGMA6(GCC diagnostic push) +PRAGMA6(GCC diagnostic ignored "-Wunused-const-variable") defBoolEnum(OnTheFly); -PRAGMA6("GCC diagnostic pop") +PRAGMA6(GCC diagnostic pop) #endif // ENUMS_SIMPLETYPES_ONTHEFLY_H diff --git a/src/enums/simpletypes/protected.h b/src/enums/simpletypes/protected.h index 0e93efdfe..0494b2b73 100644 --- a/src/enums/simpletypes/protected.h +++ b/src/enums/simpletypes/protected.h @@ -23,11 +23,11 @@ #include "enums/simpletypes/booldefines.h" -PRAGMA6("GCC diagnostic push") -PRAGMA6("GCC diagnostic ignored \"-Wunused-const-variable\"") +PRAGMA6(GCC diagnostic push) +PRAGMA6(GCC diagnostic ignored "-Wunused-const-variable") defBoolEnum(Protected); -PRAGMA6("GCC diagnostic pop") +PRAGMA6(GCC diagnostic pop) #endif // ENUMS_SIMPLETYPES_PROTECTED_H diff --git a/src/enums/simpletypes/separator.h b/src/enums/simpletypes/separator.h index 88cc2f6bd..f782f3822 100644 --- a/src/enums/simpletypes/separator.h +++ b/src/enums/simpletypes/separator.h @@ -23,11 +23,11 @@ #include "enums/simpletypes/booldefines.h" -PRAGMA6("GCC diagnostic push") -PRAGMA6("GCC diagnostic ignored \"-Wunused-const-variable\"") +PRAGMA6(GCC diagnostic push) +PRAGMA6(GCC diagnostic ignored "-Wunused-const-variable") defBoolEnum(Separator); -PRAGMA6("GCC diagnostic pop") +PRAGMA6(GCC diagnostic pop) #endif // ENUMS_SIMPLETYPES_SEPARATOR_H diff --git a/src/enums/simpletypes/sfx.h b/src/enums/simpletypes/sfx.h index 3accb540e..03c82fb7c 100644 --- a/src/enums/simpletypes/sfx.h +++ b/src/enums/simpletypes/sfx.h @@ -23,11 +23,11 @@ #include "enums/simpletypes/booldefines.h" -PRAGMA6("GCC diagnostic push") -PRAGMA6("GCC diagnostic ignored \"-Wunused-const-variable\"") +PRAGMA6(GCC diagnostic push) +PRAGMA6(GCC diagnostic ignored "-Wunused-const-variable") defBoolEnum(Sfx); -PRAGMA6("GCC diagnostic pop") +PRAGMA6(GCC diagnostic pop) #endif // ENUMS_SIMPLETYPES_SFX_H diff --git a/src/enums/simpletypes/showcenter.h b/src/enums/simpletypes/showcenter.h index aa9c9d492..8fac92953 100644 --- a/src/enums/simpletypes/showcenter.h +++ b/src/enums/simpletypes/showcenter.h @@ -23,11 +23,11 @@ #include "enums/simpletypes/booldefines.h" -PRAGMA6("GCC diagnostic push") -PRAGMA6("GCC diagnostic ignored \"-Wunused-const-variable\"") +PRAGMA6(GCC diagnostic push) +PRAGMA6(GCC diagnostic ignored "-Wunused-const-variable") defBoolEnum(ShowCenter); -PRAGMA6("GCC diagnostic pop") +PRAGMA6(GCC diagnostic pop) #endif // ENUMS_SIMPLETYPES_SHOWCENTER_H diff --git a/src/enums/simpletypes/showemptyrows.h b/src/enums/simpletypes/showemptyrows.h index 89fd50a11..224a5f639 100644 --- a/src/enums/simpletypes/showemptyrows.h +++ b/src/enums/simpletypes/showemptyrows.h @@ -23,11 +23,11 @@ #include "enums/simpletypes/booldefines.h" -PRAGMA6("GCC diagnostic push") -PRAGMA6("GCC diagnostic ignored \"-Wunused-const-variable\"") +PRAGMA6(GCC diagnostic push) +PRAGMA6(GCC diagnostic ignored "-Wunused-const-variable") defBoolEnum(ShowEmptyRows); -PRAGMA6("GCC diagnostic pop") +PRAGMA6(GCC diagnostic pop) #endif // ENUMS_SIMPLETYPES_SHOWEMPTYROWS_H diff --git a/src/enums/simpletypes/skiperror.h b/src/enums/simpletypes/skiperror.h index 3fac6b97f..e31a16629 100644 --- a/src/enums/simpletypes/skiperror.h +++ b/src/enums/simpletypes/skiperror.h @@ -23,11 +23,11 @@ #include "enums/simpletypes/booldefines.h" -PRAGMA6("GCC diagnostic push") -PRAGMA6("GCC diagnostic ignored \"-Wunused-const-variable\"") +PRAGMA6(GCC diagnostic push) +PRAGMA6(GCC diagnostic ignored "-Wunused-const-variable") defBoolEnum(SkipError); -PRAGMA6("GCC diagnostic pop") +PRAGMA6(GCC diagnostic pop) #endif // ENUMS_SIMPLETYPES_SKIPERROR_H diff --git a/src/enums/simpletypes/speech.h b/src/enums/simpletypes/speech.h index 4bd2a3681..a6bd821f4 100644 --- a/src/enums/simpletypes/speech.h +++ b/src/enums/simpletypes/speech.h @@ -23,11 +23,11 @@ #include "enums/simpletypes/booldefines.h" -PRAGMA6("GCC diagnostic push") -PRAGMA6("GCC diagnostic ignored \"-Wunused-const-variable\"") +PRAGMA6(GCC diagnostic push) +PRAGMA6(GCC diagnostic ignored "-Wunused-const-variable") defBoolEnum(Speech); -PRAGMA6("GCC diagnostic pop") +PRAGMA6(GCC diagnostic pop) #endif // ENUMS_SIMPLETYPES_SPEECH_H diff --git a/src/enums/simpletypes/trading.h b/src/enums/simpletypes/trading.h index 68a082652..f270d0262 100644 --- a/src/enums/simpletypes/trading.h +++ b/src/enums/simpletypes/trading.h @@ -23,11 +23,11 @@ #include "enums/simpletypes/booldefines.h" -PRAGMA6("GCC diagnostic push") -PRAGMA6("GCC diagnostic ignored \"-Wunused-const-variable\"") +PRAGMA6(GCC diagnostic push) +PRAGMA6(GCC diagnostic ignored "-Wunused-const-variable") defBoolEnum(Trading); -PRAGMA6("GCC diagnostic pop") +PRAGMA6(GCC diagnostic pop) #endif // ENUMS_SIMPLETYPES_TRADING_H diff --git a/src/enums/simpletypes/tryremovecolors.h b/src/enums/simpletypes/tryremovecolors.h index 1662302f1..bf1cca161 100644 --- a/src/enums/simpletypes/tryremovecolors.h +++ b/src/enums/simpletypes/tryremovecolors.h @@ -23,11 +23,11 @@ #include "enums/simpletypes/booldefines.h" -PRAGMA6("GCC diagnostic push") -PRAGMA6("GCC diagnostic ignored \"-Wunused-const-variable\"") +PRAGMA6(GCC diagnostic push) +PRAGMA6(GCC diagnostic ignored "-Wunused-const-variable") defBoolEnum(TryRemoveColors); -PRAGMA6("GCC diagnostic pop") +PRAGMA6(GCC diagnostic pop) #endif // ENUMS_SIMPLETYPES_TRYREMOVECOLORS_H diff --git a/src/enums/simpletypes/useargs.h b/src/enums/simpletypes/useargs.h index 22f652fde..774594a28 100644 --- a/src/enums/simpletypes/useargs.h +++ b/src/enums/simpletypes/useargs.h @@ -23,11 +23,11 @@ #include "enums/simpletypes/booldefines.h" -PRAGMA6("GCC diagnostic push") -PRAGMA6("GCC diagnostic ignored \"-Wunused-const-variable\"") +PRAGMA6(GCC diagnostic push) +PRAGMA6(GCC diagnostic ignored "-Wunused-const-variable") defBoolEnum(UseArgs); -PRAGMA6("GCC diagnostic pop") +PRAGMA6(GCC diagnostic pop) #endif // ENUMS_SIMPLETYPES_USEARGS_H diff --git a/src/enums/simpletypes/usebase64.h b/src/enums/simpletypes/usebase64.h index f327758c7..3c24092ff 100644 --- a/src/enums/simpletypes/usebase64.h +++ b/src/enums/simpletypes/usebase64.h @@ -23,11 +23,11 @@ #include "enums/simpletypes/booldefines.h" -PRAGMA6("GCC diagnostic push") -PRAGMA6("GCC diagnostic ignored \"-Wunused-const-variable\"") +PRAGMA6(GCC diagnostic push) +PRAGMA6(GCC diagnostic ignored "-Wunused-const-variable") defBoolEnum(UseBase64); -PRAGMA6("GCC diagnostic pop") +PRAGMA6(GCC diagnostic pop) #endif // ENUMS_SIMPLETYPES_USEBASE64_H diff --git a/src/enums/simpletypes/useresman.h b/src/enums/simpletypes/useresman.h index b97693ad2..6b158a3b5 100644 --- a/src/enums/simpletypes/useresman.h +++ b/src/enums/simpletypes/useresman.h @@ -23,11 +23,11 @@ #include "enums/simpletypes/booldefines.h" -PRAGMA6("GCC diagnostic push") -PRAGMA6("GCC diagnostic ignored \"-Wunused-const-variable\"") +PRAGMA6(GCC diagnostic push) +PRAGMA6(GCC diagnostic ignored "-Wunused-const-variable") defBoolEnum(UseResman); -PRAGMA6("GCC diagnostic pop") +PRAGMA6(GCC diagnostic pop) #endif // ENUMS_SIMPLETYPES_USERESMAN_H diff --git a/src/enums/simpletypes/visible.h b/src/enums/simpletypes/visible.h index 20934ca5a..be49e079a 100644 --- a/src/enums/simpletypes/visible.h +++ b/src/enums/simpletypes/visible.h @@ -23,11 +23,11 @@ #include "enums/simpletypes/booldefines.h" -PRAGMA6("GCC diagnostic push") -PRAGMA6("GCC diagnostic ignored \"-Wunused-const-variable\"") +PRAGMA6(GCC diagnostic push) +PRAGMA6(GCC diagnostic ignored "-Wunused-const-variable") defBoolEnum(Visible); -PRAGMA6("GCC diagnostic pop") +PRAGMA6(GCC diagnostic pop) #endif // ENUMS_SIMPLETYPES_VISIBLE_H diff --git a/src/gui/sdlinput.cpp b/src/gui/sdlinput.cpp index 7b0d7dca9..3dfa5d6d6 100644 --- a/src/gui/sdlinput.cpp +++ b/src/gui/sdlinput.cpp @@ -333,8 +333,8 @@ int SDLInput::convertKeyCharacter(const SDL_Event &event) int value = keysym.unicode; #endif - PRAGMA45("GCC diagnostic push") - PRAGMA45("GCC diagnostic ignored \"-Wswitch-enum\"") + PRAGMA45(GCC diagnostic push) + PRAGMA45(GCC diagnostic ignored "-Wswitch-enum") switch (keysym.sym) { case SDLK_TAB: @@ -496,12 +496,12 @@ int SDLInput::convertKeyCharacter(const SDL_Event &event) default: break; } - PRAGMA45("GCC diagnostic pop") + PRAGMA45(GCC diagnostic pop) if (!(CAST_U32(keysym.mod) & KMOD_NUM)) { - PRAGMA45("GCC diagnostic push") - PRAGMA45("GCC diagnostic ignored \"-Wswitch-enum\"") + PRAGMA45(GCC diagnostic push) + PRAGMA45(GCC diagnostic ignored "-Wswitch-enum") switch (keysym.sym) { case SDLK_KP0: @@ -537,7 +537,7 @@ int SDLInput::convertKeyCharacter(const SDL_Event &event) default: break; } - PRAGMA45("GCC diagnostic pop") + PRAGMA45(GCC diagnostic pop) } return value; } diff --git a/src/gui/widgets/dropdown.cpp b/src/gui/widgets/dropdown.cpp index 05ca7124f..6e6d56652 100644 --- a/src/gui/widgets/dropdown.cpp +++ b/src/gui/widgets/dropdown.cpp @@ -334,8 +334,8 @@ void DropDown::keyPressed(KeyEvent& event) return; const InputActionT actionId = event.getActionId(); - PRAGMA45("GCC diagnostic push") - PRAGMA45("GCC diagnostic ignored \"-Wswitch-enum\"") + PRAGMA45(GCC diagnostic push) + PRAGMA45(GCC diagnostic ignored "-Wswitch-enum") switch (actionId) { case InputAction::GUI_SELECT: @@ -366,7 +366,7 @@ void DropDown::keyPressed(KeyEvent& event) default: return; } - PRAGMA45("GCC diagnostic pop") + PRAGMA45(GCC diagnostic pop) event.consume(); } diff --git a/src/gui/widgets/tabs/setup_colors.cpp b/src/gui/widgets/tabs/setup_colors.cpp index d2f51afe5..d4440d0f1 100644 --- a/src/gui/widgets/tabs/setup_colors.cpp +++ b/src/gui/widgets/tabs/setup_colors.cpp @@ -288,8 +288,8 @@ void Setup_Colors::valueChanged(const SelectionEvent &event A_UNUSED) // probably need combite both switches and add all mssing color ids. - PRAGMA45("GCC diagnostic push") - PRAGMA45("GCC diagnostic ignored \"-Wswitch-enum\"") + PRAGMA45(GCC diagnostic push) + PRAGMA45(GCC diagnostic ignored "-Wswitch-enum") switch (type) { case UserColorId::AIR_COLLISION_HIGHLIGHT: @@ -364,7 +364,7 @@ void Setup_Colors::valueChanged(const SelectionEvent &event A_UNUSED) mGradDelaySlider->setScale(20, 100); break; } - PRAGMA45("GCC diagnostic pop") + PRAGMA45(GCC diagnostic pop) if (grad != GradientType::STATIC && grad != GradientType::PULSE) { // If nonstatic color, don't display the current, but the committed // color at the sliders diff --git a/src/gui/widgets/textbox.cpp b/src/gui/widgets/textbox.cpp index 91218d41a..c9720072f 100644 --- a/src/gui/widgets/textbox.cpp +++ b/src/gui/widgets/textbox.cpp @@ -259,8 +259,8 @@ void TextBox::keyPressed(KeyEvent& event) const Key &key = event.getKey(); const InputActionT action = event.getActionId(); - PRAGMA45("GCC diagnostic push") - PRAGMA45("GCC diagnostic ignored \"-Wswitch-enum\"") + PRAGMA45(GCC diagnostic push) + PRAGMA45(GCC diagnostic ignored "-Wswitch-enum") switch (action) { case InputAction::GUI_LEFT: @@ -434,7 +434,7 @@ void TextBox::keyPressed(KeyEvent& event) break; } } - PRAGMA45("GCC diagnostic pop") + PRAGMA45(GCC diagnostic pop) adjustSize(); scrollToCaret(); diff --git a/src/gui/widgets/textfield.cpp b/src/gui/widgets/textfield.cpp index d02cd2541..9f64b56cd 100644 --- a/src/gui/widgets/textfield.cpp +++ b/src/gui/widgets/textfield.cpp @@ -398,8 +398,8 @@ void TextField::keyPressed(KeyEvent &event) bool TextField::handleNormalKeys(const InputActionT action, bool &consumed) { - PRAGMA45("GCC diagnostic push") - PRAGMA45("GCC diagnostic ignored \"-Wswitch-enum\"") + PRAGMA45(GCC diagnostic push) + PRAGMA45(GCC diagnostic ignored "-Wswitch-enum") switch (action) { case InputAction::GUI_LEFT: @@ -479,14 +479,14 @@ bool TextField::handleNormalKeys(const InputActionT action, bool &consumed) default: break; } - PRAGMA45("GCC diagnostic pop") + PRAGMA45(GCC diagnostic pop) return true; } void TextField::handleCtrlKeys(const InputActionT action, bool &consumed) { - PRAGMA45("GCC diagnostic push") - PRAGMA45("GCC diagnostic ignored \"-Wswitch-enum\"") + PRAGMA45(GCC diagnostic push) + PRAGMA45(GCC diagnostic ignored "-Wswitch-enum") switch (action) { case InputAction::GUI_LEFT: @@ -577,7 +577,7 @@ void TextField::handleCtrlKeys(const InputActionT action, bool &consumed) default: break; } - PRAGMA45("GCC diagnostic pop") + PRAGMA45(GCC diagnostic pop) } void TextField::moveCaretBack() diff --git a/src/gui/windows/charcreatedialog.cpp b/src/gui/windows/charcreatedialog.cpp index 028e8cbab..01132aa86 100644 --- a/src/gui/windows/charcreatedialog.cpp +++ b/src/gui/windows/charcreatedialog.cpp @@ -825,8 +825,8 @@ void CharCreateDialog::updatePlayer() void CharCreateDialog::keyPressed(KeyEvent &event) { const InputActionT actionId = event.getActionId(); - PRAGMA45("GCC diagnostic push") - PRAGMA45("GCC diagnostic ignored \"-Wswitch-enum\"") + PRAGMA45(GCC diagnostic push) + PRAGMA45(GCC diagnostic ignored "-Wswitch-enum") switch (actionId) { case InputAction::GUI_CANCEL: @@ -838,7 +838,7 @@ void CharCreateDialog::keyPressed(KeyEvent &event) default: break; } - PRAGMA45("GCC diagnostic pop") + PRAGMA45(GCC diagnostic pop) } void CharCreateDialog::setButtonsPosition(const int w, const int h) diff --git a/src/gui/windows/charselectdialog.cpp b/src/gui/windows/charselectdialog.cpp index 95bb964d1..c71d0eb52 100644 --- a/src/gui/windows/charselectdialog.cpp +++ b/src/gui/windows/charselectdialog.cpp @@ -337,8 +337,8 @@ void CharSelectDialog::use(const int selected) void CharSelectDialog::keyPressed(KeyEvent &event) { const InputActionT actionId = event.getActionId(); - PRAGMA45("GCC diagnostic push") - PRAGMA45("GCC diagnostic ignored \"-Wswitch-enum\"") + PRAGMA45(GCC diagnostic push) + PRAGMA45(GCC diagnostic ignored "-Wswitch-enum") switch (actionId) { case InputAction::GUI_CANCEL: @@ -428,7 +428,7 @@ void CharSelectDialog::keyPressed(KeyEvent &event) default: break; } - PRAGMA45("GCC diagnostic pop") + PRAGMA45(GCC diagnostic pop) } /** diff --git a/src/gui/windows/chatwindow.cpp b/src/gui/windows/chatwindow.cpp index fe20fe935..b3a0ced78 100644 --- a/src/gui/windows/chatwindow.cpp +++ b/src/gui/windows/chatwindow.cpp @@ -994,8 +994,8 @@ void ChatWindow::attributeChanged(const AttributesT id, { if (!mShowBattleEvents) return; - PRAGMA45("GCC diagnostic push") - PRAGMA45("GCC diagnostic ignored \"-Wswitch-enum\"") + PRAGMA45(GCC diagnostic push) + PRAGMA45(GCC diagnostic ignored "-Wswitch-enum") switch (id) { case Attributes::EXP: @@ -1018,7 +1018,7 @@ void ChatWindow::attributeChanged(const AttributesT id, default: break; }; - PRAGMA45("GCC diagnostic pop") + PRAGMA45(GCC diagnostic pop) } void ChatWindow::addInputText(const std::string &text, const bool space) diff --git a/src/gui/windows/killstats.cpp b/src/gui/windows/killstats.cpp index 0269f9fcb..0be2044ae 100644 --- a/src/gui/windows/killstats.cpp +++ b/src/gui/windows/killstats.cpp @@ -405,8 +405,8 @@ void KillStats::attributeChanged(const AttributesT id, const int oldVal, const int newVal) { - PRAGMA45("GCC diagnostic push") - PRAGMA45("GCC diagnostic ignored \"-Wswitch-enum\"") + PRAGMA45(GCC diagnostic push) + PRAGMA45(GCC diagnostic ignored "-Wswitch-enum") switch (id) { case Attributes::EXP: @@ -438,5 +438,5 @@ void KillStats::attributeChanged(const AttributesT id, default: break; } - PRAGMA45("GCC diagnostic pop") + PRAGMA45(GCC diagnostic pop) } diff --git a/src/gui/windows/ministatuswindow.cpp b/src/gui/windows/ministatuswindow.cpp index 6dd427a98..6bf43d216 100644 --- a/src/gui/windows/ministatuswindow.cpp +++ b/src/gui/windows/ministatuswindow.cpp @@ -270,8 +270,8 @@ void MiniStatusWindow::attributeChanged(const AttributesT id, const int oldVal A_UNUSED, const int newVal A_UNUSED) { - PRAGMA45("GCC diagnostic push") - PRAGMA45("GCC diagnostic ignored \"-Wswitch-enum\"") + PRAGMA45(GCC diagnostic push) + PRAGMA45(GCC diagnostic ignored "-Wswitch-enum") switch (id) { case Attributes::HP: @@ -296,7 +296,7 @@ void MiniStatusWindow::attributeChanged(const AttributesT id, default: break; } - PRAGMA45("GCC diagnostic pop") + PRAGMA45(GCC diagnostic pop) } void MiniStatusWindow::updateStatus() diff --git a/src/gui/windows/quitdialog.cpp b/src/gui/windows/quitdialog.cpp index cda477346..c1901c5a2 100644 --- a/src/gui/windows/quitdialog.cpp +++ b/src/gui/windows/quitdialog.cpp @@ -205,8 +205,8 @@ void QuitDialog::keyPressed(KeyEvent &event) const InputActionT actionId = event.getActionId(); int dir = 0; - PRAGMA45("GCC diagnostic push") - PRAGMA45("GCC diagnostic ignored \"-Wswitch-enum\"") + PRAGMA45(GCC diagnostic push) + PRAGMA45(GCC diagnostic ignored "-Wswitch-enum") switch (actionId) { case InputAction::GUI_SELECT: @@ -225,7 +225,7 @@ void QuitDialog::keyPressed(KeyEvent &event) default: break; } - PRAGMA45("GCC diagnostic pop") + PRAGMA45(GCC diagnostic pop) if (dir != 0) { diff --git a/src/gui/windows/serverdialog.cpp b/src/gui/windows/serverdialog.cpp index f03d28f03..dac370887 100644 --- a/src/gui/windows/serverdialog.cpp +++ b/src/gui/windows/serverdialog.cpp @@ -306,8 +306,8 @@ void ServerDialog::action(const ActionEvent &event) void ServerDialog::keyPressed(KeyEvent &event) { - PRAGMA45("GCC diagnostic push") - PRAGMA45("GCC diagnostic ignored \"-Wswitch-enum\"") + PRAGMA45(GCC diagnostic push) + PRAGMA45(GCC diagnostic ignored "-Wswitch-enum") switch (event.getActionId()) { case InputAction::GUI_CANCEL: @@ -352,7 +352,7 @@ void ServerDialog::keyPressed(KeyEvent &event) default: break; } - PRAGMA45("GCC diagnostic pop") + PRAGMA45(GCC diagnostic pop) if (!event.isConsumed()) mServersList->keyPressed(event); } diff --git a/src/gui/windows/statuswindow.cpp b/src/gui/windows/statuswindow.cpp index e2c65f827..cc50c719e 100644 --- a/src/gui/windows/statuswindow.cpp +++ b/src/gui/windows/statuswindow.cpp @@ -310,8 +310,8 @@ void StatusWindow::attributeChanged(const AttributesT id, const int oldVal A_UNUSED, const int newVal) { - PRAGMA45("GCC diagnostic push") - PRAGMA45("GCC diagnostic ignored \"-Wswitch-enum\"") + PRAGMA45(GCC diagnostic push) + PRAGMA45(GCC diagnostic ignored "-Wswitch-enum") switch (id) { case Attributes::HP: @@ -371,7 +371,7 @@ void StatusWindow::attributeChanged(const AttributesT id, default: break; } - PRAGMA45("GCC diagnostic pop") + PRAGMA45(GCC diagnostic pop) } void StatusWindow::setPointsNeeded(const AttributesT id, diff --git a/src/gui/windows/whoisonline.cpp b/src/gui/windows/whoisonline.cpp index 2698ef918..0bc7e3703 100644 --- a/src/gui/windows/whoisonline.cpp +++ b/src/gui/windows/whoisonline.cpp @@ -565,8 +565,8 @@ int WhoIsOnline::downloadThread(void *ptr) if ((res = curl_easy_perform(curl)) != 0) { wio->mDownloadStatus = UPDATE_ERROR; - PRAGMA45("GCC diagnostic push") - PRAGMA45("GCC diagnostic ignored \"-Wswitch-enum\"") + PRAGMA45(GCC diagnostic push) + PRAGMA45(GCC diagnostic ignored "-Wswitch-enum") switch (res) { case CURLE_COULDNT_CONNECT: @@ -577,7 +577,7 @@ int WhoIsOnline::downloadThread(void *ptr) << url.c_str() << std::endl; break; } - PRAGMA45("GCC diagnostic pop") + PRAGMA45(GCC diagnostic pop) attempts++; curl_easy_cleanup(curl); curl_slist_free_all(pHeaders); diff --git a/src/localconsts.h b/src/localconsts.h index b5ca05e04..dd8da46f3 100644 --- a/src/localconsts.h +++ b/src/localconsts.h @@ -151,7 +151,7 @@ #ifdef ADVGCC #define const2 const #if GCC_VERSION >= 60000 -#define PRAGMA6(str) _Pragma(str) +#define PRAGMA6(str) _Pragma(#str) #else // GCC_VERSION > 60000 #define PRAGMA6(str) #endif // GCC_VERSION > 60000 @@ -162,7 +162,7 @@ #ifdef __GNUC__ #if GCC_VERSION > 40500 -#define PRAGMA45(str) _Pragma(str) +#define PRAGMA45(str) _Pragma(#str) #else // GCC_VERSION > 40400 #define PRAGMA45(str) #endif // GCC_VERSION > 40400 diff --git a/src/net/download.cpp b/src/net/download.cpp index 48e1d8ed4..96b330aec 100644 --- a/src/net/download.cpp +++ b/src/net/download.cpp @@ -351,8 +351,8 @@ int Download::downloadThread(void *ptr) if ((res = curl_easy_perform(d->mCurl)) != 0 && !d->mOptions.cancel) { - PRAGMA45("GCC diagnostic push") - PRAGMA45("GCC diagnostic ignored \"-Wswitch-enum\"") + PRAGMA45(GCC diagnostic push) + PRAGMA45(GCC diagnostic ignored "-Wswitch-enum") switch (res) { case CURLE_ABORTED_BY_CALLBACK: @@ -362,7 +362,7 @@ int Download::downloadThread(void *ptr) default: break; } - PRAGMA45("GCC diagnostic pop") + PRAGMA45(GCC diagnostic pop) if (res) { |