From 4ab12bb105f250aa65057641caae5b17e283f7c1 Mon Sep 17 00:00:00 2001
From: Kirill Volinsky <mataes2007@gmail.com>
Date: Tue, 23 Jun 2015 06:07:37 +0000
Subject: FloatingContacts: unified project

git-svn-id: http://svn.miranda-ng.org/main/trunk@14342 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
---
 plugins/FloatingContacts/src/bitmap_funcs.cpp |  2 +-
 plugins/FloatingContacts/src/filedrop.cpp     |  2 +-
 plugins/FloatingContacts/src/main.cpp         |  2 +-
 plugins/FloatingContacts/src/options.cpp      |  4 +--
 plugins/FloatingContacts/src/stdafx.cpp       | 18 -------------
 plugins/FloatingContacts/src/stdafx.h         | 37 +++++++++++++++++++++++++
 plugins/FloatingContacts/src/stdhdr.h         | 39 ---------------------------
 plugins/FloatingContacts/src/thumbs.cpp       |  3 ++-
 8 files changed, 44 insertions(+), 63 deletions(-)
 delete mode 100644 plugins/FloatingContacts/src/stdafx.cpp
 create mode 100644 plugins/FloatingContacts/src/stdafx.h
 delete mode 100644 plugins/FloatingContacts/src/stdhdr.h

(limited to 'plugins/FloatingContacts/src')

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/stdafx.h b/plugins/FloatingContacts/src/stdafx.h
new file mode 100644
index 0000000000..f2d793f8be
--- /dev/null
+++ b/plugins/FloatingContacts/src/stdafx.h
@@ -0,0 +1,37 @@
+
+#ifndef __STDHDR_H__
+#define __STDHDR_H__
+
+#include <windows.h>
+#include <assert.h>
+#include <math.h>
+#include <Shlwapi.h>
+
+#include <newpluginapi.h>
+#include <m_system_cpp.h>
+#include <m_skin.h>
+#include <m_fontservice.h>
+#include <m_langpack.h>
+#include <m_protosvc.h>
+#include <m_database.h>
+#include <m_message.h>
+#include <m_clui.h>
+#include <m_options.h>
+#include <m_clistint.h>
+#include <m_hotkeys.h>
+#include <m_imgsrvc.h>
+#include <win2k.h>
+
+#include "bitmap_funcs.h"
+#include "fltcont.h"
+#include "thumbs.h"
+#include "filedrop.h"
+#include "resource.h"
+#include "version.h"
+
+/////////////////////////////////////////////////////////////////////////////
+
+#endif	// #ifndef __STDHDR_H__
+
+/////////////////////////////////////////////////////////////////////////////
+// End Of File stdhdr.h
diff --git a/plugins/FloatingContacts/src/stdhdr.h b/plugins/FloatingContacts/src/stdhdr.h
deleted file mode 100644
index f4fa678833..0000000000
--- a/plugins/FloatingContacts/src/stdhdr.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-#ifndef __STDHDR_H__
-#define __STDHDR_H__
-
-#define _CRT_SECURE_NO_WARNINGS
-
-#include <windows.h>
-#include <assert.h>
-#include <math.h>
-#include <Shlwapi.h>
-
-#include <newpluginapi.h>
-#include <m_system_cpp.h>
-#include <m_skin.h>
-#include <m_fontservice.h>
-#include <m_langpack.h>
-#include <m_protosvc.h>
-#include <m_database.h>
-#include <m_message.h>
-#include <m_clui.h>
-#include <m_options.h>
-#include <m_clistint.h>
-#include <m_hotkeys.h>
-#include <m_imgsrvc.h>
-#include <win2k.h>
-
-#include "bitmap_funcs.h"
-#include "fltcont.h"
-#include "thumbs.h"
-#include "filedrop.h"
-#include "resource.h"
-#include "version.h"
-
-/////////////////////////////////////////////////////////////////////////////
-
-#endif	// #ifndef __STDHDR_H__
-
-/////////////////////////////////////////////////////////////////////////////
-// End Of File stdhdr.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;
 
-- 
cgit v1.2.3