From 4960adf9c9f36c26eca1f0ee731c9a2c8f945954 Mon Sep 17 00:00:00 2001 From: Bernd Wachter Date: Sat, 22 Aug 2015 00:54:01 +0300 Subject: [PATCH] [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 | 10 +++++----- libssu/sandbox.cpp | 2 +- libssu/ssu.cpp | 6 +++--- libssu/ssucoreconfig.cpp | 2 +- libssu/{ssucoreconfig.h => ssucoreconfig_p.h} | 6 +++--- libssu/ssudeviceinfo.cpp | 6 +++--- libssu/ssufeaturemanager.cpp | 6 +++--- libssu/ssulog.cpp | 4 ++-- libssu/{ssulog.h => ssulog_p.h} | 6 +++--- libssu/ssurepomanager.cpp | 6 +++--- libssu/ssusettings.cpp | 2 +- libssu/ssuvariables.cpp | 4 ++-- libssu/{ssuvariables.h => ssuvariables_p.h} | 6 +++--- ssucli/ssucli.cpp | 4 ++-- ssuks/ssukickstarter.cpp | 2 +- ssuslipstream/ssuslipstream.cpp | 2 +- ssuurlresolver/ssuurlresolver.cpp | 2 +- tests/ut_coreconfig/coreconfigtest.cpp | 2 +- tests/ut_repomanager/repomanagertest.cpp | 2 +- tests/ut_variables/variablestest.h | 2 +- 20 files changed, 41 insertions(+), 41 deletions(-) rename libssu/{ssucoreconfig.h => ssucoreconfig_p.h} (97%) rename libssu/{ssulog.h => ssulog_p.h} (89%) rename libssu/{ssuvariables.h => ssuvariables_p.h} (97%) diff --git a/libssu/libssu.pro b/libssu/libssu.pro index 667f9b3..aacfa51 100644 --- a/libssu/libssu.pro +++ b/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 \ diff --git a/libssu/sandbox.cpp b/libssu/sandbox.cpp index 4273023..a16f473 100644 --- a/libssu/sandbox.cpp +++ b/libssu/sandbox.cpp @@ -15,7 +15,7 @@ #include #include -#include "libssu/ssucoreconfig.h" +#include "libssu/ssucoreconfig_p.h" #include "constants.h" /** diff --git a/libssu/ssu.cpp b/libssu/ssu.cpp index 9a58f43..93c7491 100644 --- a/libssu/ssu.cpp +++ b/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" diff --git a/libssu/ssucoreconfig.cpp b/libssu/ssucoreconfig.cpp index 49a5495..b9bb371 100644 --- a/libssu/ssucoreconfig.cpp +++ b/libssu/ssucoreconfig.cpp @@ -13,7 +13,7 @@ #include #include -#include "ssucoreconfig.h" +#include "ssucoreconfig_p.h" SsuCoreConfig *SsuCoreConfig::ssuCoreConfig = 0; diff --git a/libssu/ssucoreconfig.h b/libssu/ssucoreconfig_p.h similarity index 97% rename from libssu/ssucoreconfig.h rename to libssu/ssucoreconfig_p.h index e323b00..fc34ab5 100644 --- a/libssu/ssucoreconfig.h +++ b/libssu/ssucoreconfig_p.h @@ -1,12 +1,12 @@ /** - * @file ssucoreconfig.h + * @file ssucoreconfig_p.h * @copyright 2013 Jolla Ltd. * @author Bernd Wachter * @date 2013 */ -#ifndef _SSUCORECONFIG_H -#define _SSUCORECONFIG_H +#ifndef _SSUCORECONFIG_P_H +#define _SSUCORECONFIG_P_H #include #include "ssusettings.h" diff --git a/libssu/ssudeviceinfo.cpp b/libssu/ssudeviceinfo.cpp index 271bde8..201161c 100644 --- a/libssu/ssudeviceinfo.cpp +++ b/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" diff --git a/libssu/ssufeaturemanager.cpp b/libssu/ssufeaturemanager.cpp index 17c36e5..4fa28ba 100644 --- a/libssu/ssufeaturemanager.cpp +++ b/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" diff --git a/libssu/ssulog.cpp b/libssu/ssulog.cpp index 8066481..0231afb 100644 --- a/libssu/ssulog.cpp +++ b/libssu/ssulog.cpp @@ -8,8 +8,8 @@ #include #include -#include "ssulog.h" -#include "ssucoreconfig.h" +#include "ssulog_p.h" +#include "ssucoreconfig_p.h" SsuLog *SsuLog::ssuLog = 0; diff --git a/libssu/ssulog.h b/libssu/ssulog_p.h similarity index 89% rename from libssu/ssulog.h rename to libssu/ssulog_p.h index fcf342a..0a9329f 100644 --- a/libssu/ssulog.h +++ b/libssu/ssulog_p.h @@ -1,12 +1,12 @@ /** - * @file ssulog.h + * @file ssulog_p.h * @copyright 2013 Jolla Ltd. * @author Bernd Wachter * @date 2013 */ -#ifndef _SSULOG_H -#define _SSULOG_H +#ifndef _SSULOG_P_H +#define _SSULOG_P_H #include diff --git a/libssu/ssurepomanager.cpp b/libssu/ssurepomanager.cpp index 4cfd1b1..f484451 100644 --- a/libssu/ssurepomanager.cpp +++ b/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" diff --git a/libssu/ssusettings.cpp b/libssu/ssusettings.cpp index 6dff28b..ed33fc8 100644 --- a/libssu/ssusettings.cpp +++ b/libssu/ssusettings.cpp @@ -12,7 +12,7 @@ #include "sandbox_p.h" #include "ssusettings.h" -#include "ssulog.h" +#include "ssulog_p.h" SsuSettings::SsuSettings(): QSettings(){ diff --git a/libssu/ssuvariables.cpp b/libssu/ssuvariables.cpp index bde8057..815dc31 100644 --- a/libssu/ssuvariables.cpp +++ b/libssu/ssuvariables.cpp @@ -9,8 +9,8 @@ #include #include -#include "ssuvariables.h" -#include "ssulog.h" +#include "ssuvariables_p.h" +#include "ssulog_p.h" #include "../constants.h" diff --git a/libssu/ssuvariables.h b/libssu/ssuvariables_p.h similarity index 97% rename from libssu/ssuvariables.h rename to libssu/ssuvariables_p.h index 0b6ef4e..370d288 100644 --- a/libssu/ssuvariables.h +++ b/libssu/ssuvariables_p.h @@ -1,12 +1,12 @@ /** - * @file ssuvariables.h + * @file ssuvariables_p.h * @copyright 2013 Jolla Ltd. * @author Bernd Wachter * @date 2013 */ -#ifndef _SSUVARIABLES_H -#define _SSUVARIABLES_H +#ifndef _SSUVARIABLES_P_H +#define _SSUVARIABLES_P_H #include #include diff --git a/ssucli/ssucli.cpp b/ssucli/ssucli.cpp index 9cc8e3a..f8cd083 100644 --- a/ssucli/ssucli.cpp +++ b/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 diff --git a/ssuks/ssukickstarter.cpp b/ssuks/ssukickstarter.cpp index abedaf3..4ee97b7 100644 --- a/ssuks/ssukickstarter.cpp +++ b/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" diff --git a/ssuslipstream/ssuslipstream.cpp b/ssuslipstream/ssuslipstream.cpp index fdba6cc..b553cb1 100644 --- a/ssuslipstream/ssuslipstream.cpp +++ b/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() diff --git a/ssuurlresolver/ssuurlresolver.cpp b/ssuurlresolver/ssuurlresolver.cpp index 69fd24b..57d00f4 100644 --- a/ssuurlresolver/ssuurlresolver.cpp +++ b/ssuurlresolver/ssuurlresolver.cpp @@ -14,7 +14,7 @@ #include #include "libssu/sandbox_p.h" -#include "libssu/ssulog.h" +#include "libssu/ssulog_p.h" SsuUrlResolver::SsuUrlResolver(): QObject(){ QObject::connect(this,SIGNAL(done()), diff --git a/tests/ut_coreconfig/coreconfigtest.cpp b/tests/ut_coreconfig/coreconfigtest.cpp index f21f45e..9993764 100644 --- a/tests/ut_coreconfig/coreconfigtest.cpp +++ b/tests/ut_coreconfig/coreconfigtest.cpp @@ -9,7 +9,7 @@ #include -#include "libssu/ssucoreconfig.h" +#include "libssu/ssucoreconfig_p.h" void CoreconfigTest::testCredentialsScope(){ QCOMPARE(SsuCoreConfig::instance()->credentialsScope("/*ignored*/", false), QString("example")); diff --git a/tests/ut_repomanager/repomanagertest.cpp b/tests/ut_repomanager/repomanagertest.cpp index 3160a30..d3a95d7 100644 --- a/tests/ut_repomanager/repomanagertest.cpp +++ b/tests/ut_repomanager/repomanagertest.cpp @@ -9,7 +9,7 @@ #include -#include "libssu/ssucoreconfig.h" +#include "libssu/ssucoreconfig_p.h" #include "libssu/ssurepomanager.h" void RepoManagerTest::testSettings(){ diff --git a/tests/ut_variables/variablestest.h b/tests/ut_variables/variablestest.h index 5a21bd0..e4ee07f 100644 --- a/tests/ut_variables/variablestest.h +++ b/tests/ut_variables/variablestest.h @@ -13,7 +13,7 @@ #include #include "libssu/ssu.h" -#include "libssu/ssuvariables.h" +#include "libssu/ssuvariables_p.h" class VariablesTest: public QObject { Q_OBJECT