refactor: Remove the NullablePtr class (#5091)

This commit is contained in:
pajlada
2024-01-15 22:30:34 +01:00
committed by GitHub
parent 47a14c9041
commit 7f935665f9
4 changed files with 4 additions and 78 deletions
+1 -2
View File
@@ -911,7 +911,7 @@ void Split::insertTextToInput(const QString &text)
void Split::showChangeChannelPopup(const char *dialogTitle, bool empty,
std::function<void(bool)> callback)
{
if (this->selectChannelDialog_.hasElement())
if (!this->selectChannelDialog_.isNull())
{
this->selectChannelDialog_->raise();
@@ -935,7 +935,6 @@ void Split::showChangeChannelPopup(const char *dialogTitle, bool empty,
}
callback(dialog->hasSeletedChannel());
this->selectChannelDialog_ = nullptr;
});
this->selectChannelDialog_ = dialog;
}
+2 -2
View File
@@ -2,13 +2,13 @@
#include "common/Aliases.hpp"
#include "common/Channel.hpp"
#include "common/NullablePtr.hpp"
#include "widgets/BaseWidget.hpp"
#include "widgets/splits/SplitCommon.hpp"
#include <boost/signals2.hpp>
#include <pajlada/signals/signalholder.hpp>
#include <QFont>
#include <QPointer>
#include <QShortcut>
#include <QVBoxLayout>
#include <QWidget>
@@ -155,7 +155,7 @@ private:
SplitInput *const input_;
SplitOverlay *const overlay_;
NullablePtr<SelectChannelDialog> selectChannelDialog_;
QPointer<SelectChannelDialog> selectChannelDialog_;
pajlada::Signals::Connection channelIDChangedConnection_;
pajlada::Signals::Connection usermodeChangedConnection_;