Fixing conflicts merging master

git-svn-id: svn+ssh://svn.kde.org/home/kde/trunk/playground/network/rekonq@964593 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

1 files changed, 15 insertions, 6 deletions

diff --git a/src/autosaver.h b/src/autosaver.h
index 8931da13..b486fcb9 100644
--- a/src/autosaver.h
+++ b/src/autosaver.h
@@ -23,13 +23,22 @@
 #ifndef AUTOSAVER_H
 #define AUTOSAVER_H
 
-#include <QtCore>
+// Qt Includes
+#include <QtCore/QObject>
+#include <QtCore/QBasicTimer>
+#include <QtCore/QTime>
 
-/*
-    This class will call the save() slot on the parent object when the parent changes.
-    It will wait several seconds after changed() to combining multiple changes and
-    prevent continuous writing to disk.
-  */
+// Forward Declarations
+#include <QtCore/QTimerEvent>
+
+/**
+ *  This class will call the save() slot on the parent object when the parent changes.
+ *  It will wait several seconds after changed() to combining multiple changes and
+ *  prevent continuous writing to disk.
+ *
+ */
+
+>>>>>>> master:src/autosaver.h
 class AutoSaver : public QObject
 {
     Q_OBJECT