--- smsdaemon/common.h	2008/06/10 15:34:19	36
+++ smsdaemon/Common.h	2008/12/21 18:41:08	208
@@ -2,12 +2,8 @@
 #define __COMMON_H__
 
 #include <string>
-#define VERSION "smsdaemon v0.1 by Torben Nielsen\n"
 
 
-#include "PluginManager.h"
-#include "TaskManager.h"
-
 //time_t is defines as long int ! //No need to include time.h
 
 class SmsCounter
@@ -28,33 +24,47 @@
 
 	bool isDaemon;
 	bool isDebug;
+	bool daemonized;
 	int uid;
 	int gid;
 	volatile bool mainContinue;
+	volatile bool reloadConfig;
+
+	std::string configFilePath;
 
 	std::string pidfile;
 	std::string spooldir;
 
-	PluginManager pluginManager;
-	TaskManager taskManager;
 	long int daemonStart;
 
 	SmsCounter smsCounter;
 
-	void logMessage(std::string str);
-	void setLogfile(std::string file) {_logFile = file;}
+	class PluginManager* GetPluginManager();
+	class TaskManager* GetTaskManager();
+	class ConfigFile* GetConfigfile();
+	void SetConfigfile(class ConfigFile*);
+
 
 	void loadConfig(int argc, char* argv[]);
 
-	std::string getStatusMessage();	
+	std::string getStatusMessage();
 private:
-	Common() {}
+	Common();
 	Common(const Common&) {}
-	Common& operator=(const Common) {return *this;}
+	Common& operator=(const Common)
+	{
+		return *this;
+	}
+	~Common();
+
+
+
+	class PluginManager* _pluginManager;
+	class TaskManager* _taskManager;
+	class ConfigFile* _configFile;
 
 	void printUsage();
 
-	std::string _logFile;
 };