- compilation fix

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

8 files changed, 18 insertions, 18 deletions

diff --git a/protocols/Skype/Skype_10.vcxproj b/protocols/Skype/Skype_10.vcxproj
index dea0492a7f..5f7cea213b 100644
--- a/protocols/Skype/Skype_10.vcxproj
+++ b/protocols/Skype/Skype_10.vcxproj
@@ -192,7 +192,7 @@
     <ClInclude Include="src\skypekit\message.h" />

     <ClInclude Include="src\skypekit\participant.h" />

     <ClInclude Include="src\skypekit\search.h" />

-    <ClInclude Include="src\skypekit\skype.h" />

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

     <ClInclude Include="src\skypekit\transfer.h" />

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

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

@@ -209,7 +209,7 @@
     <ClCompile Include="src\skypekit\message.cpp" />

     <ClCompile Include="src\skypekit\participant.cpp" />

     <ClCompile Include="src\skypekit\search.cpp" />

-    <ClCompile Include="src\skypekit\skype.cpp" />

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

     <ClCompile Include="src\skypekit\transfer.cpp" />

     <ClCompile Include="src\skype_account.cpp" />

     <ClCompile Include="src\skype_chat.cpp" />

diff --git a/protocols/Skype/Skype_10.vcxproj.filters b/protocols/Skype/Skype_10.vcxproj.filters
index d7470bc9bb..2befbf1767 100644
--- a/protocols/Skype/Skype_10.vcxproj.filters
+++ b/protocols/Skype/Skype_10.vcxproj.filters
@@ -96,15 +96,15 @@
     <ClCompile Include="src\skypekit\search.cpp">

       <Filter>Source Files\skypekit</Filter>

     </ClCompile>

-    <ClCompile Include="src\skypekit\skype.cpp">

-      <Filter>Source Files\skypekit</Filter>

-    </ClCompile>

     <ClCompile Include="src\skypekit\transfer.cpp">

       <Filter>Source Files\skypekit</Filter>

     </ClCompile>

     <ClCompile Include="src\aes\aes.cpp">

       <Filter>Source Files</Filter>

     </ClCompile>

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

+      <Filter>Source Files</Filter>

+    </ClCompile>

   </ItemGroup>

   <ItemGroup>

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

@@ -146,15 +146,15 @@
     <ClInclude Include="src\skypekit\search.h">

       <Filter>Header Files\skypekit</Filter>

     </ClInclude>

-    <ClInclude Include="src\skypekit\skype.h">

-      <Filter>Header Files\skypekit</Filter>

-    </ClInclude>

     <ClInclude Include="src\skypekit\transfer.h">

       <Filter>Header Files\skypekit</Filter>

     </ClInclude>

     <ClInclude Include="src\aes\aes.h">

       <Filter>Header Files</Filter>

     </ClInclude>

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

+      <Filter>Header Files\skypekit</Filter>

+    </ClInclude>

   </ItemGroup>

   <ItemGroup>

     <ResourceCompile Include="res\Resource.rc">

diff --git a/protocols/Skype/Skype_11.vcxproj b/protocols/Skype/Skype_11.vcxproj
index 733c9894d8..7c772da91a 100644
--- a/protocols/Skype/Skype_11.vcxproj
+++ b/protocols/Skype/Skype_11.vcxproj
@@ -199,7 +199,7 @@
     <ClInclude Include="src\skypekit\message.h" />

     <ClInclude Include="src\skypekit\participant.h" />

     <ClInclude Include="src\skypekit\search.h" />

-    <ClInclude Include="src\skypekit\skype.h" />

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

     <ClInclude Include="src\skypekit\transfer.h" />

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

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

@@ -216,7 +216,7 @@
     <ClCompile Include="src\skypekit\message.cpp" />

     <ClCompile Include="src\skypekit\participant.cpp" />

     <ClCompile Include="src\skypekit\search.cpp" />

