cmake: avoid de-duplication of user's CXXFLAGS

[quassel.git] / src / qtui / settingspages / identityeditwidget.h

diff --git a/src/qtui/settingspages/identityeditwidget.h b/src/qtui/settingspages/identityeditwidget.h
index 1d36987..cd24c1d 100644 (file)
--- a/src/qtui/settingspages/identityeditwidget.h
+++ b/src/qtui/settingspages/identityeditwidget.h
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-2018 by the Quassel Project                        *
+ *   Copyright (C) 2005-2022 by the Quassel Project                        *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -18,43 +18,39 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.         *
  ***************************************************************************/
 
-#ifndef IDENTITYEDITWIDGET_H
-#define IDENTITYEDITWIDGET_H
+#pragma once
 
-#include "ui_identityeditwidget.h"
-#include "ui_nickeditdlg.h"
-
-#ifdef HAVE_SSL
 #include <QSslCertificate>
 #include <QSslKey>
-#endif
 
 #include "clientidentity.h"
 
+#include "ui_identityeditwidget.h"
+#include "ui_nickeditdlg.h"
+
 class IdentityEditWidget : public QWidget
 {
     Q_OBJECT
 
 public:
-    IdentityEditWidget(QWidget *parent = nullptr);
+    IdentityEditWidget(QWidget* parent = nullptr);
 
-    enum SslState {
+    enum SslState
+    {
         NoSsl,
         UnsecureSsl,
         AllowSsl
     };
 
-    void displayIdentity(CertIdentity *id, CertIdentity *saveId = nullptr);
-    void saveToIdentity(CertIdentity *id);
+    void displayIdentity(CertIdentity* id, CertIdentity* saveId = nullptr);
+    void saveToIdentity(CertIdentity* id);
 
 public slots:
     void setSslState(SslState state);
     void showAdvanced(bool advanced);
 
 protected:
-#ifdef HAVE_SSL
-    virtual bool eventFilter(QObject *watched, QEvent *event);
-#endif
+    bool eventFilter(QObject* watched, QEvent* event) override;
 
 signals:
     void requestEditSsl();
@@ -67,43 +63,36 @@ private slots:
     void on_nickUp_clicked();
     void on_nickDown_clicked();
 
-#ifdef HAVE_SSL
     void on_clearOrLoadKeyButton_clicked();
     void on_clearOrLoadCertButton_clicked();
-#endif
     void setWidgetStates();
 
-#ifdef HAVE_SSL
-    void sslDragEnterEvent(QDragEnterEvent *event);
-    void sslDropEvent(QDropEvent *event, bool isCert);
-#endif
+    void sslDragEnterEvent(QDragEnterEvent* event);
+    void sslDropEvent(QDropEvent* event, bool isCert);
 
 private:
     Ui::IdentityEditWidget ui;
     bool _editSsl;
 
-#ifdef HAVE_SSL
-    QSslKey keyByFilename(const QString &filename);
-    void showKeyState(const QSslKey &key);
-    QSslCertificate certByFilename(const QString &filename);
-    void showCertState(const QSslCertificate &cert);
-#endif
+    QSslKey keyByFilename(const QString& filename);
+    void showKeyState(const QSslKey& key);
+    QSslCertificate certByFilename(const QString& filename);
+    void showCertState(const QSslCertificate& cert);
 
     bool testHasChanged();
 };
 
-
 class NickEditDlg : public QDialog
 {
     Q_OBJECT
 
 public:
-    NickEditDlg(const QString &oldnick, const QStringList &existing = QStringList(), QWidget *parent = nullptr);
+    NickEditDlg(const QString& oldnick, QStringList existing = QStringList(), QWidget* parent = nullptr);
 
     QString nick() const;
 
 private slots:
-    void on_nickEdit_textChanged(const QString &);
+    void on_nickEdit_textChanged(const QString&);
 
 private:
     Ui::NickEditDlg ui;
@@ -111,6 +100,3 @@ private:
     QString oldNick;
     QStringList existing;
 };
-
-
-#endif //IDENTITYEDITWIDGET_H