QuickMessages, QuickReplies: changed folder structure

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

23 files changed, 42 insertions, 63 deletions

diff --git a/plugins/QuickMessages/quickmessages-translation.txt b/plugins/QuickMessages/docs/quickmessages-translation.txt
index e61ab90adc..e61ab90adc 100644
--- a/plugins/QuickMessages/quickmessages-translation.txt
+++ b/plugins/QuickMessages/docs/quickmessages-translation.txt
diff --git a/plugins/QuickMessages/quickmessages_10.vcxproj b/plugins/QuickMessages/quickmessages_10.vcxproj
index 10a142a233..7792651c37 100644
--- a/plugins/QuickMessages/quickmessages_10.vcxproj
+++ b/plugins/QuickMessages/quickmessages_10.vcxproj
@@ -165,20 +165,17 @@
     </Link>

   </ItemDefinitionGroup>

   <ItemGroup>

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

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

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

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

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

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

   </ItemGroup>

   <ItemGroup>

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

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

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

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

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

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

   </ItemGroup>

   <ItemGroup>

-    <None Include="icons\qicon.ico" />

-  </ItemGroup>

-  <ItemGroup>

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

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

   </ItemGroup>

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

   <ImportGroup Label="ExtensionTargets">

diff --git a/plugins/QuickMessages/quickmessages_10.vcxproj.filters b/plugins/QuickMessages/quickmessages_10.vcxproj.filters
index 45104938f6..fbdae253cb 100644
--- a/plugins/QuickMessages/quickmessages_10.vcxproj.filters
+++ b/plugins/QuickMessages/quickmessages_10.vcxproj.filters
@@ -15,34 +15,29 @@
     </Filter>

   </ItemGroup>

   <ItemGroup>

-    <ClCompile Include="main.cpp">

+    <ClCompile Include="src\main.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="quickmessages.h">

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

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="resource.h">

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

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="Utils.h">

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

       <Filter>Header Files</Filter>

     </ClInclude>

   </ItemGroup>

   <ItemGroup>

-    <None Include="icons\qicon.ico">

-      <Filter>Resource Files</Filter>

-    </None>

-  </ItemGroup>

-  <ItemGroup>

-    <ResourceCompile Include="quickmessages.rc">

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

       <Filter>Resource Files</Filter>

     </ResourceCompile>

   </ItemGroup>

diff --git a/plugins/QuickMessages/icons/qicon.ico b/plugins/QuickMessages/res/qicon.ico
index a46ae2becc..a46ae2becc 100644
--- a/plugins/QuickMessages/icons/qicon.ico
+++ b/plugins/QuickMessages/res/qicon.ico
diff --git a/plugins/QuickMessages/quickmessages.rc b/plugins/QuickMessages/res/quickmessages.rc
index e44b0787d2..6cc083dc37 100644
--- a/plugins/QuickMessages/quickmessages.rc
+++ b/plugins/QuickMessages/res/quickmessages.rc
@@ -1,6 +1,6 @@
 // Microsoft Visual C++ generated resource script.

 //

-#include "resource.h"

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

 

 #define APSTUDIO_READONLY_SYMBOLS

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

@@ -29,8 +29,7 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
 

 1 TEXTINCLUDE 

 BEGIN

-    "resource.h\0"

-    "version.rc\0"

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

 END

 

 2 TEXTINCLUDE 

@@ -179,7 +178,7 @@ END
 

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

 // remains consistent on all systems.

-IDI_QICON               ICON                    "icons\\qicon.ico"

+IDI_QICON               ICON                    "qicon.ico"

 

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

 //

