Skip to content

Commit

Permalink
Use correct syntax for public includes
Browse files Browse the repository at this point in the history
  • Loading branch information
@syyyr
syyyr committed Oct 21, 2024
1 parent 5f91dbc commit 79efc3f
Show file tree
Hide file tree
Showing 68 changed files with 105 additions and 106 deletions.
2 changes: 1 addition & 1 deletion libshvbroker/include/shv/broker/appclioptions.h
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#pragma once

#include "shvbrokerglobal.h"
#include <shv/broker/shvbrokerglobal.h>

#include <shv/chainpack/rpcvalue.h>
#include <shv/core/utils/clioptions.h>
Expand Down
2 changes: 1 addition & 1 deletion libshvbroker/include/shv/broker/azureconfig.h
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#pragma once
#include "groupmapping.h"
#include <shv/broker/groupmapping.h>

#include <string>
#include <vector>
Expand Down
2 changes: 1 addition & 1 deletion libshvbroker/include/shv/broker/brokerapp.h
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#pragma once

#include "shv/chainpack/rpcdriver.h"
#include <shv/chainpack/rpcdriver.h>
#ifdef USE_SHV_PATHS_GRANTS_CACHE
#include <string>

Expand Down
1 change: 0 additions & 1 deletion libshvbroker/src/aclmanager.cpp
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
#include <shv/broker/aclmanager.h>
#include <shv/broker/brokerapp.h>
//#include "currentclientshvnode.h"

#include <shv/chainpack/utils.h>
#include <shv/chainpack/cponreader.h>
Expand Down
1 change: 1 addition & 0 deletions libshvbroker/src/aclmanagersqlite.cpp
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
#include "aclmanagersqlite.h"
#include <shv/core/shvcoreglobal.h>
#include <shv/broker/brokerapp.h>

#include <shv/core/exception.h>
Expand Down
2 changes: 1 addition & 1 deletion libshvchainpack/c/include/shv/chainpack/ccpon.h
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#pragma once

#include "ccpcp.h"
#include <shv/chainpack/ccpcp.h>

#include <time.h>

Expand Down
2 changes: 1 addition & 1 deletion libshvchainpack/include/shv/chainpack/rpcmessage.h
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#pragma once

#include "shv/chainpack/accesslevel.h"
#include <shv/chainpack/accesslevel.h>
#include <shv/chainpack/rpcvalue.h>
#include <shv/chainpack/rpc.h>

Expand Down
4 changes: 2 additions & 2 deletions libshvcore/include/shv/core/assert.h
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#pragma once

#include "log.h"
#include "exception.h"
#include <shv/core/exception.h>
#include <shv/core/log.h>

#define SHV_EXCEPTION_STRING(cond, message) shvError() << "EXCEPTION:" << "\"" cond"\" -" << message << Q_FUNC_INFO
#define SHV_ASSERT_STRING(cond, message) shvError() << "\"" cond"\" -" << message << Q_FUNC_INFO
Expand Down
2 changes: 1 addition & 1 deletion libshvcore/include/shv/core/log.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
#define NECROLOG_NO_DEBUG_LOG
#endif

#include "shvcoreglobal.h"
#include <shv/core/shvcoreglobal.h>
#include <necrolog.h>

#define shvCDebug(category) nCDebug(category)
Expand Down
4 changes: 2 additions & 2 deletions libshvcore/include/shv/core/string.h
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#pragma once

#include "shvcoreglobal.h"
#include "stringview.h"
#include <shv/core/shvcoreglobal.h>
#include <shv/core/stringview.h>

#include <sstream>
#include <string>
Expand Down
2 changes: 1 addition & 1 deletion libshvcore/include/shv/core/stringview.h
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#pragma once

#include "shvcoreglobal.h"
#include <shv/core/shvcoreglobal.h>
#include <shv/chainpack/compat.h>

#include <string>
Expand Down
4 changes: 2 additions & 2 deletions libshvcore/include/shv/core/utils.h
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#pragma once

#include "shvcoreglobal.h"
#include "stringview.h"
#include <shv/core/shvcoreglobal.h>
#include <shv/core/stringview.h>

#include <shv/chainpack/rpcvalue.h>

Expand Down
2 changes: 1 addition & 1 deletion libshvcore/include/shv/core/utils/abstractshvjournal.h
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#pragma once

#include "../shvcoreglobal.h"
#include <shv/core/shvcoreglobal.h>

#include <string>
#include <map>
Expand Down
2 changes: 1 addition & 1 deletion libshvcore/include/shv/core/utils/clioptions.h
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#pragma once

#include "../shvcoreglobal.h"
#include <shv/core/shvcoreglobal.h>

#include <shv/chainpack/rpcvalue.h>

Expand Down
2 changes: 1 addition & 1 deletion libshvcore/include/shv/core/utils/crypt.h
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#pragma once

#include "../shvcoreglobal.h"
#include <shv/core/shvcoreglobal.h>

