From: Marcus Eggenberger <egs@quassel-irc.org>
Date: Tue, 3 Feb 2009 15:28:11 +0000 (+0100)
Subject: making Quassel compile with NO_SSL again
X-Git-Tag: 0.4.0~143
X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=commitdiff_plain;h=5910ce5b98f8752002a6a26199eac9a3c10cb9e7;hp=b33f7f5cd3f706c27e2822c39606887ce8ade348

making Quassel compile with NO_SSL again
---

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