From 2535c2c3998719429988c09d1847a30ed5bf8602 Mon Sep 17 00:00:00 2001 From: Thomas Lauf Date: Thu, 31 Mar 2022 08:11:58 +0200 Subject: [PATCH] Cleanup includes - Remove unused includes - Use '<..>' style consistently - Strip any paths from include - Replace deprecated C++ headers - Sort includes according to LLVM rules https://llvm.org/docs/CodingStandards.html#include-style Signed-off-by: Thomas Lauf --- src/AtomicFile.cpp | 21 ++++++++++----------- src/CLI.cpp | 19 +++++++++---------- src/CLI.h | 12 ++++++------ src/Chart.cpp | 13 +++++-------- src/Chart.h | 2 +- src/ChartConfig.h | 4 ++++ src/Database.cpp | 17 ++++++++--------- src/Database.h | 10 +++++----- src/Datafile.cpp | 15 +++++++-------- src/Datafile.h | 4 ++-- src/DatetimeParser.cpp | 10 ++-------- src/DatetimeParser.h | 4 ++-- src/Exclusion.cpp | 7 +++---- src/Exclusion.h | 2 +- src/Extensions.cpp | 8 +++----- src/Extensions.h | 2 +- src/Interval.cpp | 10 ++++------ src/IntervalFactory.cpp | 5 ++--- src/IntervalFilterAllWithIds.h | 6 +++--- src/IntervalFilterAllWithTags.cpp | 2 +- src/IntervalFilterAllWithTags.h | 6 +++--- src/IntervalFilterAndGroup.h | 2 +- src/IntervalFilterFirstOf.h | 2 +- src/Journal.cpp | 4 +--- src/Journal.h | 6 +++--- src/Range.cpp | 2 +- src/Rules.cpp | 17 ++++++++--------- src/Rules.h | 8 ++++---- src/TagInfoDatabase.cpp | 2 +- src/TagInfoDatabase.h | 4 ++-- src/TransactionsFactory.cpp | 2 +- src/TransactionsFactory.h | 2 +- src/commands/CmdAnnotate.cpp | 10 ++++------ src/commands/CmdCancel.cpp | 2 +- src/commands/CmdChart.cpp | 14 ++++++-------- src/commands/CmdConfig.cpp | 2 +- src/commands/CmdContinue.cpp | 12 ++++++------ src/commands/CmdDefault.cpp | 6 +++--- src/commands/CmdDelete.cpp | 6 +++--- src/commands/CmdDiagnostics.cpp | 4 ++-- src/commands/CmdExport.cpp | 6 +++--- src/commands/CmdExtensions.cpp | 2 +- src/commands/CmdFill.cpp | 8 ++++---- src/commands/CmdGaps.cpp | 6 +++--- src/commands/CmdGet.cpp | 4 ++-- src/commands/CmdHelp.cpp | 12 +++++------- src/commands/CmdJoin.cpp | 10 ++++------ src/commands/CmdLengthen.cpp | 10 ++++------ src/commands/CmdModify.cpp | 9 ++++----- src/commands/CmdMove.cpp | 10 ++++------ src/commands/CmdReport.cpp | 13 ++++++------- src/commands/CmdResize.cpp | 10 ++++------ src/commands/CmdShorten.cpp | 10 ++++------ src/commands/CmdShow.cpp | 5 ++--- src/commands/CmdSplit.cpp | 10 ++++------ src/commands/CmdStart.cpp | 2 +- src/commands/CmdStop.cpp | 4 ++-- src/commands/CmdSummary.cpp | 15 +++++++-------- src/commands/CmdTag.cpp | 11 ++++------- src/commands/CmdTags.cpp | 11 +++++------ src/commands/CmdTrack.cpp | 2 +- src/commands/CmdUndo.cpp | 7 +++---- src/commands/CmdUntag.cpp | 10 ++++------ src/commands/commands.h | 2 +- src/data.cpp | 11 ++++------- src/dom.cpp | 11 +++++------ src/helper.cpp | 9 +++------ src/init.cpp | 9 ++++----- src/lex.cpp | 2 +- src/log.cpp | 2 +- src/paths.h | 4 ++-- src/timew.cpp | 12 +++++------- src/timew.h | 8 ++++---- src/util.cpp | 3 +-- src/validate.cpp | 7 +++---- test/AtomicFileTest.cpp | 17 ++++++----------- test/Datafile.t.cpp | 3 +-- test/DatetimeParser.t.cpp | 7 +++---- test/TagInfoDatabase.t.cpp | 3 +-- test/TempDir.h | 10 ++++------ test/data.t.cpp | 4 ++-- test/exclusion.t.cpp | 4 +--- test/helper.t.cpp | 3 +-- test/interval.t.cpp | 1 - test/range.t.cpp | 4 ++-- test/rules.t.cpp | 1 - test/test.cpp | 12 ++++++------ test/util.t.cpp | 3 +-- 88 files changed, 275 insertions(+), 350 deletions(-) diff --git a/src/AtomicFile.cpp b/src/AtomicFile.cpp index 81e107f3..48d28814 100644 --- a/src/AtomicFile.cpp +++ b/src/AtomicFile.cpp @@ -24,19 +24,18 @@ // //////////////////////////////////////////////////////////////////////////////// -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include #include #include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include struct AtomicFile::impl { diff --git a/src/CLI.cpp b/src/CLI.cpp index 2581566a..2695c05c 100644 --- a/src/CLI.cpp +++ b/src/CLI.cpp @@ -24,19 +24,18 @@ // //////////////////////////////////////////////////////////////////////////////// -#include #include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include #include +#include +#include +#include +#include +#include +#include +#include +#include +#include //////////////////////////////////////////////////////////////////////////////// A2::A2 (const std::string& raw, Lexer::Type lextype) diff --git a/src/CLI.h b/src/CLI.h index 94c18dca..aef544e6 100644 --- a/src/CLI.h +++ b/src/CLI.h @@ -27,13 +27,13 @@ #ifndef INCLUDED_CLI #define INCLUDED_CLI -#include -#include -#include -#include -#include #include -#include "Interval.h" +#include +#include +#include +#include +#include +#include // Represents a single argument. class A2 diff --git a/src/Chart.cpp b/src/Chart.cpp index e3b7d87c..06b5c9f2 100644 --- a/src/Chart.cpp +++ b/src/Chart.cpp @@ -24,17 +24,14 @@ // //////////////////////////////////////////////////////////////////////////////// -#include -#include -#include -#include -#include +#include #include -#include -#include +#include #include +#include +#include +#include #include -#include #include //////////////////////////////////////////////////////////////////////////////// diff --git a/src/Chart.h b/src/Chart.h index 86748b86..5f6ceff3 100644 --- a/src/Chart.h +++ b/src/Chart.h @@ -27,10 +27,10 @@ #ifndef INCLUDED_CHART #define INCLUDED_CHART +#include #include #include #include -#include "ChartConfig.h" class Chart { diff --git a/src/ChartConfig.h b/src/ChartConfig.h index e08e0bad..c9430695 100644 --- a/src/ChartConfig.h +++ b/src/ChartConfig.h @@ -27,6 +27,10 @@ #ifndef INCLUDED_CHARTCONFIG #define INCLUDED_CHARTCONFIG +#include +#include +#include + class ChartConfig { public: diff --git a/src/Database.cpp b/src/Database.cpp index a4c7e254..94728dae 100644 --- a/src/Database.cpp +++ b/src/Database.cpp @@ -24,16 +24,15 @@ // //////////////////////////////////////////////////////////////////////////////// -#include -#include -#include -#include -#include -#include -#include -#include -#include #include +#include +#include +#include +#include +#include +#include +#include +#include //////////////////////////////////////////////////////////////////////////////// Database::iterator::iterator (files_iterator fbegin, files_iterator fend) : diff --git a/src/Database.h b/src/Database.h index 7b1b10e8..a428e528 100644 --- a/src/Database.h +++ b/src/Database.h @@ -29,12 +29,12 @@ #include #include -#include -#include -#include -#include -#include #include +#include +#include +#include +#include +#include class Database { diff --git a/src/Datafile.cpp b/src/Datafile.cpp index 5cac4269..e1b23bc3 100644 --- a/src/Datafile.cpp +++ b/src/Datafile.cpp @@ -24,16 +24,15 @@ // //////////////////////////////////////////////////////////////////////////////// -#include -#include -#include -#include -#include -#include -#include -#include #include +#include #include +#include +#include +#include +#include +#include +#include //////////////////////////////////////////////////////////////////////////////// void Datafile::initialize (const std::string& name) diff --git a/src/Datafile.h b/src/Datafile.h index 6cf0e6b8..24fe302d 100644 --- a/src/Datafile.h +++ b/src/Datafile.h @@ -27,11 +27,11 @@ #ifndef INCLUDED_DATAFILE #define INCLUDED_DATAFILE +#include #include #include -#include -#include #include +#include class Datafile { diff --git a/src/DatetimeParser.cpp b/src/DatetimeParser.cpp index 919d554e..7ba6fde2 100644 --- a/src/DatetimeParser.cpp +++ b/src/DatetimeParser.cpp @@ -24,19 +24,13 @@ // //////////////////////////////////////////////////////////////////////////////// -#include #include +#include #include -#include -#include -#include -#include -#include -#include #include +#include #include #include -#include static std::vector dayNames { "sunday", diff --git a/src/DatetimeParser.h b/src/DatetimeParser.h index 3af54fba..65c2b038 100644 --- a/src/DatetimeParser.h +++ b/src/DatetimeParser.h @@ -27,10 +27,10 @@ #ifndef INCLUDED_DATETIMEPARSER #define INCLUDED_DATETIMEPARSER -#include -#include #include #include +#include +#include class DatetimeParser { diff --git a/src/Exclusion.cpp b/src/Exclusion.cpp index 6880e005..cbfa7d81 100644 --- a/src/Exclusion.cpp +++ b/src/Exclusion.cpp @@ -24,13 +24,12 @@ // //////////////////////////////////////////////////////////////////////////////// -#include -#include #include +#include #include -#include -#include #include +#include +#include //////////////////////////////////////////////////////////////////////////////// // An exclusion represents untrackable time such as holidays, weekends, evenings diff --git a/src/Exclusion.h b/src/Exclusion.h index 6026b8f3..c851cddb 100644 --- a/src/Exclusion.h +++ b/src/Exclusion.h @@ -29,8 +29,8 @@ #include #include -#include #include +#include class Exclusion { diff --git a/src/Extensions.cpp b/src/Extensions.cpp index c3174314..66b33ea1 100644 --- a/src/Extensions.cpp +++ b/src/Extensions.cpp @@ -24,16 +24,14 @@ // //////////////////////////////////////////////////////////////////////////////// -#include #include #include #include -#include -#include -#include +#include #include #include -#include +#include +#include //////////////////////////////////////////////////////////////////////////////// void Extensions::initialize (const std::string& location) diff --git a/src/Extensions.h b/src/Extensions.h index f5385951..a2f6372b 100644 --- a/src/Extensions.h +++ b/src/Extensions.h @@ -27,8 +27,8 @@ #ifndef INCLUDED_EXTENSIONS #define INCLUDED_EXTENSIONS -#include #include +#include class Extensions { diff --git a/src/Interval.cpp b/src/Interval.cpp index fbdba7a3..26ad13bf 100644 --- a/src/Interval.cpp +++ b/src/Interval.cpp @@ -24,14 +24,12 @@ // //////////////////////////////////////////////////////////////////////////////// -#include #include -#include -#include -#include -#include #include -#include +#include +#include +#include +#include //////////////////////////////////////////////////////////////////////////////// bool Interval::operator== (const Interval& other) const diff --git a/src/IntervalFactory.cpp b/src/IntervalFactory.cpp index fd90e761..aa66e237 100644 --- a/src/IntervalFactory.cpp +++ b/src/IntervalFactory.cpp @@ -24,11 +24,10 @@ // //////////////////////////////////////////////////////////////////////////////// -#include -#include #include #include -#include +#include +#include static std::vector tokenizeSerialization (const std::string& line) { diff --git a/src/IntervalFilterAllWithIds.h b/src/IntervalFilterAllWithIds.h index b6ad04dc..b28625a6 100644 --- a/src/IntervalFilterAllWithIds.h +++ b/src/IntervalFilterAllWithIds.h @@ -27,10 +27,10 @@ #ifndef INCLUDED_INTERVALFILTERALLWITHIDS #define INCLUDED_INTERVALFILTERALLWITHIDS -#include -#include -#include #include +#include +#include +#include class IntervalFilterAllWithIds : public IntervalFilter { diff --git a/src/IntervalFilterAllWithTags.cpp b/src/IntervalFilterAllWithTags.cpp index 19621d8f..dad30046 100644 --- a/src/IntervalFilterAllWithTags.cpp +++ b/src/IntervalFilterAllWithTags.cpp @@ -24,8 +24,8 @@ // //////////////////////////////////////////////////////////////////////////////// -#include #include +#include IntervalFilterAllWithTags::IntervalFilterAllWithTags (std::set tags): _tags (std::move(tags)) {} diff --git a/src/IntervalFilterAllWithTags.h b/src/IntervalFilterAllWithTags.h index 9e204113..cfed21dd 100644 --- a/src/IntervalFilterAllWithTags.h +++ b/src/IntervalFilterAllWithTags.h @@ -27,10 +27,10 @@ #ifndef INCLUDED_INTERVALFILTERALLWITHTAGSET #define INCLUDED_INTERVALFILTERALLWITHTAGSET -#include -#include -#include #include +#include +#include +#include class IntervalFilterAllWithTags : public IntervalFilter { diff --git a/src/IntervalFilterAndGroup.h b/src/IntervalFilterAndGroup.h index a11fd435..03c40d98 100644 --- a/src/IntervalFilterAndGroup.h +++ b/src/IntervalFilterAndGroup.h @@ -27,8 +27,8 @@ #ifndef INCLUDED_INTERVALFILTERANDGROUP #define INCLUDED_INTERVALFILTERANDGROUP -#include #include +#include class IntervalFilterAndGroup : public IntervalFilter { diff --git a/src/IntervalFilterFirstOf.h b/src/IntervalFilterFirstOf.h index ed6e5508..f2c43efd 100644 --- a/src/IntervalFilterFirstOf.h +++ b/src/IntervalFilterFirstOf.h @@ -27,8 +27,8 @@ #ifndef INCLUDED_INTERVALFILTERFIRSTOF #define INCLUDED_INTERVALFILTERFIRSTOF -#include #include +#include class IntervalFilterFirstOf : public IntervalFilter { diff --git a/src/Journal.cpp b/src/Journal.cpp index de153754..f6f70d3f 100644 --- a/src/Journal.cpp +++ b/src/Journal.cpp @@ -24,12 +24,10 @@ // //////////////////////////////////////////////////////////////////////////////// -#include #include -#include #include #include - +#include #include //////////////////////////////////////////////////////////////////////////////// diff --git a/src/Journal.h b/src/Journal.h index 6b7e153d..6c13bb52 100644 --- a/src/Journal.h +++ b/src/Journal.h @@ -28,10 +28,10 @@ #define INCLUDED_JOURNAL -#include -#include -#include #include +#include +#include +#include class Journal { diff --git a/src/Range.cpp b/src/Range.cpp index 0438c120..cfc775e5 100644 --- a/src/Range.cpp +++ b/src/Range.cpp @@ -25,8 +25,8 @@ //////////////////////////////////////////////////////////////////////////////// #include -#include #include +#include //////////////////////////////////////////////////////////////////////////////// // A Range consists of a start time and optional end time. A missing end diff --git a/src/Rules.cpp b/src/Rules.cpp index f332049e..3bca04c1 100644 --- a/src/Rules.cpp +++ b/src/Rules.cpp @@ -24,18 +24,17 @@ // //////////////////////////////////////////////////////////////////////////////// -#include -#include +#include #include -#include -#include -#include -#include +#include +#include #include #include -#include -#include -#include +#include +#include +#include +#include +#include //////////////////////////////////////////////////////////////////////////////// Rules::Rules () diff --git a/src/Rules.h b/src/Rules.h index 34221c57..e5975fde 100644 --- a/src/Rules.h +++ b/src/Rules.h @@ -27,12 +27,12 @@ #ifndef INCLUDED_RULES #define INCLUDED_RULES -#include -#include -#include -#include #include #include +#include +#include +#include +#include class Rules { diff --git a/src/TagInfoDatabase.cpp b/src/TagInfoDatabase.cpp index 48f16a7d..4121957f 100644 --- a/src/TagInfoDatabase.cpp +++ b/src/TagInfoDatabase.cpp @@ -25,9 +25,9 @@ //////////////////////////////////////////////////////////////////////////////// #include +#include #include #include -#include #include /////////////////////////////////////////////////////////////////////////////// diff --git a/src/TagInfoDatabase.h b/src/TagInfoDatabase.h index d55fc145..232d33b9 100644 --- a/src/TagInfoDatabase.h +++ b/src/TagInfoDatabase.h @@ -27,10 +27,10 @@ #ifndef INCLUDED_TAGINFODATABASE #define INCLUDED_TAGINFODATABASE +#include +#include #include #include -#include -#include class TagInfoDatabase { diff --git a/src/TransactionsFactory.cpp b/src/TransactionsFactory.cpp index 8e2ead31..4a0db850 100644 --- a/src/TransactionsFactory.cpp +++ b/src/TransactionsFactory.cpp @@ -24,8 +24,8 @@ // //////////////////////////////////////////////////////////////////////////////// -#include #include +#include void TransactionsFactory::parseLine (const std::string& line) { diff --git a/src/TransactionsFactory.h b/src/TransactionsFactory.h index d1cbe96d..6caa0f4e 100644 --- a/src/TransactionsFactory.h +++ b/src/TransactionsFactory.h @@ -27,8 +27,8 @@ #ifndef INCLUDED_TRANSACTIONSFACTORY #define INCLUDED_TRANSACTIONSFACTORY -#include #include +#include class TransactionsFactory { diff --git a/src/commands/CmdAnnotate.cpp b/src/commands/CmdAnnotate.cpp index 43b36ffb..85f0f429 100644 --- a/src/commands/CmdAnnotate.cpp +++ b/src/commands/CmdAnnotate.cpp @@ -24,15 +24,13 @@ // //////////////////////////////////////////////////////////////////////////////// -#include +#include +#include +#include #include #include -#include #include -#include -#include -#include -#include +#include //////////////////////////////////////////////////////////////////////////////// int CmdAnnotate ( diff --git a/src/commands/CmdCancel.cpp b/src/commands/CmdCancel.cpp index eb516dfd..e730bb75 100644 --- a/src/commands/CmdCancel.cpp +++ b/src/commands/CmdCancel.cpp @@ -25,8 +25,8 @@ //////////////////////////////////////////////////////////////////////////////// #include -#include #include +#include //////////////////////////////////////////////////////////////////////////////// int CmdCancel ( diff --git a/src/commands/CmdChart.cpp b/src/commands/CmdChart.cpp index 649832c4..9c5cbc73 100644 --- a/src/commands/CmdChart.cpp +++ b/src/commands/CmdChart.cpp @@ -24,19 +24,17 @@ // //////////////////////////////////////////////////////////////////////////////// -#include -#include #include #include -#include -#include -#include -#include -#include -#include +#include #include #include #include +#include +#include +#include +#include +#include int renderChart (const CLI&, const std::string&, Interval&, Rules&, Database&); diff --git a/src/commands/CmdConfig.cpp b/src/commands/CmdConfig.cpp index be83e0e7..f754fac2 100644 --- a/src/commands/CmdConfig.cpp +++ b/src/commands/CmdConfig.cpp @@ -25,8 +25,8 @@ //////////////////////////////////////////////////////////////////////////////// #include -#include #include +#include #include //////////////////////////////////////////////////////////////////////////////// diff --git a/src/commands/CmdContinue.cpp b/src/commands/CmdContinue.cpp index 26713e81..fb0fab0f 100644 --- a/src/commands/CmdContinue.cpp +++ b/src/commands/CmdContinue.cpp @@ -24,15 +24,15 @@ // //////////////////////////////////////////////////////////////////////////////// -#include -#include -#include -#include -#include +#include #include #include #include -#include +#include +#include +#include +#include +#include //////////////////////////////////////////////////////////////////////////////// int CmdContinue ( diff --git a/src/commands/CmdDefault.cpp b/src/commands/CmdDefault.cpp index 48df8e78..43f19f07 100644 --- a/src/commands/CmdDefault.cpp +++ b/src/commands/CmdDefault.cpp @@ -24,11 +24,11 @@ // //////////////////////////////////////////////////////////////////////////////// -#include -#include -#include #include #include +#include +#include +#include //////////////////////////////////////////////////////////////////////////////// // Returns 0 if tracking is active, 1 if not. diff --git a/src/commands/CmdDelete.cpp b/src/commands/CmdDelete.cpp index 8762cfd6..df5d4c02 100644 --- a/src/commands/CmdDelete.cpp +++ b/src/commands/CmdDelete.cpp @@ -24,11 +24,11 @@ // //////////////////////////////////////////////////////////////////////////////// -#include +#include +#include #include #include -#include -#include +#include //////////////////////////////////////////////////////////////////////////////// int CmdDelete ( diff --git a/src/commands/CmdDiagnostics.cpp b/src/commands/CmdDiagnostics.cpp index 97f88b18..d7966fd7 100644 --- a/src/commands/CmdDiagnostics.cpp +++ b/src/commands/CmdDiagnostics.cpp @@ -26,10 +26,10 @@ #include #include -#include #include -#include #include +#include +#include #ifdef HAVE_COMMIT #include diff --git a/src/commands/CmdExport.cpp b/src/commands/CmdExport.cpp index f2c6ee44..5f68fc32 100644 --- a/src/commands/CmdExport.cpp +++ b/src/commands/CmdExport.cpp @@ -24,13 +24,13 @@ // //////////////////////////////////////////////////////////////////////////////// -#include -#include -#include #include #include #include #include +#include +#include +#include //////////////////////////////////////////////////////////////////////////////// int CmdExport ( diff --git a/src/commands/CmdExtensions.cpp b/src/commands/CmdExtensions.cpp index 2ef136a8..6d3e9901 100644 --- a/src/commands/CmdExtensions.cpp +++ b/src/commands/CmdExtensions.cpp @@ -24,8 +24,8 @@ // //////////////////////////////////////////////////////////////////////////////// -#include #include +#include #include #include diff --git a/src/commands/CmdFill.cpp b/src/commands/CmdFill.cpp index 359c786d..65bef79b 100644 --- a/src/commands/CmdFill.cpp +++ b/src/commands/CmdFill.cpp @@ -25,11 +25,11 @@ //////////////////////////////////////////////////////////////////////////////// #include -#include -#include -#include -#include #include +#include +#include +#include +#include //////////////////////////////////////////////////////////////////////////////// int CmdFill ( diff --git a/src/commands/CmdGaps.cpp b/src/commands/CmdGaps.cpp index 971bf082..479159fd 100644 --- a/src/commands/CmdGaps.cpp +++ b/src/commands/CmdGaps.cpp @@ -24,12 +24,12 @@ // //////////////////////////////////////////////////////////////////////////////// -#include #include -#include +#include #include -#include +#include #include +#include //////////////////////////////////////////////////////////////////////////////// int CmdGaps ( diff --git a/src/commands/CmdGet.cpp b/src/commands/CmdGet.cpp index 4b0d35b1..79027163 100644 --- a/src/commands/CmdGet.cpp +++ b/src/commands/CmdGet.cpp @@ -25,10 +25,10 @@ //////////////////////////////////////////////////////////////////////////////// #include -#include -#include #include #include +#include +#include //////////////////////////////////////////////////////////////////////////////// // Іdentify DOM references in cli, provide space-separated results. diff --git a/src/commands/CmdHelp.cpp b/src/commands/CmdHelp.cpp index 07adb51e..f102818d 100644 --- a/src/commands/CmdHelp.cpp +++ b/src/commands/CmdHelp.cpp @@ -24,15 +24,13 @@ // //////////////////////////////////////////////////////////////////////////////// -#include -#include - -#include -#include -#include #include -#include #include +#include +#include +#include +#include +#include //////////////////////////////////////////////////////////////////////////////// int CmdHelpUsage (const Extensions& extensions) diff --git a/src/commands/CmdJoin.cpp b/src/commands/CmdJoin.cpp index 6f5a78de..6c8164aa 100644 --- a/src/commands/CmdJoin.cpp +++ b/src/commands/CmdJoin.cpp @@ -24,14 +24,12 @@ // //////////////////////////////////////////////////////////////////////////////// -#include #include -#include -#include -#include -#include -#include #include +#include +#include +#include +#include //////////////////////////////////////////////////////////////////////////////// int CmdJoin ( diff --git a/src/commands/CmdLengthen.cpp b/src/commands/CmdLengthen.cpp index 5380a2d7..3ccb7cfc 100644 --- a/src/commands/CmdLengthen.cpp +++ b/src/commands/CmdLengthen.cpp @@ -24,14 +24,12 @@ // //////////////////////////////////////////////////////////////////////////////// -#include #include -#include -#include -#include -#include -#include #include +#include +#include +#include +#include //////////////////////////////////////////////////////////////////////////////// int CmdLengthen ( diff --git a/src/commands/CmdModify.cpp b/src/commands/CmdModify.cpp index a6f5f5ff..9bfe7e62 100644 --- a/src/commands/CmdModify.cpp +++ b/src/commands/CmdModify.cpp @@ -24,12 +24,11 @@ // //////////////////////////////////////////////////////////////////////////////// -#include -#include -#include -#include -#include #include +#include +#include +#include +#include //////////////////////////////////////////////////////////////////////////////// int CmdModify ( diff --git a/src/commands/CmdMove.cpp b/src/commands/CmdMove.cpp index 1d2e9323..acd352f5 100644 --- a/src/commands/CmdMove.cpp +++ b/src/commands/CmdMove.cpp @@ -24,14 +24,12 @@ // //////////////////////////////////////////////////////////////////////////////// -#include #include -#include -#include -#include -#include -#include #include +#include +#include +#include +#include //////////////////////////////////////////////////////////////////////////////// int CmdMove ( diff --git a/src/commands/CmdReport.cpp b/src/commands/CmdReport.cpp index ad675fb1..4de24864 100644 --- a/src/commands/CmdReport.cpp +++ b/src/commands/CmdReport.cpp @@ -24,17 +24,16 @@ // //////////////////////////////////////////////////////////////////////////////// -#include -#include -#include -#include -#include -#include -#include #include #include #include #include +#include +#include +#include +#include +#include +#include //////////////////////////////////////////////////////////////////////////////// // Given a partial match for an extension script name, find the full patch of diff --git a/src/commands/CmdResize.cpp b/src/commands/CmdResize.cpp index 49412c7e..0e58b3fb 100644 --- a/src/commands/CmdResize.cpp +++ b/src/commands/CmdResize.cpp @@ -24,14 +24,12 @@ // //////////////////////////////////////////////////////////////////////////////// -#include #include -#include -#include -#include -#include -#include #include +#include +#include +#include +#include //////////////////////////////////////////////////////////////////////////////// int CmdResize ( diff --git a/src/commands/CmdShorten.cpp b/src/commands/CmdShorten.cpp index 174b2e75..0a3b9990 100644 --- a/src/commands/CmdShorten.cpp +++ b/src/commands/CmdShorten.cpp @@ -24,14 +24,12 @@ // //////////////////////////////////////////////////////////////////////////////// -#include #include -#include -#include -#include -#include -#include #include +#include +#include +#include +#include //////////////////////////////////////////////////////////////////////////////// int CmdShorten ( diff --git a/src/commands/CmdShow.cpp b/src/commands/CmdShow.cpp index abe6d8b8..cb2cead2 100644 --- a/src/commands/CmdShow.cpp +++ b/src/commands/CmdShow.cpp @@ -24,11 +24,10 @@ // //////////////////////////////////////////////////////////////////////////////// -#include -#include -#include #include #include +#include +#include //////////////////////////////////////////////////////////////////////////////// int CmdShow (Rules& rules) diff --git a/src/commands/CmdSplit.cpp b/src/commands/CmdSplit.cpp index 0c76581a..bf0d1611 100644 --- a/src/commands/CmdSplit.cpp +++ b/src/commands/CmdSplit.cpp @@ -24,14 +24,12 @@ // //////////////////////////////////////////////////////////////////////////////// -#include #include -#include -#include -#include -#include -#include #include +#include +#include +#include +#include //////////////////////////////////////////////////////////////////////////////// int CmdSplit ( diff --git a/src/commands/CmdStart.cpp b/src/commands/CmdStart.cpp index 95447f40..a56d57d6 100644 --- a/src/commands/CmdStart.cpp +++ b/src/commands/CmdStart.cpp @@ -25,8 +25,8 @@ //////////////////////////////////////////////////////////////////////////////// #include -#include #include +#include //////////////////////////////////////////////////////////////////////////////// int CmdStart ( diff --git a/src/commands/CmdStop.cpp b/src/commands/CmdStop.cpp index b430198e..8fe2948e 100644 --- a/src/commands/CmdStop.cpp +++ b/src/commands/CmdStop.cpp @@ -24,10 +24,10 @@ // //////////////////////////////////////////////////////////////////////////////// -#include #include -#include +#include #include +#include template T setIntersect ( const T& left, const T& right) diff --git a/src/commands/CmdSummary.cpp b/src/commands/CmdSummary.cpp index 1ae957f2..c4335c34 100644 --- a/src/commands/CmdSummary.cpp +++ b/src/commands/CmdSummary.cpp @@ -24,16 +24,15 @@ // //////////////////////////////////////////////////////////////////////////////// -#include #include -#include -#include -#include -#include -#include -#include -#include #include +#include +#include +#include +#include +#include +#include +#include #include // Implemented in CmdChart.cpp. diff --git a/src/commands/CmdTag.cpp b/src/commands/CmdTag.cpp index d29f2e76..f774bea7 100644 --- a/src/commands/CmdTag.cpp +++ b/src/commands/CmdTag.cpp @@ -24,16 +24,13 @@ // //////////////////////////////////////////////////////////////////////////////// -#include -#include +#include +#include +#include #include #include -#include #include -#include -#include -#include -#include +#include //////////////////////////////////////////////////////////////////////////////// int CmdTag ( diff --git a/src/commands/CmdTags.cpp b/src/commands/CmdTags.cpp index 1fe712b7..25882c07 100644 --- a/src/commands/CmdTags.cpp +++ b/src/commands/CmdTags.cpp @@ -24,16 +24,15 @@ // //////////////////////////////////////////////////////////////////////////////// -#include -#include -#include -#include #include -#include -#include #include #include #include +#include +#include +#include +#include +#include //////////////////////////////////////////////////////////////////////////////// int CmdTags ( diff --git a/src/commands/CmdTrack.cpp b/src/commands/CmdTrack.cpp index 13017b41..de125c8a 100644 --- a/src/commands/CmdTrack.cpp +++ b/src/commands/CmdTrack.cpp @@ -25,8 +25,8 @@ //////////////////////////////////////////////////////////////////////////////// #include -#include #include +#include //////////////////////////////////////////////////////////////////////////////// int CmdTrack ( diff --git a/src/commands/CmdUndo.cpp b/src/commands/CmdUndo.cpp index 1b94714f..3c006965 100644 --- a/src/commands/CmdUndo.cpp +++ b/src/commands/CmdUndo.cpp @@ -24,11 +24,10 @@ // //////////////////////////////////////////////////////////////////////////////// -#include -#include -#include -#include #include +#include +#include +#include static void undoIntervalAction(UndoAction& action, Database& database) { diff --git a/src/commands/CmdUntag.cpp b/src/commands/CmdUntag.cpp index 0702ca70..1e88c99b 100644 --- a/src/commands/CmdUntag.cpp +++ b/src/commands/CmdUntag.cpp @@ -24,15 +24,13 @@ // //////////////////////////////////////////////////////////////////////////////// -#include +#include +#include +#include #include #include -#include #include -#include -#include -#include -#include +#include //////////////////////////////////////////////////////////////////////////////// int CmdUntag ( diff --git a/src/commands/commands.h b/src/commands/commands.h index 36859840..cde1bae4 100644 --- a/src/commands/commands.h +++ b/src/commands/commands.h @@ -28,10 +28,10 @@ #define INCLUDED_COMMANDS #include -#include #include #include #include +#include int CmdAnnotate (const CLI&, Rules&, Database&, Journal& ); int CmdCancel ( Rules&, Database&, Journal& ); diff --git a/src/data.cpp b/src/data.cpp index f54dbfa9..0904acfb 100644 --- a/src/data.cpp +++ b/src/data.cpp @@ -24,17 +24,14 @@ // //////////////////////////////////////////////////////////////////////////////// -#include -#include -#include -#include #include #include -#include -#include -#include #include #include +#include +#include +#include +#include //////////////////////////////////////////////////////////////////////////////// // Read rules and extract all holiday definitions. Create a Range for each diff --git a/src/dom.cpp b/src/dom.cpp index b3eb8cef..051d8217 100644 --- a/src/dom.cpp +++ b/src/dom.cpp @@ -24,17 +24,16 @@ // //////////////////////////////////////////////////////////////////////////////// -#include -#include -#include #include -#include -#include -#include #include #include #include #include +#include +#include +#include +#include +#include //////////////////////////////////////////////////////////////////////////////// bool domGet ( diff --git a/src/helper.cpp b/src/helper.cpp index dfcf447e..1c164ad0 100644 --- a/src/helper.cpp +++ b/src/helper.cpp @@ -24,17 +24,14 @@ // //////////////////////////////////////////////////////////////////////////////// -#include -#include -#include -#include #include #include #include -#include +#include #include -#include #include +#include +#include #include //////////////////////////////////////////////////////////////////////////////// diff --git a/src/init.cpp b/src/init.cpp index 6d8e03e4..b80672f1 100644 --- a/src/init.cpp +++ b/src/init.cpp @@ -25,14 +25,13 @@ //////////////////////////////////////////////////////////////////////////////// #include -#include -#include -#include #include -#include -#include +#include #include #include +#include +#include +#include //////////////////////////////////////////////////////////////////////////////// bool lightweightVersionCheck (int argc, const char** argv) diff --git a/src/lex.cpp b/src/lex.cpp index e625e2b7..dee2da47 100644 --- a/src/lex.cpp +++ b/src/lex.cpp @@ -1,7 +1,7 @@ //////////////////////////////////////////////////////////////////////////////// -#include #include +#include int main (int argc, char** argv) { diff --git a/src/log.cpp b/src/log.cpp index 47297384..7772d94d 100644 --- a/src/log.cpp +++ b/src/log.cpp @@ -25,9 +25,9 @@ //////////////////////////////////////////////////////////////////////////////// #include -#include #include #include +#include static bool debugMode = false; static std::string debugIndicator = ">>"; diff --git a/src/paths.h b/src/paths.h index 14498d2e..d970f76f 100644 --- a/src/paths.h +++ b/src/paths.h @@ -26,10 +26,10 @@ #ifndef INCLUDED_PATH_RESOLVER #define INCLUDED_PATH_RESOLVER -#include -#include #include #include +#include +#include namespace paths { void initializeDirs (const CLI&, Rules&); diff --git a/src/timew.cpp b/src/timew.cpp index 9b0bae70..b0924bb7 100644 --- a/src/timew.cpp +++ b/src/timew.cpp @@ -24,20 +24,18 @@ // //////////////////////////////////////////////////////////////////////////////// -#include #include #include #include -#include -#include #include +#include +#include #include -#include -#include -#include -#include #include +#include #include +#include +#include //////////////////////////////////////////////////////////////////////////////// int main (int argc, const char** argv) diff --git a/src/timew.h b/src/timew.h index 7f97b26b..06c322cb 100644 --- a/src/timew.h +++ b/src/timew.h @@ -28,14 +28,14 @@ #define INCLUDED_TIMEW #include +#include #include -#include +#include #include #include -#include -#include -#include #include +#include +#include // data.cpp std::vector getHolidays (const Rules&); diff --git a/src/util.cpp b/src/util.cpp index ebb1c4ed..4a2a247f 100644 --- a/src/util.cpp +++ b/src/util.cpp @@ -24,9 +24,8 @@ // //////////////////////////////////////////////////////////////////////////////// -#include -#include #include +#include //////////////////////////////////////////////////////////////////////////////// // Escape all 'c' --> '\c'. diff --git a/src/validate.cpp b/src/validate.cpp index f5094301..7b8a71b4 100644 --- a/src/validate.cpp +++ b/src/validate.cpp @@ -24,11 +24,10 @@ // //////////////////////////////////////////////////////////////////////////////// -#include -#include -#include -#include #include +#include +#include +#include //////////////////////////////////////////////////////////////////////////////// // :fill diff --git a/test/AtomicFileTest.cpp b/test/AtomicFileTest.cpp index f356830c..900b5f5e 100644 --- a/test/AtomicFileTest.cpp +++ b/test/AtomicFileTest.cpp @@ -24,20 +24,15 @@ // //////////////////////////////////////////////////////////////////////////////// -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include #include #include #include +#include +#include +#include +#include +#include +#include #ifdef FIU_ENABLE diff --git a/test/Datafile.t.cpp b/test/Datafile.t.cpp index 2bd4101c..e63d738e 100644 --- a/test/Datafile.t.cpp +++ b/test/Datafile.t.cpp @@ -24,11 +24,10 @@ // //////////////////////////////////////////////////////////////////////////////// -#include #include #include - #include +#include int main () { diff --git a/test/DatetimeParser.t.cpp b/test/DatetimeParser.t.cpp index 510519ed..a92dffae 100644 --- a/test/DatetimeParser.t.cpp +++ b/test/DatetimeParser.t.cpp @@ -24,12 +24,11 @@ // //////////////////////////////////////////////////////////////////////////////// -#include #include -#include +#include +#include #include -#include -#include +#include //////////////////////////////////////////////////////////////////////////////// void testParseOpenRange ( diff --git a/test/TagInfoDatabase.t.cpp b/test/TagInfoDatabase.t.cpp index ac083912..64a5b03b 100644 --- a/test/TagInfoDatabase.t.cpp +++ b/test/TagInfoDatabase.t.cpp @@ -24,9 +24,8 @@ // //////////////////////////////////////////////////////////////////////////////// -#include -#include #include +#include //////////////////////////////////////////////////////////////////////////////// int main (int, char**) diff --git a/test/TempDir.h b/test/TempDir.h index 864f0ad2..c70d86f2 100644 --- a/test/TempDir.h +++ b/test/TempDir.h @@ -27,13 +27,11 @@ #ifndef TIMEW_TEMP_DIR #define TIMEW_TEMP_DIR -#include -#include - -#include -#include - #include +#include +#include +#include +#include class TempDir { diff --git a/test/data.t.cpp b/test/data.t.cpp index 3bbabf78..6c55e006 100644 --- a/test/data.t.cpp +++ b/test/data.t.cpp @@ -24,9 +24,9 @@ // //////////////////////////////////////////////////////////////////////////////// -#include +#include #include -#include +#include //////////////////////////////////////////////////////////////////////////////// void test_flatten ( diff --git a/test/exclusion.t.cpp b/test/exclusion.t.cpp index caed8e14..35ffd168 100644 --- a/test/exclusion.t.cpp +++ b/test/exclusion.t.cpp @@ -24,12 +24,10 @@ // //////////////////////////////////////////////////////////////////////////////// -#include #include #include -#include -#include #include +#include //////////////////////////////////////////////////////////////////////////////// int main (int, char**) diff --git a/test/helper.t.cpp b/test/helper.t.cpp index 1ef4024b..a91e82eb 100644 --- a/test/helper.t.cpp +++ b/test/helper.t.cpp @@ -24,9 +24,8 @@ // //////////////////////////////////////////////////////////////////////////////// -#include -#include #include +#include //////////////////////////////////////////////////////////////////////////////// int main (int, char**) diff --git a/test/interval.t.cpp b/test/interval.t.cpp index c57ed8ff..03a20795 100644 --- a/test/interval.t.cpp +++ b/test/interval.t.cpp @@ -24,7 +24,6 @@ // //////////////////////////////////////////////////////////////////////////////// -#include #include #include #include diff --git a/test/range.t.cpp b/test/range.t.cpp index bbc74533..eca2714f 100644 --- a/test/range.t.cpp +++ b/test/range.t.cpp @@ -24,10 +24,10 @@ // //////////////////////////////////////////////////////////////////////////////// -#include #include -#include +#include #include +#include //////////////////////////////////////////////////////////////////////////////// int main (int, char**) diff --git a/test/rules.t.cpp b/test/rules.t.cpp index d51f1d15..3aa54d6f 100644 --- a/test/rules.t.cpp +++ b/test/rules.t.cpp @@ -24,7 +24,6 @@ // //////////////////////////////////////////////////////////////////////////////// -#include #include #include diff --git a/test/test.cpp b/test/test.cpp index 95405345..dca3979c 100644 --- a/test/test.cpp +++ b/test/test.cpp @@ -24,14 +24,14 @@ // //////////////////////////////////////////////////////////////////////////////// -#include +#include +#include +#include +#include #include -#include -#include -#include -#include -#include +#include #include +#include /////////////////////////////////////////////////////////////////////////////// UnitTest::UnitTest () diff --git a/test/util.t.cpp b/test/util.t.cpp index 65bd8428..cb375fe3 100644 --- a/test/util.t.cpp +++ b/test/util.t.cpp @@ -24,9 +24,8 @@ // //////////////////////////////////////////////////////////////////////////////// -#include -#include #include +#include //////////////////////////////////////////////////////////////////////////////// int main (int, char**)