diff --git a/cmake/NSIS.template.in b/cmake/NSIS.template.in index 84b2c38af..5af116470 100644 --- a/cmake/NSIS.template.in +++ b/cmake/NSIS.template.in @@ -294,20 +294,6 @@ Section "Application" SecApplication SetShellVarContext all SetOutPath "$INSTDIR" -${If} $PortableMode = 0 - - ; --- Register .cod file type --- - WriteRegStr HKCR ".cod" "" "Cockatrice" - WriteRegStr HKCR "Cockatrice" "" "Cockatrice Deck File" - WriteRegStr HKCR "Cockatrice\shell\open\command" "" '"$INSTDIR\cockatrice.exe" "%1"' - - ; --- Register custom URI protocol --- - WriteRegStr HKCR "cockatrice" "" "URL: Cockatrice Protocol" - WriteRegStr HKCR "cockatrice" "URL Protocol" "" - WriteRegStr HKCR "cockatrice\shell\open\command" "" '"$INSTDIR\cockatrice.exe" "%1"' - -${EndIf} - ${If} $PortableMode = 1 ${AndIf} ${FileExists} "$INSTDIR\portable.dat" ; upgrade portable mode @@ -416,18 +402,6 @@ Section "un.Application" UnSecApplication RMDir "$SMPROGRAMS\Cockatrice" DeleteRegKey HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Cockatrice" - - ; Only remove the file/protocol associations if we registered them (i.e. the - ; install was not portable) and .cod is still owned by Cockatrice, so we don't - ; clobber a .cod association installed by another application. - ${If} Not ${FileExists} "$INSTDIR\portable.dat" - ReadRegStr $0 HKCR ".cod" "" - ${If} $0 == "Cockatrice" - DeleteRegKey HKCR ".cod" - DeleteRegKey HKCR "Cockatrice" - DeleteRegKey HKCR "cockatrice" - ${EndIf} - ${EndIf} SectionEnd ; unselected because it is /o diff --git a/cockatrice/src/interface/widgets/tabs/api/archidekt/display/archidekt_api_response_deck_entry_display_widget.h b/cockatrice/src/interface/widgets/tabs/api/archidekt/display/archidekt_api_response_deck_entry_display_widget.h index 0a251f3c6..575a81b5f 100644 --- a/cockatrice/src/interface/widgets/tabs/api/archidekt/display/archidekt_api_response_deck_entry_display_widget.h +++ b/cockatrice/src/interface/widgets/tabs/api/archidekt/display/archidekt_api_response_deck_entry_display_widget.h @@ -98,7 +98,7 @@ public slots: protected: void mousePressEvent(QMouseEvent *event) override; - void enterEvent(QEnterEvent *event) override; ///< Qt6 hover enter + void enterEvent(QEnterEvent *event) override; ///< Hover enter void leaveEvent(QEvent *event) override; private: diff --git a/cockatrice/src/interface/widgets/tabs/api/edhrec/display/cards/edhrec_api_response_card_details_display_widget.h b/cockatrice/src/interface/widgets/tabs/api/edhrec/display/cards/edhrec_api_response_card_details_display_widget.h index c2a35b5b9..b09cc4e04 100644 --- a/cockatrice/src/interface/widgets/tabs/api/edhrec/display/cards/edhrec_api_response_card_details_display_widget.h +++ b/cockatrice/src/interface/widgets/tabs/api/edhrec/display/cards/edhrec_api_response_card_details_display_widget.h @@ -39,7 +39,7 @@ private: protected slots: void mousePressEvent(QMouseEvent *event) override; - void enterEvent(QEnterEvent *event) override; ///< Qt6 hover enter + void enterEvent(QEnterEvent *event) override; ///< Hover enter void leaveEvent(QEvent *event) override; };