fix for icon pack warning in h++ (damned git...)

10 files changed, 16 insertions, 19 deletions

diff --git a/plugins/HistoryPlusPlus/historypp_icons/res/Icon_42.ico b/plugins/HistoryPlusPlus/historypp_icons/res/Icon_39_.ico
index 77f6e61458..77f6e61458 100644
--- a/plugins/HistoryPlusPlus/historypp_icons/res/Icon_42.ico
+++ b/plugins/HistoryPlusPlus/historypp_icons/res/Icon_39_.ico
diff --git a/plugins/HistoryPlusPlus/historypp_icons/res/Icon_43.ico b/plugins/HistoryPlusPlus/historypp_icons/res/Icon_40_.ico
index 7a5e461f6f..7a5e461f6f 100644
--- a/plugins/HistoryPlusPlus/historypp_icons/res/Icon_43.ico
+++ b/plugins/HistoryPlusPlus/historypp_icons/res/Icon_40_.ico
diff --git a/plugins/HistoryPlusPlus/historypp_icons/res/Icon_44.ico b/plugins/HistoryPlusPlus/historypp_icons/res/Icon_41_.ico
index 2e6b9745b3..2e6b9745b3 100644
--- a/plugins/HistoryPlusPlus/historypp_icons/res/Icon_44.ico
+++ b/plugins/HistoryPlusPlus/historypp_icons/res/Icon_41_.ico
diff --git a/plugins/HistoryPlusPlus/historypp_icons/res/Icon_45.ico b/plugins/HistoryPlusPlus/historypp_icons/res/Icon_42_.ico
index d2257bd0bd..d2257bd0bd 100644
--- a/plugins/HistoryPlusPlus/historypp_icons/res/Icon_45.ico
+++ b/plugins/HistoryPlusPlus/historypp_icons/res/Icon_42_.ico
diff --git a/plugins/HistoryPlusPlus/historypp_icons/res/Icon_46.ico b/plugins/HistoryPlusPlus/historypp_icons/res/Icon_43_.ico
index 045e116798..045e116798 100644
--- a/plugins/HistoryPlusPlus/historypp_icons/res/Icon_46.ico
+++ b/plugins/HistoryPlusPlus/historypp_icons/res/Icon_43_.ico
diff --git a/plugins/HistoryPlusPlus/historypp_icons/res/Icon_47.ico b/plugins/HistoryPlusPlus/historypp_icons/res/Icon_44_.ico
index 6adf5211d6..6adf5211d6 100644
--- a/plugins/HistoryPlusPlus/historypp_icons/res/Icon_47.ico
+++ b/plugins/HistoryPlusPlus/historypp_icons/res/Icon_44_.ico
diff --git a/plugins/HistoryPlusPlus/historypp_icons/res/Icon_48.ico b/plugins/HistoryPlusPlus/historypp_icons/res/Icon_45_.ico
index 98bd33e6d9..98bd33e6d9 100644
--- a/plugins/HistoryPlusPlus/historypp_icons/res/Icon_48.ico
+++ b/plugins/HistoryPlusPlus/historypp_icons/res/Icon_45_.ico
diff --git a/plugins/HistoryPlusPlus/historypp_icons/res/resource.rc b/plugins/HistoryPlusPlus/historypp_icons/res/resource.rc
index e2472e1406..fde91933b3 100644
--- a/plugins/HistoryPlusPlus/historypp_icons/res/resource.rc
+++ b/plugins/HistoryPlusPlus/historypp_icons/res/resource.rc
@@ -65,13 +65,13 @@ IDI_ICON35                    ICON    "Icon_35.ico"
 IDI_ICON36                    ICON    "Icon_36.ico"

 IDI_ICON37                    ICON    "Icon_37.ico"

 IDI_ICON38                    ICON    "Icon_38.ico"

-IDI_ICON42                    ICON    "Icon_42.ico"

-IDI_ICON43                    ICON    "Icon_43.ico"

-IDI_ICON44                    ICON    "Icon_44.ico"

-IDI_ICON45                    ICON    "Icon_45.ico"

-IDI_ICON46                    ICON    "Icon_46.ico"

-IDI_ICON47                    ICON    "Icon_47.ico"

-IDI_ICON48                    ICON    "Icon_48.ico"

+IDI_ICON39                    ICON    "Icon_39_.ico"

+IDI_ICON40                    ICON    "Icon_40_.ico"

+IDI_ICON41                    ICON    "Icon_41_.ico"

+IDI_ICON42                    ICON    "Icon_42_.ico"

+IDI_ICON43                    ICON    "Icon_43_.ico"

+IDI_ICON44                    ICON    "Icon_44_.ico"

+IDI_ICON45                    ICON    "Icon_45_.ico"

 

 #endif    // English (U.S.) resources

 /////////////////////////////////////////////////////////////////////////////
\ No newline at end of file
diff --git a/plugins/HistoryPlusPlus/historypp_icons/src/resource.h b/plugins/HistoryPlusPlus/historypp_icons/src/resource.h
index 10821b547f..3357de2e50 100644
--- a/plugins/HistoryPlusPlus/historypp_icons/src/resource.h
+++ b/plugins/HistoryPlusPlus/historypp_icons/src/resource.h
@@ -47,9 +47,6 @@
 #define IDI_ICON43                      43

 #define IDI_ICON44                      44

 #define IDI_ICON45                      45

-#define IDI_ICON46                      46

-#define IDI_ICON47                      47

-#define IDI_ICON48                      48

 

 // Next default values for new objects

 // 

diff --git a/plugins/HistoryPlusPlus/hpp_global.pas b/plugins/HistoryPlusPlus/hpp_global.pas
index 925aa4c6d7..9da53cab55 100644
--- a/plugins/HistoryPlusPlus/hpp_global.pas
+++ b/plugins/HistoryPlusPlus/hpp_global.pas
@@ -233,15 +233,15 @@ const
   HPP_ICON_EVENT_OUTGOING    = 34;

   HPP_ICON_EVENT_SYSTEM      = 35;

   HPP_ICON_EVENT_CONTACTS    = 36;

-  HPP_ICON_EVENT_STATUS      = 40;

-  HPP_ICON_EVENT_SMTPSIMPLE  = 41;

-  HPP_ICON_EVENT_NICK        = 42;

-  HPP_ICON_EVENT_AVATAR      = 43;

-  HPP_ICON_EVENT_WATRACK     = 44;

-  HPP_ICON_EVENT_STATUSMES   = 45;

-  HPP_ICON_EVENT_VOICECALL   = 46;

-

-  HppIconsCount              = 47;

+  HPP_ICON_EVENT_STATUS      = 37;

+  HPP_ICON_EVENT_SMTPSIMPLE  = 38;

+  HPP_ICON_EVENT_NICK        = 39;

+  HPP_ICON_EVENT_AVATAR      = 40;

+  HPP_ICON_EVENT_WATRACK     = 41;

+  HPP_ICON_EVENT_STATUSMES   = 42;

+  HPP_ICON_EVENT_VOICECALL   = 43;

+

+  HppIconsCount              = 44;

 

   HPP_SKIN_EVENT_MESSAGE     = 0;

   HPP_SKIN_EVENT_URL         = 1;