[cleanup] Make ssusettings private, JB#31688

sailfishos · Aug 21, 2015 · 0136629 · 0136629
1 parent 4960adf
commit 0136629
Show file tree

Hide file tree

Showing 11 changed files with 14 additions and 12 deletions.
diff --git a/libssu/libssu.pro b/libssu/libssu.pro
@@ -6,14 +6,14 @@ public_headers = \
         ssu.h \
         ssudeviceinfo.h \
         ssurepomanager.h \
-        ssusettings.h
 
 HEADERS = \
         $${public_headers} \
         sandbox_p.h \
         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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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 → libssu/ssusettings_p.h b/libssu/ssusettings.h → 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
@@ -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
@@ -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
@@ -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
@@ -13,7 +13,7 @@
 #include <QtCore/QTemporaryFile>
 #include <QtCore/QTextStream>
 
-#include "libssu/ssusettings.h"
+#include "libssu/ssusettings_p.h"
 
 /**
  * @class UpgradeTestHelper