diff --git a/src/Makefile.am b/src/Makefile.am index 96add23..7b28f13 100644 --- a/src/Makefile.am +++ b/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 \ diff --git a/src/cdopener.cpp b/src/cdopener.cpp index b707012..df4aa16 100644 --- a/src/cdopener.cpp +++ b/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" diff --git a/src/configbackendspage.cpp b/src/configbackendspage.cpp index da10d49..eba1999 100644 --- a/src/configbackendspage.cpp +++ b/src/configbackendspage.cpp @@ -3,7 +3,7 @@ #include "convertpluginloader.h" #include "replaygainpluginloader.h" #include "ripperpluginloader.h" -#include "config.h" +#include "configuration.h" #include #include diff --git a/src/configdialog.cpp b/src/configdialog.cpp index 1bc0efb..5152a9c 100644 --- a/src/configdialog.cpp +++ b/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" diff --git a/src/configenvironmentpage.cpp b/src/configenvironmentpage.cpp index 3d5caf6..263f2de 100644 --- a/src/configenvironmentpage.cpp +++ b/src/configenvironmentpage.cpp @@ -1,7 +1,7 @@ #include "configenvironmentpage.h" -#include "config.h" +#include "configuration.h" #include #include diff --git a/src/configgeneralpage.cpp b/src/configgeneralpage.cpp index bef1162..1da343b 100644 --- a/src/configgeneralpage.cpp +++ b/src/configgeneralpage.cpp @@ -1,7 +1,7 @@ #include "configgeneralpage.h" -#include "config.h" +#include "configuration.h" #include #include diff --git a/src/configpluginspage.cpp b/src/configpluginspage.cpp index 0215ea7..3c9ead4 100644 --- a/src/configpluginspage.cpp +++ b/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" diff --git a/src/config.cpp b/src/configuration.cpp similarity index 99% rename from src/config.cpp rename to src/configuration.cpp index d33d975..8ca153d 100644 --- a/src/config.cpp +++ b/src/configuration.cpp @@ -1,5 +1,5 @@ -#include "config.h" +#include "configuration.h" #include "logger.h" #include "convertpluginloader.h" #include "replaygainpluginloader.h" diff --git a/src/config.h b/src/configuration.h similarity index 100% rename from src/config.h rename to src/configuration.h diff --git a/src/convert.cpp b/src/convert.cpp index d1a2149..204fb17 100644 --- a/src/convert.cpp +++ b/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" diff --git a/src/dirdialog.cpp b/src/dirdialog.cpp index edb3d32..627a5de 100644 --- a/src/dirdialog.cpp +++ b/src/dirdialog.cpp @@ -1,6 +1,6 @@ #include "dirdialog.h" -#include "config.h" +#include "configuration.h" #include #include diff --git a/src/filelist.cpp b/src/filelist.cpp index fa28c9b..f1f49d3 100644 --- a/src/filelist.cpp +++ b/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 diff --git a/src/options.cpp b/src/options.cpp index 74a190e..be69a37 100644 --- a/src/options.cpp +++ b/src/options.cpp @@ -2,7 +2,7 @@ #include "options.h" #include "optionssimple.h" #include "optionsdetailed.h" -#include "config.h" +#include "configuration.h" #include #include diff --git a/src/optionsdetailed.cpp b/src/optionsdetailed.cpp index b050b49..7f23072 100644 --- a/src/optionsdetailed.cpp +++ b/src/optionsdetailed.cpp @@ -1,7 +1,7 @@ #include "optionsdetailed.h" #include "convertpluginloader.h" -#include "config.h" +#include "configuration.h" #include #include diff --git a/src/optionseditor.cpp b/src/optionseditor.cpp index 9e97c93..5794777 100644 --- a/src/optionseditor.cpp +++ b/src/optionseditor.cpp @@ -5,6 +5,7 @@ #include "filelist.h" #include "conversionoptions.h" #include "outputdirectory.h" +#include "configuration.h" #include #include diff --git a/src/optionsrequester.cpp b/src/optionsrequester.cpp index 854921b..29d6cd0 100644 --- a/src/optionsrequester.cpp +++ b/src/optionsrequester.cpp @@ -1,7 +1,7 @@ #include "optionsrequester.h" #include "options.h" -#include "config.h" +#include "configuration.h" #include #include diff --git a/src/optionssimple.cpp b/src/optionssimple.cpp index c5dbefe..e72ab35 100644 --- a/src/optionssimple.cpp +++ b/src/optionssimple.cpp @@ -1,6 +1,6 @@ #include "optionssimple.h" -#include "config.h" +#include "configuration.h" #include "convertpluginloader.h" #include "optionsdetailed.h" diff --git a/src/outputdirectory.cpp b/src/outputdirectory.cpp index 16a8a35..d2d0b7c 100644 --- a/src/outputdirectory.cpp +++ b/src/outputdirectory.cpp @@ -3,7 +3,7 @@ #include "filelist.h" #include "conversionoptions.h" #include "tagengine.h" -#include "config.h" +#include "configuration.h" #include #include diff --git a/src/replaygain.cpp b/src/replaygain.cpp index abf29c4..d93d57e 100644 --- a/src/replaygain.cpp +++ b/src/replaygain.cpp @@ -1,6 +1,6 @@ #include "replaygain.h" -#include "config.h" +#include "configuration.h" #include "logger.h" #include "replaygainpluginloader.h" diff --git a/src/replaygainfilelist.cpp b/src/replaygainfilelist.cpp index 7749baf..91852a2 100644 --- a/src/replaygainfilelist.cpp +++ b/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" diff --git a/src/replaygainscanner.cpp b/src/replaygainscanner.cpp index b6a7e79..53808b6 100644 --- a/src/replaygainscanner.cpp +++ b/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 diff --git a/src/soundkonverter.cpp b/src/soundkonverter.cpp index d6267a0..1914c1d 100644 --- a/src/soundkonverter.cpp +++ b/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"