Merge branch 'master' of https://github.com/GoldenCheetah/GoldenCheetah…

… into fixWarnings2
GoldenCheetah · Mar 31, 2017 · 30fc87b · 30fc87b
2 parents 713341f + e433e8c
commit 30fc87b
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/src/Cloud/AddCloudWizard.cpp b/src/Cloud/AddCloudWizard.cpp
@@ -451,7 +451,11 @@ void
 AddFinish::initializePage()
 {
     // clear previous
-    while(layout->rowCount() > 0) layout->removeRow(0);
+    while(layout->count() > 0) {
+       QLayoutItem *item = layout->takeAt(0);
+       if (item->widget()) delete item->widget();
+       delete item;
+    }
 
     // add from wizard settings -- this is what we
     // will now create.

diff --git a/src/Cloud/CloudService.h b/src/Cloud/CloudService.h
@@ -37,6 +37,7 @@
 #include <QProgressBar>
 
 #include "Context.h"
+#include "Settings.h"
 
 // A CloudService is a base class for working with cloud services
 // and for historic reasons local file stores too