Skip to content

Commit f5f6ca5

Browse files
committed
Fix linuxdeploy log directory rename
1 parent 70b4665 commit f5f6ca5

13 files changed

+24
-24
lines changed

Diff for: lib/linuxdeploy

Diff for: src/deployers/BasicPluginsDeployer.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@
33
#include <utility>
44

55
// library headers
6-
#include <linuxdeploy/core/log.h>
6+
#include <linuxdeploy/log/log.h>
77

88
// local headers
99
#include "BasicPluginsDeployer.h"
1010

11-
using namespace linuxdeploy::core::log;
11+
using namespace linuxdeploy::log;
1212
using namespace linuxdeploy::core::appdir;
1313
using namespace linuxdeploy::plugin::qt;
1414

Diff for: src/deployers/Multimedia6PluginsDeployer.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@
22
#include <filesystem>
33

44
// library headers
5-
#include <linuxdeploy/core/log.h>
5+
#include <linuxdeploy/log/log.h>
66

77
// local headers
88
#include "Multimedia6PluginsDeployer.h"
99

1010
using namespace linuxdeploy::plugin::qt;
11-
using namespace linuxdeploy::core::log;
11+
using namespace linuxdeploy::log;
1212

1313
namespace fs = std::filesystem;
1414

Diff for: src/deployers/PlatformPluginsDeployer.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,14 @@
22
#include <filesystem>
33

44
// library headers
5-
#include <linuxdeploy/core/log.h>
5+
#include <linuxdeploy/log/log.h>
66
#include <linuxdeploy/util/util.h>
77

88
// local headers
99
#include "PlatformPluginsDeployer.h"
1010

1111
using namespace linuxdeploy::plugin::qt;
12-
using namespace linuxdeploy::core::log;
12+
using namespace linuxdeploy::log;
1313

1414
namespace fs = std::filesystem;
1515

Diff for: src/deployers/SvgPluginsDeployer.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@
22
#include <filesystem>
33

44
// library headers
5-
#include <linuxdeploy/core/log.h>
5+
#include <linuxdeploy/log/log.h>
66

77
// local headers
88
#include "SvgPluginsDeployer.h"
99

1010
using namespace linuxdeploy::plugin::qt;
11-
using namespace linuxdeploy::core::log;
11+
using namespace linuxdeploy::log;
1212

1313
namespace fs = std::filesystem;
1414

Diff for: src/deployers/TextToSpeechPluginsDeployer.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@
22
#include <filesystem>
33

44
// library headers
5-
#include <linuxdeploy/core/log.h>
5+
#include <linuxdeploy/log/log.h>
66

77
// local headers
88
#include "TextToSpeechPluginsDeployer.h"
99

1010
using namespace linuxdeploy::plugin::qt;
11-
using namespace linuxdeploy::core::log;
11+
using namespace linuxdeploy::log;
1212

1313
namespace fs = std::filesystem;
1414

Diff for: src/deployers/WebEnginePluginsDeployer.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@
33
#include <fstream>
44

55
// library headers
6-
#include <linuxdeploy/core/log.h>
6+
#include <linuxdeploy/log/log.h>
77
#include <util.h>
88

99
// local headers
1010
#include "WebEnginePluginsDeployer.h"
1111

1212
using namespace linuxdeploy::plugin::qt;
13-
using namespace linuxdeploy::core::log;
13+
using namespace linuxdeploy::log;
1414

1515
namespace fs = std::filesystem;
1616

Diff for: src/deployers/XcbglIntegrationPluginsDeployer.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
// library headers
2-
#include <linuxdeploy/core/log.h>
2+
#include <linuxdeploy/log/log.h>
33

44
// local headers
55
#include "XcbglIntegrationPluginsDeployer.h"
66
#include "deployment.h"
77

88
using namespace linuxdeploy::plugin::qt;
9-
using namespace linuxdeploy::core::log;
9+
using namespace linuxdeploy::log;
1010

