unified project for clist_nicer

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

47 files changed, 52 insertions, 52 deletions

diff --git a/plugins/Clist_nicer/src/CLCButton.cpp b/plugins/Clist_nicer/src/CLCButton.cpp
index d5689f67f5..047ef84064 100644
--- a/plugins/Clist_nicer/src/CLCButton.cpp
+++ b/plugins/Clist_nicer/src/CLCButton.cpp
@@ -16,7 +16,7 @@ You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software

 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.

 */

-#include "commonheaders.h"

+#include "stdafx.h"

 

 #include <m_button_int.h>

 #include <m_toptoolbar.h>

diff --git a/plugins/Clist_nicer/src/Docking.cpp b/plugins/Clist_nicer/src/Docking.cpp
index 2455efa43d..cb9848878e 100644
--- a/plugins/Clist_nicer/src/Docking.cpp
+++ b/plugins/Clist_nicer/src/Docking.cpp
@@ -22,7 +22,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 "commonheaders.h"

+#include "stdafx.h"

 

 #define WM_DOCKCALLBACK   (WM_USER+121)

 #define WM_CREATEDOCKED   (WM_USER+122)

diff --git a/plugins/Clist_nicer/src/alphablend.cpp b/plugins/Clist_nicer/src/alphablend.cpp
index 403f244fa5..0906dc512f 100644
--- a/plugins/Clist_nicer/src/alphablend.cpp
+++ b/plugins/Clist_nicer/src/alphablend.cpp
@@ -22,7 +22,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 "commonheaders.h"

+#include "stdafx.h"

 

 extern int g_hottrack, g_hottrack_done;

 extern BOOL g_inCLCpaint;

diff --git a/plugins/Clist_nicer/src/Include/alphablend.h b/plugins/Clist_nicer/src/alphablend.h
index d5ce2225b1..d5ce2225b1 100644
--- a/plugins/Clist_nicer/src/Include/alphablend.h
+++ b/plugins/Clist_nicer/src/alphablend.h
diff --git a/plugins/Clist_nicer/src/clc.cpp b/plugins/Clist_nicer/src/clc.cpp
index 6a5a3937ca..d2276d2f72 100644
--- a/plugins/Clist_nicer/src/clc.cpp
+++ b/plugins/Clist_nicer/src/clc.cpp
@@ -22,11 +22,11 @@ along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.

 */

 

-#include <commonheaders.h>

-#include <resource.h>

+#include "stdafx.h"

+#include "resource.h"

 #include <m_userinfo.h>

-#include "../cluiframes/cluiframes.h"

-#include "../coolsb/coolscroll.h"

+#include "cluiframes.h"

+#include "coolscroll.h"

 

 void CSH_Destroy();

 

