OidentdConfigGen: tweak signals, names and stuff

[quassel.git] / src / core / oidentdconfiggenerator.h

diff --git a/src/core/oidentdconfiggenerator.h b/src/core/oidentdconfiggenerator.h
index f4e819f..5d96b6c 100644 (file)
--- a/src/core/oidentdconfiggenerator.h
+++ b/src/core/oidentdconfiggenerator.h
@@ -27,6 +27,7 @@
 #include <QDateTime>
 #include <QHostAddress>
 
+#include "quassel.h"
 #include "coreidentity.h"
 #include <QDebug>
 
@@ -36,27 +37,27 @@ class OidentdConfigGenerator : public QObject
 public:
   explicit OidentdConfigGenerator(QObject *parent = 0);
 
-  QDir configDir;
-  QString configFileName;
-    
 signals:
     
 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);
 
 private:
   bool init();
   bool writeConfig();
-  bool parseConfig(bool stripQuasselStanzas = false);
-  bool checkLine(const QByteArray &line);
+  bool parseConfig(bool keepQuasselStanzas = true);
+  bool lineByUs(const QByteArray &line);
 
   bool _initialized;
   QDateTime _lastSync;
   QFile *_configFile;
   QByteArray _config;
 
+  QDir configDir;
+  QString configFileName;
+  QString configPath;
   QString configTag;
-
   QRegExp quasselStanza;
 };