From 76706947d6e375a56bcb9f8e63062ed13df1fdde Mon Sep 17 00:00:00 2001
From: Tristan Matthews <tristan.matthews@savoirfairelinux.com>
Date: Sun, 29 Apr 2012 10:23:56 -0400
Subject: [PATCH] * #10094: renamed config/config.{h,cpp}
config/sfl_config.{h,cpp}
---
daemon/src/account.h | 2 +-
daemon/src/config/Makefile.am | 4 ++--
daemon/src/config/{config.cpp => sfl_config.cpp} | 5 +----
daemon/src/config/{config.h => sfl_config.h} | 0
daemon/src/config/yamlparser.cpp | 2 +-
daemon/src/managerimpl.h | 2 +-
daemon/test/echocanceltest.cpp | 2 +-
daemon/test/gaincontroltest.cpp | 2 +-
8 files changed, 8 insertions(+), 11 deletions(-)
rename daemon/src/config/{config.cpp => sfl_config.cpp} (99%)
rename daemon/src/config/{config.h => sfl_config.h} (100%)
diff --git a/daemon/src/account.h b/daemon/src/account.h
index 6ebb7bd517..080f544ad8 100644
--- a/daemon/src/account.h
+++ b/daemon/src/account.h
@@ -37,7 +37,7 @@
#include "global.h"
#include "noncopyable.h"
-#include "config/config.h"
+#include "config/sfl_config.h"
#include "config/serializable.h"
class VoIPLink;
diff --git a/daemon/src/config/Makefile.am b/daemon/src/config/Makefile.am
index 559faf36eb..a790afe67d 100644
--- a/daemon/src/config/Makefile.am
+++ b/daemon/src/config/Makefile.am
@@ -1,13 +1,13 @@
noinst_LTLIBRARIES = libconfig.la
libconfig_la_SOURCES = \
- config.cpp \
+ sfl_config.cpp \
yamlemitter.cpp \
yamlparser.cpp \
yamlnode.cpp
noinst_HEADERS = \
- config.h \
+ sfl_config.h \
serializable.h \
yamlemitter.h \
yamlparser.h \
diff --git a/daemon/src/config/config.cpp b/daemon/src/config/sfl_config.cpp
similarity index 99%
rename from daemon/src/config/config.cpp
rename to daemon/src/config/sfl_config.cpp
index c8b5fe390f..c7e5ac3102 100644
--- a/daemon/src/config/config.cpp
+++ b/daemon/src/config/sfl_config.cpp
@@ -29,9 +29,7 @@
* as that of the covered work.
*/
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
+#include "sfl_config.h"
#include "logger.h"
#include <fstream>
#include <cstdlib>
@@ -324,4 +322,3 @@ ConfigTreeIterator::next()
return tk;
}
} // end namespace ConfigTree
-
diff --git a/daemon/src/config/config.h b/daemon/src/config/sfl_config.h
similarity index 100%
rename from daemon/src/config/config.h
rename to daemon/src/config/sfl_config.h
diff --git a/daemon/src/config/yamlparser.cpp b/daemon/src/config/yamlparser.cpp
index 97b0c18b71..2dd58cfc3b 100644
--- a/daemon/src/config/yamlparser.cpp
+++ b/daemon/src/config/yamlparser.cpp
@@ -31,7 +31,7 @@
#include "yamlparser.h"
#include "../global.h"
-#include "config.h"
+#include "sfl_config.h"
#include "yamlnode.h"
#include <cstdio>
diff --git a/daemon/src/managerimpl.h b/daemon/src/managerimpl.h
index eafec01c49..b7447e02fb 100644
--- a/daemon/src/managerimpl.h
+++ b/daemon/src/managerimpl.h
@@ -43,7 +43,7 @@
#include "cc_thread.h"
#include "dbus/dbusmanager.h"
-#include "config/config.h"
+#include "config/sfl_config.h"
#include "call.h"
#include "conference.h"
diff --git a/daemon/test/echocanceltest.cpp b/daemon/test/echocanceltest.cpp
index bc76b80eef..c872003641 100644
--- a/daemon/test/echocanceltest.cpp
+++ b/daemon/test/echocanceltest.cpp
@@ -31,7 +31,7 @@
#include <iostream>
#include "echocanceltest.h"
-#include "config/config.h"
+#include "config/sfl_config.h"
EchoCancelTest::EchoCancelTest() : echoCanceller_() {}
diff --git a/daemon/test/gaincontroltest.cpp b/daemon/test/gaincontroltest.cpp
index 89a936cd35..ed5492099b 100644
--- a/daemon/test/gaincontroltest.cpp
+++ b/daemon/test/gaincontroltest.cpp
@@ -30,7 +30,7 @@
#include "gaincontroltest.h"
#include "audio/gaincontrol.h"
-#include "config/config.h"
+#include "config/sfl_config.h"
void GainControlTest::testGainProcessing()
{
--
GitLab