Revert two incorrect commits

Revert "Don't add a close button to KMessageWidget"
This reverts commit 75c9bcd72668f5b5524e29291cce2a908fddcdaa.

Revert "Remove unused variable"
This reverts commit 9edee3477a1fa3945717512e591f30af9c3ca468.

I was fixing the wrong problem... instead of removing the handling of the
Close button I should have figured out why the close button was
incorrectly shown in the first place.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>

1 files changed, 4 insertions, 3 deletions

diff --git a/qt-ui/kmessagewidget.cpp b/qt-ui/kmessagewidget.cpp
index 017fa1085..e03d10c75 100644
--- a/qt-ui/kmessagewidget.cpp
+++ b/qt-ui/kmessagewidget.cpp
@@ -101,9 +101,10 @@ void KMessageWidgetPrivate::createLayout()
 			button->show();
 			buttonLayout->addButton(button, QDialogButtonBox::QDialogButtonBox::AcceptRole);
 		}
-		//buttonLayout->addButton(closeButton, QDialogButtonBox::RejectRole);
+		buttonLayout->addButton(closeButton, QDialogButtonBox::RejectRole);
 		layout->addWidget(buttonLayout, 1, 0, 1, 2, Qt::AlignHCenter | Qt::AlignTop);
 	} else {
+		bool closeButtonVisible = closeButton->isVisible();
 		QHBoxLayout *layout = new QHBoxLayout(content);
 		layout->addWidget(iconLabel);
 		layout->addWidget(textLabel);
@@ -113,9 +114,9 @@ void KMessageWidgetPrivate::createLayout()
 			buttonLayout->addButton(button, QDialogButtonBox::QDialogButtonBox::AcceptRole);
 		}
 
-		//buttonLayout->addButton(closeButton, QDialogButtonBox::RejectRole);
+		buttonLayout->addButton(closeButton, QDialogButtonBox::RejectRole);
 		// Something gets changed when added to the buttonLayout
-		//closeButton->setVisible(closeButtonVisible);
+		closeButton->setVisible(closeButtonVisible);
 		layout->addWidget(buttonLayout);
 	};