X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcore%2Foidentdconfiggenerator.h;h=ee3e53c3196622cc3a4a72d67134ffb6a38cf06a;hp=666242dbb92078e695572e7e94f3ac4887e30db3;hb=158443f71d48215eea8b47b836b61afd77654b78;hpb=11cecc112915cd9940e7612c05091f9b5bb18b00

diff --git a/src/core/oidentdconfiggenerator.h b/src/core/oidentdconfiggenerator.h
index 666242db..ee3e53c3 100644
--- a/src/core/oidentdconfiggenerator.h
+++ b/src/core/oidentdconfiggenerator.h
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2012 by the Quassel Project                             *
+ *   Copyright (C) 2005-2018 by the Quassel Project                        *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -15,23 +15,20 @@
  *   You should have received a copy of the GNU General Public License     *
  *   along with this program; if not, write to the                         *
  *   Free Software Foundation, Inc.,                                       *
- *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.         *
  ***************************************************************************/
 
 #ifndef OIDENTDCONFIGGENERATOR_H
 #define OIDENTDCONFIGGENERATOR_H
 
 #include <QObject>
+#include <QString>
 #include <QDir>
 #include <QFile>
 #include <QDateTime>
 #include <QHostAddress>
 #include <QMutex>
-
-#ifndef Q_OS_WIN32
-#  include <sys/types.h>
-#  include <sys/stat.h>
-#endif /* Q_OS_WIN32 */
+#include <QByteArray>
 
 #include "quassel.h"
 #include "coreidentity.h"
@@ -57,33 +54,40 @@ class OidentdConfigGenerator : public QObject
 {
     Q_OBJECT
 public:
-  explicit OidentdConfigGenerator(QObject *parent = 0);
-  ~OidentdConfigGenerator();
+    explicit OidentdConfigGenerator(QObject *parent = nullptr);
+    ~OidentdConfigGenerator() override;
 
 public slots:
-  bool addSocket(const CoreIdentity *identity, const QHostAddress &localAddress, quint16 localPort, const QHostAddress &peerAddress, quint16 peerPort);
-  bool removeSocket(const CoreIdentity *identity, const QHostAddress &localAddress, quint16 localPort, const QHostAddress &peerAddress, quint16 peerPort);
+    bool addSocket(const CoreIdentity *identity, const QHostAddress &localAddress,
+                   quint16 localPort, const QHostAddress &peerAddress, quint16 peerPort,
+                   qint64 socketId);
+    bool removeSocket(const CoreIdentity *identity, const QHostAddress &localAddress,
+                      quint16 localPort, const QHostAddress &peerAddress, quint16 peerPort,
+                      qint64 socketId);
 
 private:
-  bool init();
-  bool writeConfig();
-  bool parseConfig(bool readQuasselStanzas = false);
-  bool lineByUs(const QByteArray &line);
+    QString sysIdentForIdentity(const CoreIdentity *identity) const;
+    bool init();
+    bool writeConfig();
+    bool parseConfig(bool readQuasselStanzas = false);
+    bool lineByUs(const QByteArray &line);
 
-  bool _initialized;
-  QDateTime _lastSync;
-  QFile *_configFile;
-  QByteArray _parsedConfig;
-  QByteArray _quasselConfig;
-  // Mutex isn't strictly necessary at the moment, since with the current invocation in Core only one instance at a time exists
-  QMutex _mutex;
+    bool _initialized{false};
+    bool _strict;
+    QDateTime _lastSync;
+    QFile *_configFile;
+    QByteArray _parsedConfig;
+    QByteArray _quasselConfig;
+    // Mutex isn't strictly necessary at the moment, since with the current invocation in Core only one instance at a time exists
+    QMutex _mutex;
 
-  QDir configDir;
-  QString configFileName;
-  QString configPath;
-  QString configTag;
-  QRegExp quasselStanzaRx;
-  QString quasselStanzaTemplate;
+    QDir _configDir;
+    QString _configFileName;
+    QString _configPath;
+    QString _configTag;
+    QRegExp _quasselStanzaRx;
+    QString _quasselStanzaTemplate;
 };
 
+
 #endif // OIDENTDCONFIGGENERATOR_H