[cleanup] Make ssuvariables/ssulog/ssucoreconfig headers private, JB#31688

Rename private headers with _p suffix to make accidental inclusion into
public headers less likely

libssu/libssu.pro

@@ -5,16 +5,16 @@ include(../ssulibrary.pri)
 public_headers = \
         ssu.h \
         ssudeviceinfo.h \
-        ssulog.h \
         ssurepomanager.h \
-        ssusettings.h \
-        ssuvariables.h
+        ssusettings.h
 
 HEADERS = \
         $${public_headers} \
         sandbox_p.h \
-        ssucoreconfig.h \
-        ssufeaturemanager.h
+        ssucoreconfig_p.h \
+        ssufeaturemanager.h \
+        ssulog_p.h \
+        ssuvariables_p.h
 
 SOURCES = \
         sandbox.cpp \

libssu/sandbox.cpp

@@ -15,7 +15,7 @@
 #include <QtCore/QProcessEnvironment>
 #include <QtCore/QSet>
 
-#include "libssu/ssucoreconfig.h"
+#include "libssu/ssucoreconfig_p.h"
 #include "constants.h"
 
 /**

libssu/ssu.cpp

@@ -22,9 +22,9 @@
 
 #include "ssu.h"
 #include "sandbox_p.h"
-#include "ssulog.h"
-#include "ssuvariables.h"
-#include "ssucoreconfig.h"
+#include "ssulog_p.h"
+#include "ssuvariables_p.h"
+#include "ssucoreconfig_p.h"
 #include "ssurepomanager.h"
 #include "ssudeviceinfo.h"
 

libssu/ssucoreconfig.cpp

@@ -13,7 +13,7 @@
 #include <sys/types.h>
 #include <unistd.h>
 
-#include "ssucoreconfig.h"
+#include "ssucoreconfig_p.h"
 
 SsuCoreConfig *SsuCoreConfig::ssuCoreConfig = 0;
 

libssu/ssucoreconfig.h → libssu/ssucoreconfig_p.h

 /**
- * @file ssucoreconfig.h
+ * @file ssucoreconfig_p.h
  * @copyright 2013 Jolla Ltd.
  * @author Bernd Wachter <bwachter@lart.info>
  * @date 2013
  */
 
-#ifndef _SSUCORECONFIG_H
-#define _SSUCORECONFIG_H
+#ifndef _SSUCORECONFIG_P_H
+#define _SSUCORECONFIG_P_H
 
 #include <QObject>
 #include "ssusettings.h"

libssu/ssudeviceinfo.cpp

@@ -17,9 +17,9 @@
 
 #include "sandbox_p.h"
 #include "ssudeviceinfo.h"
-#include "ssucoreconfig.h"
-#include "ssulog.h"
-#include "ssuvariables.h"
+#include "ssucoreconfig_p.h"
+#include "ssulog_p.h"
+#include "ssuvariables_p.h"
 
 #include "../constants.h"
 

libssu/ssufeaturemanager.cpp

@@ -11,9 +11,9 @@
 
 #include "ssudeviceinfo.h"
 #include "ssufeaturemanager.h"
-#include "ssucoreconfig.h"
-#include "ssulog.h"
-#include "ssuvariables.h"
+#include "ssucoreconfig_p.h"
+#include "ssulog_p.h"
+#include "ssuvariables_p.h"
 #include "ssu.h"
 
 #include "../constants.h"

libssu/ssulog.cpp

@@ -8,8 +8,8 @@
 #include <QFile>
 #include <QTextStream>
 
-#include "ssulog.h"
-#include "ssucoreconfig.h"
+#include "ssulog_p.h"
+#include "ssucoreconfig_p.h"
 
 SsuLog *SsuLog::ssuLog = 0;
 

libssu/ssulog.h → libssu/ssulog_p.h

 /**
- * @file ssulog.h
+ * @file ssulog_p.h
  * @copyright 2013 Jolla Ltd.
  * @author Bernd Wachter <bwachter@lart.info>
  * @date 2013
  */
 
-#ifndef _SSULOG_H
-#define _SSULOG_H
+#ifndef _SSULOG_P_H
+#define _SSULOG_P_H
 
 #include <QObject>
 

libssu/ssurepomanager.cpp