1111
bool XcbglIntegrationPluginsDeployer::doDeploy() {
1212
ldLog() << "Deploying xcb-gl integrations" << std::endl;

Diff for: src/deployment.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
// library includes
88
#include <linuxdeploy/core/appdir.h>
99
#include <linuxdeploy/core/elf_file.h>
10-
#include <linuxdeploy/core/log.h>
10+
#include <linuxdeploy/log/log.h>
1111
#include <linuxdeploy/util/util.h>
1212

1313
// local includes
@@ -19,7 +19,7 @@ namespace fs = std::filesystem;
1919

2020
using namespace linuxdeploy::core;
2121
using namespace linuxdeploy::util::misc;
22-
using namespace linuxdeploy::core::log;
22+
using namespace linuxdeploy::log;
2323

2424
// little helper called by other integration plugins
2525
inline bool deployIntegrationPlugins(appdir::AppDir& appDir, const fs::path& qtPluginsPath, const std::initializer_list<fs::path>& subDirs) {

Diff for: src/main.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
// library includes
1010
#include <linuxdeploy/core/appdir.h>
1111
#include <linuxdeploy/core/elf_file.h>
12-
#include <linuxdeploy/core/log.h>
12+
#include <linuxdeploy/log/log.h>
1313
#include <linuxdeploy/util/util.h>
1414

1515
// local includes
@@ -22,7 +22,7 @@ namespace fs = std::filesystem;
2222

2323
using namespace linuxdeploy::core;
2424
using namespace linuxdeploy::util::misc;
25-
using namespace linuxdeploy::core::log;
25+
using namespace linuxdeploy::log;
2626
using namespace linuxdeploy::plugin::qt;
2727

2828

Diff for: src/qml.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
// library includes
55
#include <nlohmann/json.hpp>
66
#include <linuxdeploy/core/appdir.h>
7-
#include <linuxdeploy/core/log.h>
7+
#include <linuxdeploy/log/log.h>
88
#include <linuxdeploy/core/elf_file.h>
99
#include <linuxdeploy/subprocess/subprocess.h>
1010
#include <linuxdeploy/util/util.h>
@@ -14,7 +14,7 @@
1414
#include "qml.h"
1515

1616
using namespace linuxdeploy::core;
17-
using namespace linuxdeploy::core::log;
17+
using namespace linuxdeploy::log;
1818
using namespace linuxdeploy::subprocess;
1919
using namespace linuxdeploy::util;
2020
using namespace nlohmann;

Diff for: src/util.cpp

+3-2
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
#include <assert.h>
33

44
// library headers
5+
#include <linuxdeploy/log/log.h>
56
#include <linuxdeploy/util/util.h>
67
#include <linuxdeploy/subprocess/subprocess.h>
78

@@ -13,7 +14,7 @@ using namespace linuxdeploy::subprocess;
1314
std::map<std::string, std::string> queryQmake(const std::filesystem::path& qmakePath) {
1415
auto qmakeCall = subprocess({qmakePath.string(), "-query"}).run();
1516

16-
using namespace linuxdeploy::core::log;
17+
using namespace linuxdeploy::log;
1718

1819
if (qmakeCall.exit_code() != 0) {
1920
ldLog() << LD_ERROR << "Call to qmake failed:" << qmakeCall.stderr_string() << std::endl;
@@ -54,7 +55,7 @@ std::map<std::string, std::string> queryQmake(const std::filesystem::path& qmake
5455
};
5556

5657
std::filesystem::path findQmake() {
57-
using namespace linuxdeploy::core::log;
58+
using namespace linuxdeploy::log;
5859

5960
std::filesystem::path qmakePath;
6061

Diff for: src/util.h

-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010

1111
// library includes
1212
#include <args.hxx>
13-
#include <linuxdeploy/core/log.h>
1413

1514
typedef struct {
1615
bool success;

0 commit comments

Comments
 (0)