diff --git a/plugins/QuickMessages/Utils.cpp b/plugins/QuickMessages/src/Utils.cpp
index 9531268524..9531268524 100644
--- a/plugins/QuickMessages/Utils.cpp
+++ b/plugins/QuickMessages/src/Utils.cpp
diff --git a/plugins/QuickMessages/Utils.h b/plugins/QuickMessages/src/Utils.h
index c136459239..c136459239 100644
--- a/plugins/QuickMessages/Utils.h
+++ b/plugins/QuickMessages/src/Utils.h
diff --git a/plugins/QuickMessages/main.cpp b/plugins/QuickMessages/src/main.cpp
index 3720d84a6a..3720d84a6a 100644
--- a/plugins/QuickMessages/main.cpp
+++ b/plugins/QuickMessages/src/main.cpp
diff --git a/plugins/QuickMessages/options.cpp b/plugins/QuickMessages/src/options.cpp
index 4527e1c858..4527e1c858 100644
--- a/plugins/QuickMessages/options.cpp
+++ b/plugins/QuickMessages/src/options.cpp
diff --git a/plugins/QuickMessages/quickmessages.h b/plugins/QuickMessages/src/quickmessages.h
index f236b4175f..f236b4175f 100644
--- a/plugins/QuickMessages/quickmessages.h
+++ b/plugins/QuickMessages/src/quickmessages.h
diff --git a/plugins/QuickMessages/resource.h b/plugins/QuickMessages/src/resource.h
index 9facd53bf2..9facd53bf2 100644
--- a/plugins/QuickMessages/resource.h
+++ b/plugins/QuickMessages/src/resource.h
diff --git a/plugins/QuickReplies/quickreplies-translation.txt b/plugins/QuickReplies/docs/quickreplies-translation.txt
index fae9a1e2b2..fae9a1e2b2 100644
--- a/plugins/QuickReplies/quickreplies-translation.txt
+++ b/plugins/QuickReplies/docs/quickreplies-translation.txt
diff --git a/plugins/QuickReplies/quickreplies_10.vcxproj b/plugins/QuickReplies/quickreplies_10.vcxproj
index 51984a7c50..d24696a110 100644
--- a/plugins/QuickReplies/quickreplies_10.vcxproj
+++ b/plugins/QuickReplies/quickreplies_10.vcxproj
@@ -75,13 +75,12 @@
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>

       <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>

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

