From 38a8096732fa0ad67e5f649dbd39c4694ebea6a9 Mon Sep 17 00:00:00 2001
From: Klaas Freitag <freitag@owncloud.com>
Date: Sat, 9 Feb 2013 14:03:05 +0100
Subject: [PATCH] Fixed sorting of header entries, ie. public / protected /
 private.

---
 src/mirall/folder.h | 59 ++++++++++++++++++++++-----------------------
 1 file changed, 29 insertions(+), 30 deletions(-)

diff --git a/src/mirall/folder.h b/src/mirall/folder.h
index a5b79cef5..b9852b960 100644
--- a/src/mirall/folder.h
+++ b/src/mirall/folder.h
@@ -149,6 +149,12 @@ public:
      QIcon icon( int size ) const;
      QTimer   *_pollTimer;
 
+signals:
+    void syncStateChange();
+    void syncStarted();
+    void syncFinished(const SyncResult &result);
+    void scheduleToSync( const QString& );
+
 public slots:
      void slotSyncFinished(const SyncResult &);
 
@@ -162,30 +168,39 @@ public slots:
        */
      virtual void slotTerminateSync() = 0;
 
+     /**
+      * Sets minimum amounts of milliseconds that will separate
+      * poll intervals
+      */
+     void setPollInterval( uint );
+
 protected:
     /**
      * The minimum amounts of seconds to wait before
      * doing a full sync to see if the remote changed
      */
-    int pollInterval() const;
+    uint pollInterval() const;
 
-    /**
-     * Sets minimum amounts of milliseconds that will separate
-     * poll intervals
-     */
-    void setPollInterval( int );
-
-signals:
-    void syncStateChange();
-    void syncStarted();
-    void syncFinished(const SyncResult &result);
-    void scheduleToSync( const QString& );
-
-protected:
     FolderWatcher *_watcher;
     int _errorCount;
     SyncResult _syncResult;
 
+protected slots:
+
+    void slotOnlineChanged(bool online);
+
+    void slotPollTimerTimeout();
+
+    /* called when the watcher detect a list of changed
+       paths */
+
+    void slotSyncStarted();
+
+    /**
+     * Triggered by a file system watcher on the local sync dir
+     */
+    virtual void slotLocalPathChanged( const QString& );
+
 private:
 
     /**
@@ -212,22 +227,6 @@ private:
     bool       _enabled;
     QString    _backend;
 
-protected slots:
-
-    void slotOnlineChanged(bool online);
-
-    void slotPollTimerTimeout();
-
-    /* called when the watcher detect a list of changed
-       paths */
-
-    void slotSyncStarted();
-
-    /**
-     * Triggered by a file system watcher on the local sync dir
-     */
-    virtual void slotLocalPathChanged( const QString& );
-
 };
 
 }