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>
pull/12/head
Michele Calgaro 6 months ago
parent f24778bf1f
commit adcdf1d0d0
Signed by: MicheleC
GPG Key ID: 2A75B7CA8ADED5CF

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

Loading…
Cancel
Save