Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

refactor: remove nested directories #822

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,6 @@ cmake-build-*
.DS_Store
src/.DS_Store
src/modules/.DS_Store
src/modules/location/.DS_Store

html/
latex/
Expand Down
128 changes: 64 additions & 64 deletions src/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,40 +3,40 @@ cmake_minimum_required(VERSION 3.22)
include("${CMAKE_SOURCE_DIR}/cmake/CompilerWarnings.cmake")

set(FAKER_SOURCES
modules/airline/airline.cpp
modules/animal/animal.cpp
modules/book/book.cpp
modules/color/color.cpp
modules/commerce/commerce.cpp
modules/company/company.cpp
modules/computer/computer.cpp
modules/crypto/crypto.cpp
modules/database/database.cpp
modules/datatype/datatype.cpp
modules/date/date.cpp
modules/finance/finance.cpp
modules/food/food.cpp
modules/git/git.cpp
modules/hacker/hacker.cpp
modules/helper/helper.cpp
modules/image/image.cpp
modules/internet/internet.cpp
modules/location/location.cpp
modules/lorem/lorem.cpp
modules/medicine/medicine.cpp
modules/movie/movie.cpp
modules/music/music.cpp
modules/person/person.cpp
modules/phone/phone.cpp
modules/plant/plant.cpp
modules/science/science.cpp
modules/sport/sport.cpp
modules/string/string.cpp
modules/system/system.cpp
modules/vehicle/vehicle.cpp
modules/video_game/video_game.cpp
modules/weather/weather.cpp
modules/word/word.cpp
modules/airline.cpp
modules/animal.cpp
modules/book.cpp
modules/color.cpp
modules/commerce.cpp
modules/company.cpp
modules/computer.cpp
modules/crypto.cpp
modules/database.cpp
modules/datatype.cpp
modules/date.cpp
modules/finance.cpp
modules/food.cpp
modules/git.cpp
modules/hacker.cpp
modules/helper.cpp
modules/image.cpp
modules/internet.cpp
modules/location.cpp
modules/lorem.cpp
modules/medicine.cpp
modules/movie.cpp
modules/music.cpp
modules/person.cpp
modules/phone.cpp
modules/plant.cpp
modules/science.cpp
modules/sport.cpp
modules/string.cpp
modules/system.cpp
modules/vehicle.cpp
modules/video_game.cpp
modules/weather.cpp
modules/word.cpp
common/format_helper.cpp
common/luhn_check.cpp
common/string_helper.cpp
Expand All @@ -47,36 +47,36 @@ set(FAKER_HEADERS
common/format_helper.h
common/algo_helper.h
common/string_helper.h
modules/plant/plant_data.h
modules/person/person_data.h
modules/internet/internet_data.h
modules/sport/sport_data.h
modules/airline/airline_data.h
modules/location/location_data.h
modules/book/book_data.h
modules/string/string_data.h
modules/video_game/video_game_data.h
modules/medicine/medicine_data.h
modules/vehicle/vehicle_data.h
modules/hacker/hacker_data.h
modules/science/science_data.h
modules/date/date_data.h
modules/system/system_data.h
modules/commerce/commerce_data.h
modules/computer/computer_data.h
modules/weather/weather_data.h
modules/music/music_data.h
modules/database/database_data.h
modules/movie/movie_data.h
modules/food/food_data.h
modules/word/word_data.h
modules/word/word_store.h
modules/animal/animal_data.h
modules/company/company_data.h
modules/finance/finance_data.h
modules/phone/phone_data.h
modules/color/color_data.h
modules/lorem/lorem_data.h
modules/plant_data.h
modules/person_data.h
modules/internet_data.h
modules/sport_data.h
modules/airline_data.h
modules/location_data.h
modules/book_data.h
modules/string_data.h
modules/video_game_data.h
modules/medicine_data.h
modules/vehicle_data.h
modules/hacker_data.h
modules/science_data.h
modules/date_data.h
modules/system_data.h
modules/commerce_data.h
modules/computer_data.h
modules/weather_data.h
modules/music_data.h
modules/database_data.h
modules/movie_data.h
modules/food_data.h
modules/word_data.h
modules/word_store.h
modules/animal_data.h
modules/company_data.h
modules/finance_data.h
modules/phone_data.h
modules/color_data.h
modules/lorem_data.h
)

target_sources(${CMAKE_PROJECT_NAME} PRIVATE ${FAKER_SOURCES} ${FAKER_HEADERS})
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
#include "faker-cxx/types/hex.h"
#include "faker-cxx/word.h"
#include "internet_data.h"
#include "modules/string/string_data.h"
#include "modules/string_data.h"

namespace faker::internet
{
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
72 changes: 36 additions & 36 deletions tests/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -8,42 +8,42 @@ set(FAKER_UT_SOURCES
common/format_helper_test.cpp
common/luhn_check_test.cpp
common/string_helper_test.cpp
modules/airline/airline_test.cpp
modules/animal/animal_test.cpp
modules/book/book_test.cpp
modules/color/color_test.cpp
modules/commerce/commerce_test.cpp
modules/company/company_test.cpp
modules/computer/computer_test.cpp
modules/crypto/crypto_test.cpp
modules/database/database_test.cpp
modules/datatype/datatype_test.cpp
modules/date/date_test.cpp
modules/finance/finance_test.cpp
modules/food/food_test.cpp
modules/git/git_test.cpp
modules/hacker/hacker_test.cpp
modules/helper/helper_test.cpp
modules/image/image_test.cpp
modules/internet/internet_test.cpp
modules/location/location_test.cpp
modules/lorem/lorem_test.cpp
modules/medicine/medicine_test.cpp
modules/movie/movie_test.cpp
modules/music/music_test.cpp
modules/number/number_test.cpp
modules/person/person_test.cpp
modules/phone/phone_test.cpp
modules/plant/plant_test.cpp
modules/science/science_test.cpp
modules/sport/sport_test.cpp
modules/string/string_test.cpp
modules/system/system_test.cpp
modules/vehicle/vehicle_test.cpp
modules/version/version_test.cpp
modules/video_game/video_game_test.cpp
modules/weather/weather_test.cpp
modules/word/word_test.cpp
modules/airline_test.cpp
modules/animal_test.cpp
modules/book_test.cpp
modules/color_test.cpp
modules/commerce_test.cpp
modules/company_test.cpp
modules/computer_test.cpp
modules/crypto_test.cpp
modules/database_test.cpp
modules/datatype_test.cpp
modules/date_test.cpp
modules/finance_test.cpp
modules/food_test.cpp
modules/git_test.cpp
modules/hacker_test.cpp
modules/helper_test.cpp
modules/image_test.cpp
modules/internet_test.cpp
modules/location_test.cpp
modules/lorem_test.cpp
modules/medicine_test.cpp
modules/movie_test.cpp
modules/music_test.cpp
modules/number_test.cpp
modules/person_test.cpp
modules/phone_test.cpp
modules/plant_test.cpp
modules/science_test.cpp
modules/sport_test.cpp
modules/string_test.cpp
modules/system_test.cpp
modules/vehicle_test.cpp
modules/version_test.cpp
modules/video_game_test.cpp
modules/weather_test.cpp
modules/word_test.cpp
)

add_executable(${PROJECT_NAME} ${FAKER_UT_SOURCES})
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

#include "gtest/gtest.h"

#include "airline/airline_data.h"
#include "airline_data.h"

using namespace ::testing;
using namespace faker::airline;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

#include "gtest/gtest.h"

#include "animal/animal_data.h"
#include "animal_data.h"

using namespace ::testing;
using namespace faker::animal;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

#include "gtest/gtest.h"

#include "book/book_data.h"
#include "book_data.h"

using namespace ::testing;
using namespace faker::book;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@

#include "gtest/gtest.h"

#include "color/color_data.h"
#include "color_data.h"
#include "common/string_helper.h"
#include "faker-cxx/types/hex.h"
#include "string/string_data.h"
#include "string_data.h"

using namespace ::testing;
using namespace faker;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@

#include "gtest/gtest.h"

#include "commerce/commerce_data.h"
#include "commerce_data.h"
#include "common/string_helper.h"
#include "string/string_data.h"
#include "string_data.h"

using namespace ::testing;
using namespace faker;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
#include "gtest/gtest.h"

#include "common/string_helper.h"
#include "company/company_data.h"
#include "person/person_data.h"
#include "company_data.h"
#include "person_data.h"

using namespace ::testing;
using namespace faker;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

#include "gtest/gtest.h"

#include "computer/computer_data.h"
#include "computer_data.h"

using namespace ::testing;
using namespace faker::computer;
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@

#include "gtest/gtest.h"

#include "database/database_data.h"
#include "string/string_data.h"
#include "database_data.h"
#include "string_data.h"

using namespace ::testing;
using namespace faker;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
#include "gtest/gtest.h"

#include "common/string_helper.h"
#include "date/date_data.h"
#include "date_data.h"

#ifdef _WIN32
#define timegm _mkgmtime
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@
#include "common/luhn_check.h"
#include "common/string_helper.h"
#include "faker-cxx/types/precision.h"
#include "finance/finance_data.h"
#include "finance_data.h"
#include "gmock/gmock.h"
#include "string/string_data.h"
#include "string_data.h"

using namespace ::testing;
using namespace faker;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

#include "gtest/gtest.h"

#include "food/food_data.h"
#include "food_data.h"

using namespace ::testing;
using namespace faker;
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

#include "gtest/gtest.h"

#include "hacker/hacker_data.h"
#include "hacker_data.h"

using namespace ::testing;
using namespace faker;
Expand Down
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@
#include "common/string_helper.h"
#include "faker-cxx/number.h"
#include "faker-cxx/types/country.h"
#include "internet/internet_data.h"
#include "person/person_data.h"
#include "string/string_data.h"
#include "word/word_data.h"
#include "internet_data.h"
#include "person_data.h"
#include "string_data.h"
#include "word_data.h"

using namespace ::testing;
using namespace faker;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@

#include "common/string_helper.h"
#include "faker-cxx/types/precision.h"
#include "location/location_data.h"
#include "person/person_data.h"
#include "string/string_data.h"
#include "location_data.h"
#include "person_data.h"
#include "string_data.h"

using namespace ::testing;
using namespace faker;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
#include "gtest/gtest.h"

#include "common/string_helper.h"
#include "lorem/lorem_data.h"
#include "lorem_data.h"

using namespace ::testing;
using namespace::faker;
Expand Down
Loading
Loading