Db3x: changed folder structure

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

18 files changed, 30 insertions, 34 deletions

diff --git a/plugins/Db3x/db3x_10.vcxproj b/plugins/Db3x/db3x_10.vcxproj
index 20f828e179..bd702267d1 100644
--- a/plugins/Db3x/db3x_10.vcxproj
+++ b/plugins/Db3x/db3x_10.vcxproj
@@ -83,7 +83,6 @@
       <PrecompiledHeaderFile>commonheaders.h</PrecompiledHeaderFile>

       <WarningLevel>Level3</WarningLevel>

       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>

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

     </ClCompile>

     <ResourceCompile>

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

@@ -114,7 +113,6 @@
       <PrecompiledHeader>Use</PrecompiledHeader>

       <PrecompiledHeaderFile>commonheaders.h</PrecompiledHeaderFile>

       <WarningLevel>Level3</WarningLevel>

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

     </ClCompile>

     <ResourceCompile>

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

@@ -145,7 +143,6 @@
       <PrecompiledHeader>Use</PrecompiledHeader>

       <PrecompiledHeaderFile>commonheaders.h</PrecompiledHeaderFile>

       <WarningLevel>Level3</WarningLevel>

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

       <FloatingPointModel>Fast</FloatingPointModel>

       <ExceptionHandling>false</ExceptionHandling>

     </ClCompile>

@@ -181,7 +178,6 @@
       <PrecompiledHeader>Use</PrecompiledHeader>

       <PrecompiledHeaderFile>commonheaders.h</PrecompiledHeaderFile>

       <WarningLevel>Level3</WarningLevel>

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

       <FloatingPointModel>Fast</FloatingPointModel>

     </ClCompile>

     <ResourceCompile>

@@ -203,25 +199,25 @@
     </PreBuildEvent>

   </ItemDefinitionGroup>

   <ItemGroup>

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

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

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

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

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

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

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

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

-    <ClCompile Include="init.cpp">

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

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

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

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

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

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

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

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

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

       <PrecompiledHeader>Create</PrecompiledHeader>

     </ClCompile>

   </ItemGroup>

   <ItemGroup>

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

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

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

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

   </ItemGroup>

   <ItemGroup>

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

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

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

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

   </ItemGroup>

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

   <ImportGroup Label="ExtensionTargets">

diff --git a/plugins/Db3x/db3x_10.vcxproj.filters b/plugins/Db3x/db3x_10.vcxproj.filters
index 444c119160..19e4fdcf15 100644
--- a/plugins/Db3x/db3x_10.vcxproj.filters
+++ b/plugins/Db3x/db3x_10.vcxproj.filters
@@ -15,47 +15,47 @@
     </Filter>

   </ItemGroup>

   <ItemGroup>

-    <ClCompile Include="database.cpp">

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

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="dbcache.cpp">

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

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="dbcontacts.cpp">

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

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="dbevents.cpp">

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

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="dbheaders.cpp">

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

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="dbmodulechain.cpp">

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

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="dbsettings.cpp">

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

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="encrypt.cpp">

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

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="init.cpp">

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

       <Filter>Source Files</Filter>

     </ClCompile>

   </ItemGroup>

   <ItemGroup>

-    <ClInclude Include="commonheaders.h">

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

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="database.h">

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

       <Filter>Header Files</Filter>

     </ClInclude>

   </ItemGroup>

   <ItemGroup>

-    <ResourceCompile Include="resource.rc">

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

       <Filter>Resource Files</Filter>

     </ResourceCompile>

-    <ResourceCompile Include="version.rc">

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

       <Filter>Resource Files</Filter>

     </ResourceCompile>

   </ItemGroup>

diff --git a/plugins/Db3x/db3x-translation.txt b/plugins/Db3x/docs/db3x-translation.txt
index e7f834f1e1..e7f834f1e1 100644
--- a/plugins/Db3x/db3x-translation.txt
+++ b/plugins/Db3x/docs/db3x-translation.txt
diff --git a/plugins/Db3x/resource.rc b/plugins/Db3x/res/resource.rc
index daa99f340d..c4a3c0b6f9 100644
--- a/plugins/Db3x/resource.rc
+++ b/plugins/Db3x/res/resource.rc
@@ -1,6 +1,6 @@
 //Microsoft Developer Studio generated resource script.

 //