@@ -94,7 +94,7 @@ static int ClcEventAdded(WPARAM hContact, LPARAM lParam)
 

 static int ClcMetamodeChanged(WPARAM bMetaEnabled, LPARAM)

 {

-	if (bMetaEnabled != cfg::dat.bMetaEnabled) {

+	if (BOOL(bMetaEnabled) != cfg::dat.bMetaEnabled) {

 		cfg::dat.bMetaEnabled = (BYTE)bMetaEnabled;

 		pcli->pfnClcBroadcast(CLM_AUTOREBUILD, 0, 0);

 	}

diff --git a/plugins/Clist_nicer/src/Include/clc.h b/plugins/Clist_nicer/src/clc.h
index a196275b15..a196275b15 100644
--- a/plugins/Clist_nicer/src/Include/clc.h
+++ b/plugins/Clist_nicer/src/clc.h
diff --git a/plugins/Clist_nicer/src/clcidents.cpp b/plugins/Clist_nicer/src/clcidents.cpp
index bf2200cec5..d4f49e2cd3 100644
--- a/plugins/Clist_nicer/src/clcidents.cpp
+++ b/plugins/Clist_nicer/src/clcidents.cpp
@@ -22,7 +22,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 <commonheaders.h>

+#include "stdafx.h"

 

 /* the CLC uses 3 different ways to identify elements in its list, this file

 contains routines to convert between them.

diff --git a/plugins/Clist_nicer/src/clcitems.cpp b/plugins/Clist_nicer/src/clcitems.cpp
index c745bfac31..1efaba03ad 100644
--- a/plugins/Clist_nicer/src/clcitems.cpp
+++ b/plugins/Clist_nicer/src/clcitems.cpp
@@ -22,7 +22,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 <commonheaders.h>

+#include "stdafx.h"

 

 /*

 * load time zone information for the contact

diff --git a/plugins/Clist_nicer/src/clcmsgs.cpp b/plugins/Clist_nicer/src/clcmsgs.cpp
index c7e9df06f7..7f219c11db 100644
--- a/plugins/Clist_nicer/src/clcmsgs.cpp
+++ b/plugins/Clist_nicer/src/clcmsgs.cpp
@@ -22,7 +22,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 <commonheaders.h>

+#include "stdafx.h"

 

 //processing of all the CLM_ messages incoming

 

diff --git a/plugins/Clist_nicer/src/clcopts.cpp b/plugins/Clist_nicer/src/clcopts.cpp
index aa07621ba0..a2735846df 100644
--- a/plugins/Clist_nicer/src/clcopts.cpp
+++ b/plugins/Clist_nicer/src/clcopts.cpp
@@ -22,8 +22,8 @@ along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.

 */

 

-#include <commonheaders.h>

-#include "../coolsb/coolscroll.h"

+#include "stdafx.h"

+#include "coolscroll.h"

 

 #include <m_extraicons.h>

 

diff --git a/plugins/Clist_nicer/src/clcpaint.cpp b/plugins/Clist_nicer/src/clcpaint.cpp
index 4dd4748b27..7a49a4aa0b 100644
--- a/plugins/Clist_nicer/src/clcpaint.cpp
+++ b/plugins/Clist_nicer/src/clcpaint.cpp
@@ -22,7 +22,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 "commonheaders.h"

+#include "stdafx.h"

 

 extern struct avatarCache *g_avatarCache;

 extern int g_curAvatar;

diff --git a/plugins/Clist_nicer/src/clcutils.cpp b/plugins/Clist_nicer/src/clcutils.cpp
index 57a5023c87..da568c67a6 100644
--- a/plugins/Clist_nicer/src/clcutils.cpp
+++ b/plugins/Clist_nicer/src/clcutils.cpp
@@ -22,9 +22,9 @@ along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.

 */

 

-#include <commonheaders.h>

+#include "stdafx.h"

 

-#include "../coolsb/coolscroll.h"

+#include "coolscroll.h"

 

 #ifndef SPI_GETDESKWALLPAPER

 #define SPI_GETDESKWALLPAPER 115

diff --git a/plugins/Clist_nicer/src/Include/clist.h b/plugins/Clist_nicer/src/clist.h
index 6f9a0622ed..6f9a0622ed 100644
--- a/plugins/Clist_nicer/src/Include/clist.h
+++ b/plugins/Clist_nicer/src/clist.h
diff --git a/plugins/Clist_nicer/src/clistevents.cpp b/plugins/Clist_nicer/src/clistevents.cpp
index 9d7e722d8b..b3b9c6cb37 100644
--- a/plugins/Clist_nicer/src/clistevents.cpp
+++ b/plugins/Clist_nicer/src/clistevents.cpp
@@ -22,8 +22,8 @@ along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.

 */

 

-#include <commonheaders.h>

-#include "../cluiframes/cluiframes.h"

+#include "stdafx.h"

+#include "cluiframes.h"

 

 static HWND hwndEventFrame = 0;

 HFONT __fastcall ChangeToFont(HDC hdc, struct ClcData *dat, int id, int *fontHeight);

diff --git a/plugins/Clist_nicer/src/clistmenus.cpp b/plugins/Clist_nicer/src/clistmenus.cpp
index 8642b4978d..abaf6cda54 100644
--- a/plugins/Clist_nicer/src/clistmenus.cpp
+++ b/plugins/Clist_nicer/src/clistmenus.cpp
@@ -22,10 +22,10 @@ along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.

 */

 

-#include <commonheaders.h>

+#include "stdafx.h"

 #include <m_genmenu.h>

 #include <m_ignore.h>

-#include "../CLUIFrames/cluiframes.h"

+#include "cluiframes.h"

 

 #pragma hdrstop

 

diff --git a/plugins/Clist_nicer/src/clistmod.cpp b/plugins/Clist_nicer/src/clistmod.cpp
index bb19f80c8e..e590392b4d 100644
--- a/plugins/Clist_nicer/src/clistmod.cpp
+++ b/plugins/Clist_nicer/src/clistmod.cpp
@@ -22,7 +22,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 <commonheaders.h>

+#include "stdafx.h"

 

 extern int AddEvent(WPARAM wParam, LPARAM lParam);

 extern int RemoveEvent(WPARAM wParam, LPARAM lParam);

diff --git a/plugins/Clist_nicer/src/clistopts.cpp b/plugins/Clist_nicer/src/clistopts.cpp
index 291431b238..0059673aa8 100644
--- a/plugins/Clist_nicer/src/clistopts.cpp
+++ b/plugins/Clist_nicer/src/clistopts.cpp
@@ -22,7 +22,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 "commonheaders.h"

+#include "stdafx.h"

 

 void LoadContactTree(void);

 void SortContacts(void);

diff --git a/plugins/Clist_nicer/src/clistsettings.cpp b/plugins/Clist_nicer/src/clistsettings.cpp
index 05e4cb7692..396b179b6a 100644
--- a/plugins/Clist_nicer/src/clistsettings.cpp
+++ b/plugins/Clist_nicer/src/clistsettings.cpp
@@ -22,7 +22,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 "commonheaders.h"

+#include "stdafx.h"

 

 INT_PTR GetContactStatusMessage(WPARAM wParam, LPARAM lParam)

 {

diff --git a/plugins/Clist_nicer/src/clisttray.cpp b/plugins/Clist_nicer/src/clisttray.cpp
index f9c6ba956e..d60405fecc 100644
--- a/plugins/Clist_nicer/src/clisttray.cpp
+++ b/plugins/Clist_nicer/src/clisttray.cpp
@@ -22,7 +22,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 "commonheaders.h"

+#include "stdafx.h"

 

 #define TRAYICON_ID_BASE	100

 #define TIM_CALLBACK	(WM_USER+1857)

diff --git a/plugins/Clist_nicer/src/clnplus.cpp b/plugins/Clist_nicer/src/clnplus.cpp
index eed275b1e3..a59b2ef982 100644
--- a/plugins/Clist_nicer/src/clnplus.cpp
+++ b/plugins/Clist_nicer/src/clnplus.cpp
@@ -2,7 +2,7 @@
  * test for gdi+

  */

 

-#include <commonheaders.h>

+#include "stdafx.h"

 #include <shobjidl.h>

 #include "msapi/comptr.h"

 

diff --git a/plugins/Clist_nicer/src/clui.cpp b/plugins/Clist_nicer/src/clui.cpp
index bd4e65f1a5..80b01a7a48 100644
--- a/plugins/Clist_nicer/src/clui.cpp
+++ b/plugins/Clist_nicer/src/clui.cpp
@@ -22,10 +22,10 @@ along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 
-#include <commonheaders.h>
+#include "stdafx.h"
 #include <m_findadd.h>
-#include "../cluiframes/cluiframes.h"
-#include "../coolsb/coolscroll.h"
+#include "cluiframes.h"
+#include "coolscroll.h"
 
 #define TM_AUTOALPHA  1
 #define TIMERID_AUTOSIZE 100
diff --git a/plugins/Clist_nicer/src/CLUIFrames/cluiframes.cpp b/plugins/Clist_nicer/src/cluiframes.cpp
index 84c4390de9..ace31e1037 100644
--- a/plugins/Clist_nicer/src/CLUIFrames/cluiframes.cpp
+++ b/plugins/Clist_nicer/src/cluiframes.cpp
@@ -22,7 +22,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 <commonheaders.h>
+#include "stdafx.h"
 #include "cluiframes.h"
 HFONT __fastcall ChangeToFont(HDC hdc, struct ClcData *dat, int id, int *fontHeight);
 
diff --git a/plugins/Clist_nicer/src/CLUIFrames/cluiframes.h b/plugins/Clist_nicer/src/cluiframes.h
index 4fef8cec0f..4fef8cec0f 100644
--- a/plugins/Clist_nicer/src/CLUIFrames/cluiframes.h
+++ b/plugins/Clist_nicer/src/cluiframes.h
diff --git a/plugins/Clist_nicer/src/cluiopts.cpp b/plugins/Clist_nicer/src/cluiopts.cpp
index 3bdd48aeb9..bfba68fd9e 100644
--- a/plugins/Clist_nicer/src/cluiopts.cpp
+++ b/plugins/Clist_nicer/src/cluiopts.cpp
@@ -22,7 +22,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 "commonheaders.h"

+#include "stdafx.h"

 

 extern HANDLE hExtraImageApplying;

 extern SIZE g_oldSize;

diff --git a/plugins/Clist_nicer/src/cluiservices.cpp b/plugins/Clist_nicer/src/cluiservices.cpp
index 351e4073c4..cda2e1b583 100644
--- a/plugins/Clist_nicer/src/cluiservices.cpp
+++ b/plugins/Clist_nicer/src/cluiservices.cpp
@@ -22,8 +22,8 @@ along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.

 */

 

-#include <commonheaders.h>

-#include "../cluiframes/cluiframes.h"

+#include "stdafx.h"

+#include "cluiframes.h"

 

 extern HIMAGELIST hCListImages;

 extern ButtonItem *g_ButtonItems;

diff --git a/plugins/Clist_nicer/src/config.cpp b/plugins/Clist_nicer/src/config.cpp
index ba013a2202..48486e1456 100644
--- a/plugins/Clist_nicer/src/config.cpp
+++ b/plugins/Clist_nicer/src/config.cpp
@@ -22,7 +22,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 <commonheaders.h>

+#include "stdafx.h"

 

 TCluiData cfg::dat = { 0 };

 ClcData* cfg::clcdat = 0;

diff --git a/plugins/Clist_nicer/src/Include/config.h b/plugins/Clist_nicer/src/config.h
index c833107fe3..c833107fe3 100644
--- a/plugins/Clist_nicer/src/Include/config.h
+++ b/plugins/Clist_nicer/src/config.h
diff --git a/plugins/Clist_nicer/src/contact.cpp b/plugins/Clist_nicer/src/contact.cpp
index 7f1145226a..7e8617783a 100644
--- a/plugins/Clist_nicer/src/contact.cpp
+++ b/plugins/Clist_nicer/src/contact.cpp
@@ -22,7 +22,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 <commonheaders.h>

+#include "stdafx.h"

 

 struct

 {

diff --git a/plugins/Clist_nicer/src/Coolsb/coolsb_internal.h b/plugins/Clist_nicer/src/coolsb_internal.h
index 64249c355c..64249c355c 100644
--- a/plugins/Clist_nicer/src/Coolsb/coolsb_internal.h
+++ b/plugins/Clist_nicer/src/coolsb_internal.h
diff --git a/plugins/Clist_nicer/src/Coolsb/coolsblib.cpp b/plugins/Clist_nicer/src/coolsblib.cpp
index d2c0e15e54..bf4e14421d 100644
--- a/plugins/Clist_nicer/src/Coolsb/coolsblib.cpp
+++ b/plugins/Clist_nicer/src/coolsblib.cpp
@@ -26,7 +26,7 @@
 

 */

 

-#include <commonheaders.h>

+#include "stdafx.h"

 #include "coolscroll.h"

 #include "userdefs.h"

 #include "coolsb_internal.h"

diff --git a/plugins/Clist_nicer/src/Coolsb/coolsblib.h b/plugins/Clist_nicer/src/coolsblib.h
index d9b1c711f3..d9b1c711f3 100644
--- a/plugins/Clist_nicer/src/Coolsb/coolsblib.h
+++ b/plugins/Clist_nicer/src/coolsblib.h
diff --git a/plugins/Clist_nicer/src/Coolsb/coolscroll.cpp b/plugins/Clist_nicer/src/coolscroll.cpp
index 80b0cd12c4..1e8f5b98ff 100644
--- a/plugins/Clist_nicer/src/Coolsb/coolscroll.cpp
+++ b/plugins/Clist_nicer/src/coolscroll.cpp
@@ -43,7 +43,7 @@
 	 with careful thought.

 */

 

-#include <commonheaders.h>

+#include "stdafx.h"

 #include "coolscroll.h"

 #include "userdefs.h"

 #include "coolsb_internal.h"

diff --git a/plugins/Clist_nicer/src/Coolsb/coolscroll.h b/plugins/Clist_nicer/src/coolscroll.h
index c5fe848a83..c5fe848a83 100644
--- a/plugins/Clist_nicer/src/Coolsb/coolscroll.h
+++ b/plugins/Clist_nicer/src/coolscroll.h
diff --git a/plugins/Clist_nicer/src/extBackg.cpp b/plugins/Clist_nicer/src/extBackg.cpp
index 937a550431..aad2b8689c 100644
--- a/plugins/Clist_nicer/src/extBackg.cpp
+++ b/plugins/Clist_nicer/src/extBackg.cpp
@@ -22,8 +22,8 @@ along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.

 */

 

-#include <commonheaders.h>

-#include "../coolsb/coolscroll.h"

+#include "stdafx.h"

+#include "coolscroll.h"

 

 extern int g_hottrack;

 

diff --git a/plugins/Clist_nicer/src/Include/extBackg.h b/plugins/Clist_nicer/src/extBackg.h
index 9b98c283ee..9b98c283ee 100644
--- a/plugins/Clist_nicer/src/Include/extBackg.h
+++ b/plugins/Clist_nicer/src/extBackg.h
diff --git a/plugins/Clist_nicer/src/CLUIFrames/groupmenu.cpp b/plugins/Clist_nicer/src/groupmenu.cpp
index c68a3c16d1..a3be204ae6 100644
--- a/plugins/Clist_nicer/src/CLUIFrames/groupmenu.cpp
+++ b/plugins/Clist_nicer/src/groupmenu.cpp
@@ -22,7 +22,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 <commonheaders.h>

+#include "stdafx.h"

 

 /////////////////////////////////////////////////////////////////////////////////////////

 //////////////////////////////         Group MENU          //////////////////////////////

diff --git a/plugins/Clist_nicer/src/init.cpp b/plugins/Clist_nicer/src/init.cpp
index b785b163e3..462ada6ea0 100644
--- a/plugins/Clist_nicer/src/init.cpp
+++ b/plugins/Clist_nicer/src/init.cpp
@@ -22,8 +22,10 @@ along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.

 */

 

-#include <commonheaders.h>

-#include "../cluiframes/cluiframes.h"

+#include "stdafx.h"

+#include "cluiframes.h"

+

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

 

 HINSTANCE g_hInst = 0;

 CLIST_INTERFACE *pcli, coreCli;

diff --git a/plugins/Clist_nicer/src/Include/resource.h b/plugins/Clist_nicer/src/resource.h
index abb763ae2e..abb763ae2e 100644
--- a/plugins/Clist_nicer/src/Include/resource.h
+++ b/plugins/Clist_nicer/src/resource.h
diff --git a/plugins/Clist_nicer/src/rowheight_funcs.cpp b/plugins/Clist_nicer/src/rowheight_funcs.cpp
index a7eb1b83cb..6b0803275c 100644
--- a/plugins/Clist_nicer/src/rowheight_funcs.cpp
+++ b/plugins/Clist_nicer/src/rowheight_funcs.cpp
@@ -22,8 +22,8 @@ along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.

 */

 

-#include <commonheaders.h>

-#include <rowheight_funcs.h>

+#include "stdafx.h"

+#include "rowheight_funcs.h"

 

 BOOL RowHeight::Init(ClcData *dat)

 {

diff --git a/plugins/Clist_nicer/src/Include/rowheight_funcs.h b/plugins/Clist_nicer/src/rowheight_funcs.h
index 60a0998e1c..60a0998e1c 100644
--- a/plugins/Clist_nicer/src/Include/rowheight_funcs.h
+++ b/plugins/Clist_nicer/src/rowheight_funcs.h
diff --git a/plugins/Clist_nicer/src/statusbar.cpp b/plugins/Clist_nicer/src/statusbar.cpp
index 774e193a8d..2aec05b640 100644
--- a/plugins/Clist_nicer/src/statusbar.cpp
+++ b/plugins/Clist_nicer/src/statusbar.cpp
@@ -22,8 +22,8 @@ along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.

 */

 

-#include <commonheaders.h>

-#include "../CLUIFrames/cluiframes.h"

+#include "stdafx.h"

+#include "cluiframes.h"

 

 static POINT ptMouse = { 0 };

 static RECT rcMouse = { 0 };

diff --git a/plugins/Clist_nicer/src/stdafx.cpp b/plugins/Clist_nicer/src/stdafx.cxx
index 048b14e9d2..0c766ea07f 100644
--- a/plugins/Clist_nicer/src/stdafx.cpp
+++ b/plugins/Clist_nicer/src/stdafx.cxx
@@ -15,4 +15,4 @@ 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 "commonheaders.h"
\ No newline at end of file
+#include "stdafx.h"

diff --git a/plugins/Clist_nicer/src/Include/commonheaders.h b/plugins/Clist_nicer/src/stdafx.h
index a7cd57a950..4dfc5ffa40 100644
--- a/plugins/Clist_nicer/src/Include/commonheaders.h
+++ b/plugins/Clist_nicer/src/stdafx.h
@@ -22,8 +22,6 @@ along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.

 */

 

-#define _CRT_SECURE_NO_WARNINGS

-

 #undef FASTCALL

 

 #define TSAPI __stdcall

@@ -58,6 +56,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include <m_xstatus.h>

 #include <m_extraicons.h>

 #include <m_string.h>

+#include <m_variables.h>

 

 #include <m_metacontacts.h>

 #include <m_cln_skinedit.h>

diff --git a/plugins/Clist_nicer/src/Coolsb/userdefs.h b/plugins/Clist_nicer/src/userdefs.h
index ea7ea1fe92..ea7ea1fe92 100644
--- a/plugins/Clist_nicer/src/Coolsb/userdefs.h
+++ b/plugins/Clist_nicer/src/userdefs.h
diff --git a/plugins/Clist_nicer/src/Include/Version.h b/plugins/Clist_nicer/src/version.h
index babd66c1bc..babd66c1bc 100644
--- a/plugins/Clist_nicer/src/Include/Version.h
+++ b/plugins/Clist_nicer/src/version.h
diff --git a/plugins/Clist_nicer/src/viewmodes.cpp b/plugins/Clist_nicer/src/viewmodes.cpp
index c19d607890..5e8ed3b24a 100644
--- a/plugins/Clist_nicer/src/viewmodes.cpp
+++ b/plugins/Clist_nicer/src/viewmodes.cpp
@@ -22,9 +22,8 @@ along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.

 */

 

-#include <commonheaders.h>

-#include <m_variables.h>

-#include "../cluiframes/cluiframes.h"

+#include "stdafx.h"

+#include "cluiframes.h"

 

 #define TIMERID_VIEWMODEEXPIRE 100

 

diff --git a/plugins/Clist_nicer/src/wallpaper.cpp b/plugins/Clist_nicer/src/wallpaper.cpp
index c235094fda..75e1831bfe 100644
--- a/plugins/Clist_nicer/src/wallpaper.cpp
+++ b/plugins/Clist_nicer/src/wallpaper.cpp
@@ -22,7 +22,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 <commonheaders.h>

+#include "stdafx.h"

 

 typedef enum {

 	WPS_TILED=0,