made channels shared_pointers

This commit is contained in:
fourtf
2017-01-30 19:14:25 +01:00
parent 23c2bf03d6
commit 1d1c98ecdb
9 changed files with 90 additions and 42 deletions
+1 -1
View File
@@ -14,7 +14,7 @@ namespace widgets {
ChatWidget::ChatWidget(QWidget *parent)
: QWidget(parent)
, channel(NULL)
, channel(Channels::getEmpty())
, channelName(QString())
, vbox(this)
, header(this)
+2 -2
View File
@@ -29,7 +29,7 @@ public:
return view;
}
Channel *
std::shared_ptr<Channel>
getChannel() const
{
return channel;
@@ -49,7 +49,7 @@ protected:
void paintEvent(QPaintEvent *) Q_DECL_OVERRIDE;
private:
Channel *channel;
std::shared_ptr<Channel> channel;
QString channelName;
QFont font;
+3 -1
View File
@@ -52,7 +52,9 @@ ChatWidgetInput::ChatWidgetInput(ChatWidget *widget)
this->edit.keyPressed.connect([this](QKeyEvent *event) {
if (event->key() == Qt::Key_Enter || event->key() == Qt::Key_Return) {
Channel *c = this->chatWidget->getChannel();
auto ptr = this->chatWidget->getChannel();
Channel *c = ptr.get();
if (c != nullptr) {
IrcManager::send("PRIVMSG #" + c->getName() + ": " +
this->edit.toPlainText());
+2 -2
View File
@@ -42,7 +42,7 @@ MainWindow::layoutVisibleChatWidgets(Channel *channel)
for (auto it = widgets.begin(); it != widgets.end(); ++it) {
ChatWidget *widget = *it;
if (channel == NULL || channel == widget->getChannel()) {
if (channel == NULL || channel == widget->getChannel().get()) {
if (widget->getView().layoutMessages()) {
widget->update();
}
@@ -64,7 +64,7 @@ MainWindow::repaintVisibleChatWidgets(Channel *channel)
for (auto it = widgets.begin(); it != widgets.end(); ++it) {
ChatWidget *widget = *it;
if (channel == NULL || channel == widget->getChannel()) {
if (channel == NULL || channel == widget->getChannel().get()) {
widget->getView().layoutMessages();
widget->update();
}