SimpleAR, SimpleStatusMsg, SmileyAdd, SpellChecker: changed folder structure

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

12 files changed, 34 insertions, 72 deletions

diff --git a/plugins/SimpleStatusMsg/simplestatusmsg-translation.txt b/plugins/SimpleStatusMsg/docs/simplestatusmsg-translation.txt
index 37e50a086e..37e50a086e 100644
--- a/plugins/SimpleStatusMsg/simplestatusmsg-translation.txt
+++ b/plugins/SimpleStatusMsg/docs/simplestatusmsg-translation.txt
diff --git a/plugins/SimpleStatusMsg/resource.rc b/plugins/SimpleStatusMsg/res/resource.rc
index 4a81378d39..2014c9da82 100644
--- a/plugins/SimpleStatusMsg/resource.rc
+++ b/plugins/SimpleStatusMsg/res/resource.rc
@@ -1,6 +1,6 @@
 // Microsoft Visual C++ generated resource script.

 //

-#include "resource.h"

+#include "..\src\resource.h"

 

 #define APSTUDIO_READONLY_SYMBOLS

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

@@ -81,7 +81,7 @@ LANGUAGE LANG_POLISH, SUBLANG_DEFAULT
 

 1 TEXTINCLUDE 

 BEGIN

-    "resource.h\0"

+    "..\\src\\resource.h\0"

 END

 

 2 TEXTINCLUDE 

@@ -181,14 +181,14 @@ END
 

 // Icon with lowest ID value placed first to ensure application icon

 // remains consistent on all systems.

-IDI_CROSS               ICON                    "res\\cross.ico"

-IDI_HISTORY             ICON                    "res\\history.ico"

-IDI_MESSAGE             ICON                    "res\\msg.ico"

-IDI_PLUS                ICON                    "res\\plus.ico"

-IDI_CHIST               ICON                    "res\\cbook.ico"

-IDI_COPY                ICON                    "res\\copy.ico"

-IDI_CSMSG               ICON                    "res\\csmsg.ico"

-IDI_GOTOURL             ICON                    "res\\gotourl.ico"

+IDI_CROSS               ICON                    "cross.ico"

+IDI_HISTORY             ICON                    "history.ico"

+IDI_MESSAGE             ICON                    "msg.ico"

+IDI_PLUS                ICON                    "plus.ico"

+IDI_CHIST               ICON                    "cbook.ico"

+IDI_COPY                ICON                    "copy.ico"

+IDI_CSMSG               ICON                    "csmsg.ico"

+IDI_GOTOURL             ICON                    "gotourl.ico"

 

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

 //

diff --git a/plugins/SimpleStatusMsg/simplestatusmsg_10.vcxproj b/plugins/SimpleStatusMsg/simplestatusmsg_10.vcxproj
index afea8eaf86..1cff22adf5 100644
--- a/plugins/SimpleStatusMsg/simplestatusmsg_10.vcxproj
+++ b/plugins/SimpleStatusMsg/simplestatusmsg_10.vcxproj
@@ -73,14 +73,13 @@
     <ClCompile>

       <Optimization>Disabled</Optimization>

       <AdditionalIncludeDirectories>..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

-      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;UNICODE;_USRDLL;SIMPLESTATUSMSG_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <MinimalRebuild>true</MinimalRebuild>

       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>

       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>

       <FunctionLevelLinking>true</FunctionLevelLinking>

       <WarningLevel>Level3</WarningLevel>

       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>

-      <DisableSpecificWarnings>4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>

     </ClCompile>

     <ResourceCompile>

       <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

@@ -100,13 +99,12 @@
     <ClCompile>

       <Optimization>Disabled</Optimization>

       <AdditionalIncludeDirectories>..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

-      <PreprocessorDefinitions>WIN64;_DEBUG;_WINDOWS;UNICODE;_USRDLL;SIMPLESTATUSMSG_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <PreprocessorDefinitions>WIN64;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <MinimalRebuild>true</MinimalRebuild>

       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>

       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>

       <FunctionLevelLinking>true</FunctionLevelLinking>

       <WarningLevel>Level3</WarningLevel>

-      <DisableSpecificWarnings>4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>

     </ClCompile>

     <ResourceCompile>

       <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

