StopSpamPlus, TipperYM, TooltipNotify, TopToolBar, TranslitSwitcher, UserGuide: changed folder structure

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

16 files changed, 26 insertions, 26 deletions

diff --git a/plugins/StopSpamPlus/stopspamplus-translation.txt b/plugins/StopSpamPlus/docs/stopspamplus-translation.txt
index 50b195e9f2..50b195e9f2 100644
--- a/plugins/StopSpamPlus/stopspamplus-translation.txt
+++ b/plugins/StopSpamPlus/docs/stopspamplus-translation.txt
diff --git a/plugins/StopSpamPlus/res/stopspam.rc b/plugins/StopSpamPlus/res/stopspam.rc
index e6f3f1ffc1..4cb4a45a1c 100644
--- a/plugins/StopSpamPlus/res/stopspam.rc
+++ b/plugins/StopSpamPlus/res/stopspam.rc
@@ -1,6 +1,6 @@
 // Microsoft Visual C++ generated resource script.

 //

-#include "resource.h"

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

 

 #define APSTUDIO_READONLY_SYMBOLS

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

@@ -123,7 +123,7 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 

 1 TEXTINCLUDE 

 BEGIN

-    "resource.h\0"

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

 END

 

 2 TEXTINCLUDE 

diff --git a/plugins/StopSpamPlus/res/version.rc b/plugins/StopSpamPlus/res/version.rc
index ebf0f96c65..75748ead8a 100644
--- a/plugins/StopSpamPlus/res/version.rc
+++ b/plugins/StopSpamPlus/res/version.rc
@@ -3,7 +3,7 @@
 #endif //APSTUDIO_INVOKED

 

 #include "afxres.h"

-#include "version.h"

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

 

 #ifdef _WIN32

 LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL

diff --git a/plugins/StopSpamPlus/src/events.cpp b/plugins/StopSpamPlus/src/events.cpp
index c4943f8e0f..41f4d9e8eb 100644
--- a/plugins/StopSpamPlus/src/events.cpp
+++ b/plugins/StopSpamPlus/src/events.cpp
@@ -1,4 +1,4 @@
-#include "../headers.h"

+#include "headers.h"

 

 

 MIRANDA_HOOK_EVENT(ME_DB_EVENT_ADDED, wParam, lParam)

diff --git a/plugins/StopSpamPlus/headers.h b/plugins/StopSpamPlus/src/headers.h
index d80060d668..6da161f793 100644
--- a/plugins/StopSpamPlus/headers.h
+++ b/plugins/StopSpamPlus/src/headers.h
@@ -26,9 +26,9 @@
 #include <m_skin.h>

 #include <m_clist.h>

 

-#include "src/eventhooker.h"

-#include "res/version.h"

-#include "res/resource.h"

+#include "eventhooker.h"

+#include "version.h"

+#include "resource.h"

 #include "m_stopspam.h"

 

 #include "m_variables.h"

@@ -50,7 +50,7 @@ extern HINSTANCE hInst;
 	#define PREF_TCHAR2 0

 #endif //_UNICODE

 

-#include "src/settings.h"

+#include "settings.h"

 

 //options

 INT_PTR CALLBACK MainDlgProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam);

diff --git a/plugins/StopSpamPlus/src/opt_proto.cpp b/plugins/StopSpamPlus/src/opt_proto.cpp
index 014a44e7c7..cfdfe0b991 100644
--- a/plugins/StopSpamPlus/src/opt_proto.cpp
+++ b/plugins/StopSpamPlus/src/opt_proto.cpp
@@ -1,4 +1,4 @@
-#include "../headers.h"

