Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
[cleanup] Make ssuvariables/ssulog/ssucoreconfig headers private, JB#…
…31688

Rename private headers with _p suffix to make accidental inclusion into
public headers less likely
  • Loading branch information
Bernd Wachter committed Aug 21, 2015
1 parent c687b53 commit 4960adf
Show file tree
Hide file tree
Showing 20 changed files with 41 additions and 41 deletions.
10 changes: 5 additions & 5 deletions libssu/libssu.pro
Expand Up @@ -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 \
Expand Down
2 changes: 1 addition & 1 deletion libssu/sandbox.cpp
Expand Up @@ -15,7 +15,7 @@
#include <QtCore/QProcessEnvironment>
#include <QtCore/QSet>

#include "libssu/ssucoreconfig.h"
#include "libssu/ssucoreconfig_p.h"
#include "constants.h"

/**
Expand Down
6 changes: 3 additions & 3 deletions libssu/ssu.cpp
Expand Up @@ -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"

Expand Down
2 changes: 1 addition & 1 deletion libssu/ssucoreconfig.cpp
Expand Up @@ -13,7 +13,7 @@
#include <sys/types.h>
#include <unistd.h>

#include "ssucoreconfig.h"
#include "ssucoreconfig_p.h"

SsuCoreConfig *SsuCoreConfig::ssuCoreConfig = 0;

Expand Down
6 changes: 3 additions & 3 deletions libssu/ssucoreconfig.h → libssu/ssucoreconfig_p.h
@@ -1,12 +1,12 @@
/**
* @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"
Expand Down
6 changes: 3 additions & 3 deletions libssu/ssudeviceinfo.cpp
Expand Up @@ -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"

Expand Down
6 changes: 3 additions & 3 deletions libssu/ssufeaturemanager.cpp
Expand Up @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions libssu/ssulog.cpp
Expand Up @@ -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;

Expand Down
6 changes: 3 additions & 3 deletions libssu/ssulog.h → libssu/ssulog_p.h
@@ -1,12 +1,12 @@
/**
* @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>

Expand Down
6 changes: 3 additions & 3 deletions libssu/ssurepomanager.cpp
Expand Up @@ -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"

Expand Down
2 changes: 1 addition & 1 deletion libssu/ssusettings.cpp
Expand Up @@ -12,7 +12,7 @@

#include "sandbox_p.h"
#include "ssusettings.h"
#include "ssulog.h"
#include "ssulog_p.h"

SsuSettings::SsuSettings(): QSettings(){

Expand Down
4 changes: 2 additions & 2 deletions libssu/ssuvariables.cpp
Expand Up @@ -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"

Expand Down
6 changes: 3 additions & 3 deletions libssu/ssuvariables.h → libssu/ssuvariables_p.h
@@ -1,12 +1,12 @@
/**
* @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>
Expand Down
4 changes: 2 additions & 2 deletions ssucli/ssucli.cpp
Expand Up @@ -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>

Expand Down
2 changes: 1 addition & 1 deletion ssuks/ssukickstarter.cpp
Expand Up @@ -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"

Expand Down
2 changes: 1 addition & 1 deletion ssuslipstream/ssuslipstream.cpp
Expand Up @@ -26,7 +26,7 @@

#include "libssu/ssu.h"
#include "libssu/ssudeviceinfo.h"
#include "libssu/ssucoreconfig.h"
#include "libssu/ssucoreconfig_p.h"


SsuSlipstream::SsuSlipstream()
Expand Down
2 changes: 1 addition & 1 deletion ssuurlresolver/ssuurlresolver.cpp
Expand Up @@ -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()),
Expand Down
2 changes: 1 addition & 1 deletion tests/ut_coreconfig/coreconfigtest.cpp
Expand Up @@ -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"));
Expand Down
2 changes: 1 addition & 1 deletion tests/ut_repomanager/repomanagertest.cpp
Expand Up @@ -9,7 +9,7 @@

#include <QtTest/QtTest>

#include "libssu/ssucoreconfig.h"
#include "libssu/ssucoreconfig_p.h"
#include "libssu/ssurepomanager.h"

void RepoManagerTest::testSettings(){
Expand Down
2 changes: 1 addition & 1 deletion tests/ut_variables/variablestest.h
Expand Up @@ -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
Expand Down

0 comments on commit 4960adf

Please sign in to comment.