#include <limits>
#include <functional>
Expand Down
6 changes: 3 additions & 3 deletions libshvcore/include/shv/core/utils/patternmatcher.h
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
#pragma once

#include "../shvcoreglobal.h"
#include <shv/core/shvcoreglobal.h>

#include "shvgetlogparams.h"
#include "shvjournalentry.h"
#include <shv/core/utils/shvgetlogparams.h>
#include <shv/core/utils/shvjournalentry.h>

#include <regex>

Expand Down
2 changes: 1 addition & 1 deletion libshvcore/include/shv/core/utils/shvalarm.h
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#pragma once

#include "../shvcoreglobal.h"
#include <shv/core/shvcoreglobal.h>

#include <necrologlevel.h>

Expand Down
8 changes: 4 additions & 4 deletions libshvcore/include/shv/core/utils/shvfilejournal.h
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
#pragma once

#include "../shvcoreglobal.h"
#include "abstractshvjournal.h"
#include "shvjournalentry.h"
#include "shvgetlogparams.h"
#include <shv/core/shvcoreglobal.h>
#include <shv/core/utils/abstractshvjournal.h>
#include <shv/core/utils/shvjournalentry.h>
#include <shv/core/utils/shvgetlogparams.h>

#include <fstream>
#include <functional>
Expand Down
2 changes: 1 addition & 1 deletion libshvcore/include/shv/core/utils/shvgetlogparams.h
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#pragma once

#include "../shvcoreglobal.h"
#include <shv/core/shvcoreglobal.h>

#include <shv/core/utils/shvjournalcommon.h>
#include <shv/chainpack/rpcvalue.h>
Expand Down
4 changes: 2 additions & 2 deletions libshvcore/include/shv/core/utils/shvjournalentry.h
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
#pragma once

#include "../shvcoreglobal.h"
#include <shv/core/shvcoreglobal.h>

#include "shvtypeinfo.h"
#include <shv/core/utils/shvtypeinfo.h>

#include <shv/chainpack/datachange.h>
#include <shv/chainpack/rpc.h>
Expand Down
7 changes: 3 additions & 4 deletions libshvcore/include/shv/core/utils/shvjournalfilereader.h
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
#pragma once

#include "../shvcoreglobal.h"
#include "shvjournalentry.h"
#include "shvtypeinfo.h"
#include "../exception.h"
#include <shv/core/shvcoreglobal.h>
#include <shv/core/utils/shvjournalentry.h>
#include <shv/core/exception.h>

#include <string>
#include <fstream>
Expand Down
6 changes: 3 additions & 3 deletions libshvcore/include/shv/core/utils/shvlogfilereader.h
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
#pragma once

#include "../shvcoreglobal.h"
#include <shv/core/shvcoreglobal.h>

#include "shvlogheader.h"
#include "shvjournalentry.h"
#include <shv/core/utils/shvlogheader.h>
#include <shv/core/utils/shvjournalentry.h>

#include <shv/chainpack/chainpackreader.h>

Expand Down
8 changes: 4 additions & 4 deletions libshvcore/include/shv/core/utils/shvlogfilter.h
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
#pragma once

#include "../shvcoreglobal.h"
#include <shv/core/shvcoreglobal.h>

#include "abstractshvjournal.h"
#include "patternmatcher.h"
#include "shvgetlogparams.h"
#include <shv/core/utils/abstractshvjournal.h>
#include <shv/core/utils/patternmatcher.h>
#include <shv/core/utils/shvgetlogparams.h>

