From 71f4749d566c9a3fd7448bd878427d8e7efc2696 Mon Sep 17 00:00:00 2001 From: Paul Beckingham Date: Wed, 10 Jun 2009 21:18:48 -0400 Subject: [PATCH] Code Cleanup - Renamed files task.h -> main.h, task.cpp -> main.cpp. This is to prepare for the next rename, which addresses the OpenBSD bug. - Removed utf8.h, utf8.cpp from Makefile.am, which were inadvertantly added. --- src/Context.cpp | 2 +- src/Makefile.am | 4 ++-- src/TDB2.cpp | 2 +- src/command.cpp | 2 +- src/edit.cpp | 2 +- src/import.cpp | 2 +- src/interactive.cpp | 2 +- src/{task.cpp => main.cpp} | 2 +- src/{task.h => main.h} | 0 src/recur.cpp | 2 +- src/report.cpp | 2 +- src/tests/autocomplete.t.cpp | 2 +- src/tests/filt.t.cpp | 2 +- src/tests/parse.t.cpp | 2 +- src/tests/t.benchmark.t.cpp | 2 +- src/tests/t.t.cpp | 2 +- src/tests/t2.t.cpp | 2 +- src/tests/tdb.t.cpp | 2 +- src/tests/test.cpp | 2 +- src/tests/text.t.cpp | 2 +- src/util.cpp | 2 +- 21 files changed, 21 insertions(+), 21 deletions(-) rename src/{task.cpp => main.cpp} (99%) rename src/{task.h => main.h} (100%) diff --git a/src/Context.cpp b/src/Context.cpp index 2965b3381..dc29c5f28 100644 --- a/src/Context.cpp +++ b/src/Context.cpp @@ -32,7 +32,7 @@ #include "Context.h" #include "text.h" #include "util.h" -#include "task.h" +#include "main.h" #include "i18n.h" #include "../auto.h" diff --git a/src/Makefile.am b/src/Makefile.am index 54d6cc0ed..ab30e3973 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -4,9 +4,9 @@ task_SOURCES = Att.cpp Cmd.cpp Config.cpp Context.cpp Date.cpp Duration.cpp \ Record.cpp Sequence.cpp StringTable.cpp Subst.cpp T2.cpp \ TDB2.cpp Table.cpp Timer.cpp color.cpp command.cpp edit.cpp \ import.cpp interactive.cpp parse.cpp recur.cpp report.cpp \ - rules.cpp task.cpp text.cpp utf8.cpp util.cpp \ + rules.cpp main.cpp text.cpp util.cpp \ Att.h Cmd.h Config.h Context.h Date.h Duration.h Filter.h \ Grid.h Keymap.h Location.h Nibbler.h Record.h Sequence.h \ StringTable.h Subst.h T2.h TDB2.h Table.h Timer.h color.h \ - i18n.h task.h text.h utf8.h util.h \ + i18n.h main.h text.h util.h \ T.cpp T.h TDB.cpp TDB.h diff --git a/src/TDB2.cpp b/src/TDB2.cpp index f444fc401..5641f6607 100644 --- a/src/TDB2.cpp +++ b/src/TDB2.cpp @@ -32,7 +32,7 @@ #include "text.h" #include "util.h" #include "TDB2.h" -#include "task.h" +#include "main.h" //////////////////////////////////////////////////////////////////////////////// // The ctor/dtor do nothing. diff --git a/src/command.cpp b/src/command.cpp index 1aea1dae7..a91e7d5ea 100644 --- a/src/command.cpp +++ b/src/command.cpp @@ -38,7 +38,7 @@ #include "TDB.h" #include "text.h" #include "util.h" -#include "task.h" +#include "main.h" #ifdef HAVE_LIBNCURSES #include diff --git a/src/edit.cpp b/src/edit.cpp index 42d8c615d..fd2c22fb0 100644 --- a/src/edit.cpp +++ b/src/edit.cpp @@ -38,7 +38,7 @@ #include "Date.h" #include "text.h" #include "util.h" -#include "task.h" +#include "main.h" extern Context context; diff --git a/src/import.cpp b/src/import.cpp index 7b4817cd3..9c541fb14 100644 --- a/src/import.cpp +++ b/src/import.cpp @@ -33,7 +33,7 @@ #include "TDB.h" #include "text.h" #include "util.h" -#include "task.h" +#include "main.h" extern Context context; diff --git a/src/interactive.cpp b/src/interactive.cpp index d50dcce6d..eef5d7b70 100644 --- a/src/interactive.cpp +++ b/src/interactive.cpp @@ -32,7 +32,7 @@ #include "Context.h" //#include "text.h" //#include "util.h" -//#include "task.h" +//#include "main.h" //#include "i18n.h" #include "../auto.h" diff --git a/src/task.cpp b/src/main.cpp similarity index 99% rename from src/task.cpp rename to src/main.cpp index a28a89219..cbdec7a75 100644 --- a/src/task.cpp +++ b/src/main.cpp @@ -44,7 +44,7 @@ #include "T.h" #include "text.h" #include "util.h" -#include "task.h" +#include "main.h" #ifdef HAVE_LIBNCURSES #include diff --git a/src/task.h b/src/main.h similarity index 100% rename from src/task.h rename to src/main.h diff --git a/src/recur.cpp b/src/recur.cpp index 8ad33a125..8a1c0fd25 100644 --- a/src/recur.cpp +++ b/src/recur.cpp @@ -44,7 +44,7 @@ #include "T.h" #include "text.h" #include "util.h" -#include "task.h" +#include "main.h" #ifdef HAVE_LIBNCURSES #include diff --git a/src/report.cpp b/src/report.cpp index 4ae458549..b7bdf9944 100644 --- a/src/report.cpp +++ b/src/report.cpp @@ -42,7 +42,7 @@ #include "T.h" #include "text.h" #include "util.h" -#include "task.h" +#include "main.h" #ifdef HAVE_LIBNCURSES #include diff --git a/src/tests/autocomplete.t.cpp b/src/tests/autocomplete.t.cpp index 806a3f840..918c6d6ab 100644 --- a/src/tests/autocomplete.t.cpp +++ b/src/tests/autocomplete.t.cpp @@ -27,7 +27,7 @@ #include #include #include -#include +#include Context context; diff --git a/src/tests/filt.t.cpp b/src/tests/filt.t.cpp index 0d4492a88..764bfc8b4 100644 --- a/src/tests/filt.t.cpp +++ b/src/tests/filt.t.cpp @@ -24,7 +24,7 @@ // USA // //////////////////////////////////////////////////////////////////////////////// -#include "task.h" +#include "main.h" #include "test.h" #include "Filter.h" #include "T2.h" diff --git a/src/tests/parse.t.cpp b/src/tests/parse.t.cpp index 2df17d913..477c9ff95 100644 --- a/src/tests/parse.t.cpp +++ b/src/tests/parse.t.cpp @@ -25,7 +25,7 @@ // //////////////////////////////////////////////////////////////////////////////// #include -#include "task.h" +#include "main.h" #include "text.h" #include "test.h" diff --git a/src/tests/t.benchmark.t.cpp b/src/tests/t.benchmark.t.cpp index 1a19c8db1..a90a71b9c 100644 --- a/src/tests/t.benchmark.t.cpp +++ b/src/tests/t.benchmark.t.cpp @@ -26,7 +26,7 @@ //////////////////////////////////////////////////////////////////////////////// #include #include "T.h" -#include "task.h" +#include "main.h" #include "test.h" Context context; diff --git a/src/tests/t.t.cpp b/src/tests/t.t.cpp index ca6d91d36..2d5704c42 100644 --- a/src/tests/t.t.cpp +++ b/src/tests/t.t.cpp @@ -26,7 +26,7 @@ //////////////////////////////////////////////////////////////////////////////// #include "TDB.h" #include "T.h" -#include "task.h" +#include "main.h" #include "test.h" Context context; diff --git a/src/tests/t2.t.cpp b/src/tests/t2.t.cpp index eb21d6a49..d1b0602bf 100644 --- a/src/tests/t2.t.cpp +++ b/src/tests/t2.t.cpp @@ -24,7 +24,7 @@ // USA // //////////////////////////////////////////////////////////////////////////////// -#include "task.h" +#include "main.h" #include "test.h" Context context; diff --git a/src/tests/tdb.t.cpp b/src/tests/tdb.t.cpp index 8931e7d4d..3fc8df123 100644 --- a/src/tests/tdb.t.cpp +++ b/src/tests/tdb.t.cpp @@ -28,7 +28,7 @@ #include #include "TDB.h" -#include "task.h" +#include "main.h" #include "test.h" Context context; diff --git a/src/tests/test.cpp b/src/tests/test.cpp index f5245d2d8..67a54d51c 100644 --- a/src/tests/test.cpp +++ b/src/tests/test.cpp @@ -27,7 +27,7 @@ #include #include #include -#include +#include #include #include #include "test.h" diff --git a/src/tests/text.t.cpp b/src/tests/text.t.cpp index dcabb4d5a..cdc744ad8 100644 --- a/src/tests/text.t.cpp +++ b/src/tests/text.t.cpp @@ -25,7 +25,7 @@ // //////////////////////////////////////////////////////////////////////////////// #include -#include "task.h" +#include "main.h" #include "text.h" #include "test.h" diff --git a/src/util.cpp b/src/util.cpp index 9e3e167c7..f5ea97801 100644 --- a/src/util.cpp +++ b/src/util.cpp @@ -41,7 +41,7 @@ #include "T.h" #include "TDB.h" #include "text.h" -#include "task.h" +#include "main.h" #include "i18n.h" #include "../auto.h"