From 013662981c1f7750f6b8930fd40e41da0f370624 Mon Sep 17 00:00:00 2001
From: Bernd Wachter <bernd.wachter@jollamobile.com>
Date: Sat, 22 Aug 2015 01:24:26 +0300
Subject: [PATCH] [cleanup] Make ssusettings private, JB#31688

---
 libssu/libssu.pro                         | 2 +-
 libssu/ssucoreconfig_p.h                  | 2 +-
 libssu/ssudeviceinfo.h                    | 3 ++-
 libssu/ssufeaturemanager.h                | 2 +-
 libssu/ssurepomanager.cpp                 | 2 +-
 libssu/ssusettings.cpp                    | 2 +-
 libssu/{ssusettings.h => ssusettings_p.h} | 6 +++---
 libssu/ssuvariables_p.h                   | 2 +-
 ssuks/ssuks.cpp                           | 1 +
 tests/ut_settings/settingstest.cpp        | 2 +-
 tests/ut_settings/upgradetesthelper.cpp   | 2 +-
 11 files changed, 14 insertions(+), 12 deletions(-)
 rename libssu/{ssusettings.h => ssusettings_p.h} (93%)

diff --git a/libssu/libssu.pro b/libssu/libssu.pro
index aacfa51..ad5df7e 100644
--- a/libssu/libssu.pro
+++ b/libssu/libssu.pro
@@ -6,7 +6,6 @@ public_headers = \
         ssu.h \
         ssudeviceinfo.h \
         ssurepomanager.h \
-        ssusettings.h
 
 HEADERS = \
         $${public_headers} \
@@ -14,6 +13,7 @@ HEADERS = \
         ssucoreconfig_p.h \
         ssufeaturemanager.h \
         ssulog_p.h \
+        ssusettings_p.h \
         ssuvariables_p.h
 
 SOURCES = \
diff --git a/libssu/ssucoreconfig_p.h b/libssu/ssucoreconfig_p.h
index fc34ab5..a41aa98 100644
--- a/libssu/ssucoreconfig_p.h
+++ b/libssu/ssucoreconfig_p.h
@@ -9,7 +9,7 @@
 #define _SSUCORECONFIG_P_H
 
 #include <QObject>
-#include "ssusettings.h"
+#include "ssusettings_p.h"
 #include "ssu.h"
 
 #ifndef SSU_CONFIGURATION
diff --git a/libssu/ssudeviceinfo.h b/libssu/ssudeviceinfo.h
index 813904e..d5c0c71 100644
--- a/libssu/ssudeviceinfo.h
+++ b/libssu/ssudeviceinfo.h
@@ -10,9 +10,10 @@
 
 #include <QObject>
 
-#include "ssusettings.h"
 #include "ssu.h"
 
+class SsuSettings;
+
 class SsuDeviceInfo: public QObject {
     Q_OBJECT
 
diff --git a/libssu/ssufeaturemanager.h b/libssu/ssufeaturemanager.h
index 39a365e..57b8926 100644
--- a/libssu/ssufeaturemanager.h
+++ b/libssu/ssufeaturemanager.h
@@ -13,7 +13,7 @@
 #include <QStringList>
 
 #include "ssu.h"
-#include "ssusettings.h"
+#include "ssusettings_p.h"
 
 class SsuFeatureManager: public QObject {
     Q_OBJECT
diff --git a/libssu/ssurepomanager.cpp b/libssu/ssurepomanager.cpp
index f484451..d383f84 100644
--- a/libssu/ssurepomanager.cpp
+++ b/libssu/ssurepomanager.cpp
@@ -13,7 +13,7 @@
 #include "ssudeviceinfo.h"
 #include "ssurepomanager.h"
 #include "ssucoreconfig_p.h"
-#include "ssusettings.h"
+#include "ssusettings_p.h"
 #include "ssulog_p.h"
 #include "ssuvariables_p.h"
 #include "ssufeaturemanager.h"
diff --git a/libssu/ssusettings.cpp b/libssu/ssusettings.cpp
index ed33fc8..eb2563b 100644
--- a/libssu/ssusettings.cpp
+++ b/libssu/ssusettings.cpp
@@ -11,7 +11,7 @@
 #include <QDateTime>
 
 #include "sandbox_p.h"
-#include "ssusettings.h"
+#include "ssusettings_p.h"
 #include "ssulog_p.h"
 
 SsuSettings::SsuSettings(): QSettings(){
diff --git a/libssu/ssusettings.h b/libssu/ssusettings_p.h
similarity index 93%
rename from libssu/ssusettings.h
rename to libssu/ssusettings_p.h
index 55a5c4e..0b3b376 100644
--- a/libssu/ssusettings.h
+++ b/libssu/ssusettings_p.h
@@ -1,12 +1,12 @@
 /**
- * @file ssusettings.h
+ * @file ssusettings_p.h
  * @copyright 2013 Jolla Ltd.
  * @author Bernd Wachter <bwachter@lart.info>
  * @date 2013
  */
 
-#ifndef _SSUSETTINGS_H
-#define _SSUSETTINGS_H
+#ifndef _SSUSETTINGS_P_H
+#define _SSUSETTINGS_P_H
 
 #include <QSettings>
 
diff --git a/libssu/ssuvariables_p.h b/libssu/ssuvariables_p.h
index 370d288..2a36324 100644
--- a/libssu/ssuvariables_p.h
+++ b/libssu/ssuvariables_p.h
@@ -11,7 +11,7 @@
 #include <QObject>
 #include <QHash>
 
-#include "ssusettings.h"
+#include "ssusettings_p.h"
 
 class SsuVariables: public QObject {
     Q_OBJECT
diff --git a/ssuks/ssuks.cpp b/ssuks/ssuks.cpp
index 8d4d50e..918297b 100644
--- a/ssuks/ssuks.cpp
+++ b/ssuks/ssuks.cpp
@@ -16,6 +16,7 @@
 #include "ssukickstarter.h"
 #include "constants.h"
 #include "libssu/sandbox_p.h"
+#include "libssu/ssusettings_p.h"
 
 #include "ssuks.h"
 
diff --git a/tests/ut_settings/settingstest.cpp b/tests/ut_settings/settingstest.cpp
index 0fd8cfd..c3fefa3 100644
--- a/tests/ut_settings/settingstest.cpp
+++ b/tests/ut_settings/settingstest.cpp
@@ -9,7 +9,7 @@
 
 #include <QtTest/QtTest>
 
-#include "libssu/ssusettings.h"
+#include "libssu/ssusettings_p.h"
 #include "upgradetesthelper.h"
 
 void SettingsTest::initTestCase(){
diff --git a/tests/ut_settings/upgradetesthelper.cpp b/tests/ut_settings/upgradetesthelper.cpp
index 7382c59..edf8c47 100644
--- a/tests/ut_settings/upgradetesthelper.cpp
+++ b/tests/ut_settings/upgradetesthelper.cpp
@@ -13,7 +13,7 @@
 #include <QtCore/QTemporaryFile>
 #include <QtCore/QTextStream>
 
-#include "libssu/ssusettings.h"
+#include "libssu/ssusettings_p.h"
 
 /**
  * @class UpgradeTestHelper