Cleanup

src/plugin/Config.h

 #ifndef _CONFIG_H
 #define _CONFIG_H
 
 // ----------------------------------------------------------------------------
 // Filter configuration
 // ----------------------------------------------------------------------------
 
 #ifdef NDEBUG
 #undef _DEBUG
 #endif

[Wladimir Palant, 2013/07/05 09:26:45]

We shouldn't do that in the config, it's already defined correctly in
adblockplus.gyp.

 
 // Define filter configuration
 #if (defined PRODUCT_ADBLOCKPLUS)
 #define FILTERS_PROTOCOL "https://"
 #define FILTERS_HOST "easylist-downloads.adblockplus.org"

[Wladimir Palant, 2013/07/05 09:26:45]

These two macros are unused and can be removed.

 #endif
 
 // ----------------------------------------------------------------------------
 // Define default protocols, hosts, scripts and pages
 // ----------------------------------------------------------------------------
 
 #define USERS_PROTOCOL              L"http://"
 #define USERS_PATH                  L""
 #define USERS_PORT                  INTERNET_DEFAULT_HTTP_PORT
 
 #define USERS_SCRIPT_SETTINGS       L"/user_manager.php"
 #define USERS_SCRIPT_ABOUT          L"/user_about.php"
 #define USERS_SCRIPT_FAQ            L"/user_faq.php"
 #define USERS_SCRIPT_FEEDBACK       L"/user_feedback.php"
 #define USERS_SCRIPT_INFO           L"/user_info.php"
 #define USERS_SCRIPT_WELCOME        L"/user_welcome.php"
 #define USERS_SCRIPT_USER_SETTINGS  L"/user_mysettings.php"
 #define USERS_SCRIPT_INVITATION     L"/user_invitation.php"
 #define USERS_SCRIPT_UPGRADE        L"/user_upgrade.php"

[Wladimir Palant, 2013/07/05 09:26:45]

All these macros need to be removed along with the code that's using them.

 
 // ----------------------------------------------------------------------------
 // Define actual configurations
 // ----------------------------------------------------------------------------
 
 // AdblockPlus configuration
 
 
 #if (defined PRODUCT_ADBLOCKPLUS)
 #define ABPDOMAIN L"adblockplus.org"
 #ifdef ADBLOCKPLUS_TEST_MODE
 #define USERS_HOST L"127.0.0.1"

[Wladimir Palant, 2013/07/05 09:26:45]

These two macros should be removed along with their use in
CPluginClientBase::IsValidDomain().

 #elif (defined ADBLOCKPLUS_PRODUCTION_MODE)
 #ifdef _DEBUG
 #define USERS_HOST L"127.0.0.1"
 #else
 #define USERS_HOST L"update.adblockplus.org"
 #endif
 #else
 #error "Undefined mode. Please use configuation Release Production/Test or Debug Production/Test"
 #endif
 #else
 #error "Undefined product. Please specify PRODUCT_ADBLOCKPLUS in configuration"
 #endif
 
 // ----------------------------------------------------------------------------
 // Timers
 // ----------------------------------------------------------------------------
 
 // Time interval between user registration trials
 #define TIMER_INTERVAL_USER_REGISTRATION 1000
 
 // How long time should we wait between each try of initializing the server client (ms)
 #ifdef _DEBUG
 #define TIMER_INTERVAL_SERVER_CLIENT_INIT 10000
 #else
 #define TIMER_INTERVAL_SERVER_CLIENT_INIT 120000
 #endif

[Wladimir Palant, 2013/07/05 09:26:45]

This macro is unused and can be removed.

 
 // How long time sleep in background thread (ms)
 #define TIMER_THREAD_SLEEP_USER_REGISTRATION 10000
 #define TIMER_THREAD_SLEEP_MAIN_LOOP 60000

[Wladimir Palant, 2013/07/05 09:26:45]

This macro is unused and can be removed.

 #define TIMER_THREAD_SLEEP_TAB_LOOP 10000
 
 
 // Should we to on debug information
 #ifdef _DEBUG
 #define ENABLE_DEBUG_INFO
 #define ENABLE_DEBUG_GENERAL
 #define ENABLE_DEBUG_ERROR
 #undef  ENABLE_DEBUG_BLOCKER
 #undef  ENABLE_DEBUG_FILTER
@@ skipping 116 matching lines @@
 
 // ----------------------------------------------------------------------------
 // Miscellaneous
 // ----------------------------------------------------------------------------
 
 //For debugging production build
 //#define ENABLE_DEBUG_INFO
 
 
 // Max elements in white list menus
 #define DOMAIN_HISTORY_MAX_COUNT 5

[Wladimir Palant, 2013/07/05 09:26:45]

