summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPixel <Pixel>2001-11-19 22:32:34 +0000
committerPixel <Pixel>2001-11-19 22:32:34 +0000
commitcca213f6493119ab3f642e08dba798f557630f53 (patch)
tree38774b6803676235b73b80f06c618a78bf14035d
parentd994b63efc388311700412d0cb0e6e8e1fae4849 (diff)
Headers cleaning
-rw-r--r--include/Action.h6
-rw-r--r--include/Buffer.h3
-rw-r--r--include/Confirm.h5
-rw-r--r--include/CopyJob.h1
-rw-r--r--include/Exceptions.h1
-rw-r--r--include/Form.h9
-rw-r--r--include/Handle.h1
-rw-r--r--include/HttpServ.h2
-rw-r--r--include/IRC.h3
-rw-r--r--include/Input.h1
-rw-r--r--include/Menu.h5
-rw-r--r--include/Message.h5
-rw-r--r--include/Output.h1
-rw-r--r--include/ReadJob.h1
-rw-r--r--include/Regex.h1
-rw-r--r--include/Socket.h3
-rw-r--r--include/String.h1
-rw-r--r--include/Table.h5
-rw-r--r--include/Task.h1
-rw-r--r--include/TaskMan.h1
-rw-r--r--include/Variables.h17
21 files changed, 49 insertions, 24 deletions
diff --git a/include/Action.h b/include/Action.h
index bf3dc1a..fd8b204 100644
--- a/include/Action.h
+++ b/include/Action.h
@@ -33,8 +33,8 @@
class Action : public Base {
public:
- Action(const String & = "");
- virtual ~Action();
+ Action(const String & = "");
+ virtual ~Action();
Action * Look4URL(const String &);
virtual Task * Do(Variables *, Handle *) = 0;
virtual void SendHead(Handle *);
@@ -43,8 +43,10 @@ class Action : public Base {
virtual String GetTitle(void) = 0;
String GetURL(void);
void CleanUp(void);
+
protected:
void Accessed(void);
+
private:
static Action * start;
Action * next, * prev;
diff --git a/include/Buffer.h b/include/Buffer.h
index 8b1c131..4971eb9 100644
--- a/include/Buffer.h
+++ b/include/Buffer.h
@@ -12,13 +12,14 @@
class Buffer : public Handle {
public:
Buffer();
- ~Buffer();
+ virtual ~Buffer();
virtual ssize_t write(const void *buf, size_t count);
virtual ssize_t read(void *buf, size_t count) throw (GeneralException);
virtual bool CanRead();
virtual bool CanWrite();
virtual String GetName();
Buffer operator=(const Buffer &);
+
private:
char * buffer;
int realsiz, bufsiz, ptr;
diff --git a/include/Confirm.h b/include/Confirm.h
index d327f23..9e2cc7b 100644
--- a/include/Confirm.h
+++ b/include/Confirm.h
@@ -18,10 +18,11 @@
class Confirm : public Action {
public:
- Confirm(const String & titre, const String & msg, const String & url, Action * yes, Action * no = 0);
- virtual ~Confirm() { }
+ Confirm(const String & titre, const String & msg, const String & url, Action * yes, Action * no = 0);
+ virtual ~Confirm() { }
virtual String GetTitle();
virtual Task * Do(Variables *, Handle *);
+
private:
String tit, msg;
Action * NYes, * NNo;
diff --git a/include/CopyJob.h b/include/CopyJob.h
index c4cda81..bd859bb 100644
--- a/include/CopyJob.h
+++ b/include/CopyJob.h
@@ -13,6 +13,7 @@ class CopyJob : public Task {
virtual ~CopyJob();
virtual int Do() throw (GeneralException);
virtual String GetName();
+
private:
Handle * s, * d;
bool ds;
diff --git a/include/Exceptions.h b/include/Exceptions.h
index 04b30d6..052002e 100644
--- a/include/Exceptions.h
+++ b/include/Exceptions.h
@@ -77,6 +77,7 @@ class GeneralException : public Base {
GeneralException(const GeneralException &);
~GeneralException();
char * GetMsg();
+
protected:
GeneralException();
char * msg;
diff --git a/include/Form.h b/include/Form.h
index 1b22742..dd923be 100644
--- a/include/Form.h
+++ b/include/Form.h
@@ -24,12 +24,13 @@
class Form : public Action {
public:
- Form(const String & titre, const String & url, const String & inv,
- String * names, String * invs, String * defaults, String ** lists, String ** descs,
- int nb, Action * ok = 0);
- virtual ~Form() { }
+ Form(const String & titre, const String & url, const String & inv,
+ String * names, String * invs, String * defaults, String ** lists, String ** descs,
+ int nb, Action * ok = 0);
+ virtual ~Form() { }
virtual String GetTitle();
virtual Task * Do(Variables *, Handle *);
+
private:
String tit, iv, * nms, * ivs, * defs, ** lsts, ** dscs;
int n;
diff --git a/include/Handle.h b/include/Handle.h
index 19de77a..237adff 100644
--- a/include/Handle.h
+++ b/include/Handle.h
@@ -36,6 +36,7 @@ class Handle : public Base {
virtual bool CanRead();
virtual bool CanWrite();
virtual String GetName();
+
protected:
Handle(int h);
int GetHandle();
diff --git a/include/HttpServ.h b/include/HttpServ.h
index 51511b2..564e24d 100644
--- a/include/HttpServ.h
+++ b/include/HttpServ.h
@@ -23,8 +23,10 @@ class HttpServ : public Task {
~HttpServ() {}
void SetMenu(Action *);
virtual String GetName();
+
protected:
virtual int Do();
+
private:
Socket Listener;
Action * p;
diff --git a/include/IRC.h b/include/IRC.h
index f8db55b..457c199 100644
--- a/include/IRC.h
+++ b/include/IRC.h
@@ -170,11 +170,13 @@ class Channel : public Base {
public:
Channel(const String &, const String & = "");
~Channel();
+
protected:
Channel * GetNext();
Channel * GetPrev();
String GetName();
String GetKey();
+
private:
String Name, Key;
static Channel * start;
@@ -187,6 +189,7 @@ class IRC : public Base {
virtual ~IRC();
bool Connect();
void MainLoop();
+
private:
int Parse(const String &);
String nick, server, user, name;
diff --git a/include/Input.h b/include/Input.h
index 682cee1..471ba91 100644
--- a/include/Input.h
+++ b/include/Input.h
@@ -16,6 +16,7 @@ class Input : public Handle {
virtual bool CanWrite();
virtual bool CanRead();
virtual String GetName();
+
protected:
String n;
};
diff --git a/include/Menu.h b/include/Menu.h
index e656657..bb0b74c 100644
--- a/include/Menu.h
+++ b/include/Menu.h
@@ -18,10 +18,11 @@
class Menu : public Action {
public:
- Menu(const String & titre, const String & url, String * labels, Action ** listac, int nb);
- virtual ~Menu() {}
+ Menu(const String & titre, const String & url, String * labels, Action ** listac, int nb);
+ virtual ~Menu() {}
virtual String GetTitle();
virtual Task * Do(Variables *, Handle *);
+
private:
String tit;
String * lt;
diff --git a/include/Message.h b/include/Message.h
index 77bd62c..41ca841 100644
--- a/include/Message.h
+++ b/include/Message.h
@@ -17,10 +17,11 @@
class Message : public Action {
public:
- Message(const String & titre, const String & msg, const String & url, Action * ok = 0);
- virtual ~Message() { }
+ Message(const String & titre, const String & msg, const String & url, Action * ok = 0);
+ virtual ~Message() { }
virtual String GetTitle();
virtual Task * Do(Variables *, Handle *);
+
private:
String tit, msg;
Action * Next;
diff --git a/include/Output.h b/include/Output.h
index 4e1e092..10a1849 100644
--- a/include/Output.h
+++ b/include/Output.h
@@ -16,6 +16,7 @@ class Output : public Handle {
virtual bool CanWrite();
virtual bool CanRead();
virtual String GetName();
+
protected:
String n;
};
diff --git a/include/ReadJob.h b/include/ReadJob.h
index 5cc4846..ae0eef7 100644
--- a/include/ReadJob.h
+++ b/include/ReadJob.h
@@ -12,6 +12,7 @@ class ReadJob : public Task {
virtual ~ReadJob();
virtual int Do() throw (GeneralException);
virtual String GetName();
+
private:
Handle * s, * d;
};
diff --git a/include/Regex.h b/include/Regex.h
index 66f6fc3..6786041 100644
--- a/include/Regex.h
+++ b/include/Regex.h
@@ -6,6 +6,7 @@
class Regex : public Base {
public:
+
private:
};
diff --git a/include/Socket.h b/include/Socket.h
index 514db43..9e0f85f 100644
--- a/include/Socket.h
+++ b/include/Socket.h
@@ -42,8 +42,9 @@ class Socket : public Handle {
virtual bool CanRead();
virtual bool CanWrite();
virtual String GetName();
+
private:
- Socket(int s);
+ Socket(int s);
bool connected, listening;
};
diff --git a/include/String.h b/include/String.h
index ddb0cde..94faa54 100644
--- a/include/String.h
+++ b/include/String.h
@@ -77,6 +77,7 @@ class String : public Base {
bool operator<(const String &) const;
bool operator>(const String &) const;
char operator[](size_t i) const;
+
private:
String(int hs, const char *);
static char t[BUFSIZ];
diff --git a/include/Table.h b/include/Table.h
index f1ec6c6..97b1503 100644
--- a/include/Table.h
+++ b/include/Table.h
@@ -20,10 +20,11 @@
class Table : public Action {
public:
- Table(const String & titre, const String & url, String * heads, String * cells, int nbcol, int nblgn, Action * ok = 0);
- virtual ~Table() { }
+ Table(const String & titre, const String & url, String * heads, String * cells, int nbcol, int nblgn, Action * ok = 0);
+ virtual ~Table() { }
virtual String GetTitle();
virtual Task * Do(Variables *, Handle *);
+
private:
String tit, * hds, * cls;
int nc, nl;
diff --git a/include/Task.h b/include/Task.h
index 503e0df..b727cbe 100644
--- a/include/Task.h
+++ b/include/Task.h
@@ -30,6 +30,7 @@ class Task : public Base {
void Stop();
void Restart();
bool IsStopped();
+
protected:
virtual int Do() throw (GeneralException);
int current;
diff --git a/include/TaskMan.h b/include/TaskMan.h
index 16bc0ee..2025e5c 100644
--- a/include/TaskMan.h
+++ b/include/TaskMan.h
@@ -11,6 +11,7 @@ class TaskMan : public Base {
static int RemoveTask(Task *);
static void Init() throw (GeneralException);
static void MainLoop() throw (GeneralException);
+
private:
static vector<Task *> TaskList;
static int number;
diff --git a/include/Variables.h b/include/Variables.h
index c4d6ba3..199e96f 100644
--- a/include/Variables.h
+++ b/include/Variables.h
@@ -31,14 +31,15 @@ class Variables : public Base {
public:
Variables(int = 0);
~Variables();
- void SetTo(int i, const String &);
- String operator[](const String &);
- String operator[](int i);
- void Dump(Handle *);
- int GetNb();
- void Add(const String &);
- void Del(int);
- void Del(const String &);
+ void SetTo(int i, const String &);
+ String operator[](const String &);
+ String operator[](int i);
+ void Dump(Handle *);
+ int GetNb();
+ void Add(const String &);
+ void Del(int);
+ void Del(const String &);
+
private:
vector<String> Vars;
int nbvars;