Omegle: folders restructurization

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

35 files changed, 59 insertions, 79 deletions

diff --git a/protocols/Omegle/omegle-translation.txt b/protocols/Omegle/docs/omegle-translation.txt
index 2eff25dbfb..2eff25dbfb 100644
--- a/protocols/Omegle/omegle-translation.txt
+++ b/protocols/Omegle/docs/omegle-translation.txt
diff --git a/protocols/Omegle/readme.txt b/protocols/Omegle/docs/readme.txt
index cbc85e0bb8..cbc85e0bb8 100644
--- a/protocols/Omegle/readme.txt
+++ b/protocols/Omegle/docs/readme.txt
diff --git a/protocols/Omegle/omegle_10.vcxproj b/protocols/Omegle/omegle_10.vcxproj
index 24ec1e1f2d..6d3b2803e2 100644
--- a/protocols/Omegle/omegle_10.vcxproj
+++ b/protocols/Omegle/omegle_10.vcxproj
@@ -174,38 +174,35 @@
     </Link>

   </ItemDefinitionGroup>

   <ItemGroup>

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

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

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

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

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

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

-    <ClCompile Include="main.cpp">

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

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

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

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

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

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

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

       <PrecompiledHeader>Create</PrecompiledHeader>

     </ClCompile>

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

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

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

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

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

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

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

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

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

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

   </ItemGroup>

   <ItemGroup>

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

   </ItemGroup>

   <ItemGroup>

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

-  </ItemGroup>

-  <ItemGroup>

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

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

   </ItemGroup>

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

   <ImportGroup Label="ExtensionTargets">

diff --git a/protocols/Omegle/omegle_10.vcxproj.filters b/protocols/Omegle/omegle_10.vcxproj.filters
index c222cc6004..3f60176dad 100644
--- a/protocols/Omegle/omegle_10.vcxproj.filters
+++ b/protocols/Omegle/omegle_10.vcxproj.filters
@@ -15,82 +15,77 @@
     </Filter>

   </ItemGroup>

   <ItemGroup>

-    <ClCompile Include="chat.cpp">

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

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="communication.cpp">

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

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="connection.cpp">

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

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="events.cpp">

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

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="http.cpp">

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

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="main.cpp">

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

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="messages.cpp">

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

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="proto.cpp">

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

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="stubs.cpp">

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

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="theme.cpp">

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

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="utils.cpp">

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

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="dialogs.cpp">

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

       <Filter>Source Files</Filter>

     </ClCompile>

   </ItemGroup>

   <ItemGroup>

-    <ClInclude Include="client.h">

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

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="common.h">

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

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="constants.h">

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

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="db.h">

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

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="http.h">

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

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="proto.h">

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

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="theme.h">

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

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="utils.h">

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

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="resource.h">

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

       <Filter>Resource Files</Filter>

     </ClInclude>

-    <ClInclude Include="dialogs.h">

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

       <Filter>Header Files</Filter>

     </ClInclude>

   </ItemGroup>

   <ItemGroup>

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

-      <Filter>Resource Files</Filter>

-    </None>

-  </ItemGroup>

-  <ItemGroup>

-    <ResourceCompile Include="omegle.rc">

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

       <Filter>Resource Files</Filter>

     </ResourceCompile>

   </ItemGroup>

diff --git a/protocols/Omegle/omegle_icons_10.vcxproj b/protocols/Omegle/proto_omegle/omegle_icons_10.vcxproj
index f2e9f913f3..5e0dbf8313 100644
--- a/protocols/Omegle/omegle_icons_10.vcxproj
+++ b/protocols/Omegle/proto_omegle/omegle_icons_10.vcxproj
@@ -120,14 +120,10 @@
     </ResourceCompile>

   </ItemDefinitionGroup>

   <ItemGroup>

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

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

   </ItemGroup>

   <ItemGroup>

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

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

-  </ItemGroup>

-  <ItemGroup>

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

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

   </ItemGroup>

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

   <ImportGroup Label="ExtensionTargets">

diff --git a/protocols/Omegle/omegle_icons_10.vcxproj.filters b/protocols/Omegle/proto_omegle/omegle_icons_10.vcxproj.filters
index c4634fb934..39791d31f8 100644
--- a/protocols/Omegle/omegle_icons_10.vcxproj.filters
+++ b/protocols/Omegle/proto_omegle/omegle_icons_10.vcxproj.filters
@@ -7,20 +7,12 @@
     </Filter>

   </ItemGroup>

   <ItemGroup>

-    <ResourceCompile Include="omegle_icons.rc">

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

       <Filter>Resource Files</Filter>

     </ResourceCompile>

   </ItemGroup>

   <ItemGroup>

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

-      <Filter>Resource Files</Filter>

-    </None>

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

-      <Filter>Resource Files</Filter>

-    </None>

-  </ItemGroup>

-  <ItemGroup>

