From 1765b93250ac3b89947c3da7f0c7266a910367c9 Mon Sep 17 00:00:00 2001
From: Stijn Buys <ingar@osirion.org>
Date: Sat, 2 Feb 2008 13:21:22 +0000
Subject: moved ConsoleInterface to libsys
---
src/common/Makefile.am | 6 -----
src/common/common.h | 21 ---------------
src/common/consoleinterface.cc | 36 --------------------------
src/common/consoleinterface.h | 59 ------------------------------------------
4 files changed, 122 deletions(-)
delete mode 100644 src/common/Makefile.am
delete mode 100644 src/common/common.h
delete mode 100644 src/common/consoleinterface.cc
delete mode 100644 src/common/consoleinterface.h
diff --git a/src/common/Makefile.am b/src/common/Makefile.am
deleted file mode 100644
index a3f50a6..0000000
--- a/src/common/Makefile.am
+++ /dev/null
@@ -1,6 +0,0 @@
-METASOURCES = AUTO
-libcommon_la_SOURCES = consoleinterface.cc
-libcommon_la_LDFLAGS = -avoid-version -no-undefined
-noinst_LTLIBRARIES = libcommon.la
-noinst_HEADERS = common.h consoleinterface.h
-INCLUDES = -I$(top_srcdir)/src
diff --git a/src/common/common.h b/src/common/common.h
deleted file mode 100644
index 2fdec9d..0000000
--- a/src/common/common.h
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- common/common.h
- This file is part of the Osirion project and is distributed under
- the terms of the GNU General Public License version 2
-*/
-
-#ifndef __INCLUDED_COMMON_H__
-#define __INCLUDED_COMMON_H__
-
-#include "config.h"
-
-/// common functions and components that can be use by any subsytem
-/** libcommon has no dependencies
- */
-namespace common {}
-
-#include "common/consoleinterface.h"
-
-
-#endif // __INCLUDED_COMMON_H__
-
diff --git a/src/common/consoleinterface.cc b/src/common/consoleinterface.cc
deleted file mode 100644
index eb532c6..0000000
--- a/src/common/consoleinterface.cc
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- common/consoleinterface.cc
- This file is part of the Osirion project and is distributed under
- the terms of the GNU General Public License version 2
-*/
-
-#include "common/consoleinterface.h"
-
-#include <iostream>
-
-#include <stdlib.h>
-
-namespace common {
-
-ConsoleInterface *ConsoleInterface::consoleinterface_instance = 0;
-
-ConsoleInterface::ConsoleInterface() {
- if (consoleinterface_instance) {
- std::cerr << "multiple singleton instances: common::ConsoleInterface" << std::endl;
- exit(2);
- }
- consoleinterface_instance = this;
-}
-
-ConsoleInterface::~ConsoleInterface()
-{
- consoleinterface_instance = 0;
-}
-
-ConsoleInterface *ConsoleInterface::instance()
-{
- return consoleinterface_instance;
-}
-
-} // namespace common
-
diff --git a/src/common/consoleinterface.h b/src/common/consoleinterface.h
deleted file mode 100644
index ec77e1d..0000000
--- a/src/common/consoleinterface.h
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- common/consoleinterface.h
- This file is part of the Osirion project and is distributed under
- the terms of the GNU General Public License version 2.
-*/
-
-#ifndef __INCLUDED_COMMON_CONSOLEINTERFACE_H__
-#define __INCLUDED_COMMON_CONSOLEINTERFACE_H__
-
-// project headers
-#include "common/common.h"
-
-// C++ headers
-#include <iostream>
-
-/// global define to send a message to the system console
-#define con_print common::ConsoleInterface::instance()->messagestream()
-/// global define to send a warning message to the system console
-#define con_warn common::ConsoleInterface::instance()->warningstream()
-
-#ifdef HAVE_DEBUG_MESSAGES
-/// global define to send a debug message to the system console
-#define con_debug common::ConsoleInterface::instance()->debugstream()
-#else
-#define con_debug if (0) *(std::ostream*)(0)
-#endif
-
-namespace common {
-
-/// common interface for the client and server Console classes
-class ConsoleInterface {
-public:
- /// default constructor
- ConsoleInterface();
-
- /// default destructor
- virtual ~ConsoleInterface();
-
- /// stream to send normal messages too
- virtual std::ostream & messagestream() = 0;
-
- /// stream to send warning messages too
- virtual std::ostream & warningstream() = 0;
-
- /// stream to send debug messages too
- virtual std::ostream & debugstream() = 0;
-
- /// a pointer to the current console instance
- static ConsoleInterface *instance();
-
-private:
- /// console singleton
- static ConsoleInterface *consoleinterface_instance;
-};
-
-} // namespace common
-
-#endif // __INCLUDED_COMMON_CONSOLEINTERFACE_H__
-
--
cgit v1.2.3