FloatingContacts: unified project

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

7 files changed, 7 insertions, 26 deletions

diff --git a/plugins/FloatingContacts/src/bitmap_funcs.cpp b/plugins/FloatingContacts/src/bitmap_funcs.cpp
index 47690ac980..25347c47fb 100644
--- a/plugins/FloatingContacts/src/bitmap_funcs.cpp
+++ b/plugins/FloatingContacts/src/bitmap_funcs.cpp
@@ -19,7 +19,7 @@ along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.

 */

 

-#include "stdhdr.h"

+#include "stdafx.h"

 

 #define PU_FONT_THRESHOLD				96

 #define PU_BMP_ACCURATE_ARITHMETICS

diff --git a/plugins/FloatingContacts/src/filedrop.cpp b/plugins/FloatingContacts/src/filedrop.cpp
index 4280ed8f61..311c2acee2 100644
--- a/plugins/FloatingContacts/src/filedrop.cpp
+++ b/plugins/FloatingContacts/src/filedrop.cpp
@@ -1,4 +1,4 @@
-#include "stdhdr.h"

+#include "stdafx.h"

 

 static void ProcessDroppedItems(char **ppDroppedItems, int nCount, char **ppFiles);

 static int  CountDroppedFiles(char **ppDroppedItems, int nCount);

diff --git a/plugins/FloatingContacts/src/main.cpp b/plugins/FloatingContacts/src/main.cpp
index d16405ffbb..464521581a 100644
--- a/plugins/FloatingContacts/src/main.cpp
+++ b/plugins/FloatingContacts/src/main.cpp
@@ -14,7 +14,7 @@ This plugin has been tested to work under Windows ME, 2000 and XP.
 No warranty for any misbehaviour.

 */

 

-#include "stdhdr.h"

+#include "stdafx.h"

 

 #include "../Utils/mir_fonts.h"

 

diff --git a/plugins/FloatingContacts/src/options.cpp b/plugins/FloatingContacts/src/options.cpp
index 3f6a7e8c0d..7cd5b9680d 100644
--- a/plugins/FloatingContacts/src/options.cpp
+++ b/plugins/FloatingContacts/src/options.cpp
@@ -1,5 +1,5 @@
-

-#include "stdhdr.h"

+#include "stdafx.h"

+#pragma comment(lib, "shlwapi.lib")

 

 #define M_GUESSSAMEASBOXES		(WM_USER + 18)

 

diff --git a/plugins/FloatingContacts/src/stdafx.cpp b/plugins/FloatingContacts/src/stdafx.cpp
deleted file mode 100644
index e111a5f498..0000000000
--- a/plugins/FloatingContacts/src/stdafx.cpp
+++ /dev/null
@@ -1,18 +0,0 @@
-/*

-Copyright (C) 2012-15 Miranda NG project (http://miranda-ng.org)

-

-This program is free software; you can redistribute it and/or

-modify it under the terms of the GNU General Public License

-as published by the Free Software Foundation version 2

-of the License.

-

-This program 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 General Public License for more details.

-

-You should have received a copy of the GNU General Public License

-along with this program. If not, see <http://www.gnu.org/licenses/>.

-*/

-

-#include "stdhdr.h"
\ No newline at end of file
diff --git a/plugins/FloatingContacts/src/stdhdr.h b/plugins/FloatingContacts/src/stdafx.h
index f4fa678833..f2d793f8be 100644
--- a/plugins/FloatingContacts/src/stdhdr.h
+++ b/plugins/FloatingContacts/src/stdafx.h
@@ -2,8 +2,6 @@
 #ifndef __STDHDR_H__

 #define __STDHDR_H__

 

-#define _CRT_SECURE_NO_WARNINGS

-

 #include <windows.h>

 #include <assert.h>

 #include <math.h>

diff --git a/plugins/FloatingContacts/src/thumbs.cpp b/plugins/FloatingContacts/src/thumbs.cpp
index 455626dbc0..e5e3e09482 100644
--- a/plugins/FloatingContacts/src/thumbs.cpp
+++ b/plugins/FloatingContacts/src/thumbs.cpp
@@ -1,4 +1,5 @@
-#include "stdhdr.h"

+#include "stdafx.h"

+#pragma comment(lib, "Msimg32.lib")

 

 ThumbList thumbList;