@@ -128,13 +126,12 @@
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>

       <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>

       <AdditionalIncludeDirectories>..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;UNICODE;_USRDLL;SIMPLESTATUSMSG_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <StringPooling>true</StringPooling>

       <BufferSecurityCheck>false</BufferSecurityCheck>

       <FunctionLevelLinking>true</FunctionLevelLinking>

       <FloatingPointModel>Fast</FloatingPointModel>

       <WarningLevel>Level3</WarningLevel>

-      <DisableSpecificWarnings>4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>

     </ClCompile>

     <ResourceCompile>

       <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

@@ -158,13 +155,12 @@
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>

       <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>

       <AdditionalIncludeDirectories>..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

-      <PreprocessorDefinitions>WIN64;NDEBUG;_WINDOWS;UNICODE;_USRDLL;SIMPLESTATUSMSG_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <PreprocessorDefinitions>WIN64;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <StringPooling>true</StringPooling>

       <BufferSecurityCheck>false</BufferSecurityCheck>

       <FunctionLevelLinking>true</FunctionLevelLinking>

       <FloatingPointModel>Fast</FloatingPointModel>

       <WarningLevel>Level3</WarningLevel>

-      <DisableSpecificWarnings>4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>

     </ClCompile>

     <ResourceCompile>

       <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

@@ -183,29 +179,19 @@
     </Link>

   </ItemDefinitionGroup>

   <ItemGroup>

-    <ClCompile Include="awaymsg.cpp" />

-    <ClCompile Include="main.cpp" />

-    <ClCompile Include="msgbox.cpp" />

-    <ClCompile Include="options.cpp" />

-    <ClCompile Include="utils.cpp" />

+    <ClCompile Include="src\awaymsg.cpp" />

+    <ClCompile Include="src\main.cpp" />

+    <ClCompile Include="src\msgbox.cpp" />

+    <ClCompile Include="src\options.cpp" />

+    <ClCompile Include="src\utils.cpp" />

   </ItemGroup>

   <ItemGroup>

-    <ClInclude Include="commonheaders.h" />

-    <ClInclude Include="resource.h" />

-    <ClInclude Include="simplestatusmsg.h" />

+    <ClInclude Include="src\commonheaders.h" />

+    <ClInclude Include="src\resource.h" />

+    <ClInclude Include="src\simplestatusmsg.h" />

   </ItemGroup>

   <ItemGroup>

-    <None Include="res\cbook.ico" />

-    <None Include="res\copy.ico" />

-    <None Include="res\cross.ico" />

-    <None Include="res\csmsg.ico" />

-    <None Include="res\gotourl.ico" />

-    <None Include="res\history.ico" />

-    <None Include="res\msg.ico" />

-    <None Include="res\plus.ico" />

-  </ItemGroup>

-  <ItemGroup>

-    <ResourceCompile Include="resource.rc" />

+    <ResourceCompile Include="res\resource.rc" />

   </ItemGroup>

   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

   <ImportGroup Label="ExtensionTargets">

diff --git a/plugins/SimpleStatusMsg/simplestatusmsg_10.vcxproj.filters b/plugins/SimpleStatusMsg/simplestatusmsg_10.vcxproj.filters
index 84705e53ed..c797e51b5e 100644
--- a/plugins/SimpleStatusMsg/simplestatusmsg_10.vcxproj.filters
+++ b/plugins/SimpleStatusMsg/simplestatusmsg_10.vcxproj.filters
@@ -15,61 +15,35 @@
     </Filter>

   </ItemGroup>

   <ItemGroup>

-    <ClCompile Include="awaymsg.cpp">

+    <ClCompile Include="src\awaymsg.cpp">

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="main.cpp">

+    <ClCompile Include="src\main.cpp">

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="msgbox.cpp">

+    <ClCompile Include="src\msgbox.cpp">

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="options.cpp">

+    <ClCompile Include="src\options.cpp">

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="utils.cpp">

+    <ClCompile Include="src\utils.cpp">

       <Filter>Source Files</Filter>

     </ClCompile>

   </ItemGroup>

   <ItemGroup>

-    <ClInclude Include="commonheaders.h">

