Skip to content

Commit 6e74dbe

Browse files
ElTh0r0ElTh0r0
authored
Code quality: Consistent includes, remove unused includes (flameshot-org#4587)
* Add pragma once * Consistent includes * Remove unused includes * Fix Windows build * Fix Windows build
1 parent b26cf40 commit 6e74dbe

156 files changed

Lines changed: 442 additions & 456 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎src/CMakeLists.txt‎

Lines changed: 5 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -174,50 +174,11 @@ target_sources(
174174
${QM_FILES}
175175
main.cpp)
176176

177-
target_include_directories(
178-
flameshot
179-
PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../>
180-
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/>
181-
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../dbus/>
182-
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/cli>
183-
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/config>
184-
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/core>
185-
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/tools>
186-
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/tools/arrow>
187-
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/tools/pixelate>
188-
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/tools/circle>
189-
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/tools/circlecount>
190-
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/tools/copy>
191-
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/tools/exit>
192-
if(ENABLE_IMGUR)
193-
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/tools/imgur>
194-
endif()
195-
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/tools/launcher>
196-
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/tools/line>
197-
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/tools/marker>
198-
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/tools/move>
199-
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/tools/pencil>
200-
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/tools/pin>
201-
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/tools/rectangle>
202-
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/tools/redo>
203-
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/tools/save>
204-
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/tools/invert>
205-
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/tools/selection>
206-
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/tools/sizeindicator>
207-
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/tools/text>
208-
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/tools/undo>
209-
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/tools/sizeincrease>
210-
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/tools/sizedecrease>
211-
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/utils>
212-
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/widgets>
213-
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/widgets/panel>
214-
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/widgets/capture>
215-
$<INSTALL_INTERFACE:include/mylib>)
216-
target_include_directories(
217-
flameshot
218-
PUBLIC
219-
$<BUILD_INTERFACE:${CMAKE_BINARY_DIR}/>
220-
)
177+
178+
target_include_directories(flameshot PUBLIC
179+
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/> # src/
180+
$<BUILD_INTERFACE:${CMAKE_BINARY_DIR}/>
181+
)
221182

222183
target_link_libraries(
223184
flameshot

‎src/cli/commandlineparser.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
// SPDX-FileCopyrightText: 2017-2019 Alejandro Sirgo Rica & Contributors
33

44
#include "commandlineparser.h"
5-
#include "abstractlogger.h"
6-
#include "src/utils/globalvalues.h"
5+
#include "utils/abstractlogger.h"
6+
#include "utils/globalvalues.h"
77
#include <QApplication>
88
#include <QTextStream>
99

‎src/cli/commandlineparser.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33

44
#pragma once
55

6-
#include "src/cli/commandargument.h"
7-
#include "src/cli/commandoption.h"
6+
#include "cli/commandargument.h"
7+
#include "cli/commandoption.h"
88
#include <QMap>
99

1010
class CommandLineParser

‎src/config/buttonlistview.cpp‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,9 @@
22
// SPDX-FileCopyrightText: 2017-2019 Alejandro Sirgo Rica & Contributors
33

44
#include "buttonlistview.h"
5-
#include "src/tools/toolfactory.h"
6-
#include "src/utils/confighandler.h"
5+
#include "tools/toolfactory.h"
6+
#include "utils/confighandler.h"
7+
78
#include <QListWidgetItem>
89
#include <algorithm>
910

‎src/config/buttonlistview.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
#pragma once
55

6-
#include "src/widgets/capture/capturetoolbutton.h"
6+
#include "widgets/capture/capturetoolbutton.h"
77
#include <QListWidget>
88

99
class ButtonListView : public QListWidget

‎src/config/cacheutils.h‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,11 @@
11
// SPDX-License-Identifier: GPL-3.0-or-later
22
// SPDX-FileCopyrightText: 2021 Jeremy Borgman
33

4-
#ifndef FLAMESHOT_CACHEUTILS_H
5-
#define FLAMESHOT_CACHEUTILS_H
4+
#pragma once
65

76
class QString;
87
class QRect;
98

109
QString getCachePath();
1110
QRect getLastRegion();
1211
void setLastRegion(QRect const& newRegion);
13-
14-
#endif // FLAMESHOT_CACHEUTILS_H

‎src/config/colorpickereditmode.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33

44
#pragma once
55

6-
#include "src/utils/confighandler.h"
7-
#include "src/widgets/colorpickerwidget.h"
6+
#include "utils/confighandler.h"
7+
#include "widgets/colorpickerwidget.h"
88

99
class ColorPickerEditMode : public ColorPickerWidget
1010
{

‎src/config/colorpickereditor.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
// SPDX-FileCopyrightText: 2022 Dearsh Oberoi
33

44
#include "colorpickereditor.h"
5-
#include "colorpickereditmode.h"
6-
#include "src/utils/globalvalues.h"
5+
#include "config/colorpickereditmode.h"
6+
#include "utils/globalvalues.h"
77

88
#include <QApplication>
99
#include <QColor>

‎src/config/colorpickereditor.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
#pragma once
55

66
#include "QtColorWidgets/color_wheel.hpp"
7-
#include "src/utils/confighandler.h"
7+
#include "utils/confighandler.h"
88

99
#include <QWidget>
1010

‎src/config/configerrordetails.cpp‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
1-
#include "src/config/configerrordetails.h"
2-
3-
#include "src/utils/abstractlogger.h"
4-
#include "src/utils/confighandler.h"
1+
#include "configerrordetails.h"
2+
#include "utils/abstractlogger.h"
3+
#include "utils/confighandler.h"
54

65
#include <QApplication>
76
#include <QDialogButtonBox>

0 commit comments

Comments
 (0)