Rename src/config.h to src/configuration.h to avoid possible conflicts with autogenerated config.h file

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
(cherry picked from commit adcdf1d0d0)

src/Makefile.am

@@ -3,7 +3,7 @@ INCLUDES = $(all_includes) -I$(top_srcdir)/src/metadata/ \
 	-I$(top_srcdir)/src/pluginloader/ $(cdda_includes)
 
 # these are the headers for your project
-noinst_HEADERS = cdmanager.h cdopener.h combobutton.h config.h \
+noinst_HEADERS = cdmanager.h cdopener.h combobutton.h configuration.h \
 	configbackendspage.h configdialog.h configenvironmentpage.h configgeneralpage.h \
 	configpagebase.h configpluginspage.h conversionoptions.h convert.h cuesheeteditor.h \
 	dcopinterface.h dirdialog.h filelist.h logger.h logviewer.h options.h optionsdetailed.h \
@@ -29,7 +29,7 @@ bin_PROGRAMS = soundkonverter
 
 # the application source, library search path, and link libraries
 soundkonverter_SOURCES = cddb.cpp cdmanager.cpp cdopener.cpp combobutton.cpp \
-	config.cpp configbackendspage.cpp configdialog.cpp configenvironmentpage.cpp \
+	configuration.cpp configbackendspage.cpp configdialog.cpp configenvironmentpage.cpp \
 	configgeneralpage.cpp configpagebase.cpp configpluginspage.cpp conversionoptions.cpp \
 	convert.cpp cuesheeteditor.cpp dcopinterface.skel dirdialog.cpp filelist.cpp \
 	logger.cpp logviewer.cpp main.cpp options.cpp optionsdetailed.cpp \

src/cdopener.cpp

@@ -2,7 +2,7 @@
 #include "cdopener.h"
 #include "cdmanager.h"
 #include "tagengine.h"
-#include "config.h"
+#include "configuration.h"
 #include "ripperpluginloader.h"
 #include "combobutton.h"
 

src/configbackendspage.cpp

@@ -3,7 +3,7 @@
 #include "convertpluginloader.h"
 #include "replaygainpluginloader.h"
 #include "ripperpluginloader.h"
-#include "config.h"
+#include "configuration.h"
 
 #include <tqlayout.h>
 #include <tqlabel.h>

src/configdialog.cpp

@@ -2,7 +2,7 @@
 
 #include "configdialog.h"
 
-#include "config.h"
+#include "configuration.h"
 #include "configgeneralpage.h"
 #include "configpluginspage.h"
 #include "configenvironmentpage.h"

src/configenvironmentpage.cpp

@@ -1,7 +1,7 @@
 
 #include "configenvironmentpage.h"
 
-#include "config.h"
+#include "configuration.h"
 
 #include <tdelocale.h>
 #include <kiconloader.h>

src/configgeneralpage.cpp

@@ -1,7 +1,7 @@
 
 #include "configgeneralpage.h"
 
-#include "config.h"
+#include "configuration.h"
 
 #include <tdelocale.h>
 #include <kcombobox.h>

src/configpluginspage.cpp

@@ -1,6 +1,6 @@
 
 #include "configpluginspage.h"
-#include "config.h"
+#include "configuration.h"
 #include "convertpluginloader.h"
 #include "replaygainpluginloader.h"
 #include "ripperpluginloader.h"

src/configuration.cpp

@@ -1,5 +1,5 @@
 
-#include "config.h"
+#include "configuration.h"
 #include "logger.h"
 #include "convertpluginloader.h"
 #include "replaygainpluginloader.h"

src/convert.cpp

@@ -5,7 +5,7 @@
 #include "replaygainpluginloader.h"
 #include "replaygain.h"
 #include "ripperpluginloader.h"
-#include "config.h"
+#include "configuration.h"
 #include "tagengine.h"
 #include "cdmanager.h"
 #include "logger.h"

src/dirdialog.cpp

@@ -1,6 +1,6 @@
 
 #include "dirdialog.h"
-#include "config.h"
+#include "configuration.h"
 
 #include <tqlayout.h>
 #include <tqlabel.h>

src/filelist.cpp

@@ -6,7 +6,7 @@
 #include "convert.h"
 #include "optionseditor.h"
 #include "outputdirectory.h"
-#include "config.h"
+#include "configuration.h"
 #include "logger.h"
 #include "convertpluginloader.h" // NOTE DEBUG
 

src/options.cpp

@@ -2,7 +2,7 @@
 #include "options.h"
 #include "optionssimple.h"
 #include "optionsdetailed.h"
-#include "config.h"
+#include "configuration.h"
 
 #include <tqlayout.h>
 #include <tqtooltip.h>

src/optionsdetailed.cpp

@@ -1,7 +1,7 @@
 
 #include "optionsdetailed.h"
 #include "convertpluginloader.h"
-#include "config.h"
+#include "configuration.h"
 
 #include <tqlayout.h>
 #include <tqlabel.h>

src/optionseditor.cpp

@@ -5,6 +5,7 @@
 #include "filelist.h"
 #include "conversionoptions.h"
 #include "outputdirectory.h"
+#include "configuration.h"
 
 #include <tqlayout.h>
 #include <tqstring.h>

src/optionsrequester.cpp

@@ -1,7 +1,7 @@
 
 #include "optionsrequester.h"
 #include "options.h"
-#include "config.h"
+#include "configuration.h"
 
 #include <tqlayout.h>
 #include <tqlabel.h>

src/optionssimple.cpp

@@ -1,6 +1,6 @@
 
 #include "optionssimple.h"
-#include "config.h"
+#include "configuration.h"
 #include "convertpluginloader.h"
 #include "optionsdetailed.h"
 

src/outputdirectory.cpp

@@ -3,7 +3,7 @@
 #include "filelist.h"
 #include "conversionoptions.h"
 #include "tagengine.h"
-#include "config.h"
+#include "configuration.h"
 
 #include <tqlayout.h>
 #include <tqtooltip.h>

src/replaygain.cpp

@@ -1,6 +1,6 @@
 
 #include "replaygain.h"
-#include "config.h"
+#include "configuration.h"
 #include "logger.h"
 #include "replaygainpluginloader.h"
 

src/replaygainfilelist.cpp

@@ -2,7 +2,7 @@
 #include "replaygainfilelist.h"
 #include "tagengine.h"
 #include "logger.h"
-#include "config.h"
+#include "configuration.h"
 #include "replaygain.h"
 #include "replaygainpluginloader.h"
 

src/replaygainscanner.cpp

@@ -2,7 +2,7 @@
 #include "replaygainscanner.h"
 #include "logger.h"
 #include "combobutton.h"
-#include "config.h"
+#include "configuration.h"
 #include "dirdialog.h"
 
 #include <tqlayout.h>

src/soundkonverter.cpp

@@ -1,6 +1,6 @@
 
 #include "soundkonverter.h"
-#include "config.h"
+#include "configuration.h"
 #include "configdialog.h"
 #include "logger.h"
 #include "logviewer.h"