core extraicons: remove dbeditor calls

git-svn-id: http://svn.miranda-ng.org/main/trunk@16431 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c

4 files changed, 3 insertions, 23 deletions

diff --git a/src/mir_app/src/ExtraIconGroup.cpp b/src/mir_app/src/ExtraIconGroup.cpp
index 7a98756fd6..effbdd5862 100644
--- a/src/mir_app/src/ExtraIconGroup.cpp
+++ b/src/mir_app/src/ExtraIconGroup.cpp
@@ -78,7 +78,7 @@ int ExtraIconGroup::getPosition() const
 {

 	int pos = INT_MAX;

 	for (int i = 0; i < m_items.getCount(); i++)

-		pos = MIN(pos, m_items[i]->getPosition());

+		pos = min(pos, m_items[i]->getPosition());

 	return pos;

 }

 

diff --git a/src/mir_app/src/extraicons.cpp b/src/mir_app/src/extraicons.cpp
index 7d0326a8ec..0d71daeaff 100644
--- a/src/mir_app/src/extraicons.cpp
+++ b/src/mir_app/src/extraicons.cpp
@@ -56,10 +56,6 @@ int InitOptionsCallback(WPARAM wParam, LPARAM lParam);
 // Called when all the modules are loaded

 int ModulesLoaded(WPARAM, LPARAM)

 {

-	// add our modules to the KnownModules list

-	CallService("DBEditorpp/RegisterSingleModule", (WPARAM) MODULE_NAME, 0);

-	CallService("DBEditorpp/RegisterSingleModule", (WPARAM) MODULE_NAME "Groups", 0);

-

 	HookEvent(ME_OPT_INITIALISE, InitOptionsCallback);

 	return 0;

 }

diff --git a/src/mir_app/src/extraicons.h b/src/mir_app/src/extraicons.h
index dc8c7d38c4..285c8372a7 100644
--- a/src/mir_app/src/extraicons.h
+++ b/src/mir_app/src/extraicons.h
@@ -26,8 +26,6 @@ Boston, MA 02111-1307, USA.
 

 // Global Variables

 

-#define FREE(_m_)		if (_m_ != NULL) { free(_m_); _m_ = NULL; }

-

 #define ICON_SIZE 16

 

 #include "Extraicon.h"

@@ -54,18 +52,4 @@ static inline BOOL IsEmpty(const char *str)
 	return str == NULL || str[0] == 0;

 }

 

-static inline int MIN(int a, int b)

-{

-	if (a <= b)

-		return a;

-	return b;

-}

-

-static inline int MAX(int a, int b)

-{

-	if (a >= b)

-		return a;

-	return b;

-}

-

 #endif // __COMMONS_H__

diff --git a/src/mir_app/src/options_ei.cpp b/src/mir_app/src/options_ei.cpp
index e95c320fce..19c38b4a57 100644
--- a/src/mir_app/src/options_ei.cpp
+++ b/src/mir_app/src/options_ei.cpp
@@ -309,9 +309,9 @@ public:
 			else

 				// Remove old slot for groups to re-set images

 				oldSlots[i] = -1;

-			lastUsedSlot = MAX(lastUsedSlot, registeredExtraIcons[i]->getSlot());

+			lastUsedSlot = max(lastUsedSlot, registeredExtraIcons[i]->getSlot());

 		}

-		lastUsedSlot = MIN(lastUsedSlot, GetNumberOfSlots());

+		lastUsedSlot = max(lastUsedSlot, GetNumberOfSlots());

 

 		// Get user data and create new groups

 		LIST<ExtraIconGroup> groups(1);