@@ -12,10 +12,10 @@
 #include "sandbox_p.h"
 #include "ssudeviceinfo.h"
 #include "ssurepomanager.h"
-#include "ssucoreconfig.h"
+#include "ssucoreconfig_p.h"
 #include "ssusettings.h"
-#include "ssulog.h"
-#include "ssuvariables.h"
+#include "ssulog_p.h"
+#include "ssuvariables_p.h"
 #include "ssufeaturemanager.h"
 #include "ssu.h"
 

libssu/ssusettings.cpp

@@ -12,7 +12,7 @@
 
 #include "sandbox_p.h"
 #include "ssusettings.h"
-#include "ssulog.h"
+#include "ssulog_p.h"
 
 SsuSettings::SsuSettings(): QSettings(){
 

libssu/ssuvariables.cpp

@@ -9,8 +9,8 @@
 #include <QRegExp>
 #include <QStringRef>
 
-#include "ssuvariables.h"
-#include "ssulog.h"
+#include "ssuvariables_p.h"
+#include "ssulog_p.h"
 
 #include "../constants.h"
 

libssu/ssuvariables.h → libssu/ssuvariables_p.h

 /**
- * @file ssuvariables.h
+ * @file ssuvariables_p.h
  * @copyright 2013 Jolla Ltd.
  * @author Bernd Wachter <bwachter@lart.info>
  * @date 2013
  */
 
-#ifndef _SSUVARIABLES_H
-#define _SSUVARIABLES_H
+#ifndef _SSUVARIABLES_P_H
+#define _SSUVARIABLES_P_H
 
 #include <QObject>
 #include <QHash>

ssucli/ssucli.cpp

@@ -12,8 +12,8 @@
 
 #include "libssu/ssudeviceinfo.h"
 #include "libssu/ssurepomanager.h"
-#include "libssu/ssucoreconfig.h"
-#include "libssu/ssuvariables.h"
+#include "libssu/ssucoreconfig_p.h"
+#include "libssu/ssuvariables_p.h"
 
 #include <QDebug>
 

ssuks/ssukickstarter.cpp

@@ -12,7 +12,7 @@
 #include "ssukickstarter.h"
 #include "libssu/sandbox_p.h"
 #include "libssu/ssurepomanager.h"
-#include "libssu/ssuvariables.h"
+#include "libssu/ssuvariables_p.h"
 
 #include "../constants.h"
 

ssuslipstream/ssuslipstream.cpp

@@ -26,7 +26,7 @@
 
 #include "libssu/ssu.h"
 #include "libssu/ssudeviceinfo.h"
-#include "libssu/ssucoreconfig.h"
+#include "libssu/ssucoreconfig_p.h"
 
 
 SsuSlipstream::SsuSlipstream()

ssuurlresolver/ssuurlresolver.cpp

@@ -14,7 +14,7 @@
 #include <systemd/sd-journal.h>
 
 #include "libssu/sandbox_p.h"
-#include "libssu/ssulog.h"
+#include "libssu/ssulog_p.h"
 
 SsuUrlResolver::SsuUrlResolver(): QObject(){
   QObject::connect(this,SIGNAL(done()),

tests/ut_coreconfig/coreconfigtest.cpp

@@ -9,7 +9,7 @@
 
 #include <QtTest/QtTest>
 
-#include "libssu/ssucoreconfig.h"
+#include "libssu/ssucoreconfig_p.h"
 
 void CoreconfigTest::testCredentialsScope(){
   QCOMPARE(SsuCoreConfig::instance()->credentialsScope("/*ignored*/", false), QString("example"));

tests/ut_repomanager/repomanagertest.cpp

@@ -9,7 +9,7 @@
 
 #include <QtTest/QtTest>
 
-#include "libssu/ssucoreconfig.h"
+#include "libssu/ssucoreconfig_p.h"
 #include "libssu/ssurepomanager.h"
 
 void RepoManagerTest::testSettings(){

tests/ut_variables/variablestest.h

@@ -13,7 +13,7 @@
 #include <QHash>
 
 #include "libssu/ssu.h"
-#include "libssu/ssuvariables.h"
+#include "libssu/ssuvariables_p.h"
 
 class VariablesTest: public QObject {
     Q_OBJECT