Skip to content

Commit a9a2b20

Browse files
committed
cmake: remove deprecated DecodeHints + TextUTFEncoding + ZXVersion files
1 parent b85cb6b commit a9a2b20

File tree

7 files changed

+0
-112
lines changed

7 files changed

+0
-112
lines changed

core/CMakeLists.txt

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,6 @@ set (COMMON_FILES
143143
src/ZXAlgorithms.h
144144
src/ZXConfig.h
145145
src/ZXTestSupport.h
146-
src/ZXVersion.h # [[deprecated]]
147146
$<$<BOOL:${ZXING_C_API}>:src/ZXingC.h>
148147
$<$<BOOL:${ZXING_C_API}>:src/ZXingC.cpp>
149148
)
@@ -156,8 +155,6 @@ if (ZXING_READERS OR ZXING_WRITERS_OLD)
156155
src/GenericGF.cpp
157156
src/GenericGFPoly.h
158157
src/GenericGFPoly.cpp
159-
src/TextUtfEncoding.h # [[deprecated]]
160-
src/TextUtfEncoding.cpp # [[deprecated]]
161158
src/Scope.h
162159
)
163160
endif()
@@ -176,8 +173,6 @@ if (ZXING_READERS)
176173
src/BitSource.cpp
177174
src/ConcentricFinder.h
178175
src/ConcentricFinder.cpp
179-
src/DecodeHints.h
180-
$<$<BOOL:${BUILD_SHARED_LIBS}>:src/DecodeHints.cpp> # [[deprecated]]
181176
src/GlobalHistogramBinarizer.h
182177
src/GlobalHistogramBinarizer.cpp
183178
src/GridSampler.h
@@ -242,16 +237,13 @@ set (PUBLIC_HEADERS
242237
src/ReadBarcode.h
243238
src/ReaderOptions.h
244239
src/StructuredAppend.h
245-
src/TextUtfEncoding.h # [[deprecated]]
246240
src/WriteBarcode.h
247241
src/ZXingCpp.h
248242
src/ZXAlgorithms.h
249-
src/ZXVersion.h # [[deprecated]]
250243
$<$<BOOL:${ZXING_C_API}>:${CMAKE_CURRENT_SOURCE_DIR}/src/ZXingC.h>
251244
)
252245
if (ZXING_READERS)
253246
set (PUBLIC_HEADERS ${PUBLIC_HEADERS}
254-
src/DecodeHints.h # [[deprecated]]
255247
)
256248
endif()
257249
if (ZXING_WRITERS_OLD)
@@ -576,10 +568,7 @@ set_target_properties(ZXing PROPERTIES PUBLIC_HEADER "${PUBLIC_HEADERS}")
576568

577569
set(PRECOMPILE_HEADERS ${PUBLIC_HEADERS})
578570
list(REMOVE_ITEM PRECOMPILE_HEADERS "$<$<BOOL:${ZXING_C_API}>:${CMAKE_CURRENT_SOURCE_DIR}/src/ZXingC.h>")
579-
list(REMOVE_ITEM PRECOMPILE_HEADERS src/DecodeHints.h) # [[deprecated]]
580-
list(REMOVE_ITEM PRECOMPILE_HEADERS src/ZXVersion.h) # [[deprecated]]
581571
target_precompile_headers(ZXing PRIVATE ${PRECOMPILE_HEADERS})
582-
set_source_files_properties(src/DecodeHints.cpp PROPERTIES SKIP_PRECOMPILE_HEADERS ON)
583572

584573
if(CMAKE_BUILD_TYPE MATCHES "Release|RelWithDebInfo")
585574
# The following is a list of translation units that fulfill two criteria regarding the use of -Os vs -O3:

core/src/DecodeHints.cpp

Lines changed: 0 additions & 30 deletions
This file was deleted.

core/src/DecodeHints.h

Lines changed: 0 additions & 10 deletions
This file was deleted.

core/src/ReaderOptions.h

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -172,8 +172,4 @@ class ReaderOptions
172172
bool hasFormat(BarcodeFormats f) const noexcept { return _formats.testFlags(f) || _formats.empty(); }
173173
};
174174

175-
#ifndef HIDE_DECODE_HINTS_ALIAS
176-
using DecodeHints [[deprecated]] = ReaderOptions;
177-
#endif
178-
179175
} // ZXing

core/src/TextUtfEncoding.cpp

Lines changed: 0 additions & 28 deletions
This file was deleted.

core/src/TextUtfEncoding.h

Lines changed: 0 additions & 19 deletions
This file was deleted.

core/src/ZXVersion.h

Lines changed: 0 additions & 10 deletions
This file was deleted.

0 commit comments

Comments
 (0)