ColTypeDate: Renamed 'ColDate' to 'ColTypeDate'

- Renamed files ColDate* to ColTypeDate*.
- Renamed objects ColumnDate* to ColumnTypeDate*.
- This is mainly to make way for ColType{Duration,String,Numeric}, while leaving
  ColString untouched. ColString is used only for ViewText columns, but may soon
  be replaced by ColTypeString. Unknown.
This commit is contained in:
Paul Beckingham 2015-10-31 11:35:24 -04:00
parent 6baff92b5a
commit 2a6ce539d0
12 changed files with 27 additions and 27 deletions

View file

@ -6,7 +6,7 @@ include_directories (${CMAKE_SOURCE_DIR}
${TASK_INCLUDE_DIRS})
set (columns_SRCS Column.cpp Column.h
ColDate.cpp ColDate.h
ColTypeDate.cpp ColTypeDate.h
ColDepends.cpp ColDepends.h
ColDescription.cpp ColDescription.h
ColDue.cpp ColDue.h

View file

@ -27,9 +27,9 @@
#ifndef INCLUDED_COLDUE
#define INCLUDED_COLDUE
#include <ColDate.h>
#include <ColTypeDate.h>
class ColumnDue : public ColumnDate
class ColumnDue : public ColumnTypeDate
{
public:
ColumnDue ();

View file

@ -27,9 +27,9 @@
#ifndef INCLUDED_COLEND
#define INCLUDED_COLEND
#include <ColDate.h>
#include <ColTypeDate.h>
class ColumnEnd : public ColumnDate
class ColumnEnd : public ColumnTypeDate
{
public:
ColumnEnd ();

View file

@ -27,9 +27,9 @@
#ifndef INCLUDED_COLENTRY
#define INCLUDED_COLENTRY
#include <ColDate.h>
#include <ColTypeDate.h>
class ColumnEntry : public ColumnDate
class ColumnEntry : public ColumnTypeDate
{
public:
ColumnEntry ();

View file

@ -27,9 +27,9 @@
#ifndef INCLUDED_COLMODIFIED
#define INCLUDED_COLMODIFIED
#include <ColDate.h>
#include <ColTypeDate.h>
class ColumnModified : public ColumnDate
class ColumnModified : public ColumnTypeDate
{
public:
ColumnModified ();

View file

@ -27,9 +27,9 @@
#ifndef INCLUDED_COLSCHED
#define INCLUDED_COLSCHED
#include <ColDate.h>
#include <ColTypeDate.h>
class ColumnScheduled : public ColumnDate
class ColumnScheduled : public ColumnTypeDate
{
public:
ColumnScheduled ();

View file

@ -75,7 +75,7 @@ void ColumnStart::measure (Task& task, unsigned int& minimum, unsigned int& maxi
minimum = maximum = 0;
}
else
ColumnDate::measure (task, minimum, maximum);
ColumnTypeDate::measure (task, minimum, maximum);
}
}
@ -97,7 +97,7 @@ void ColumnStart::render (
context.config.get ("active.indicator"), width)));
}
else
ColumnDate::render (lines, task, width, color);
ColumnTypeDate::render (lines, task, width, color);
}
}

View file

@ -27,9 +27,9 @@
#ifndef INCLUDED_COLSTART
#define INCLUDED_COLSTART
#include <ColDate.h>
#include <ColTypeDate.h>
class ColumnStart : public ColumnDate
class ColumnStart : public ColumnTypeDate
{
public:
ColumnStart ();

View file

@ -27,7 +27,7 @@
#include <cmake.h>
#include <math.h>
#include <Context.h>
#include <ColDate.h>
#include <ColTypeDate.h>
#include <ISO8601.h>
#include <text.h>
#include <i18n.h>
@ -35,7 +35,7 @@
extern Context context;
////////////////////////////////////////////////////////////////////////////////
ColumnDate::ColumnDate ()
ColumnTypeDate::ColumnTypeDate ()
{
_name = "";
_type = "date";
@ -61,13 +61,13 @@ ColumnDate::ColumnDate ()
}
////////////////////////////////////////////////////////////////////////////////
ColumnDate::~ColumnDate ()
ColumnTypeDate::~ColumnTypeDate ()
{
}
////////////////////////////////////////////////////////////////////////////////
// Set the minimum and maximum widths for the value.
void ColumnDate::measure (Task& task, unsigned int& minimum, unsigned int& maximum)
void ColumnTypeDate::measure (Task& task, unsigned int& minimum, unsigned int& maximum)
{
minimum = maximum = 0;
@ -124,7 +124,7 @@ void ColumnDate::measure (Task& task, unsigned int& minimum, unsigned int& maxim
}
////////////////////////////////////////////////////////////////////////////////
void ColumnDate::render (
void ColumnTypeDate::render (
std::vector <std::string>& lines,
Task& task,
int width,

View file

@ -33,11 +33,11 @@
#include <Color.h>
#include <Task.h>
class ColumnDate : public Column
class ColumnTypeDate : public Column
{
public:
ColumnDate ();
virtual ~ColumnDate ();
ColumnTypeDate ();
virtual ~ColumnTypeDate ();
virtual void measure (Task&, unsigned int&, unsigned int&);
virtual void render (std::vector <std::string>&, Task&, int, Color&);

View file

@ -27,9 +27,9 @@
#ifndef INCLUDED_COLUNTIL
#define INCLUDED_COLUNTIL
#include <ColDate.h>
#include <ColTypeDate.h>
class ColumnUntil : public ColumnDate
class ColumnUntil : public ColumnTypeDate
{
public:
ColumnUntil ();

View file

@ -27,9 +27,9 @@
#ifndef INCLUDED_COLWAIT
#define INCLUDED_COLWAIT
#include <ColDate.h>
#include <ColTypeDate.h>
class ColumnWait : public ColumnDate
class ColumnWait : public ColumnTypeDate
{
public:
ColumnWait ();