From 7f23ee90fd545995a29e2175f15e8b97e59ca67a Mon Sep 17 00:00:00 2001
From: Daniel Wilhelm <daniel@wili.li>
Date: Fri, 18 Apr 2014 17:13:13 +0200
Subject: 3.20

---
 synchronization.h | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'synchronization.h')

diff --git a/synchronization.h b/synchronization.h
index 62a55d99..0f1931cb 100644
--- a/synchronization.h
+++ b/synchronization.h
@@ -3,7 +3,7 @@
 // * GNU General Public License: http://www.gnu.org/licenses/gpl.html       *
 // * Copyright (C) 2008-2011 ZenJu (zhnmju123 AT gmx.de)                    *
 // **************************************************************************
-//
+
 #ifndef SYNCHRONIZATION_H_INCLUDED
 #define SYNCHRONIZATION_H_INCLUDED
 
@@ -30,13 +30,13 @@ public:
     int getDelete() const;
     template <SelectedSide side> int getDelete() const;
 
-    int getConflict() const;
+    int getConflict() const { return conflict; }
 
     typedef std::vector<std::pair<Zstring, wxString> > ConflictTexts; // Pair(filename/conflict text)
-    const ConflictTexts& getFirstConflicts() const; //get first few sync conflicts
+    const ConflictTexts& getFirstConflicts() const { return firstConflicts; }
 
-    zen::UInt64 getDataToProcess() const;
-    size_t getRowCount() const;
+    zen::UInt64 getDataToProcess() const { return dataToProcess; }
+    size_t      getRowCount()      const { return rowsTotal; }
 
 private:
     void init();
-- 
cgit