Code Cleanup

- Eliminated '#include "x"' by changing all to '#include <x>'.

src/API.h

@@ -28,7 +28,7 @@
 #define INCLUDED_API
 #define L10N                                           // Localization complete.
 
-#include "../cmake.h"
+#include <../cmake.h>
 #ifdef HAVE_LIBLUA
 
 #include <vector>

src/Att.h

@@ -30,7 +30,7 @@
 
 #include <string>
 #include <vector>
-#include "Nibbler.h"
+#include <Nibbler.h>
 
 class Att
 {

src/Color.cpp

@@ -29,9 +29,9 @@
 #include <sstream>
 #include <vector>
 #include <algorithm>
-#include "Color.h"
+#include <Color.h>
-#include "text.h"
+#include <text.h>
-#include "i18n.h"
+#include <i18n.h>
 
 ////////////////////////////////////////////////////////////////////////////////
 static struct

src/Config.cpp

@@ -33,13 +33,13 @@
 #include <unistd.h>
 #include <stdlib.h>
 #include <pwd.h>
-#include "Directory.h"
+#include <Directory.h>
-#include "Date.h"
+#include <Date.h>
-#include "File.h"
+#include <File.h>
-#include "Config.h"
+#include <Config.h>
-#include "text.h"
+#include <text.h>
-#include "util.h"
+#include <util.h>
-#include "../cmake.h"
+#include <cmake.h>
 
 ////////////////////////////////////////////////////////////////////////////////
 // This string is used in two ways:

src/Config.h

@@ -31,7 +31,7 @@
 #include <map>
 #include <vector>
 #include <string>
-#include "File.h"
+#include <File.h>
 
 class Config : public std::map <std::string, std::string>
 {

src/DOM.cpp

@@ -30,7 +30,7 @@
 #include <text.h>
 #include <i18n.h>
 #include <DOM.h>
-#include "../cmake.h"
+#include <cmake.h>
 
 #ifdef HAVE_LIBLUA
 extern "C"

src/Date.cpp

@@ -30,10 +30,10 @@
 #include <assert.h>
 #include <stdlib.h>
 #include <ctype.h>
-#include "Date.h"
+#include <Date.h>
-#include "text.h"
+#include <text.h>
-#include "util.h"
+#include <util.h>
-#include "Context.h"
+#include <Context.h>
 
 extern Context context;
 

src/Directory.cpp

@@ -31,7 +31,7 @@
 #include <dirent.h>
 #include <string.h>
 #include <Directory.h>
-#include "../cmake.h"
+#include <cmake.h>
 
 ////////////////////////////////////////////////////////////////////////////////
 Directory::Directory ()

src/Duration.cpp

@@ -31,9 +31,9 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
-#include "text.h"
+#include <text.h>
-#include "util.h"
+#include <util.h>
-#include "Duration.h"
+#include <Duration.h>
 
 static const char* durations[] =
 {

src/File.h

@@ -33,7 +33,7 @@
 #include <string>
 #include <vector>
 #include <sys/stat.h>
-#include "Path.h"
+#include <Path.h>
 
 class File : public Path
 {

src/Filter.cpp

@@ -26,9 +26,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 #include <sstream>
-#include "Filter.h"
+#include <Filter.h>
-#include "util.h"
+#include <util.h>
-#include "main.h"
+#include <main.h>
 
 ////////////////////////////////////////////////////////////////////////////////
 // For every Att in the filter, lookup the equivalent in Record, and perform a

src/Filter.h

@@ -29,9 +29,9 @@
 #define L10N                                           // Localization complete.
 
 #include <vector>
-#include "Att.h"
+#include <Att.h>
-#include "Task.h"
+#include <Task.h>
-#include "Record.h"
+#include <Record.h>
 
 class Filter : public std::vector <Att>
 {

src/Hooks.cpp

@@ -27,9 +27,9 @@
 
 #include <iostream>
 #include <algorithm>
-#include "Context.h"
+#include <Context.h>
-#include "Hooks.h"
+#include <Hooks.h>
-#include "Timer.h"
+#include <Timer.h>
 
 extern Context context;
 

src/Hooks.h

@@ -30,8 +30,8 @@
 
 #include <vector>
 #include <string>
-#include "API.h"
+#include <API.h>
-#include "../cmake.h"
+#include <cmake.h>
 
 // Hook class representing a single hook, which is just a three-way map.
 class Hook

src/Location.cpp

@@ -25,7 +25,7 @@
 //
 ////////////////////////////////////////////////////////////////////////////////
 
-#include "Location.h"
+#include <Location.h>
 
 ////////////////////////////////////////////////////////////////////////////////
 Location::Location ()

src/Path.cpp

@@ -31,8 +31,8 @@
 #include <sys/stat.h>
 #include <pwd.h>
 #include <unistd.h>
-#include "Path.h"
+#include <Path.h>
-#include "../cmake.h"
+#include <cmake.h>
 
 ////////////////////////////////////////////////////////////////////////////////
 Path::Path ()

src/Permission.cpp

@@ -26,10 +26,10 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 #include <iostream>
-#include "Permission.h"
+#include <Permission.h>
-#include "Context.h"
+#include <Context.h>
-#include "util.h"
+#include <util.h>
-#include "i18n.h"
+#include <i18n.h>
 
 extern Context context;
 

src/Permission.h

@@ -29,7 +29,7 @@
 #define L10N                                           // Localization complete.
 
 #include <string>
-#include "Task.h"
+#include <Task.h>
 
 class Permission
 {

src/Record.cpp

@@ -28,11 +28,11 @@
 #include <iostream>
 #include <sstream>
 #include <stdlib.h>
-#include "util.h"
+#include <util.h>
-#include "Nibbler.h"
+#include <Nibbler.h>
-#include "Context.h"
+#include <Context.h>
-#include "i18n.h"
+#include <i18n.h>
-#include "Record.h"
+#include <Record.h>
 
 extern Context context;
 

src/Record.h

@@ -31,7 +31,7 @@
 #include <vector>
 #include <map>
 #include <string>
-#include "Att.h"
+#include <Att.h>
 
 class Record : public std::map <std::string, Att>
 {

src/Sequence.cpp

@@ -29,11 +29,11 @@
 #include <string>
 #include <algorithm>
 #include <ctype.h>
-#include "util.h"
+#include <util.h>
-#include "text.h"
+#include <text.h>
-#include "i18n.h"
+#include <i18n.h>
-#include "Context.h"
+#include <Context.h>
-#include "Sequence.h"
+#include <Sequence.h>
 
 extern Context context;
 

src/Subst.h

@@ -29,7 +29,7 @@
 #define L10N                                           // Localization complete.
 
 #include <string>
-#include "Att.h"
+#include <Att.h>
 
 class Subst
 {

src/TDB.cpp

@@ -35,19 +35,19 @@
 #include <stdio.h>
 #include <sys/file.h>
 #include <stdlib.h>
-#include "text.h"
+#include <text.h>
-#include "util.h"
+#include <util.h>
-#include "TDB.h"
+#include <TDB.h>
-#include "Directory.h"
+#include <Directory.h>
-#include "File.h"
+#include <File.h>
-#include "ViewText.h"
+#include <ViewText.h>
-#include "Timer.h"
+#include <Timer.h>
-#include "Color.h"
+#include <Color.h>
-#include "main.h"
+#include <main.h>
 
 #define NDEBUG
-#include "assert.h"
+#include <assert.h>
-#include "Taskmod.h"
+#include <Taskmod.h>
 
 #define DEBUG_OUTPUT 0
 

src/TDB.h

@@ -31,9 +31,9 @@
 #include <map>
 #include <vector>
 #include <string>
-#include "Location.h"
+#include <Location.h>
-#include "Filter.h"
+#include <Filter.h>
-#include "Task.h"
+#include <Task.h>
 
 // Length of longest line.
 #define T_LINE_MAX 32768

src/TDB2.cpp

@@ -279,19 +279,19 @@ void TDB2::commit ()
 #include <stdio.h>
 #include <sys/file.h>
 #include <stdlib.h>
-#include "text.h"
+#include <text.h>
-#include "util.h"
+#include <util.h>
-#include "TDB.h"
+#include <TDB.h>
-#include "Directory.h"
+#include <Directory.h>
-#include "File.h"
+#include <File.h>
-#include "ViewText.h"
+#include <ViewText.h>
-#include "Timer.h"
+#include <Timer.h>
-#include "Color.h"
+#include <Color.h>
-#include "main.h"
+#include <main.h>
 
 #define NDEBUG
-#include "assert.h"
+#include <assert.h>
-#include "Taskmod.h"
+#include <Taskmod.h>
 
 #define DEBUG_OUTPUT 0
 

src/TDB2.h

@@ -102,9 +102,9 @@ private:
 
 
 /*
-#include "Location.h"
+#include <Location.h>
-#include "Filter.h"
+#include <Filter.h>
-#include "Task.h"
+#include <Task.h>
 
 // Length of longest line.
 #define T_LINE_MAX 32768

src/Task.h

@@ -29,9 +29,9 @@
 #define L10N                                           // Localization complete.
 
 #include <string>
-#include "Record.h"
+#include <Record.h>
-#include "Subst.h"
+#include <Subst.h>
-#include "Sequence.h"
+#include <Sequence.h>
 
 class Task : public Record
 {

src/Taskmod.cpp

@@ -28,7 +28,7 @@
 #include <sstream>
 #include <iostream>
 #include <assert.h>
-#include "Taskmod.h"
+#include <Taskmod.h>
 
 ////////////////////////////////////////////////////////////////////////////////
 Taskmod::Taskmod ()

src/Timer.cpp

@@ -27,8 +27,8 @@
 #include <iostream>
 #include <iomanip>
 #include <sstream>
-#include "Timer.h"
+#include <Timer.h>
-#include "Context.h"
+#include <Context.h>
 
 extern Context context;
 

src/Transport.cpp

@@ -27,11 +27,11 @@
 
 #include <iostream>
 #include <stdlib.h>
-#include "util.h"
+#include <util.h>
-#include "Transport.h"
+#include <Transport.h>
-#include "TransportSSH.h"
+#include <TransportSSH.h>
-#include "TransportRSYNC.h"
+#include <TransportRSYNC.h>
-#include "TransportCurl.h"
+#include <TransportCurl.h>
 
 ////////////////////////////////////////////////////////////////////////////////
 Transport::Transport (const Uri& uri)

src/Transport.h

@@ -30,7 +30,7 @@
 
 #include <string>
 #include <vector>
-#include "Uri.h"
+#include <Uri.h>
 
 class Transport {
 public:

src/TransportCurl.cpp

@@ -25,9 +25,9 @@
 //
 ////////////////////////////////////////////////////////////////////////////////
 
-#include "TransportCurl.h"
+#include <TransportCurl.h>
-#include "text.h"
+#include <text.h>
-#include "util.h"
+#include <util.h>
 
 ////////////////////////////////////////////////////////////////////////////////
 TransportCurl::TransportCurl(const Uri& uri) : Transport(uri)

src/TransportRSYNC.cpp

@@ -25,7 +25,7 @@
 //
 ////////////////////////////////////////////////////////////////////////////////
 
-#include "TransportRSYNC.h"
+#include <TransportRSYNC.h>
 
 ////////////////////////////////////////////////////////////////////////////////
 TransportRSYNC::TransportRSYNC(const Uri& uri) : Transport(uri)

src/TransportSSH.cpp

@@ -25,7 +25,7 @@
 //
 ////////////////////////////////////////////////////////////////////////////////
 
-#include "TransportSSH.h"
+#include <TransportSSH.h>
 
 ////////////////////////////////////////////////////////////////////////////////
 TransportSSH::TransportSSH(const Uri& uri) : Transport(uri)

src/Uri.cpp

@@ -25,8 +25,8 @@
 //
 ////////////////////////////////////////////////////////////////////////////////
 
-#include "Context.h"
+#include <Context.h>
-#include "Uri.h"
+#include <Uri.h>
 
 extern Context context;
 

src/columns/CMakeLists.txt

@@ -1,5 +1,6 @@
 cmake_minimum_required (VERSION 2.8)
-include_directories (${CMAKE_SOURCE_DIR}/src
+include_directories (${CMAKE_SOURCE_DIR}
+                     ${CMAKE_SOURCE_DIR}/src
                      ${CMAKE_SOURCE_DIR}/src/commands
                      ${CMAKE_SOURCE_DIR}/src/columns
                      ${TASK_INCLUDE_DIRS})

src/command.cpp

@@ -36,17 +36,17 @@
 #include <pwd.h>
 #include <time.h>
 
-#include "Permission.h"
+#include <Permission.h>
-#include "Directory.h"
+#include <Directory.h>
-#include "Nibbler.h"
+#include <Nibbler.h>
-#include "text.h"
+#include <text.h>
-#include "util.h"
+#include <util.h>
-#include "main.h"
+#include <main.h>
-#include "Transport.h"
+#include <Transport.h>
-#include "ViewText.h"
+#include <ViewText.h>
-#include "../cmake.h"
+#include <cmake.h>
 #ifdef HAVE_COMMIT
-#include "../commit.h"
+#include <commit.h>
 #endif
 
 extern Context context;

src/diag.cpp

@@ -38,9 +38,9 @@
 #include <File.h>
 #include <main.h>
 #include <util.h>
-#include "../cmake.h"
+#include <cmake.h>
 #ifdef HAVE_COMMIT
-#include "../commit.h"
+#include <commit.h>
 #endif
 
 #ifdef HAVE_LIBLUA

src/edit.cpp

@@ -33,13 +33,13 @@
 #include <stdlib.h>
 #include <limits.h>
 #include <string.h>
-#include "Directory.h"
+#include <Directory.h>
-#include "File.h"
+#include <File.h>
-#include "Date.h"
+#include <Date.h>
-#include "Duration.h"
+#include <Duration.h>
-#include "text.h"
+#include <text.h>
-#include "util.h"
+#include <util.h>
-#include "main.h"
+#include <main.h>
 
 extern Context context;
 

src/export.cpp

@@ -29,11 +29,11 @@
 #include <sstream>
 #include <stdlib.h>
 
-#include "Att.h"
+#include <Att.h>
-#include "text.h"
+#include <text.h>
-#include "util.h"
+#include <util.h>
-#include "main.h"
+#include <main.h>
-#include "../cmake.h"
+#include <cmake.h>
 
 extern Context context;
 

src/feedback.cpp

@@ -35,7 +35,7 @@
 #include <main.h>
 #include <text.h>
 #include <util.h>
-#include "../cmake.h"
+#include <cmake.h>
 
 extern Context context;
 

src/i18n.h

@@ -40,7 +40,7 @@
 #define INCLUDED_I18N
 #define L10N                                           // Localization complete.
 
-#include "../cmake.h"
+#include <cmake.h>
 
 #if PACKAGE_LANGUAGE == LANGUAGE_EN_US
 #include <en-US.h>

src/import.cpp

@@ -34,7 +34,7 @@
 #include <text.h>
 #include <util.h>
 #include <main.h>
-#include "Transport.h"
+#include <Transport.h>
 
 extern Context context;
 

src/interactive.cpp

@@ -28,10 +28,10 @@
 #include <sstream>
 #include <stdio.h>
 #include <sys/ioctl.h>
-#include "Context.h"
+#include <Context.h>
-#include "main.h"
+#include <main.h>
-#include "i18n.h"
+#include <i18n.h>
-#include "../cmake.h"
+#include <cmake.h>
 
 ////////////////////////////////////////////////////////////////////////////////
 int Context::getWidth ()

src/main.cpp

@@ -36,7 +36,7 @@
 
 #include <i18n.h>
 #include <Context.h>
-#include "../cmake.h"
+#include <cmake.h>
 
 Context context;
 

src/main.h

@@ -36,10 +36,10 @@
 #include <vector>
 #include <map>
 #include <sys/types.h>
-#include "Context.h"
+#include <Context.h>
-#include "Date.h"
+#include <Date.h>
-#include "Color.h"
+#include <Color.h>
-#include "../cmake.h"
+#include <cmake.h>
 
 // recur.cpp
 void handleRecurrence ();

src/recur.cpp

@@ -37,12 +37,12 @@
 #include <pwd.h>
 #include <time.h>
 
-#include "Context.h"
+#include <Context.h>
-#include "Date.h"
+#include <Date.h>
-#include "Duration.h"
+#include <Duration.h>
-#include "text.h"
+#include <text.h>
-#include "util.h"
+#include <util.h>
-#include "main.h"
+#include <main.h>
 
 // Global context for use by all.
 extern Context context;

src/rules.cpp

@@ -26,11 +26,11 @@
 ////////////////////////////////////////////////////////////////////////////////
 #include <iostream>
 #include <stdlib.h>
-#include "Context.h"
+#include <Context.h>
-#include "Date.h"
+#include <Date.h>
-#include "text.h"
+#include <text.h>
-#include "util.h"
+#include <util.h>
-#include "main.h"
+#include <main.h>
 
 #define L10N                                           // Localization complete.
 

src/rx.cpp

@@ -27,7 +27,7 @@
 
 #include <stdlib.h>
 #include <regex.h>
-#include "rx.h"
+#include <rx.h>
 
 #define L10N                                           // Localization complete.
 

src/text.h

@@ -30,7 +30,7 @@
 
 #include <string>
 #include <vector>
-#include "../cmake.h"
+#include <cmake.h>
 
 // text.cpp, Non-UTF-8 aware.
 void wrapText (std::vector <std::string>&, const std::string&, const int);

src/util.cpp

@@ -40,12 +40,12 @@
 #include <pwd.h>
 #include <errno.h>
 
-#include "Date.h"
+#include <Date.h>
-#include "text.h"
+#include <text.h>
-#include "main.h"
+#include <main.h>
-#include "i18n.h"
+#include <i18n.h>
-#include "util.h"
+#include <util.h>
-#include "../cmake.h"
+#include <cmake.h>
 
 extern Context context;
 

src/util.h

@@ -32,8 +32,8 @@
 #include <vector>
 #include <map>
 #include <sys/types.h>
-#include "Task.h"
+#include <Task.h>
-#include "../cmake.h"
+#include <cmake.h>
 
 #ifndef min
 #define min(a,b) ((a) < (b) ? (a) : (b))

test/CMakeLists.txt

@@ -1,5 +1,6 @@
 cmake_minimum_required (VERSION 2.8)
-include_directories (${CMAKE_SOURCE_DIR}/src
+include_directories (${CMAKE_SOURCE_DIR}
+                     ${CMAKE_SOURCE_DIR}/src
                      ${CMAKE_SOURCE_DIR}/src/commands
                      ${CMAKE_SOURCE_DIR}/src/columns
                      ${CMAKE_SOURCE_DIR}/test

test/dom.t.cpp

@@ -26,7 +26,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 #include <iostream>
 #include <unistd.h>
-#include "../cmake.h"
+#include <cmake.h>
 #include <main.h>
 #include <test.h>
 

test/filt.t.cpp

@@ -24,10 +24,10 @@
 //     USA
 //
 ////////////////////////////////////////////////////////////////////////////////
-#include "main.h"
+#include <main.h>
-#include "test.h"
+#include <test.h>
-#include "Filter.h"
+#include <Filter.h>
-#include "Task.h"
+#include <Task.h>
 
 Context context;
 

test/list.t.cpp

@@ -25,9 +25,9 @@
 //
 ////////////////////////////////////////////////////////////////////////////////
 #include <iostream>
-#include "Context.h"
+#include <Context.h>
-#include "main.h"
+#include <main.h>
-#include "test.h"
+#include <test.h>
 
 Context context;
 

test/t.benchmark.t.cpp

@@ -25,9 +25,9 @@
 //
 ////////////////////////////////////////////////////////////////////////////////
 #include <sys/time.h>
-#include "Task.h"
+#include <Task.h>
-#include "main.h"
+#include <main.h>
-#include "test.h"
+#include <test.h>
 
 Context context;
 

test/t.t.cpp

@@ -24,8 +24,8 @@
 //     USA
 //
 ////////////////////////////////////////////////////////////////////////////////
-#include "main.h"
+#include <main.h>
-#include "test.h"
+#include <test.h>
 
 Context context;
 

test/tdb2.t.cpp

@@ -27,8 +27,8 @@
 #include <iostream>
 #include <unistd.h>
 
-#include "main.h"
+#include <main.h>
-#include "test.h"
+#include <test.h>
 
 Context context;
 

test/test.cpp

@@ -31,7 +31,7 @@
 #include <main.h>
 #include <util.h>
 #include <text.h>
-#include "test.h"
+#include <test.h>
 
 ///////////////////////////////////////////////////////////////////////////////
 UnitTest::UnitTest ()

test/text.t.cpp

@@ -25,10 +25,10 @@
 //
 ////////////////////////////////////////////////////////////////////////////////
 #include <iostream>
-#include "main.h"
+#include <main.h>
-#include "text.h"
+#include <text.h>
-#include "utf8.h"
+#include <utf8.h>
-#include "test.h"
+#include <test.h>
 
 Context context;
 

test/util.t.cpp

@@ -25,9 +25,9 @@
 //
 ////////////////////////////////////////////////////////////////////////////////
 #include <iostream>
-#include "main.h"
+#include <main.h>
-#include "util.h"
+#include <util.h>
-#include "test.h"
+#include <test.h>
 
 Context context;