+#include "headers.h"

 

 struct ProtocolData

 {

diff --git a/plugins/StopSpamPlus/src/options.cpp b/plugins/StopSpamPlus/src/options.cpp
index 52fab03e8f..221a06f480 100644
--- a/plugins/StopSpamPlus/src/options.cpp
+++ b/plugins/StopSpamPlus/src/options.cpp
@@ -1,4 +1,4 @@
-#include "../headers.h"

+#include "headers.h"

 

 char * pluginDescription = "No more spam! Robots can't go! Only human beings invited!\r\n\r\n"

 "This plugin works pretty simple:\r\n"

diff --git a/plugins/StopSpamPlus/res/resource.h b/plugins/StopSpamPlus/src/resource.h
index 62e603cb2e..62e603cb2e 100644
--- a/plugins/StopSpamPlus/res/resource.h
+++ b/plugins/StopSpamPlus/src/resource.h
diff --git a/plugins/StopSpamPlus/src/services.cpp b/plugins/StopSpamPlus/src/services.cpp
index 1f9097446d..7fe08a9600 100644
--- a/plugins/StopSpamPlus/src/services.cpp
+++ b/plugins/StopSpamPlus/src/services.cpp
@@ -1,4 +1,4 @@
-#include "../headers.h"

+#include "headers.h"

 

 INT_PTR IsContactPassed(WPARAM wParam, LPARAM /*lParam*/)

 {

diff --git a/plugins/StopSpamPlus/src/settings.cpp b/plugins/StopSpamPlus/src/settings.cpp
index 7d74b63919..05a9007d0c 100644
--- a/plugins/StopSpamPlus/src/settings.cpp
+++ b/plugins/StopSpamPlus/src/settings.cpp
@@ -1,4 +1,4 @@
-#include "../headers.h"

+#include "headers.h"

 

 //reading from database-------------

 tstring db_usage::DBGetPluginSetting(std::string const &name, tstring const &defValue)

diff --git a/plugins/StopSpamPlus/src/settings.h b/plugins/StopSpamPlus/src/settings.h
index 99aa9322e8..86219ebf10 100644
--- a/plugins/StopSpamPlus/src/settings.h
+++ b/plugins/StopSpamPlus/src/settings.h
@@ -1,6 +1,6 @@
 #pragma once

 

-#include "../headers.h"

+#include "headers.h"

 

 class db_usage

 {

diff --git a/plugins/StopSpamPlus/src/stopspam.cpp b/plugins/StopSpamPlus/src/stopspam.cpp
index 72d5e175c6..e58b8846ff 100644
--- a/plugins/StopSpamPlus/src/stopspam.cpp
+++ b/plugins/StopSpamPlus/src/stopspam.cpp
@@ -1,4 +1,4 @@
-#include "../headers.h"

+#include "headers.h"

 

 HANDLE hFunc, hTempRemove, hLoadHook;

 int hLangpack;

diff --git a/plugins/StopSpamPlus/src/utils.cpp b/plugins/StopSpamPlus/src/utils.cpp
index 673a858ad2..7d8bc28050 100644
--- a/plugins/StopSpamPlus/src/utils.cpp
+++ b/plugins/StopSpamPlus/src/utils.cpp
@@ -1,4 +1,4 @@
-#include "../headers.h"

+#include "headers.h"

 

 

 tstring &GetDlgItemString(HWND hwnd, int id)

diff --git a/plugins/StopSpamPlus/res/version.h b/plugins/StopSpamPlus/src/version.h
index feb992d6a3..feb992d6a3 100644
--- a/plugins/StopSpamPlus/res/version.h
+++ b/plugins/StopSpamPlus/src/version.h
diff --git a/plugins/StopSpamPlus/stopspam_10.vcxproj b/plugins/StopSpamPlus/stopspam_10.vcxproj
index 5b1d4d75fc..48a8b01d0c 100644
--- a/plugins/StopSpamPlus/stopspam_10.vcxproj
+++ b/plugins/StopSpamPlus/stopspam_10.vcxproj
@@ -74,7 +74,7 @@
       <Optimization>Full</Optimization>

       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>

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

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

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

       <StringPooling>true</StringPooling>

       <FunctionLevelLinking>true</FunctionLevelLinking>

       <WarningLevel>Level3</WarningLevel>

@@ -100,7 +100,7 @@
       <Optimization>Full</Optimization>

       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>

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

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

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

       <StringPooling>true</StringPooling>

       <FunctionLevelLinking>true</FunctionLevelLinking>

       <WarningLevel>Level3</WarningLevel>

@@ -125,7 +125,7 @@
     <ClCompile>

       <Optimization>Disabled</Optimization>

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

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

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

       <MinimalRebuild>true</MinimalRebuild>

       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>

       <WarningLevel>Level3</WarningLevel>

@@ -148,7 +148,7 @@
     <ClCompile>

       <Optimization>Disabled</Optimization>

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

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

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

       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>

       <WarningLevel>Level3</WarningLevel>

     </ClCompile>

@@ -176,11 +176,11 @@
     <ClCompile Include="src\utils.cpp" />

   </ItemGroup>

   <ItemGroup>

-    <ClInclude Include="..\ExternalAPI\m_stopspam.h" />

     <ClInclude Include="src\eventhooker.h" />

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

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

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

     <ClInclude Include="src\settings.h" />

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

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

   </ItemGroup>

   <ItemGroup>

     <ResourceCompile Include="res\stopspam.rc" />

diff --git a/plugins/StopSpamPlus/stopspam_10.vcxproj.filters b/plugins/StopSpamPlus/stopspam_10.vcxproj.filters
index e997e2959c..51bdd7ab12 100644
--- a/plugins/StopSpamPlus/stopspam_10.vcxproj.filters
+++ b/plugins/StopSpamPlus/stopspam_10.vcxproj.filters
@@ -44,16 +44,16 @@
     <ClInclude Include="src\eventhooker.h">

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="res\resource.h">

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

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="src\settings.h">

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

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="res\version.h">

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

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="..\ExternalAPI\m_stopspam.h">

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

       <Filter>Header Files</Filter>

     </ClInclude>

   </ItemGroup>