This macro is only used to set unused macros WM_WHITELIST_DOMAIN_MAX,
WM_WHITELIST_DOMAIN_SUPPORT, WM_WHITELIST_DOMAIN_SUPPORT_MAX,
WM_WHITELIST_DOMAIN_ERROR, WM_WHITELIST_DOMAIN_ERROR_MAX in PluginClass.h, it
can be removed along with these macros.

 
 // Max registration attempts
 #define REGISTRATION_MAX_ATTEMPTS 5

[Wladimir Palant, 2013/07/05 09:26:45]

This macro is unused and can be removed.

 
 // If defined, we will surround most of the methods with try catch
 #undef CATCHALL
 
 // If defined, we will throw exceptions for errors
 // Otherwise we will try to handle it in a silent way, and only report
 #undef THROW_ON_ERROR
 
 // Should we report errors to the local filesystem and/or to the ad plugin server
 #ifdef ADBLOCKPLUS_PRODUCTION_MODE
 #undef REPORT_ERROR_FILE
 #undef REPORT_ERROR_SERVER
 #else
 #define REPORT_ERROR_FILE
 #define REPORT_ERROR_SERVER
 #endif

[Wladimir Palant, 2013/07/05 09:26:45]

These two macros are unused and can be removed as well.

 
 // Should we shut down plugin automatically before starting the
 // installer? Remember to change the dictionary POSTDOWNLOADTEXT text
 // to correspond to this behaviour.
 // ex. AUTOMATIC_SHUTDOWN - "If you choose to install the new plugin, you Explorer will close before installation."
 // or  NO_AUTOMATIC_SHUTDOWN" - "If you choose to install the new plugin, you have to restart Explorer for the update to take effect"
 #define AUTOMATIC_SHUTDOWN

[Wladimir Palant, 2013/07/05 09:26:45]

This macro is only being used in the unused CPluginClass::LaunchUpdater method -
it can be removed along with that method.

 
 
 #if (defined PRODUCT_ADBLOCKPLUS)
 //This is used as an agent string for HTTP requests to our servers from the plugin
 #define BHO_NAME _T("Adblock Plus BHO/1.0")

[Wladimir Palant, 2013/07/05 09:26:45]

This macro is only used in PluginHttpRequest that's being removed now - can be
removed as well.

 #endif
 
 // Name of ini file in Windows directory for uninstall
 #if (defined PRODUCT_ADBLOCKPLUS)
 #define UNINSTALL_INI_FILE "AdBlockPlus.ini"

[Wladimir Palant, 2013/07/05 09:26:45]

This macro is also unused and can be removed.

 #endif
 
 // Prefix on temp dir files
 #if (defined PRODUCT_ADBLOCKPLUS)
 #define TEMP_FILE_PREFIX "ab_"

[Wladimir Palant, 2013/07/05 09:26:45]

This macro is only used in PluginConfig.cpp that's being removed now - can be
removed as well.

 #endif
 
-// Dictionary filename
-#if (defined PRODUCT_ADBLOCKPLUS)
-#define DICTIONARY_INI_FILE "dictionary_w.ini"
-#else
-#define DICTIONARY_INI_FILE "dictionary.ini"
-#endif
 #define DICTIONARY_DIR_NAME "Languages\\"
 #define DEFAULT_LANGUAGE "en-US"

[Wladimir Palant, 2013/07/05 09:26:45]

These two macros are also unused and can be removed.

 
-#define SETTING_PAGE_INI_FILE "settings_page_w.ini"
-
 // Config filename
 #ifdef SUPPORT_CONFIG
 #define CONFIG_INI_FILE "config.ini"

[Wladimir Palant, 2013/07/05 09:26:45]

This macro is only used in PluginConfig.cpp that is being removed - can be
removed as well.

 #endif
 
-// Settings filename
-#define SETTINGS_INI_FILE "settings.ini"
-
-// Settings tab filename
-#define SETTINGS_INI_FILE_TAB "settings_tab.ini"
-
-// Setting whitelist filename
-#ifdef SUPPORT_WHITELIST
-#define SETTINGS_INI_FILE_WHITELIST "settings_whitelist.ini"
-#endif
-
-// Personal filter filename
-#ifdef SUPPORT_FILTER
-#define PERSONAL_FILTER_FILE "filter_personal.txt"
-#define PERSONAL_FILTER_FILE_OLD "easylist_personal.txt"
-#endif
-
 // Install MSI filename
 #if (defined PRODUCT_ADBLOCKPLUS)
 #define INSTALL_MSI_FILE "adblock.msi"
 #define INSTALL_EXE_FILE "Setup.exe"

[Wladimir Palant, 2013/07/05 09:26:45]

These two macros are unused and can be removed.

 #endif
 
 // Status bar pane name
 #if (defined PRODUCT_ADBLOCKPLUS)
 #define STATUSBAR_PANE_NAME "AdblockPlusStatusBarPane"
 #endif
 
 // Status bar pane number
 #if (defined PRODUCT_ADBLOCKPLUS)
 #define STATUSBAR_PANE_NUMBER 2
 #endif
 
 
 
 #endif // _CONFIG_H