X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcore%2Foidentdconfiggenerator.h;h=81ee21c496637bb085f9a7705f61e8d74b5151da;hp=5d96b6cd1a2e70ddb3c4d487eb249f6fb9cf25fc;hb=da885f3c8e152e9bdf573290adcf53bed58d95d1;hpb=2e80003ab40313767d0624e05533a62e2eee387b

diff --git a/src/core/oidentdconfiggenerator.h b/src/core/oidentdconfiggenerator.h
index 5d96b6cd..81ee21c4 100644
--- a/src/core/oidentdconfiggenerator.h
+++ b/src/core/oidentdconfiggenerator.h
@@ -26,16 +26,17 @@
 #include <QFile>
 #include <QDateTime>
 #include <QHostAddress>
+#include <QMutex>
 
 #include "quassel.h"
 #include "coreidentity.h"
-#include <QDebug>
 
 class OidentdConfigGenerator : public QObject
 {
     Q_OBJECT
 public:
   explicit OidentdConfigGenerator(QObject *parent = 0);
+  ~OidentdConfigGenerator();
 
 signals:
     
@@ -46,19 +47,23 @@ public slots:
 private:
   bool init();
   bool writeConfig();
-  bool parseConfig(bool keepQuasselStanzas = true);
+  bool parseConfig(bool readQuasselStanzas = false);
   bool lineByUs(const QByteArray &line);
 
   bool _initialized;
   QDateTime _lastSync;
   QFile *_configFile;
-  QByteArray _config;
+  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 quasselStanza;
+  QRegExp quasselStanzaRx;
+  QString quasselStanzaTemplate;
 };
 
 #endif // OIDENTDCONFIGGENERATOR_H