-    <ClCompile Include="src\skypekit\skype.cpp" />

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

     <ClCompile Include="src\skypekit\transfer.cpp" />

     <ClCompile Include="src\skype_account.cpp" />

     <ClCompile Include="src\skype_chat.cpp" />

diff --git a/protocols/Skype/Skype_11.vcxproj.filters b/protocols/Skype/Skype_11.vcxproj.filters
index d7470bc9bb..2befbf1767 100644
--- a/protocols/Skype/Skype_11.vcxproj.filters
+++ b/protocols/Skype/Skype_11.vcxproj.filters
@@ -96,15 +96,15 @@
     <ClCompile Include="src\skypekit\search.cpp">

       <Filter>Source Files\skypekit</Filter>

     </ClCompile>

-    <ClCompile Include="src\skypekit\skype.cpp">

-      <Filter>Source Files\skypekit</Filter>

-    </ClCompile>

     <ClCompile Include="src\skypekit\transfer.cpp">

       <Filter>Source Files\skypekit</Filter>

     </ClCompile>

     <ClCompile Include="src\aes\aes.cpp">

       <Filter>Source Files</Filter>

     </ClCompile>

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

+      <Filter>Source Files</Filter>

+    </ClCompile>

   </ItemGroup>

   <ItemGroup>

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

@@ -146,15 +146,15 @@
     <ClInclude Include="src\skypekit\search.h">

       <Filter>Header Files\skypekit</Filter>

     </ClInclude>

-    <ClInclude Include="src\skypekit\skype.h">

-      <Filter>Header Files\skypekit</Filter>

-    </ClInclude>

     <ClInclude Include="src\skypekit\transfer.h">

       <Filter>Header Files\skypekit</Filter>

     </ClInclude>

     <ClInclude Include="src\aes\aes.h">

       <Filter>Header Files</Filter>

     </ClInclude>

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

+      <Filter>Header Files\skypekit</Filter>

+    </ClInclude>

   </ItemGroup>

   <ItemGroup>

     <ResourceCompile Include="res\Resource.rc">

diff --git a/protocols/Skype/src/skype_proto.h b/protocols/Skype/src/skype_proto.h
index 4f72dc8096..0e89f4580b 100644
--- a/protocols/Skype/src/skype_proto.h
+++ b/protocols/Skype/src/skype_proto.h
@@ -1,7 +1,7 @@
 #pragma once

 

 #include "skype.h"

-#include "skypekit\skype.h"

+#include "skypekit\skypekit.h"

 

 typedef void    (__cdecl CSkypeProto::* SkypeThreadFunc) (void*);

 typedef int     (__cdecl CSkypeProto::* SkypeEventFunc)(WPARAM, LPARAM);

diff --git a/protocols/Skype/src/skypekit/account.cpp b/protocols/Skype/src/skypekit/account.cpp
index 313b1cf50d..31b4c45298 100644
--- a/protocols/Skype/src/skypekit/account.cpp
+++ b/protocols/Skype/src/skypekit/account.cpp
@@ -1,5 +1,5 @@
 #include "account.h"

-#include "skype.h"

+#include "skypekit.h"

 

 CAccount::CAccount(unsigned int oid, SERootObject* root) : Account(oid, root) 

 {

diff --git a/protocols/Skype/src/skypekit/skype.cpp b/protocols/Skype/src/skypekit/skypekit.cpp
index fe22f548c8..fe22f548c8 100644
--- a/protocols/Skype/src/skypekit/skype.cpp
+++ b/protocols/Skype/src/skypekit/skypekit.cpp
diff --git a/protocols/Skype/src/skypekit/skype.h b/protocols/Skype/src/skypekit/skypekit.h
index faac4f3d65..faac4f3d65 100644
--- a/protocols/Skype/src/skypekit/skype.h
+++ b/protocols/Skype/src/skypekit/skypekit.h