renamed AccountSwitchPopupWidget -> AccountSwitchPopup

This has been triggering me forever
This commit is contained in:
fourtf
2019-09-01 14:13:44 +02:00
parent 19960b5d8f
commit ae20acb7ea
5 changed files with 473 additions and 473 deletions
+2 -2
View File
@@ -10,7 +10,7 @@
#include "singletons/Settings.hpp"
#include "singletons/Theme.hpp"
#include "util/Clamp.hpp"
#include "widgets/AccountSwitchPopupWidget.hpp"
#include "widgets/AccountSwitchPopup.hpp"
#include "widgets/Notebook.hpp"
#include "widgets/Window.hpp"
#include "widgets/dialogs/SettingsDialog.hpp"
@@ -63,7 +63,7 @@ void WindowManager::showSettingsDialog(SettingsDialogPreference preference)
void WindowManager::showAccountSelectPopup(QPoint point)
{
// static QWidget *lastFocusedWidget = nullptr;
static AccountSwitchPopupWidget *w = new AccountSwitchPopupWidget();
static AccountSwitchPopup *w = new AccountSwitchPopup();
if (w->hasFocus())
{
@@ -1,4 +1,4 @@
#include "widgets/AccountSwitchPopupWidget.hpp"
#include "widgets/AccountSwitchPopup.hpp"
#include "debug/Log.hpp"
#include "widgets/dialogs/SettingsDialog.hpp"
@@ -10,7 +10,7 @@
namespace chatterino {
AccountSwitchPopupWidget::AccountSwitchPopupWidget(QWidget *parent)
AccountSwitchPopup::AccountSwitchPopup(QWidget *parent)
: QWidget(parent)
{
this->setWindowFlags(Qt::FramelessWindowHint | Qt::WindowStaysOnTopHint);
@@ -43,17 +43,17 @@ AccountSwitchPopupWidget::AccountSwitchPopupWidget(QWidget *parent)
// this->setStyleSheet("background: #333");
}
void AccountSwitchPopupWidget::refresh()
void AccountSwitchPopup::refresh()
{
this->ui_.accountSwitchWidget->refresh();
}
void AccountSwitchPopupWidget::focusOutEvent(QFocusEvent *)
void AccountSwitchPopup::focusOutEvent(QFocusEvent *)
{
this->hide();
}
void AccountSwitchPopupWidget::paintEvent(QPaintEvent *)
void AccountSwitchPopup::paintEvent(QPaintEvent *)
{
QPainter painter(this);
@@ -6,12 +6,12 @@
namespace chatterino {
class AccountSwitchPopupWidget : public QWidget
class AccountSwitchPopup : public QWidget
{
Q_OBJECT
public:
AccountSwitchPopupWidget(QWidget *parent = nullptr);
AccountSwitchPopup(QWidget *parent = nullptr);
void refresh();
+1 -1
View File
@@ -10,7 +10,7 @@
#include "singletons/WindowManager.hpp"
#include "util/InitUpdateButton.hpp"
#include "util/Shortcut.hpp"
#include "widgets/AccountSwitchPopupWidget.hpp"
#include "widgets/AccountSwitchPopup.hpp"
#include "widgets/Notebook.hpp"
#include "widgets/dialogs/SettingsDialog.hpp"
#include "widgets/dialogs/UpdateDialog.hpp"