diff options
Diffstat (limited to 'plugins/Utils')
| -rw-r--r-- | plugins/Utils/mir_dblists.cpp | 138 | ||||
| -rw-r--r-- | plugins/Utils/mir_dblists.h | 46 | ||||
| -rw-r--r-- | plugins/Utils/mir_smileys.cpp | 6 | ||||
| -rw-r--r-- | plugins/Utils/mir_smileys.h | 8 |
4 files changed, 4 insertions, 194 deletions
diff --git a/plugins/Utils/mir_dblists.cpp b/plugins/Utils/mir_dblists.cpp deleted file mode 100644 index eb2a46dd81..0000000000 --- a/plugins/Utils/mir_dblists.cpp +++ /dev/null @@ -1,138 +0,0 @@ -/*
-Copyright (C) 2005 Ricardo Pescuma Domenecci
-
-This is free software; you can redistribute it and/or
-modify it under the terms of the GNU Library General Public
-License as published by the Free Software Foundation; either
-version 2 of the License, or (at your option) any later version.
-
-This is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-Library General Public License for more details.
-
-You should have received a copy of the GNU Library General Public
-License along with this file; see the file license.txt. If
-not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.
-*/
-
-
-#include "mir_dblists.h"
-
-#include <stdio.h>
-
-#include <newpluginapi.h>
-#include <m_system.h>
-
-
-void List_DestroyFreeContents(SortedList* p_list)
-{
- if (p_list == NULL)
- return;
-
- if (p_list->items != NULL)
- {
- int i;
- for (i = 0; i < p_list->realCount; i++)
- {
- if (p_list->items[i] != NULL)
- {
- mir_free(p_list->items[i]);
- }
- }
- }
-
- List_Destroy(p_list);
-}
-
-
-int List_Append(SortedList* p_list, void* p_value)
-{
- return List_Insert(p_list, p_value, p_list->realCount);
-}
-
-
-int List_InsertOrdered(SortedList* p_list, void* p_value)
-{
- int index;
-
- List_GetIndex(p_list, p_value, &index);
- List_Insert(p_list, p_value, index);
-
- return index;
-}
-
-
-int List_RemoveByValue(SortedList* p_list, void* p_value)
-{
- int ret = 0;
-
- if (p_list->items != NULL)
- {
- int i;
- for (i = p_list->realCount - 1; i >= 0; i--)
- {
- if (p_list->items[i] == p_value)
- ret += List_Remove(p_list, i);
- }
- }
-
- return ret;
-}
-
-
-int List_RemoveByValueFreeContents(SortedList* p_list, void* p_value)
-{
- int ret = 0;
-
- if (p_list->items != NULL)
- {
- int i;
- for (i = p_list->realCount - 1; i >= 0; i--)
- {
- if (p_list->items[i] == p_value)
- {
- mir_free(p_list->items[i]);
- ret += List_Remove(p_list, i);
- }
- }
- }
-
- return ret;
-}
-
-
-void List_Push(SortedList* p_list, void* p_value)
-{
- List_Insert(p_list, p_value, p_list->realCount);
-}
-
-
-void* List_Pop(SortedList* p_list)
-{
- void *ret;
-
- if (p_list->realCount <= 0)
- return NULL;
-
- ret = p_list->items[p_list->realCount - 1];
- List_Remove(p_list, p_list->realCount - 1);
-
- return ret;
-}
-
-
-void* List_Peek(SortedList* p_list)
-{
- if (p_list->realCount <= 0)
- return NULL;
-
- return p_list->items[p_list->realCount - 1];
-}
-
-
-BOOL List_HasItens(SortedList* p_list)
-{
- return p_list->realCount > 0;
-}
\ No newline at end of file diff --git a/plugins/Utils/mir_dblists.h b/plugins/Utils/mir_dblists.h deleted file mode 100644 index 23b93b6a39..0000000000 --- a/plugins/Utils/mir_dblists.h +++ /dev/null @@ -1,46 +0,0 @@ -/*
-Copyright (C) 2005 Ricardo Pescuma Domenecci
-
-This is free software; you can redistribute it and/or
-modify it under the terms of the GNU Library General Public
-License as published by the Free Software Foundation; either
-version 2 of the License, or (at your option) any later version.
-
-This is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-Library General Public License for more details.
-
-You should have received a copy of the GNU Library General Public
-License along with this file; see the file license.txt. If
-not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.
-*/
-
-
-#ifndef __MIR_DBLISTS_H__
-# define __MIR_DBLISTS_H__
-
-#include <windows.h>
-#include <newpluginapi.h>
-#include <m_system.h>
-
-// Need to be called on ME_SYSTEM_MODULESLOADED
-
-BOOL List_HasItens(SortedList* p_list);
-
-void List_DestroyFreeContents(SortedList*);
-int List_RemoveByValue(SortedList*, void*);
-int List_RemoveByValueFreeContents(SortedList*, void*);
-
-int List_Append(SortedList*, void*);
-int List_InsertOrdered(SortedList*, void*);
-
-// Theese work on the end of the list
-void List_Push(SortedList* p_list, void* p_value);
-void* List_Pop(SortedList* p_list);
-void* List_Peek(SortedList* p_list);
-
-
-
-#endif // __MIR_DBLISTS_H__
diff --git a/plugins/Utils/mir_smileys.cpp b/plugins/Utils/mir_smileys.cpp index ab5f666668..cb0c6c6b44 100644 --- a/plugins/Utils/mir_smileys.cpp +++ b/plugins/Utils/mir_smileys.cpp @@ -425,7 +425,7 @@ SortedList * ReplaceSmileys(const TCHAR *text, int text_size, const char *protoc piece->start_pos = next_text_pos - text;
piece->len = start - next_text_pos;
- List_Append(plText, piece);
+ List_Insert(plText, piece, plText->realCount);
}
// Add smiley
@@ -454,7 +454,7 @@ SortedList * ReplaceSmileys(const TCHAR *text, int text_size, const char *protoc *max_smiley_height = max(piece->smiley_height, *max_smiley_height);
- List_Append(plText, piece);
+ List_Insert(plText, piece, plText->realCount);
}
next_text_pos = end;
@@ -470,7 +470,7 @@ SortedList * ReplaceSmileys(const TCHAR *text, int text_size, const char *protoc piece->start_pos = next_text_pos - text;
piece->len = last_text_pos - next_text_pos;
- List_Append(plText, piece);
+ List_Insert(plText, piece, plText->realCount);
}
CallService(MS_SMILEYADD_BATCHFREE, 0, (LPARAM)spres);
diff --git a/plugins/Utils/mir_smileys.h b/plugins/Utils/mir_smileys.h index fe130bbc6a..8af5750703 100644 --- a/plugins/Utils/mir_smileys.h +++ b/plugins/Utils/mir_smileys.h @@ -22,13 +22,7 @@ Boston, MA 02111-1307, USA. # define __MIR_SMILEYS_H__
#include <windows.h>
-
-
-/*
-To use this files mir_dblists.h/.c are needed
-*/
-#include "mir_dblists.h"
-
+#include <m_system.h>
// Init settings needed to draw smileys using the contact list itens
// To use then, pass "clist" as the protocol name
|