BossKeyPlus: compilation fix and warnings deprecation

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

14 files changed, 23 insertions, 34 deletions

diff --git a/plugins/BossKeyPlus/BossKey_10.vcxproj b/plugins/BossKeyPlus/BossKey_10.vcxproj
index 3dbdc0bd48..94b44e46aa 100644
--- a/plugins/BossKeyPlus/BossKey_10.vcxproj
+++ b/plugins/BossKeyPlus/BossKey_10.vcxproj
@@ -165,22 +165,19 @@
     </Link>

   </ItemDefinitionGroup>

   <ItemGroup>

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

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

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

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

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

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

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

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

   </ItemGroup>

   <ItemGroup>

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

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

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

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

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

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

   </ItemGroup>

   <ItemGroup>

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

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

-  </ItemGroup>

-  <ItemGroup>

-    <None Include="icos\logo.ico" />

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

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

   </ItemGroup>

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

   <ImportGroup Label="ExtensionTargets">

diff --git a/plugins/BossKeyPlus/BossKey_10.vcxproj.filters b/plugins/BossKeyPlus/BossKey_10.vcxproj.filters
index 322e6f09e9..f1e5317181 100644
--- a/plugins/BossKeyPlus/BossKey_10.vcxproj.filters
+++ b/plugins/BossKeyPlus/BossKey_10.vcxproj.filters
@@ -15,41 +15,36 @@
     </Filter>

   </ItemGroup>

   <ItemGroup>

-    <ClCompile Include="BossKey.cpp">

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

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="BossKeyIdle.cpp">

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

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="BossKeyTriggers.cpp">

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

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="Options.cpp">

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

       <Filter>Source Files</Filter>

     </ClCompile>

   </ItemGroup>

   <ItemGroup>

-    <ClInclude Include="BossKey.h">

+    <ClInclude Include="src\BossKey.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>

-    <ResourceCompile Include="BossKey.rc">

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

       <Filter>Resource Files</Filter>

     </ResourceCompile>

-    <ResourceCompile Include="version.rc">

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

       <Filter>Source Files</Filter>

     </ResourceCompile>

   </ItemGroup>

-  <ItemGroup>

-    <None Include="icos\logo.ico">

-      <Filter>Resource Files</Filter>

-    </None>

-  </ItemGroup>

 </Project>
\ No newline at end of file
diff --git a/plugins/BossKeyPlus/Resource.rc b/plugins/BossKeyPlus/Resource.rc
deleted file mode 100644
index d0587997af..0000000000
--- a/plugins/BossKeyPlus/Resource.rc
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "BossKey.rc"

-#include "version.rc"

diff --git a/plugins/BossKeyPlus/bosskeyplus-translation.txt b/plugins/BossKeyPlus/docs/bosskeyplus-translation.txt
index 2b4b50ddc5..2b4b50ddc5 100644
--- a/plugins/BossKeyPlus/bosskeyplus-translation.txt
+++ b/plugins/BossKeyPlus/docs/bosskeyplus-translation.txt
diff --git a/plugins/BossKeyPlus/BossKey.rc b/plugins/BossKeyPlus/res/BossKey.rc
index 5915f1a196..cb131c7652 100644
--- a/plugins/BossKeyPlus/BossKey.rc
+++ b/plugins/BossKeyPlus/res/BossKey.rc
@@ -1,6 +1,6 @@
 // Microsoft Visual C++ generated resource script.

 //

-#include "resource.h"

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

 

 #define APSTUDIO_READONLY_SYMBOLS

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

@@ -170,7 +170,7 @@ END
 

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

 // remains consistent on all systems.

-IDI_DLGPASSWD           ICON                    "icos\\logo.ico"

+IDI_DLGPASSWD           ICON                    "logo.ico"

 

 #ifdef APSTUDIO_INVOKED

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

@@ -180,7 +180,7 @@ IDI_DLGPASSWD           ICON                    "icos\\logo.ico"
 

 1 TEXTINCLUDE 

 BEGIN

-    "resource.h\0"

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

 END

 

 2 TEXTINCLUDE 

@@ -210,5 +210,4 @@ END
 

 

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

-#endif    // not APSTUDIO_INVOKED

-

+#endif    // not APSTUDIO_INVOKED
\ No newline at end of file
diff --git a/plugins/BossKeyPlus/icos/logo.ico b/plugins/BossKeyPlus/res/logo.ico
index e2dc76f8c4..e2dc76f8c4 100644
--- a/plugins/BossKeyPlus/icos/logo.ico
+++ b/plugins/BossKeyPlus/res/logo.ico
diff --git a/plugins/BossKeyPlus/version.rc b/plugins/BossKeyPlus/res/version.rc
index 8179bba8ec..a637a7b7e4 100644
--- a/plugins/BossKeyPlus/version.rc
+++ b/plugins/BossKeyPlus/res/version.rc
@@ -3,7 +3,7 @@
 #endif //APSTUDIO_INVOKED

 

 #include <windows.h>

-#include "version.h"

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

 

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

 //

diff --git a/plugins/BossKeyPlus/BossKey.cpp b/plugins/BossKeyPlus/src/BossKey.cpp
index b61d3f3624..b61d3f3624 100644
--- a/plugins/BossKeyPlus/BossKey.cpp
+++ b/plugins/BossKeyPlus/src/BossKey.cpp
diff --git a/plugins/BossKeyPlus/BossKey.h b/plugins/BossKeyPlus/src/BossKey.h
index ac5cb38dad..ac5cb38dad 100644
--- a/plugins/BossKeyPlus/BossKey.h
+++ b/plugins/BossKeyPlus/src/BossKey.h
diff --git a/plugins/BossKeyPlus/BossKeyIdle.cpp b/plugins/BossKeyPlus/src/BossKeyIdle.cpp
index eba26fd29e..eba26fd29e 100644
--- a/plugins/BossKeyPlus/BossKeyIdle.cpp
+++ b/plugins/BossKeyPlus/src/BossKeyIdle.cpp
diff --git a/plugins/BossKeyPlus/BossKeyTriggers.cpp b/plugins/BossKeyPlus/src/BossKeyTriggers.cpp
index a16a0f05b4..a16a0f05b4 100644
--- a/plugins/BossKeyPlus/BossKeyTriggers.cpp
+++ b/plugins/BossKeyPlus/src/BossKeyTriggers.cpp
diff --git a/plugins/BossKeyPlus/Options.cpp b/plugins/BossKeyPlus/src/Options.cpp
index eefb5bac96..eefb5bac96 100644
--- a/plugins/BossKeyPlus/Options.cpp
+++ b/plugins/BossKeyPlus/src/Options.cpp
diff --git a/plugins/BossKeyPlus/resource.h b/plugins/BossKeyPlus/src/resource.h
index c3dbcc8b2a..c3dbcc8b2a 100644
--- a/plugins/BossKeyPlus/resource.h
+++ b/plugins/BossKeyPlus/src/resource.h
diff --git a/plugins/BossKeyPlus/version.h b/plugins/BossKeyPlus/src/version.h
index d11ef40695..d11ef40695 100644
--- a/plugins/BossKeyPlus/version.h
+++ b/plugins/BossKeyPlus/src/version.h