diff options
22 files changed, 5 insertions, 778 deletions
diff --git a/plugins/Clist_modern/clist_modern_10.vcxproj b/plugins/Clist_modern/clist_modern_10.vcxproj index 77ec7cd013..4f089efb2a 100644 --- a/plugins/Clist_modern/clist_modern_10.vcxproj +++ b/plugins/Clist_modern/clist_modern_10.vcxproj @@ -272,8 +272,6 @@ <ClInclude Include="src\hdr\modern_sync.h" />
<ClInclude Include="src\hdr\modern_tstring.h" />
<ClInclude Include="src\hdr\MString.h" />
- <ClInclude Include="res\version.h" />
- <ClInclude Include="res\resource.h" />
<ClInclude Include="src\hdr\modern_awaymsg.h" />
<ClInclude Include="src\hdr\modern_gettextasync.h" />
<ClInclude Include="src\hdr\modern_global_structure.h" />
@@ -284,52 +282,6 @@ <ResourceCompile Include="res\resource.rc" />
<ResourceCompile Include="res\version.rc" />
</ItemGroup>
- <ItemGroup>
- <None Include="res\1.ico" />
- <None Include="res\2.ico" />
- <None Include="res\3.ico" />
- <None Include="res\4.ico" />
- <None Include="res\5.ico" />
- <None Include="res\6.ico" />
- <None Include="res\7.ico" />
- <None Include="res\8.ico" />
- <None Include="res\addgoupp.ico" />
- <None Include="res\AlwaysVis.ico" />
- <None Include="res\Away.ico" />
- <None Include="res\Back.tga" />
- <None Include="res\chat.ico" />
- <None Include="res\Chatchannel.ico" />
- <None Include="res\DND.ico" />
- <None Include="res\hide_avatar.ico" />
- <None Include="res\invisible.ico" />
- <None Include="res\listening_to.ico" />
- <None Include="res\lunch.ico" />
- <None Include="res\MicroAway.ico" />
- <None Include="res\Microchat.ico" />
- <None Include="res\MicroDND.ico" />
- <None Include="res\Microinvisible.ico" />
- <None Include="res\Microlunch.ico" />
- <None Include="res\MicroNA.ico" />
- <None Include="res\Microoccupied.ico" />
- <None Include="res\Microoffline.ico" />
- <None Include="res\Microphone.ico" />
- <None Include="res\NA.ico" />
- <None Include="res\neo_meta_create.cur" />
- <None Include="res\neo_meta_default.cur" />
- <None Include="res\neo_meta_move.cur" />
- <None Include="res\NeverVis.ico" />
- <None Include="res\occupied.ico" />
- <None Include="res\offline.ico" />
- <None Include="res\phone.ico" />
- <None Include="res\rate_high.ico" />
- <None Include="res\rate_low.ico" />
- <None Include="res\rate_med.ico" />
- <None Include="res\rate_none.ico" />
- <None Include="res\reset_view.ico" />
- <None Include="res\set_view.ico" />
- <None Include="res\show_avatar.ico" />
- <None Include="res\skin.msf" />
- </ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
diff --git a/plugins/Clist_modern/clist_modern_10.vcxproj.filters b/plugins/Clist_modern/clist_modern_10.vcxproj.filters index 4eff95a68c..a517493a7d 100644 --- a/plugins/Clist_modern/clist_modern_10.vcxproj.filters +++ b/plugins/Clist_modern/clist_modern_10.vcxproj.filters @@ -13,9 +13,6 @@ <UniqueIdentifier>{160168fd-2f10-425e-bd83-f37565fffc2c}</UniqueIdentifier>
<Extensions>ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe</Extensions>
</Filter>
- <Filter Include="Resource Files\res">
- <UniqueIdentifier>{98ef713e-45a0-4ca0-929b-636ed86d9478}</UniqueIdentifier>
- </Filter>
</ItemGroup>
<ItemGroup>
<ClCompile Include="src\init.cpp">
@@ -257,152 +254,16 @@ <ClInclude Include="src\hdr\MString.h">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="res\version.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="res\resource.h">
- <Filter>Header Files</Filter>
- </ClInclude>
<ClInclude Include="src\resource.h">
<Filter>Header Files</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
- <ResourceCompile Include="res\resource.rc">
- <Filter>Resource Files</Filter>
- </ResourceCompile>
<ResourceCompile Include="res\version.rc">
<Filter>Resource Files</Filter>
</ResourceCompile>
- </ItemGroup>
- <ItemGroup>
- <None Include="res\hide_avatar.ico">
- <Filter>Resource Files</Filter>
- </None>
- <None Include="res\show_avatar.ico">
- <Filter>Resource Files</Filter>
- </None>
- <None Include="res\addgoupp.ico">
- <Filter>Resource Files</Filter>
- </None>
- <None Include="res\listening_to.ico">
- <Filter>Resource Files</Filter>
- </None>
- <None Include="res\AlwaysVis.ico">
- <Filter>Resource Files</Filter>
- </None>
- <None Include="res\NeverVis.ico">
- <Filter>Resource Files</Filter>
- </None>
- <None Include="res\Chatchannel.ico">
- <Filter>Resource Files</Filter>
- </None>
- <None Include="res\rate_none.ico">
- <Filter>Resource Files</Filter>
- </None>
- <None Include="res\rate_low.ico">
- <Filter>Resource Files</Filter>
- </None>
- <None Include="res\rate_med.ico">
- <Filter>Resource Files</Filter>
- </None>
- <None Include="res\rate_high.ico">
- <Filter>Resource Files</Filter>
- </None>
- <None Include="res\NA.ico">
- <Filter>Resource Files</Filter>
- </None>
- <None Include="res\occupied.ico">
- <Filter>Resource Files</Filter>
- </None>
- <None Include="res\offline.ico">
- <Filter>Resource Files</Filter>
- </None>
- <None Include="res\phone.ico">
- <Filter>Resource Files</Filter>
- </None>
- <None Include="res\Away.ico">
- <Filter>Resource Files</Filter>
- </None>
- <None Include="res\DND.ico">
- <Filter>Resource Files</Filter>
- </None>
- <None Include="res\invisible.ico">
- <Filter>Resource Files</Filter>
- </None>
- <None Include="res\lunch.ico">
- <Filter>Resource Files</Filter>
- </None>
- <None Include="res\chat.ico">
- <Filter>Resource Files</Filter>
- </None>
- <None Include="res\MicroNA.ico">
- <Filter>Resource Files</Filter>
- </None>
- <None Include="res\Microoccupied.ico">
- <Filter>Resource Files</Filter>
- </None>
- <None Include="res\Microoffline.ico">
- <Filter>Resource Files</Filter>
- </None>
- <None Include="res\Microphone.ico">
- <Filter>Resource Files</Filter>
- </None>
- <None Include="res\MicroAway.ico">
- <Filter>Resource Files</Filter>
- </None>
- <None Include="res\MicroDND.ico">
- <Filter>Resource Files</Filter>
- </None>
- <None Include="res\Microinvisible.ico">
- <Filter>Resource Files</Filter>
- </None>
- <None Include="res\Microlunch.ico">
- <Filter>Resource Files</Filter>
- </None>
- <None Include="res\Microchat.ico">
- <Filter>Resource Files</Filter>
- </None>
- <None Include="res\1.ico">
- <Filter>Resource Files</Filter>
- </None>
- <None Include="res\2.ico">
- <Filter>Resource Files</Filter>
- </None>
- <None Include="res\3.ico">
- <Filter>Resource Files</Filter>
- </None>
- <None Include="res\4.ico">
- <Filter>Resource Files</Filter>
- </None>
- <None Include="res\5.ico">
- <Filter>Resource Files</Filter>
- </None>
- <None Include="res\6.ico">
- <Filter>Resource Files</Filter>
- </None>
- <None Include="res\7.ico">
- <Filter>Resource Files</Filter>
- </None>
- <None Include="res\8.ico">
- <Filter>Resource Files</Filter>
- </None>
- <None Include="res\set_view.ico">
- <Filter>Resource Files</Filter>
- </None>
- <None Include="res\reset_view.ico">
- <Filter>Resource Files</Filter>
- </None>
- <None Include="res\neo_meta_default.cur">
- <Filter>Resource Files</Filter>
- </None>
- <None Include="res\neo_meta_create.cur">
- <Filter>Resource Files</Filter>
- </None>
- <None Include="res\neo_meta_move.cur">
+ <ResourceCompile Include="res\resource.rc">
<Filter>Resource Files</Filter>
- </None>
- <None Include="res\Back.tga" />
- <None Include="res\skin.msf" />
+ </ResourceCompile>
</ItemGroup>
</Project>
\ No newline at end of file diff --git a/plugins/Db3x/db3x_10.vcxproj b/plugins/Db3x/db3x_10.vcxproj index a3424d5068..47132606a3 100644 --- a/plugins/Db3x/db3x_10.vcxproj +++ b/plugins/Db3x/db3x_10.vcxproj @@ -240,7 +240,7 @@ </ClCompile>
</ItemGroup>
<ItemGroup>
- <ClInclude Include="..\db3x_mmap\dbintf.h" />
+ <ClInclude Include="..\Db3x_mmap\src\dbintf.h" />
<ClInclude Include="src\commonheaders.h" />
<ClInclude Include="src\dbintf3x.h" />
</ItemGroup>
diff --git a/plugins/Db3x/db3x_10.vcxproj.filters b/plugins/Db3x/db3x_10.vcxproj.filters index 59595fa5ab..838112c5f2 100644 --- a/plugins/Db3x/db3x_10.vcxproj.filters +++ b/plugins/Db3x/db3x_10.vcxproj.filters @@ -86,7 +86,7 @@ <ClInclude Include="src\dbintf3x.h">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="..\db3x_mmap\dbintf.h">
+ <ClInclude Include="..\Db3x_mmap\src\dbintf.h">
<Filter>Mmap</Filter>
</ClInclude>
</ItemGroup>
diff --git a/plugins/UserInfoEx/UInfoEx_10.vcxproj b/plugins/UserInfoEx/UInfoEx_10.vcxproj index 9ed80c6ee0..72154e7949 100644 --- a/plugins/UserInfoEx/UInfoEx_10.vcxproj +++ b/plugins/UserInfoEx/UInfoEx_10.vcxproj @@ -298,8 +298,6 @@ <ClInclude Include="src\ctrl_contact.h" />
<ClInclude Include="src\ctrl_edit.h" />
<ClInclude Include="src\ctrl_tzcombo.h" />
- <ClInclude Include="src\Res\resource.h" />
- <ClInclude Include="src\Res\version.h" />
</ItemGroup>
<ItemGroup>
<ResourceCompile Include="Res\resource.rc" />
diff --git a/plugins/UserInfoEx/UInfoEx_10.vcxproj.filters b/plugins/UserInfoEx/UInfoEx_10.vcxproj.filters index 1d0ce497eb..bbe6c5dde2 100644 --- a/plugins/UserInfoEx/UInfoEx_10.vcxproj.filters +++ b/plugins/UserInfoEx/UInfoEx_10.vcxproj.filters @@ -27,9 +27,6 @@ <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
<Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav</Extensions>
</Filter>
- <Filter Include="SDK">
- <UniqueIdentifier>{ea8b021b-f82f-4940-933d-15d813da6e9b}</UniqueIdentifier>
- </Filter>
</ItemGroup>
<ItemGroup>
<ClCompile Include="src\classMAnnivDate.cpp">
@@ -343,8 +340,6 @@ <ClInclude Include="src\ctrl_tzcombo.h">
<Filter>Source Files\Controls</Filter>
</ClInclude>
- <ClInclude Include="src\Res\resource.h" />
- <ClInclude Include="src\Res\version.h" />
</ItemGroup>
<ItemGroup>
<ResourceCompile Include="Res\resource.rc">
diff --git a/protocols/IcqOscarJ/UI/askauthentication.h b/protocols/IcqOscarJ/UI/askauthentication.h deleted file mode 100644 index 6a54717402..0000000000 --- a/protocols/IcqOscarJ/UI/askauthentication.h +++ /dev/null @@ -1,28 +0,0 @@ -// ---------------------------------------------------------------------------80
-// ICQ plugin for Miranda Instant Messenger
-// ________________________________________
-//
-// Copyright © 2000,2001 Richard Hughes, Roland Rabien, Tristan Van de Vreede
-// Copyright © 2001,2002 Jon Keating, Richard Hughes
-// Copyright © 2002,2003,2004 Martin Öberg, Sam Kothari, Robert Rainwater
-//
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of the GNU General Public License
-// as published by the Free Software Foundation; either version 2
-// of the License, or (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-//
-// -----------------------------------------------------------------------------
-// DESCRIPTION:
-//
-// Describe me here please...
-//
-// -----------------------------------------------------------------------------
diff --git a/protocols/IcqOscarJ/UI/loginpassword.h b/protocols/IcqOscarJ/UI/loginpassword.h deleted file mode 100644 index 90bb05db5a..0000000000 --- a/protocols/IcqOscarJ/UI/loginpassword.h +++ /dev/null @@ -1,29 +0,0 @@ -// ---------------------------------------------------------------------------80
-// ICQ plugin for Miranda Instant Messenger
-// ________________________________________
-//
-// Copyright © 2000,2001 Richard Hughes, Roland Rabien, Tristan Van de Vreede
-// Copyright © 2001,2002 Jon Keating, Richard Hughes
-// Copyright © 2002,2003,2004 Martin Öberg, Sam Kothari, Robert Rainwater
-// Copyright © 2004,2005 Joe Kucera
-//
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of the GNU General Public License
-// as published by the Free Software Foundation; either version 2
-// of the License, or (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-//
-// -----------------------------------------------------------------------------
-// DESCRIPTION:
-//
-// Describe me here please...
-//
-// -----------------------------------------------------------------------------
diff --git a/protocols/IcqOscarJ/UI/userinfotab.h b/protocols/IcqOscarJ/UI/userinfotab.h deleted file mode 100644 index 6a54717402..0000000000 --- a/protocols/IcqOscarJ/UI/userinfotab.h +++ /dev/null @@ -1,28 +0,0 @@ -// ---------------------------------------------------------------------------80
-// ICQ plugin for Miranda Instant Messenger
-// ________________________________________
-//
-// Copyright © 2000,2001 Richard Hughes, Roland Rabien, Tristan Van de Vreede
-// Copyright © 2001,2002 Jon Keating, Richard Hughes
-// Copyright © 2002,2003,2004 Martin Öberg, Sam Kothari, Robert Rainwater
-//
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of the GNU General Public License
-// as published by the Free Software Foundation; either version 2
-// of the License, or (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-//
-// -----------------------------------------------------------------------------
-// DESCRIPTION:
-//
-// Describe me here please...
-//
-// -----------------------------------------------------------------------------
diff --git a/protocols/IcqOscarJ/directpackets.cpp b/protocols/IcqOscarJ/directpackets.cpp index b9cab630c5..594f005675 100644 --- a/protocols/IcqOscarJ/directpackets.cpp +++ b/protocols/IcqOscarJ/directpackets.cpp @@ -33,7 +33,7 @@ void EncryptDirectPacket(directconnect* dc, icq_packet* p); void packEmptyMsg(icq_packet *packet);
-void packDirectMsgHeader(icq_packet* packet, WORD wDataLen, WORD wCommand, DWORD dwCookie, BYTE bMsgType, BYTE bMsgFlags, WORD wX1, WORD wX2)
+static void packDirectMsgHeader(icq_packet* packet, WORD wDataLen, WORD wCommand, DWORD dwCookie, BYTE bMsgType, BYTE bMsgFlags, WORD wX1, WORD wX2)
{
directPacketInit(packet, 29 + wDataLen);
packByte(packet, 2); /* channel */
diff --git a/protocols/IcqOscarJ/directpackets.h b/protocols/IcqOscarJ/directpackets.h deleted file mode 100644 index 64528df4f4..0000000000 --- a/protocols/IcqOscarJ/directpackets.h +++ /dev/null @@ -1,36 +0,0 @@ -// ---------------------------------------------------------------------------80
-// ICQ plugin for Miranda Instant Messenger
-// ________________________________________
-//
-// Copyright © 2000-2001 Richard Hughes, Roland Rabien, Tristan Van de Vreede
-// Copyright © 2001-2002 Jon Keating, Richard Hughes
-// Copyright © 2002-2004 Martin Öberg, Sam Kothari, Robert Rainwater
-// Copyright © 2004-2008 Joe Kucera
-//
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of the GNU General Public License
-// as published by the Free Software Foundation; either version 2
-// of the License, or (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-//
-// -----------------------------------------------------------------------------
-// DESCRIPTION:
-//
-// Describe me here please...
-//
-// -----------------------------------------------------------------------------
-#ifndef __ICQ_DIRECTPACKETS_H
-#define __ICQ_DIRECTPACKETS_H
-
-// Direct packet senders
-void packDirectMsgHeader(icq_packet *packet, WORD wDataLen, WORD wCommand, DWORD dwCookie, BYTE bMsgType, BYTE bMsgFlags, WORD wX1, WORD wX2);
-
-#endif /* __ICQ_DIRECTPACKETS_H */
diff --git a/protocols/IcqOscarJ/icq_infoupdate.h b/protocols/IcqOscarJ/icq_infoupdate.h deleted file mode 100644 index b5f950544f..0000000000 --- a/protocols/IcqOscarJ/icq_infoupdate.h +++ /dev/null @@ -1,29 +0,0 @@ -// ---------------------------------------------------------------------------80
-// ICQ plugin for Miranda Instant Messenger
-// ________________________________________
-//
-// Copyright © 2000-2001 Richard Hughes, Roland Rabien, Tristan Van de Vreede
-// Copyright © 2001-2002 Jon Keating, Richard Hughes
-// Copyright © 2002-2004 Martin Öberg, Sam Kothari, Robert Rainwater
-// Copyright © 2004-2008 Joe Kucera
-//
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of the GNU General Public License
-// as published by the Free Software Foundation; either version 2
-// of the License, or (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-//
-// -----------------------------------------------------------------------------
-// DESCRIPTION:
-//
-// Describe me here please...
-//
-// -----------------------------------------------------------------------------
diff --git a/protocols/IcqOscarJ/icq_opts.h b/protocols/IcqOscarJ/icq_opts.h deleted file mode 100644 index b26a9fbb9f..0000000000 --- a/protocols/IcqOscarJ/icq_opts.h +++ /dev/null @@ -1,30 +0,0 @@ -// ---------------------------------------------------------------------------80
-// ICQ plugin for Miranda Instant Messenger
-// ________________________________________
-//
-// Copyright © 2000-2001 Richard Hughes, Roland Rabien, Tristan Van de Vreede
-// Copyright © 2001-2002 Jon Keating, Richard Hughes
-// Copyright © 2002-2004 Martin Öberg, Sam Kothari, Robert Rainwater
-// Copyright © 2004-2008 Joe Kucera
-//
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of the GNU General Public License
-// as published by the Free Software Foundation; either version 2
-// of the License, or (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-//
-// -----------------------------------------------------------------------------
-// DESCRIPTION:
-//
-// Describe me here please...
-//
-// -----------------------------------------------------------------------------
-int IcqOptInit(WPARAM, LPARAM);
diff --git a/protocols/IcqOscarJ/icq_uploadui.h b/protocols/IcqOscarJ/icq_uploadui.h deleted file mode 100644 index 90bb05db5a..0000000000 --- a/protocols/IcqOscarJ/icq_uploadui.h +++ /dev/null @@ -1,29 +0,0 @@ -// ---------------------------------------------------------------------------80
-// ICQ plugin for Miranda Instant Messenger
-// ________________________________________
-//
-// Copyright © 2000,2001 Richard Hughes, Roland Rabien, Tristan Van de Vreede
-// Copyright © 2001,2002 Jon Keating, Richard Hughes
-// Copyright © 2002,2003,2004 Martin Öberg, Sam Kothari, Robert Rainwater
-// Copyright © 2004,2005 Joe Kucera
-//
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of the GNU General Public License
-// as published by the Free Software Foundation; either version 2
-// of the License, or (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-//
-// -----------------------------------------------------------------------------
-// DESCRIPTION:
-//
-// Describe me here please...
-//
-// -----------------------------------------------------------------------------
diff --git a/protocols/IcqOscarJ/icqoscar.h b/protocols/IcqOscarJ/icqoscar.h index 97e9bf9da0..a004e6793f 100644 --- a/protocols/IcqOscarJ/icqoscar.h +++ b/protocols/IcqOscarJ/icqoscar.h @@ -103,27 +103,20 @@ #include "icq_direct.h"
#include "icq_server.h"
#include "icqosc_svcs.h"
-#include "icq_opts.h"
#include "icq_servlist.h"
#include "icq_http.h"
#include "icq_fieldnames.h"
#include "icq_constants.h"
#include "capabilities.h"
#include "guids.h"
-#include "icq_infoupdate.h"
#include "init.h"
#include "stdpackets.h"
-#include "directpackets.h"
#include "tlv.h"
#include "channels.h"
#include "families.h"
#include "m_icq.h"
#include "icq_advsearch.h"
-#include "icq_uploadui.h"
#include "log.h"
-#include "UI/askauthentication.h"
-#include "UI/userinfotab.h"
-#include "UI/loginpassword.h"
#include "icq_rates.h"
diff --git a/protocols/IcqOscarJ/icqoscar8_10.vcxproj b/protocols/IcqOscarJ/icqoscar8_10.vcxproj index c362e45084..07891cfa2d 100644 --- a/protocols/IcqOscarJ/icqoscar8_10.vcxproj +++ b/protocols/IcqOscarJ/icqoscar8_10.vcxproj @@ -209,11 +209,9 @@ </PreBuildEvent>
</ItemDefinitionGroup>
<ItemGroup>
- <ClInclude Include="UI\askauthentication.h" />
<ClInclude Include="capabilities.h" />
<ClInclude Include="channels.h" />
<ClInclude Include="cookies.h" />
- <ClInclude Include="directpackets.h" />
<ClInclude Include="families.h" />
<ClInclude Include="guids.h" />
<ClInclude Include="i18n.h" />
@@ -224,32 +222,25 @@ <ClInclude Include="icq_direct.h" />
<ClInclude Include="icq_fieldnames.h" />
<ClInclude Include="icq_http.h" />
- <ClInclude Include="icq_infoupdate.h" />
- <ClInclude Include="icq_opts.h" />
<ClInclude Include="icq_packet.h" />
<ClInclude Include="icq_proto.h" />
<ClInclude Include="icq_rates.h" />
<ClInclude Include="icq_server.h" />
<ClInclude Include="icq_servlist.h" />
- <ClInclude Include="icq_uploadui.h" />
- <ClInclude Include="icq_xtraz.h" />
<ClInclude Include="icqosc_svcs.h" />
<ClInclude Include="icqoscar.h" />
<ClInclude Include="init.h" />
<ClInclude Include="log.h" />
- <ClInclude Include="UI\loginpassword.h" />
<ClInclude Include="oscar_filetransfer.h" />
<ClInclude Include="resource.h" />
<ClInclude Include="stdpackets.h" />
<ClInclude Include="tlv.h" />
- <ClInclude Include="UI\userinfotab.h" />
<ClInclude Include="utilities.h" />
<ClInclude Include="changeinfo\changeinfo.h" />
</ItemGroup>
<ItemGroup>
<None Include="icos\icq.ico" />
<None Include="docs\icq-readme.txt" />
- <None Include="docs\IcqOscarJ-translation.txt" />
</ItemGroup>
<ItemGroup>
<ResourceCompile Include="resources.rc" />
diff --git a/protocols/IcqOscarJ/icqoscar8_10.vcxproj.filters b/protocols/IcqOscarJ/icqoscar8_10.vcxproj.filters index c478a7b173..a7310551e1 100644 --- a/protocols/IcqOscarJ/icqoscar8_10.vcxproj.filters +++ b/protocols/IcqOscarJ/icqoscar8_10.vcxproj.filters @@ -33,9 +33,6 @@ </Filter>
</ItemGroup>
<ItemGroup>
- <ClInclude Include="UI\askauthentication.h">
- <Filter>Header Files</Filter>
- </ClInclude>
<ClInclude Include="capabilities.h">
<Filter>Header Files</Filter>
</ClInclude>
@@ -45,9 +42,6 @@ <ClInclude Include="cookies.h">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="directpackets.h">
- <Filter>Header Files</Filter>
- </ClInclude>
<ClInclude Include="families.h">
<Filter>Header Files</Filter>
</ClInclude>
@@ -78,12 +72,6 @@ <ClInclude Include="icq_http.h">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="icq_infoupdate.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="icq_opts.h">
- <Filter>Header Files</Filter>
- </ClInclude>
<ClInclude Include="icq_packet.h">
<Filter>Header Files</Filter>
</ClInclude>
@@ -99,12 +87,6 @@ <ClInclude Include="icq_servlist.h">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="icq_uploadui.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="icq_xtraz.h">
- <Filter>Header Files</Filter>
- </ClInclude>
<ClInclude Include="icqosc_svcs.h">
<Filter>Header Files</Filter>
</ClInclude>
@@ -117,9 +99,6 @@ <ClInclude Include="log.h">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="UI\loginpassword.h">
- <Filter>Header Files</Filter>
- </ClInclude>
<ClInclude Include="oscar_filetransfer.h">
<Filter>Header Files</Filter>
</ClInclude>
@@ -132,9 +111,6 @@ <ClInclude Include="tlv.h">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="UI\userinfotab.h">
- <Filter>Header Files</Filter>
- </ClInclude>
<ClInclude Include="utilities.h">
<Filter>Header Files</Filter>
</ClInclude>
@@ -149,9 +125,6 @@ <None Include="docs\icq-readme.txt">
<Filter>Documentation</Filter>
</None>
- <None Include="docs\IcqOscarJ-translation.txt">
- <Filter>Documentation</Filter>
- </None>
</ItemGroup>
<ItemGroup>
<ResourceCompile Include="resources.rc">
diff --git a/src/core/forkthread.h b/src/core/forkthread.h deleted file mode 100644 index 2062192557..0000000000 --- a/src/core/forkthread.h +++ /dev/null @@ -1,63 +0,0 @@ -/*
-
-Miranda IM: the free IM client for Microsoft* Windows*
-
-Copyright 2000-2009 Miranda ICQ/IM project,
-all portions of this codebase are copyrighted to the people
-listed in contributors.txt.
-
-This program is free software; you can redistribute it and/or
-modify it under the terms of the GNU General Public License
-as published by the Free Software Foundation; either version 2
-of the License, or (at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-*/
-
-/*
-
-Purpose:
-
- A safe version of _beginthread()
-
-Description:
-
- A new thread is created and the source thread is paused until
- internal code to call MS_SYSTEM_THREAD_PUSH is made in the context
- if the new thread.
-
- The source thread is then released and then the user supplied
- code is called, when that function returns -- MS_SYSTEM_THREAD_POP
- is called and then the thread returns.
-
- This insures that Miranda will not exit whilst new threads
- are trying to be born; and the unwind wait stack will unsure
- that Miranda will wait for all created threads to return as well.
-
-Cavets:
-
- The function must be reimplemented across MT plugins, since thread
- creation depends on CRT which can not be shared.
-
-*/
-UINT_PTR forkthread (
- void (__cdecl *threadcode)(void*),
- unsigned long stacksize,
- void *arg
-);
-
-UINT_PTR forkthreadex(
- void *sec,
- unsigned stacksize,
- unsigned (__stdcall *threadcode)(void*),
- void *owner,
- void *arg,
- unsigned *thraddr
-);
diff --git a/src/mir_core/mir_core_10.vcxproj b/src/mir_core/mir_core_10.vcxproj index c146823d55..febc5ad553 100644 --- a/src/mir_core/mir_core_10.vcxproj +++ b/src/mir_core/mir_core_10.vcxproj @@ -23,9 +23,7 @@ <ClInclude Include="..\..\include\m_database.h" />
<ClInclude Include="..\..\include\m_system.h" />
<ClInclude Include="commonheaders.h" />
- <ClInclude Include="forkthread.h" />
<ClInclude Include="miranda.h" />
- <ClInclude Include="modules.h" />
</ItemGroup>
<ItemGroup>
<ClCompile Include="cmdline.cpp" />
diff --git a/src/mir_core/mir_core_10.vcxproj.filters b/src/mir_core/mir_core_10.vcxproj.filters index ac781fdcba..d0a280985a 100644 --- a/src/mir_core/mir_core_10.vcxproj.filters +++ b/src/mir_core/mir_core_10.vcxproj.filters @@ -57,12 +57,6 @@ <ClInclude Include="commonheaders.h">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="modules.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="forkthread.h">
- <Filter>Header Files</Filter>
- </ClInclude>
<ClInclude Include="..\..\include\m_core.h">
<Filter>Header Files</Filter>
</ClInclude>
diff --git a/src/miranda32_10.vcxproj b/src/miranda32_10.vcxproj index 540be17025..8816b492d2 100644 --- a/src/miranda32_10.vcxproj +++ b/src/miranda32_10.vcxproj @@ -235,7 +235,6 @@ <ClInclude Include="..\include\m_message.h" />
<ClInclude Include="..\include\m_netlib.h" />
<ClInclude Include="..\include\m_options.h" />
- <ClInclude Include="..\include\m_plugins.h" />
<ClInclude Include="..\include\m_popup.h" />
<ClInclude Include="..\include\m_protocols.h" />
<ClInclude Include="..\include\m_protomod.h" />
@@ -277,7 +276,6 @@ <ClInclude Include="modules\icolib\IcoLib.h" />
<ClInclude Include="..\include\m_xml.h" />
<ClInclude Include="modules\xml\xmlParser.h" />
- <ClInclude Include="resource.h" />
</ItemGroup>
<ItemGroup>
<ClCompile Include="core\commonheaders.cpp">
@@ -575,69 +573,6 @@ </ClCompile>
</ItemGroup>
<ItemGroup>
- <None Include="res\Off.ico" />
- <None Include="res\On.ico" />
- <None Include="res\_blank.ico" />
- <None Include="res\arrow_sort_column_down.bmp" />
- <None Include="res\arrow_sort_column_up.bmp" />
- <None Include="res\chat_join.ico" />
- <None Include="res\chat_leave.ico" />
- <None Include="res\check_off.ico" />
- <None Include="res\check_on.ico" />
- <None Include="res\contact_add.ico" />
- <None Include="res\contact_delete.ico" />
- <None Include="res\contact_groups.ico" />
- <None Include="res\contact_rename.ico" />
- <None Include="res\contact_view_details.ico" />
- <None Include="..\docs\contributors.txt" />
- <None Include="res\cursor_drag_copy.cur" />
- <None Include="res\cursor_drop_user.cur" />
- <None Include="res\cursor_hyperlink.cur" />
- <None Include="res\group_closed.ico" />
- <None Include="res\group_opened.ico" />
- <None Include="res\icon_accmgr.ico" />
- <None Include="res\icon_all.ico" />
- <None Include="res\icon_ansi.ico" />
- <None Include="res\icon_auth_request.ico" />
- <None Include="res\icon_connecting.ico" />
- <None Include="res\icon_down_arrow.ico" />
- <None Include="res\Icon_exit.ico" />
- <None Include="res\icon_file.ico" />
- <None Include="res\icon_find_user.ico" />
- <None Include="res\icon_help.ico" />
- <None Include="res\icon_history.ico" />
- <None Include="res\icon_loaded.ico" />
- <None Include="res\icon_mail.ico" />
- <None Include="res\icon_message.ico" />
- <None Include="res\icon_notloaded.ico" />
- <None Include="res\icon_options.ico" />
- <None Include="res\icon_search_all.ico" />
- <None Include="res\Icon_show_hide.ico" />
- <None Include="res\icon_small_dot.ico" />
- <None Include="res\icon_sms.ico" />
- <None Include="res\icon_typing.ico" />
- <None Include="res\icon_undo.ico" />
- <None Include="res\icon_unicode.ico" />
- <None Include="res\icon_url.ico" />
- <None Include="res\icon_window.ico" />
- <None Include="res\icon_windows.ico" />
- <None Include="res\miranda_home.ico" />
- <None Include="res\miranda_logo.ico" />
- <None Include="res\miranda_manager.ico" />
- <None Include="res\status_away.ico" />
- <None Include="res\status_DND.ico" />
- <None Include="res\status_free4chat.ico" />
- <None Include="res\status_invisible.ico" />
- <None Include="res\status_locked.ico" />
- <None Include="res\status_NA.ico" />
- <None Include="res\status_occupied.ico" />
- <None Include="res\status_offline.ico" />
- <None Include="res\status_on_the_phone.ico" />
- <None Include="res\status_online.ico" />
- <None Include="res\status_out2lunch.ico" />
- <None Include="res\status_user_online.ico" />
- </ItemGroup>
- <ItemGroup>
<ResourceCompile Include="resource.rc" />
<ResourceCompile Include="version.rc" />
</ItemGroup>
diff --git a/src/miranda32_10.vcxproj.filters b/src/miranda32_10.vcxproj.filters index 8be88946e7..8e7af8606f 100644 --- a/src/miranda32_10.vcxproj.filters +++ b/src/miranda32_10.vcxproj.filters @@ -132,9 +132,6 @@ <ClInclude Include="..\include\m_options.h">
<Filter>SDK</Filter>
</ClInclude>
- <ClInclude Include="..\include\m_plugins.h">
- <Filter>SDK</Filter>
- </ClInclude>
<ClInclude Include="..\include\m_popup.h">
<Filter>SDK</Filter>
</ClInclude>
@@ -213,9 +210,6 @@ <ClInclude Include="modules\xml\xmlParser.h">
<Filter>Modules\xmlparser</Filter>
</ClInclude>
- <ClInclude Include="resource.h">
- <Filter>Resources</Filter>
- </ClInclude>
<ClInclude Include="..\include\m_timezones.h">
<Filter>SDK</Filter>
</ClInclude>
@@ -577,191 +571,6 @@ </ClCompile>
</ItemGroup>
<ItemGroup>
- <None Include="res\_blank.ico">
- <Filter>Resources</Filter>
- </None>
- <None Include="res\arrow_sort_column_down.bmp">
- <Filter>Resources</Filter>
- </None>
- <None Include="res\arrow_sort_column_up.bmp">
- <Filter>Resources</Filter>
- </None>
- <None Include="res\chat_join.ico">
- <Filter>Resources</Filter>
- </None>
- <None Include="res\chat_leave.ico">
- <Filter>Resources</Filter>
- </None>
- <None Include="res\check_off.ico">
- <Filter>Resources</Filter>
- </None>
- <None Include="res\check_on.ico">
- <Filter>Resources</Filter>
- </None>
- <None Include="res\contact_add.ico">
- <Filter>Resources</Filter>
- </None>
- <None Include="res\contact_delete.ico">
- <Filter>Resources</Filter>
- </None>
- <None Include="res\contact_groups.ico">
- <Filter>Resources</Filter>
- </None>
- <None Include="res\contact_rename.ico">
- <Filter>Resources</Filter>
- </None>
- <None Include="res\contact_view_details.ico">
- <Filter>Resources</Filter>
- </None>
- <None Include="..\docs\contributors.txt">
- <Filter>Resources</Filter>
- </None>
- <None Include="res\cursor_drag_copy.cur">
- <Filter>Resources</Filter>
- </None>
- <None Include="res\cursor_drop_user.cur">
- <Filter>Resources</Filter>
- </None>
- <None Include="res\cursor_hyperlink.cur">
- <Filter>Resources</Filter>
- </None>
- <None Include="res\group_closed.ico">
- <Filter>Resources</Filter>
- </None>
- <None Include="res\group_opened.ico">
- <Filter>Resources</Filter>
- </None>
- <None Include="res\icon_accmgr.ico">
- <Filter>Resources</Filter>
- </None>
- <None Include="res\icon_all.ico">
- <Filter>Resources</Filter>
- </None>
- <None Include="res\icon_ansi.ico">
- <Filter>Resources</Filter>
- </None>
- <None Include="res\icon_auth_request.ico">
- <Filter>Resources</Filter>
- </None>
- <None Include="res\icon_connecting.ico">
- <Filter>Resources</Filter>
- </None>
- <None Include="res\icon_down_arrow.ico">
- <Filter>Resources</Filter>
- </None>
- <None Include="res\Icon_exit.ico">
- <Filter>Resources</Filter>
- </None>
- <None Include="res\icon_file.ico">
- <Filter>Resources</Filter>
- </None>
- <None Include="res\icon_find_user.ico">
- <Filter>Resources</Filter>
- </None>
- <None Include="res\icon_help.ico">
- <Filter>Resources</Filter>
- </None>
- <None Include="res\icon_history.ico">
- <Filter>Resources</Filter>
- </None>
- <None Include="res\icon_loaded.ico">
- <Filter>Resources</Filter>
- </None>
- <None Include="res\icon_mail.ico">
- <Filter>Resources</Filter>
- </None>
- <None Include="res\icon_message.ico">
- <Filter>Resources</Filter>
- </None>
- <None Include="res\icon_notloaded.ico">
- <Filter>Resources</Filter>
- </None>
- <None Include="res\icon_options.ico">
- <Filter>Resources</Filter>
- </None>
- <None Include="res\icon_search_all.ico">
- <Filter>Resources</Filter>
- </None>
- <None Include="res\Icon_show_hide.ico">
- <Filter>Resources</Filter>
- </None>
- <None Include="res\icon_small_dot.ico">
- <Filter>Resources</Filter>
- </None>
- <None Include="res\icon_sms.ico">
- <Filter>Resources</Filter>
- </None>
- <None Include="res\icon_typing.ico">
- <Filter>Resources</Filter>
- </None>
- <None Include="res\icon_undo.ico">
- <Filter>Resources</Filter>
- </None>
- <None Include="res\icon_unicode.ico">
- <Filter>Resources</Filter>
- </None>
- <None Include="res\icon_url.ico">
- <Filter>Resources</Filter>
- </None>
- <None Include="res\icon_window.ico">
- <Filter>Resources</Filter>
- </None>
- <None Include="res\icon_windows.ico">
- <Filter>Resources</Filter>
- </None>
- <None Include="res\miranda_home.ico">
- <Filter>Resources</Filter>
- </None>
- <None Include="res\miranda_logo.ico">
- <Filter>Resources</Filter>
- </None>
- <None Include="res\miranda_manager.ico">
- <Filter>Resources</Filter>
- </None>
- <None Include="res\status_away.ico">
- <Filter>Resources</Filter>
- </None>
- <None Include="res\status_DND.ico">
- <Filter>Resources</Filter>
- </None>
- <None Include="res\status_free4chat.ico">
- <Filter>Resources</Filter>
- </None>
- <None Include="res\status_invisible.ico">
- <Filter>Resources</Filter>
- </None>
- <None Include="res\status_locked.ico">
- <Filter>Resources</Filter>
- </None>
- <None Include="res\status_NA.ico">
- <Filter>Resources</Filter>
- </None>
- <None Include="res\status_occupied.ico">
- <Filter>Resources</Filter>
- </None>
- <None Include="res\status_offline.ico">
- <Filter>Resources</Filter>
- </None>
- <None Include="res\status_on_the_phone.ico">
- <Filter>Resources</Filter>
- </None>
- <None Include="res\status_online.ico">
- <Filter>Resources</Filter>
- </None>
- <None Include="res\status_out2lunch.ico">
- <Filter>Resources</Filter>
- </None>
- <None Include="res\status_user_online.ico">
- <Filter>Resources</Filter>
- </None>
- <None Include="res\Off.ico">
- <Filter>Resources</Filter>
- </None>
- <None Include="res\On.ico">
- <Filter>Resources</Filter>
- </None>
- </ItemGroup>
- <ItemGroup>
<ResourceCompile Include="resource.rc">
<Filter>Resources</Filter>
</ResourceCompile>
|