+    <ClInclude Include="src\commonheaders.h">

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="resource.h">

+    <ClInclude Include="src\resource.h">

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="simplestatusmsg.h">

+    <ClInclude Include="src\simplestatusmsg.h">

       <Filter>Header Files</Filter>

     </ClInclude>

   </ItemGroup>

   <ItemGroup>

-    <None Include="res\cbook.ico">

-      <Filter>Resource Files</Filter>

-    </None>

-    <None Include="res\copy.ico">

-      <Filter>Resource Files</Filter>

-    </None>

-    <None Include="res\cross.ico">

-      <Filter>Resource Files</Filter>

-    </None>

-    <None Include="res\csmsg.ico">

-      <Filter>Resource Files</Filter>

-    </None>

-    <None Include="res\gotourl.ico">

-      <Filter>Resource Files</Filter>

-    </None>

-    <None Include="res\history.ico">

-      <Filter>Resource Files</Filter>

-    </None>

-    <None Include="res\msg.ico">

-      <Filter>Resource Files</Filter>

-    </None>

-    <None Include="res\plus.ico">

-      <Filter>Resource Files</Filter>

-    </None>

-  </ItemGroup>

-  <ItemGroup>

-    <ResourceCompile Include="resource.rc">

+    <ResourceCompile Include="res\resource.rc">

       <Filter>Resource Files</Filter>

     </ResourceCompile>

   </ItemGroup>

diff --git a/plugins/SimpleStatusMsg/awaymsg.cpp b/plugins/SimpleStatusMsg/src/awaymsg.cpp
index 705b860cc5..705b860cc5 100644
--- a/plugins/SimpleStatusMsg/awaymsg.cpp
+++ b/plugins/SimpleStatusMsg/src/awaymsg.cpp
diff --git a/plugins/SimpleStatusMsg/commonheaders.h b/plugins/SimpleStatusMsg/src/commonheaders.h
index 594fbfa546..54bf654ca4 100644
--- a/plugins/SimpleStatusMsg/commonheaders.h
+++ b/plugins/SimpleStatusMsg/src/commonheaders.h
@@ -25,6 +25,8 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 

 #define _WIN32_IE 0x0501

 

+#define _CRT_SECURE_NO_WARNINGS

+

 #include <m_stdhdr.h>

 

 #include <windows.h>

diff --git a/plugins/SimpleStatusMsg/main.cpp b/plugins/SimpleStatusMsg/src/main.cpp
index 95212f4d59..95212f4d59 100644
--- a/plugins/SimpleStatusMsg/main.cpp
+++ b/plugins/SimpleStatusMsg/src/main.cpp
diff --git a/plugins/SimpleStatusMsg/msgbox.cpp b/plugins/SimpleStatusMsg/src/msgbox.cpp
index 924307ea04..924307ea04 100644
--- a/plugins/SimpleStatusMsg/msgbox.cpp
+++ b/plugins/SimpleStatusMsg/src/msgbox.cpp
diff --git a/plugins/SimpleStatusMsg/options.cpp b/plugins/SimpleStatusMsg/src/options.cpp
index cc450c12e4..cc450c12e4 100644
--- a/plugins/SimpleStatusMsg/options.cpp
+++ b/plugins/SimpleStatusMsg/src/options.cpp
diff --git a/plugins/SimpleStatusMsg/resource.h b/plugins/SimpleStatusMsg/src/resource.h
index 137327acac..137327acac 100644
--- a/plugins/SimpleStatusMsg/resource.h
+++ b/plugins/SimpleStatusMsg/src/resource.h
diff --git a/plugins/SimpleStatusMsg/simplestatusmsg.h b/plugins/SimpleStatusMsg/src/simplestatusmsg.h
index d66aba197c..d66aba197c 100644
--- a/plugins/SimpleStatusMsg/simplestatusmsg.h
+++ b/plugins/SimpleStatusMsg/src/simplestatusmsg.h
diff --git a/plugins/SimpleStatusMsg/utils.cpp b/plugins/SimpleStatusMsg/src/utils.cpp
index 549dd957bc..549dd957bc 100644
--- a/plugins/SimpleStatusMsg/utils.cpp
+++ b/plugins/SimpleStatusMsg/src/utils.cpp