-    <ClInclude Include="resource_icons.h">

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

       <Filter>Resource Files</Filter>

     </ClInclude>

   </ItemGroup>

diff --git a/protocols/Omegle/omegle_icons.rc b/protocols/Omegle/proto_omegle/res/omegle_icons.rc
index b04059f025..132ee3694c 100644
--- a/protocols/Omegle/omegle_icons.rc
+++ b/protocols/Omegle/proto_omegle/res/omegle_icons.rc
@@ -1,6 +1,6 @@
 // Microsoft Visual C++ generated resource script.

 //

-#include "resource_icons.h"

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

 

 #define APSTUDIO_READONLY_SYMBOLS

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

@@ -29,7 +29,7 @@ LANGUAGE LANG_CZECH, SUBLANG_DEFAULT
 

 1 TEXTINCLUDE 

 BEGIN

-    "resource_icons.h\0"

+    "..\\src\\resource_icons.h\0"

 END

 

 2 TEXTINCLUDE 

@@ -54,8 +54,8 @@ END
 

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

 // remains consistent on all systems.

-IDI_OFFLINE             ICON                    "icons\\proto_offline.ico"

-IDI_ONLINE              ICON                    "icons\\proto_online.ico"

+IDI_OFFLINE             ICON                    "proto_offline.ico"

+IDI_ONLINE              ICON                    "proto_online.ico"

 #endif    // Czech resources

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

 

diff --git a/protocols/Omegle/icons/proto_offline.ico b/protocols/Omegle/proto_omegle/res/proto_offline.ico
index bc608d61c8..bc608d61c8 100644
--- a/protocols/Omegle/icons/proto_offline.ico
+++ b/protocols/Omegle/proto_omegle/res/proto_offline.ico
diff --git a/protocols/Omegle/icons/proto_online.ico b/protocols/Omegle/proto_omegle/res/proto_online.ico
index 206e829e6b..206e829e6b 100644
--- a/protocols/Omegle/icons/proto_online.ico
+++ b/protocols/Omegle/proto_omegle/res/proto_online.ico
diff --git a/protocols/Omegle/resource_icons.h b/protocols/Omegle/proto_omegle/src/resource_icons.h
index b150f4933c..b150f4933c 100644
--- a/protocols/Omegle/resource_icons.h
+++ b/protocols/Omegle/proto_omegle/src/resource_icons.h
diff --git a/protocols/Omegle/icons/omegle.ico b/protocols/Omegle/res/omegle.ico
index 04570a4327..04570a4327 100644
--- a/protocols/Omegle/icons/omegle.ico
+++ b/protocols/Omegle/res/omegle.ico
diff --git a/protocols/Omegle/omegle.rc b/protocols/Omegle/res/omegle.rc
index 7358077f7b..c8c56d3df1 100644
--- a/protocols/Omegle/omegle.rc
+++ b/protocols/Omegle/res/omegle.rc
@@ -1,6 +1,6 @@
 // Microsoft Visual C++ generated resource script.

 //

-#include "resource.h"

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

 

 #define APSTUDIO_READONLY_SYMBOLS

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

@@ -8,7 +8,7 @@
 // Generated from the TEXTINCLUDE 2 resource.

 //

 #include "afxres.h"

-#include "constants.h"

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

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

 #undef APSTUDIO_READONLY_SYMBOLS

 

@@ -135,13 +135,13 @@ END
 

 1 TEXTINCLUDE 

 BEGIN

-    "resource.h\0"

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

 END

 

 2 TEXTINCLUDE 

 BEGIN

     "#include ""afxres.h""\r\n"

-    "#include ""constants.h""\0"

+    "#include ""..\\src\\constants.h""\0"

 END

 

 3 TEXTINCLUDE 

@@ -159,7 +159,7 @@ END
 

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

 // remains consistent on all systems.

-IDI_OMEGLE              ICON                    "icons/omegle.ico"

+IDI_OMEGLE              ICON                    "omegle.ico"

 

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

 //