-#include "resource.h"

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

 

 #define APSTUDIO_READONLY_SYMBOLS

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

diff --git a/plugins/Db3x/version.rc b/plugins/Db3x/res/version.rc
index 425f7db19e..080efcd27f 100644
--- a/plugins/Db3x/version.rc
+++ b/plugins/Db3x/res/version.rc
@@ -2,10 +2,8 @@
 #error this file is not editable by Microsoft Visual C++

 #endif //APSTUDIO_INVOKED

 

-#include "version.h"

-#include "resource.h"

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

 #include "winres.h"

-#include "richedit.h"

 

 #ifdef _WIN32

 LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US

diff --git a/plugins/Db3x/commonheaders.h b/plugins/Db3x/src/commonheaders.h
index 84fc492046..415bb7448d 100644
--- a/plugins/Db3x/commonheaders.h
+++ b/plugins/Db3x/src/commonheaders.h
@@ -21,6 +21,8 @@ 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

+

 #define MIRANDA_VER 0x0A00

 

 #define _WIN32_WINNT 0x0501

diff --git a/plugins/Db3x/database.cpp b/plugins/Db3x/src/database.cpp
index 0172bde5b2..0172bde5b2 100644
--- a/plugins/Db3x/database.cpp
+++ b/plugins/Db3x/src/database.cpp
diff --git a/plugins/Db3x/database.h b/plugins/Db3x/src/database.h
index 334e47002d..334e47002d 100644
--- a/plugins/Db3x/database.h
+++ b/plugins/Db3x/src/database.h
diff --git a/plugins/Db3x/dbcache.cpp b/plugins/Db3x/src/dbcache.cpp
index 10d34e1ec3..10d34e1ec3 100644
--- a/plugins/Db3x/dbcache.cpp
+++ b/plugins/Db3x/src/dbcache.cpp
diff --git a/plugins/Db3x/dbcontacts.cpp b/plugins/Db3x/src/dbcontacts.cpp
index ef128a491e..ef128a491e 100644
--- a/plugins/Db3x/dbcontacts.cpp
+++ b/plugins/Db3x/src/dbcontacts.cpp
diff --git a/plugins/Db3x/dbevents.cpp b/plugins/Db3x/src/dbevents.cpp
index be50babe57..be50babe57 100644
--- a/plugins/Db3x/dbevents.cpp
+++ b/plugins/Db3x/src/dbevents.cpp
diff --git a/plugins/Db3x/dbheaders.cpp b/plugins/Db3x/src/dbheaders.cpp
index 8320102888..8320102888 100644
--- a/plugins/Db3x/dbheaders.cpp
+++ b/plugins/Db3x/src/dbheaders.cpp
diff --git a/plugins/Db3x/dbmodulechain.cpp b/plugins/Db3x/src/dbmodulechain.cpp
index f130937af2..f130937af2 100644
--- a/plugins/Db3x/dbmodulechain.cpp
+++ b/plugins/Db3x/src/dbmodulechain.cpp
diff --git a/plugins/Db3x/dbsettings.cpp b/plugins/Db3x/src/dbsettings.cpp
index 209b7a13ab..209b7a13ab 100644
--- a/plugins/Db3x/dbsettings.cpp
+++ b/plugins/Db3x/src/dbsettings.cpp
diff --git a/plugins/Db3x/encrypt.cpp b/plugins/Db3x/src/encrypt.cpp
index 7426a50cd7..7426a50cd7 100644
--- a/plugins/Db3x/encrypt.cpp
+++ b/plugins/Db3x/src/encrypt.cpp
diff --git a/plugins/Db3x/init.cpp b/plugins/Db3x/src/init.cpp
index f9b1269bda..f9b1269bda 100644
--- a/plugins/Db3x/init.cpp
+++ b/plugins/Db3x/src/init.cpp
diff --git a/plugins/Db3x/resource.h b/plugins/Db3x/src/resource.h
index 96abbfff99..96abbfff99 100644
--- a/plugins/Db3x/resource.h
+++ b/plugins/Db3x/src/resource.h
diff --git a/plugins/Db3x/version.h b/plugins/Db3x/src/version.h
index 2d10138fcf..2d10138fcf 100644
--- a/plugins/Db3x/version.h
+++ b/plugins/Db3x/src/version.h