From 4a72ace8aa1a2834089a76e59a12d003623c7f9d Mon Sep 17 00:00:00 2001 From: zhangjiaping Date: Fri, 10 Sep 2021 18:14:34 +0800 Subject: [PATCH] Resolve conflicts. --- src/frontend/tools/radioitembutton.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/frontend/tools/radioitembutton.cpp b/src/frontend/tools/radioitembutton.cpp index bcb56254..9ae24689 100644 --- a/src/frontend/tools/radioitembutton.cpp +++ b/src/frontend/tools/radioitembutton.cpp @@ -1,6 +1,7 @@ #include "radioitembutton.h" #include #include +#include #define FLASH_SPEED 100 #define TIMEOUT_TIMER 90*1000 #define BUTTON_SIZE 36,36 @@ -19,8 +20,6 @@ RadioItemButton::RadioItemButton(QWidget *parent) : QPushButton(parent) this->setFixedSize(BUTTON_SIZE); m_iconLabel->setFixedSize(BUTTON_SIZE); m_iconLabel->setAlignment(Qt::AlignCenter); - countCurrentTime=0; - currentPage=10; setActive(false);