diff --git a/protocols/Omegle/chat.cpp b/protocols/Omegle/src/chat.cpp
index 7b16ccdfc3..7b16ccdfc3 100644
--- a/protocols/Omegle/chat.cpp
+++ b/protocols/Omegle/src/chat.cpp
diff --git a/protocols/Omegle/client.h b/protocols/Omegle/src/client.h
index be5ec9055c..be5ec9055c 100644
--- a/protocols/Omegle/client.h
+++ b/protocols/Omegle/src/client.h
diff --git a/protocols/Omegle/common.h b/protocols/Omegle/src/common.h
index acd913f180..acd913f180 100644
--- a/protocols/Omegle/common.h
+++ b/protocols/Omegle/src/common.h
diff --git a/protocols/Omegle/communication.cpp b/protocols/Omegle/src/communication.cpp
index 047e6177a3..047e6177a3 100644
--- a/protocols/Omegle/communication.cpp
+++ b/protocols/Omegle/src/communication.cpp
diff --git a/protocols/Omegle/connection.cpp b/protocols/Omegle/src/connection.cpp
index 1ce07385d9..1ce07385d9 100644
--- a/protocols/Omegle/connection.cpp
+++ b/protocols/Omegle/src/connection.cpp
diff --git a/protocols/Omegle/constants.h b/protocols/Omegle/src/constants.h
index 6f1fbda166..6f1fbda166 100644
--- a/protocols/Omegle/constants.h
+++ b/protocols/Omegle/src/constants.h
diff --git a/protocols/Omegle/db.h b/protocols/Omegle/src/db.h
index fd0d290b3c..fd0d290b3c 100644
--- a/protocols/Omegle/db.h
+++ b/protocols/Omegle/src/db.h
diff --git a/protocols/Omegle/dialogs.cpp b/protocols/Omegle/src/dialogs.cpp
index 8045ea2e43..8045ea2e43 100644
--- a/protocols/Omegle/dialogs.cpp
+++ b/protocols/Omegle/src/dialogs.cpp
diff --git a/protocols/Omegle/dialogs.h b/protocols/Omegle/src/dialogs.h
index 880f04636b..880f04636b 100644
--- a/protocols/Omegle/dialogs.h
+++ b/protocols/Omegle/src/dialogs.h
diff --git a/protocols/Omegle/events.cpp b/protocols/Omegle/src/events.cpp
index 5e2749e70c..5e2749e70c 100644
--- a/protocols/Omegle/events.cpp
+++ b/protocols/Omegle/src/events.cpp
diff --git a/protocols/Omegle/http.cpp b/protocols/Omegle/src/http.cpp
index e360253e1a..e360253e1a 100644
--- a/protocols/Omegle/http.cpp
+++ b/protocols/Omegle/src/http.cpp
diff --git a/protocols/Omegle/http.h b/protocols/Omegle/src/http.h
index a09e4f903d..a09e4f903d 100644
--- a/protocols/Omegle/http.h
+++ b/protocols/Omegle/src/http.h
diff --git a/protocols/Omegle/main.cpp b/protocols/Omegle/src/main.cpp
index 32771e22be..32771e22be 100644
--- a/protocols/Omegle/main.cpp
+++ b/protocols/Omegle/src/main.cpp
diff --git a/protocols/Omegle/messages.cpp b/protocols/Omegle/src/messages.cpp
index b90ff67579..b90ff67579 100644
--- a/protocols/Omegle/messages.cpp
+++ b/protocols/Omegle/src/messages.cpp
diff --git a/protocols/Omegle/process.cpp b/protocols/Omegle/src/process.cpp
index eb707373ec..eb707373ec 100644
--- a/protocols/Omegle/process.cpp
+++ b/protocols/Omegle/src/process.cpp
diff --git a/protocols/Omegle/proto.cpp b/protocols/Omegle/src/proto.cpp
index 51e4bdf599..51e4bdf599 100644
--- a/protocols/Omegle/proto.cpp
+++ b/protocols/Omegle/src/proto.cpp
diff --git a/protocols/Omegle/proto.h b/protocols/Omegle/src/proto.h
index 053071aac8..053071aac8 100644
--- a/protocols/Omegle/proto.h
+++ b/protocols/Omegle/src/proto.h
diff --git a/protocols/Omegle/resource.h b/protocols/Omegle/src/resource.h
index 0cfab1d840..0cfab1d840 100644
--- a/protocols/Omegle/resource.h
+++ b/protocols/Omegle/src/resource.h
diff --git a/protocols/Omegle/stubs.cpp b/protocols/Omegle/src/stubs.cpp
index b02fd71ef5..b02fd71ef5 100644
--- a/protocols/Omegle/stubs.cpp
+++ b/protocols/Omegle/src/stubs.cpp
diff --git a/protocols/Omegle/theme.cpp b/protocols/Omegle/src/theme.cpp
index d7f7fc7e9b..d7f7fc7e9b 100644
--- a/protocols/Omegle/theme.cpp
+++ b/protocols/Omegle/src/theme.cpp
diff --git a/protocols/Omegle/theme.h b/protocols/Omegle/src/theme.h
index 7456803b6c..7456803b6c 100644
--- a/protocols/Omegle/theme.h
+++ b/protocols/Omegle/src/theme.h
diff --git a/protocols/Omegle/utils.cpp b/protocols/Omegle/src/utils.cpp
index f524dcfba1..f524dcfba1 100644
--- a/protocols/Omegle/utils.cpp
+++ b/protocols/Omegle/src/utils.cpp
diff --git a/protocols/Omegle/utils.h b/protocols/Omegle/src/utils.h
index 908b721e72..908b721e72 100644
--- a/protocols/Omegle/utils.h
+++ b/protocols/Omegle/src/utils.h