From 15d247a708a37433bbf63fbba02e2e9e12523643 Mon Sep 17 00:00:00 2001 From: Daniel Molkentin Date: Wed, 18 Sep 2013 14:06:23 +0200 Subject: [PATCH] Ui::SslErrorDialog belongs within the Mirall namespace --- src/mirall/sslerrordialog.h | 8 ++++---- src/mirall/sslerrordialog.ui | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/mirall/sslerrordialog.h b/src/mirall/sslerrordialog.h index 85fa438943..ba66d4b5b9 100644 --- a/src/mirall/sslerrordialog.h +++ b/src/mirall/sslerrordialog.h @@ -22,13 +22,13 @@ class QSslError; class QSslCertificate; +namespace Mirall +{ + namespace Ui { class SslErrorDialog; } -namespace Mirall -{ - class SslErrorDialog : public QDialog { Q_OBJECT @@ -57,7 +57,7 @@ private: QList _unknownCerts; QString _customConfigHandle; - ::Ui::SslErrorDialog *_ui; + Ui::SslErrorDialog *_ui; }; } // end namespace diff --git a/src/mirall/sslerrordialog.ui b/src/mirall/sslerrordialog.ui index 57280b53c9..39adabdf5d 100644 --- a/src/mirall/sslerrordialog.ui +++ b/src/mirall/sslerrordialog.ui @@ -1,7 +1,7 @@ - SslErrorDialog - + Mirall::SslErrorDialog + 0