From 5910ce5b98f8752002a6a26199eac9a3c10cb9e7 Mon Sep 17 00:00:00 2001 From: Marcus Eggenberger Date: Tue, 3 Feb 2009 16:28:11 +0100 Subject: [PATCH] making Quassel compile with NO_SSL again --- src/qtui/coreconnectdlg.cpp | 8 +++----- src/qtui/coreconnectdlg.h | 5 ++++- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/src/qtui/coreconnectdlg.cpp b/src/qtui/coreconnectdlg.cpp index e60d4d69..e6d30625 100644 --- a/src/qtui/coreconnectdlg.cpp +++ b/src/qtui/coreconnectdlg.cpp @@ -557,16 +557,14 @@ void CoreAccountEditDlg::on_accountName_textChanged(const QString &text) { } + // ======================================== // SslCertDisplayDialog // ======================================== +#ifdef HAVE_SSL SslCertDisplayDialog::SslCertDisplayDialog(const QString &host, const QSslCertificate &cert, QWidget *parent) : QDialog(parent) { -#ifndef HAVE_SSL - Q_UNUSED(cert) -#else - setWindowTitle(tr("SSL Certificate used by %1").arg(host)); QVBoxLayout *mainLayout = new QVBoxLayout(this); @@ -610,5 +608,5 @@ SslCertDisplayDialog::SslCertDisplayDialog(const QString &host, const QSslCertif connect(buttonBox, SIGNAL(accepted()), this, SLOT(accept())); connect(buttonBox, SIGNAL(rejected()), this, SLOT(reject())); +} #endif -}; diff --git a/src/qtui/coreconnectdlg.h b/src/qtui/coreconnectdlg.h index 01bc75a6..70cab9a7 100644 --- a/src/qtui/coreconnectdlg.h +++ b/src/qtui/coreconnectdlg.h @@ -134,6 +134,7 @@ private: // ======================================== // SslCertDisplayDialog // ======================================== +#ifdef HAVE_SSL class QSslCertificate; class SslCertDisplayDialog : public QDialog { @@ -142,4 +143,6 @@ class SslCertDisplayDialog : public QDialog { public: SslCertDisplayDialog(const QString &host, const QSslCertificate &cert, QWidget *parent = 0); }; -#endif +#endif // HAVE_SSL + +#endif // CORECONNECTDLG_H -- 2.20.1