* don't initialise random number generator multiple times, breaks randomness

* make QXmppStream easier to subclass, e.g. for a server

1 files changed, 9 insertions, 7 deletions

diff --git a/src/QXmppStream.h b/src/QXmppStream.h
index 79d4802c..d7d0d38d 100644
--- a/src/QXmppStream.h
+++ b/src/QXmppStream.h
@@ -130,8 +130,16 @@ signals:
     void jingleIqReceived(const QXmppJingleIq&);
 
 protected:
+    // Logging helpers
+    void debug(const QString&);
+    void info(const QString&);
+    void warning(const QString&);
+
+    // Overridable methods
     virtual void handleStanza(const QDomElement &element);
     virtual void handleStream(const QDomElement &element);
+    virtual bool sendStartStream();
+    virtual bool sendEndStream();
 
 private slots:
     void socketHostFound();
@@ -149,12 +157,8 @@ private slots:
 
 private:
     QXmppDiscoveryIq capabilities() const;
-    void debug(const QString&);
-    void info(const QString&);
-    void warning(const QString&);
+    void flushDataBuffer();
     void parser(const QByteArray&);
-    void sendStartStream();
-    void sendEndStream();
     void sendNonSASLAuth(bool plaintext);
     void sendNonSASLAuthQuery();
     void sendAuthDigestMD5ResponseStep1(const QString& challenge);
@@ -162,8 +166,6 @@ private:
     void sendBindIQ();
     void sendSessionIQ();
 
-    void flushDataBuffer();
-
     QXmppStreamPrivate * const d;
 };