-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;quickreplies_EXPORTS;UNICODE;%(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>

@@ -101,7 +100,7 @@
     <ClCompile>

       <Optimization>Disabled</Optimization>

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

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

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

       <StringPooling>false</StringPooling>

       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>

       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>

@@ -109,7 +108,6 @@
       <FloatingPointModel>Fast</FloatingPointModel>

       <WarningLevel>Level3</WarningLevel>

       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>

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

     </ClCompile>

     <ResourceCompile>

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

@@ -129,13 +127,12 @@
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>

       <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>

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

-      <PreprocessorDefinitions>WIN64;NDEBUG;_WINDOWS;_USRDLL;quickreplies_EXPORTS;UNICODE;%(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>

@@ -155,14 +152,13 @@
     <ClCompile>

       <Optimization>Disabled</Optimization>

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

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

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

       <StringPooling>false</StringPooling>

       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>

       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>

       <FunctionLevelLinking>true</FunctionLevelLinking>

       <FloatingPointModel>Fast</FloatingPointModel>

       <WarningLevel>Level3</WarningLevel>

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

     </ClCompile>

     <ResourceCompile>

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

@@ -177,21 +173,18 @@
     </Link>

   </ItemDefinitionGroup>

   <ItemGroup>

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

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

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

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

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

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

   </ItemGroup>

   <ItemGroup>

-    <None Include="Icons\qicon.ico" />

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

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

   </ItemGroup>

   <ItemGroup>

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

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

-  </ItemGroup>

-  <ItemGroup>

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

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

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

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

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

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

   </ItemGroup>

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

   <ImportGroup Label="ExtensionTargets">

diff --git a/plugins/QuickReplies/quickreplies_10.vcxproj.filters b/plugins/QuickReplies/quickreplies_10.vcxproj.filters
index 82b24be170..d53f3be127 100644
--- a/plugins/QuickReplies/quickreplies_10.vcxproj.filters
+++ b/plugins/QuickReplies/quickreplies_10.vcxproj.filters
@@ -12,37 +12,32 @@
     </Filter>

   </ItemGroup>

   <ItemGroup>

-    <ClInclude Include="common.h">

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

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="resource.h">

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

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="version.h">

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

       <Filter>Header Files</Filter>

     </ClInclude>

   </ItemGroup>

   <ItemGroup>

-    <None Include="Icons\qicon.ico">

-      <Filter>Resource Files</Filter>

-    </None>

-  </ItemGroup>

-  <ItemGroup>

-    <ResourceCompile Include="resources.rc">

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

       <Filter>Resource Files</Filter>

     </ResourceCompile>

-    <ResourceCompile Include="version.rc">

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

       <Filter>Resource Files</Filter>

     </ResourceCompile>

   </ItemGroup>

   <ItemGroup>

-    <ClCompile Include="events.cpp">

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

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="options.cpp">

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

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="quickreplies.cpp">

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

       <Filter>Source Files</Filter>

     </ClCompile>

   </ItemGroup>

diff --git a/plugins/QuickReplies/Icons/qicon.ico b/plugins/QuickReplies/res/qicon.ico
index 23c3765fd9..23c3765fd9 100644
--- a/plugins/QuickReplies/Icons/qicon.ico
+++ b/plugins/QuickReplies/res/qicon.ico
diff --git a/plugins/QuickReplies/resources.rc b/plugins/QuickReplies/res/resources.rc
index 2ef1204ff2..fdac5b7230 100644
--- a/plugins/QuickReplies/resources.rc
+++ b/plugins/QuickReplies/res/resources.rc
@@ -1,6 +1,6 @@
 // Microsoft Visual C++ generated resource script.

 //

-#include "resource.h"

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

 

 #define APSTUDIO_READONLY_SYMBOLS

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

@@ -73,7 +73,7 @@ END
 

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

 // remains consistent on all systems.

-IDI_QICON               ICON                    "Icons\\qicon.ico"

+IDI_QICON               ICON                    "qicon.ico"

 #endif    // нейтральный resources

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

 

@@ -95,7 +95,7 @@ LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT
 

 1 TEXTINCLUDE 

 BEGIN

-    "resource.h\0"

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

 END

 

 2 TEXTINCLUDE 

diff --git a/plugins/QuickReplies/version.rc b/plugins/QuickReplies/res/version.rc
index 95c065fb90..cc6b3bf17a 100644
--- a/plugins/QuickReplies/version.rc
+++ b/plugins/QuickReplies/res/version.rc
@@ -4,7 +4,7 @@
 #error this file is not editable by Microsoft Visual C++

 #endif //APSTUDIO_INVOKED

 

-#include "version.h"

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

 

 #define APSTUDIO_READONLY_SYMBOLS

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

@@ -83,7 +83,7 @@ LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT
 

 1 TEXTINCLUDE 

 BEGIN

-    "version.h\0"

+    "..\\src\\version.h\0"

 END

 

 2 TEXTINCLUDE 

diff --git a/plugins/QuickReplies/common.h b/plugins/QuickReplies/src/common.h
index e65994372c..e65994372c 100644
--- a/plugins/QuickReplies/common.h
+++ b/plugins/QuickReplies/src/common.h
diff --git a/plugins/QuickReplies/events.cpp b/plugins/QuickReplies/src/events.cpp
index 2227c6d6f1..2227c6d6f1 100644
--- a/plugins/QuickReplies/events.cpp
+++ b/plugins/QuickReplies/src/events.cpp
diff --git a/plugins/QuickReplies/options.cpp b/plugins/QuickReplies/src/options.cpp
index 3c96f42e89..3c96f42e89 100644
--- a/plugins/QuickReplies/options.cpp
+++ b/plugins/QuickReplies/src/options.cpp
diff --git a/plugins/QuickReplies/quickreplies.cpp b/plugins/QuickReplies/src/quickreplies.cpp
index 063ef0c8d3..063ef0c8d3 100644
--- a/plugins/QuickReplies/quickreplies.cpp
+++ b/plugins/QuickReplies/src/quickreplies.cpp
diff --git a/plugins/QuickReplies/resource.h b/plugins/QuickReplies/src/resource.h
index a27459012f..a27459012f 100644
--- a/plugins/QuickReplies/resource.h
+++ b/plugins/QuickReplies/src/resource.h
diff --git a/plugins/QuickReplies/version.h b/plugins/QuickReplies/src/version.h
index 6c87a94d0d..6c87a94d0d 100644
--- a/plugins/QuickReplies/version.h
+++ b/plugins/QuickReplies/src/version.h