namespace shv::core::utils {

Expand Down
8 changes: 4 additions & 4 deletions libshvcore/include/shv/core/utils/shvlogheader.h
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
#pragma once

#include "../shvcoreglobal.h"
#include <shv/core/shvcoreglobal.h>

#include "shvtypeinfo.h"
#include "shvgetlogparams.h"
#include "../utils.h"
#include <shv/core/utils/shvtypeinfo.h>
#include <shv/core/utils/shvgetlogparams.h>
#include <shv/core/utils.h>

#include <shv/chainpack/rpcvalue.h>

Expand Down
4 changes: 2 additions & 2 deletions libshvcore/include/shv/core/utils/shvlogrpcvaluereader.h
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#pragma once

#include "shvlogheader.h"
#include "shvjournalentry.h"
#include <shv/core/utils/shvlogheader.h>
#include <shv/core/utils/shvjournalentry.h>

namespace shv::core::utils {

Expand Down
10 changes: 5 additions & 5 deletions libshvcore/include/shv/core/utils/shvmemoryjournal.h
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
#pragma once

#include "../shvcoreglobal.h"
#include <shv/core/shvcoreglobal.h>

#include "abstractshvjournal.h"
#include "shvjournalentry.h"
#include "shvgetlogparams.h"
#include "shvlogheader.h"
#include <shv/core/utils/abstractshvjournal.h>
#include <shv/core/utils/shvjournalentry.h>
#include <shv/core/utils/shvgetlogparams.h>
#include <shv/core/utils/shvlogheader.h>

namespace shv::core::utils {

Expand Down
4 changes: 2 additions & 2 deletions libshvcore/include/shv/core/utils/shvpath.h
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
#pragma once

#include "../shvcoreglobal.h"
#include <shv/core/shvcoreglobal.h>

#include "../string.h"
#include <shv/core/string.h>

#include <functional>
#include <map>
Expand Down
2 changes: 1 addition & 1 deletion libshvcore/include/shv/core/utils/shvtypeinfo.h
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#pragma once

#include "../shvcoreglobal.h"
#include <shv/core/shvcoreglobal.h>

#include <shv/chainpack/rpcvalue.h>

Expand Down
2 changes: 1 addition & 1 deletion libshvcore/include/shv/core/utils/versioninfo.h
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#pragma once

#include "../shvcoreglobal.h"
#include <shv/core/shvcoreglobal.h>

#include <compare>
#include <string>
Expand Down
2 changes: 1 addition & 1 deletion libshviotqt/include/shv/iotqt/acl/aclmountdef.h
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#pragma once

#include "../shviotqtglobal.h"
#include <shv/iotqt/shviotqtglobal.h>

#include <string>

Expand Down
2 changes: 1 addition & 1 deletion libshviotqt/include/shv/iotqt/acl/aclrole.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

#include <shv/iotqt/shviotqtglobal.h>

#include "shv/chainpack/rpcvalue.h"
#include <shv/chainpack/rpcvalue.h>

#include <string>
#include <vector>
Expand Down
2 changes: 1 addition & 1 deletion libshviotqt/include/shv/iotqt/acl/aclroleaccessrules.h
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#pragma once

#include "../shviotqtglobal.h"
#include <shv/iotqt/shviotqtglobal.h>

#include <shv/chainpack/accessgrant.h>
#include <shv/core/utils/shvpath.h>
Expand Down
4 changes: 2 additions & 2 deletions libshviotqt/include/shv/iotqt/acl/acluser.h
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#pragma once

#include "../shviotqtglobal.h"
#include "aclpassword.h"
#include <shv/iotqt/shviotqtglobal.h>
#include <shv/iotqt/acl/aclpassword.h>

#include <vector>

Expand Down
2 changes: 1 addition & 1 deletion libshviotqt/include/shv/iotqt/node/filenode.h
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#pragma once

#include "shvnode.h"
#include <shv/iotqt/node/shvnode.h>
#if QT_VERSION_MAJOR >= 6
#include <shv/coreqt/rpc.h>
#endif
Expand Down
2 changes: 1 addition & 1 deletion libshviotqt/include/shv/iotqt/node/localfsnode.h
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#pragma once

#include "filenode.h"
#include <shv/iotqt/node/filenode.h>

#include <QDir>
#include <QMap>
Expand Down
2 changes: 1 addition & 1 deletion libshviotqt/include/shv/iotqt/node/shvnodetree.h
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#pragma once

#include "shvnode.h"
#include <shv/iotqt/node/shvnode.h>

#include <QObject>

Expand Down
2 changes: 1 addition & 1 deletion libshviotqt/include/shv/iotqt/rpc/clientappclioptions.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

#include <shv/core/utils/clioptions.h>

#include "../shviotqtglobal.h"
#include <shv/iotqt/shviotqtglobal.h>

namespace shv::iotqt::rpc {

Expand Down
2 changes: 1 addition & 1 deletion libshviotqt/include/shv/iotqt/rpc/clientconnection.h
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#pragma once

#include "socketrpcconnection.h"
#include <shv/iotqt/rpc/socketrpcconnection.h>

#include <shv/chainpack/rpcmessage.h>
#include <shv/chainpack/rpcdriver.h>
Expand Down
2 changes: 1 addition & 1 deletion libshviotqt/include/shv/iotqt/rpc/deviceappclioptions.h
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#pragma once

#include "clientappclioptions.h"
#include <shv/iotqt/rpc/clientappclioptions.h>

namespace shv::iotqt::rpc {

Expand Down
2 changes: 1 addition & 1 deletion libshviotqt/include/shv/iotqt/rpc/deviceconnection.h
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#pragma once

#include "clientconnection.h"
#include <shv/iotqt/rpc/clientconnection.h>

namespace shv::iotqt::rpc {

Expand Down
2 changes: 1 addition & 1 deletion libshviotqt/include/shv/iotqt/rpc/localsocket.h
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#pragma once

#include "socket.h"
#include <shv/iotqt/rpc/socket.h>

class QLocalSocket;

Expand Down
2 changes: 1 addition & 1 deletion libshviotqt/include/shv/iotqt/rpc/rpccall.h
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#pragma once

#include "../shviotqtglobal.h"
#include <shv/iotqt/shviotqtglobal.h>

#include <shv/coreqt/rpc.h>

Expand Down
Loading

0 comments on commit 79efc3f

Please sign in to comment.