not used files moved to Deprecated

git-svn-id: http://miranda-plugins.googlecode.com/svn/trunk@86 e753b5eb-9565-29b2-b5c5-2cc6f99dfbcb

9 files changed, 20 insertions, 373 deletions

diff --git a/popup/src/opt_old.cpp b/popup/Deprecated/opt_old.cpp
index 909cddb..909cddb 100644
--- a/popup/src/opt_old.cpp
+++ b/popup/Deprecated/opt_old.cpp
diff --git a/popup/src/opt_old.h b/popup/Deprecated/opt_old.h
index 5572558..5572558 100644
--- a/popup/src/opt_old.h
+++ b/popup/Deprecated/opt_old.h
diff --git a/popup/PopUp_10.vcxproj b/popup/PopUp_10.vcxproj
index f8f6909..0c50bb7 100644
--- a/popup/PopUp_10.vcxproj
+++ b/popup/PopUp_10.vcxproj
@@ -460,224 +460,41 @@
   </ItemDefinitionGroup>

   <ItemGroup>

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

-    <ClCompile Include="src\avatars.cpp">

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug 2in1|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug 2in1|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug Unicode|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug Unicode|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release 2in1|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release 2in1|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release Unicode|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release Unicode|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

-    </ClCompile>

-    <ClCompile Include="src\avatars_flash.cpp">

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug 2in1|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug 2in1|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug Unicode|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug Unicode|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release 2in1|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release 2in1|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release Unicode|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release Unicode|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

-    </ClCompile>

-    <ClCompile Include="src\avatars_gif.cpp">

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug 2in1|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug 2in1|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug Unicode|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug Unicode|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release 2in1|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release 2in1|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release Unicode|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release Unicode|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

-    </ClCompile>

-    <ClCompile Include="src\avatars_simple.cpp">

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug 2in1|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug 2in1|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug Unicode|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug Unicode|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release 2in1|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release 2in1|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release Unicode|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release Unicode|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

-    </ClCompile>

-    <ClCompile Include="src\bitmap_funcs.cpp">

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug 2in1|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug 2in1|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug Unicode|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug Unicode|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release 2in1|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release 2in1|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release Unicode|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release Unicode|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

-    </ClCompile>

-    <ClCompile Include="src\config.cpp">

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug 2in1|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug 2in1|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug Unicode|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug Unicode|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release 2in1|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release 2in1|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release Unicode|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release Unicode|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

-    </ClCompile>

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

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

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

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

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

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

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

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

-    <ClCompile Include="src\formula.cpp">

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug 2in1|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug 2in1|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug Unicode|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug Unicode|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release 2in1|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release 2in1|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release Unicode|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release Unicode|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

-    </ClCompile>

-    <ClCompile Include="src\headers.cpp">

-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug 2in1|Win32'">Create</PrecompiledHeader>

-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug 2in1|x64'">Create</PrecompiledHeader>

-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug Unicode|Win32'">Create</PrecompiledHeader>

-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug Unicode|x64'">Create</PrecompiledHeader>

-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release 2in1|Win32'">Create</PrecompiledHeader>

-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release 2in1|x64'">Create</PrecompiledHeader>

-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release Unicode|Win32'">Create</PrecompiledHeader>

-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release Unicode|x64'">Create</PrecompiledHeader>

-    </ClCompile>

-    <ClCompile Include="src\history.cpp">

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug 2in1|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug 2in1|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug Unicode|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug Unicode|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release 2in1|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release 2in1|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release Unicode|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release Unicode|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

-    </ClCompile>

-    <ClCompile Include="src\icons.cpp">

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug 2in1|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug 2in1|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug Unicode|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug Unicode|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release 2in1|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release 2in1|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release Unicode|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release Unicode|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

-    </ClCompile>

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

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

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

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

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

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug 2in1|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug 2in1|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug Unicode|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug Unicode|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release 2in1|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release 2in1|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release Unicode|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release Unicode|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

-    </ClCompile>

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

-    <ClCompile Include="src\popup_gdiplus.cpp">

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug 2in1|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug 2in1|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug Unicode|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug Unicode|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release 2in1|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release 2in1|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release Unicode|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release Unicode|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

-    </ClCompile>

-    <ClCompile Include="src\popup_thread.cpp">

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug 2in1|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug 2in1|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug Unicode|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug Unicode|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release 2in1|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release 2in1|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release Unicode|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release Unicode|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

-    </ClCompile>

-    <ClCompile Include="src\popup_wnd2.cpp">

       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug 2in1|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug 2in1|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug Unicode|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug Unicode|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release 2in1|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release 2in1|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release Unicode|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release Unicode|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

-    </ClCompile>

-    <ClCompile Include="src\services.cpp">

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug 2in1|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug 2in1|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug Unicode|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug Unicode|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release 2in1|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release 2in1|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release Unicode|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release Unicode|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

-    </ClCompile>

-    <ClCompile Include="src\skin.cpp">

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug 2in1|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug 2in1|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug Unicode|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug Unicode|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release 2in1|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release 2in1|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release Unicode|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release Unicode|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

     </ClCompile>

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

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

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

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

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

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

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

-    <ClCompile Include="Deprecated\notify_imp.cpp">

-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug 2in1|Win32'">true</ExcludedFromBuild>

-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug 2in1|x64'">true</ExcludedFromBuild>

-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug Unicode|Win32'">true</ExcludedFromBuild>

-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug Unicode|x64'">true</ExcludedFromBuild>

-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release 2in1|Win32'">true</ExcludedFromBuild>

-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release 2in1|x64'">true</ExcludedFromBuild>

-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release Unicode|Win32'">true</ExcludedFromBuild>

-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release Unicode|x64'">true</ExcludedFromBuild>

-    </ClCompile>

-    <ClCompile Include="Deprecated\opt_notify.cpp">

-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug 2in1|Win32'">true</ExcludedFromBuild>

-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug 2in1|x64'">true</ExcludedFromBuild>

-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug Unicode|Win32'">true</ExcludedFromBuild>

-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug Unicode|x64'">true</ExcludedFromBuild>

-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release 2in1|Win32'">true</ExcludedFromBuild>

-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release 2in1|x64'">true</ExcludedFromBuild>

-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release Unicode|Win32'">true</ExcludedFromBuild>

-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release Unicode|x64'">true</ExcludedFromBuild>

-    </ClCompile>

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

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

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

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

-    <ClCompile Include="src\opt_old.cpp">

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug 2in1|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug 2in1|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug Unicode|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug Unicode|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release 2in1|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release 2in1|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release Unicode|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release Unicode|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

-    </ClCompile>

-    <ClCompile Include="src\opt_skins.cpp">

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug 2in1|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug 2in1|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug Unicode|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug Unicode|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release 2in1|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release 2in1|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release Unicode|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release Unicode|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

-    </ClCompile>

-    <ClCompile Include="src\opttree.cpp">

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug 2in1|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug 2in1|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug Unicode|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug Unicode|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release 2in1|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release 2in1|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release Unicode|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release Unicode|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

-    </ClCompile>

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

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

   </ItemGroup>

   <ItemGroup>

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

@@ -703,56 +520,10 @@
     <ClInclude Include="src\def_settings.h" />

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

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

-    <ClInclude Include="..\..\include\m_avatars.h" />

-    <ClInclude Include="..\..\include_API\m_folders.h" />

-    <ClInclude Include="..\..\include\m_fontservice.h" />

-    <ClInclude Include="..\..\include_API\m_ieview.h" />

-    <ClInclude Include="api\m_MathModule.h" />

-    <ClInclude Include="..\..\include_API\m_nconvers.h" />

-    <ClInclude Include="..\..\include_API\m_notify_popup.h" />

-    <ClInclude Include="..\..\include\m_popup.h" />

-    <ClInclude Include="api\m_popup2.h" />

-    <ClInclude Include="..\..\include_API\m_smileyadd.h" />

-    <ClInclude Include="..\..\include_API\m_text.h" />

-    <ClInclude Include="..\..\include_API\m_ticker.h" />

-    <ClInclude Include="..\..\include_API\m_toolbar.h" />

-    <ClInclude Include="..\..\include_API\m_toptoolbar.h" />

-    <ClInclude Include="..\..\include_API\m_updater.h" />

-    <CustomBuildStep Include="..\..\include_API\m_notify.h">

-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug 2in1|Win32'">true</ExcludedFromBuild>

-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug 2in1|x64'">true</ExcludedFromBuild>

-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug Unicode|Win32'">true</ExcludedFromBuild>

-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug Unicode|x64'">true</ExcludedFromBuild>

-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release 2in1|Win32'">true</ExcludedFromBuild>

-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release 2in1|x64'">true</ExcludedFromBuild>

-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release Unicode|Win32'">true</ExcludedFromBuild>

-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release Unicode|x64'">true</ExcludedFromBuild>

-    </CustomBuildStep>

-    <CustomBuildStep Include="Deprecated\notify_imp.h">

-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug 2in1|Win32'">true</ExcludedFromBuild>

-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug 2in1|x64'">true</ExcludedFromBuild>

-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug Unicode|Win32'">true</ExcludedFromBuild>

-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug Unicode|x64'">true</ExcludedFromBuild>

-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release 2in1|Win32'">true</ExcludedFromBuild>

-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release 2in1|x64'">true</ExcludedFromBuild>

-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release Unicode|Win32'">true</ExcludedFromBuild>

-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release Unicode|x64'">true</ExcludedFromBuild>

-    </CustomBuildStep>

-    <CustomBuildStep Include="Deprecated\opt_notify.h">

-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug 2in1|Win32'">true</ExcludedFromBuild>

-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug 2in1|x64'">true</ExcludedFromBuild>

-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug Unicode|Win32'">true</ExcludedFromBuild>

-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug Unicode|x64'">true</ExcludedFromBuild>

-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release 2in1|Win32'">true</ExcludedFromBuild>

-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release 2in1|x64'">true</ExcludedFromBuild>

-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release Unicode|Win32'">true</ExcludedFromBuild>

-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release Unicode|x64'">true</ExcludedFromBuild>

-    </CustomBuildStep>

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

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

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

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

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

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

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

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

@@ -796,16 +567,7 @@
     <None Include="res\whatsnew.txt" />

   </ItemGroup>

   <ItemGroup>

-    <ResourceCompile Include="resource.rc">

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug 2in1|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug 2in1|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug Unicode|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug Unicode|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release 2in1|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release 2in1|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release Unicode|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release Unicode|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

-    </ResourceCompile>

+    <ResourceCompile Include="resource.rc" />

     <ResourceCompile Include="version.rc" />

   </ItemGroup>

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

diff --git a/popup/PopUp_8.vcproj b/popup/PopUp_8.vcproj
index fbbdf2d..efe3af5 100644
--- a/popup/PopUp_8.vcproj
+++ b/popup/PopUp_8.vcproj
@@ -1565,46 +1565,6 @@
 				>

 			</File>

 			<File

-				RelativePath="src\opt_old.cpp"

-				>

-				<FileConfiguration

-					Name="Release 2in1|Win32"

-					>

-					<Tool

-						Name="VCCLCompilerTool"

-						PreprocessorDefinitions=""

-					/>

-				</FileConfiguration>

-				<FileConfiguration

-					Name="Debug 2in1|Win32"

-					>

-					<Tool

-						Name="VCCLCompilerTool"

-						PreprocessorDefinitions=""

-					/>

-				</FileConfiguration>

-				<FileConfiguration

-					Name="Debug Unicode|Win32"

-					>

-					<Tool

-						Name="VCCLCompilerTool"

-						PreprocessorDefinitions=""

-					/>

-				</FileConfiguration>

-				<FileConfiguration

-					Name="Release Unicode|Win32"

-					>

-					<Tool

-						Name="VCCLCompilerTool"

-						PreprocessorDefinitions=""

-					/>

-				</FileConfiguration>

-			</File>

-			<File

-				RelativePath="src\opt_old.h"

-				>

-			</File>

-			<File

 				RelativePath="src\opt_skins.cpp"

 				>

 				<FileConfiguration

diff --git a/popup/PopUp_9.vcproj b/popup/PopUp_9.vcproj
index dd64290..e78bd6b 100644
--- a/popup/PopUp_9.vcproj
+++ b/popup/PopUp_9.vcproj
@@ -2630,78 +2630,6 @@
 				>

 			</File>

 			<File

-				RelativePath="src\opt_old.cpp"

-				>

-				<FileConfiguration

-					Name="Release 2in1|Win32"

-					>

-					<Tool

-						Name="VCCLCompilerTool"

-						PreprocessorDefinitions=""

-					/>

-				</FileConfiguration>

-				<FileConfiguration

-					Name="Release 2in1|x64"

-					>

-					<Tool

-						Name="VCCLCompilerTool"

-						PreprocessorDefinitions=""

-					/>

-				</FileConfiguration>

-				<FileConfiguration

-					Name="Debug 2in1|Win32"

-					>

-					<Tool

-						Name="VCCLCompilerTool"

-						PreprocessorDefinitions=""

-					/>

-				</FileConfiguration>

-				<FileConfiguration

-					Name="Debug 2in1|x64"

-					>

-					<Tool

-						Name="VCCLCompilerTool"

-						PreprocessorDefinitions=""

-					/>

-				</FileConfiguration>

-				<FileConfiguration

-					Name="Debug Unicode|Win32"

-					>

-					<Tool

-						Name="VCCLCompilerTool"

-						PreprocessorDefinitions=""

-					/>

-				</FileConfiguration>

-				<FileConfiguration

-					Name="Debug Unicode|x64"

-					>

-					<Tool

-						Name="VCCLCompilerTool"

-						PreprocessorDefinitions=""

-					/>

-				</FileConfiguration>

-				<FileConfiguration

-					Name="Release Unicode|Win32"

-					>

-					<Tool

-						Name="VCCLCompilerTool"

-						PreprocessorDefinitions=""

-					/>

-				</FileConfiguration>

-				<FileConfiguration

-					Name="Release Unicode|x64"

-					>

-					<Tool

-						Name="VCCLCompilerTool"

-						PreprocessorDefinitions=""

-					/>

-				</FileConfiguration>

-			</File>

-			<File

-				RelativePath="src\opt_old.h"

-				>

-			</File>

-			<File

 				RelativePath="src\opt_skins.cpp"

 				>

 				<FileConfiguration

diff --git a/popup/resource.h b/popup/resource.h
index f6124bb..570490b 100644
--- a/popup/resource.h
+++ b/popup/resource.h
@@ -136,7 +136,6 @@
 #define IDC_TXT_CUSTOMACTIONS           1189

 #define IDC_TXT_POSITION                1190

 #define IDC_ICO_RESTART                 1191

-#define IDC_TXT_RESTART                 1192

 #define IDC_MORE                        1193

 #define IDC_TXT_TITLE1                  1194

 #define IDC_TXT_POSITION2               1195

diff --git a/popup/resource.rc b/popup/resource.rc
index 50303c7..4546bfe 100644
--- a/popup/resource.rc
+++ b/popup/resource.rc
@@ -125,7 +125,6 @@ BEGIN
     LTEXT           "Limit window amount to:",IDC_STATIC,154,159,96,12,SS_CENTERIMAGE

     EDITTEXT        IDC_MAXPOPUPS,255,159,26,12,ES_CENTER | ES_AUTOHSCROLL | ES_NUMBER

     ICON            IDI_MB_WARN,IDC_ICO_RESTART,8,201,20,20,SS_CENTERIMAGE | SS_REALSIZEIMAGE | NOT WS_VISIBLE

-    LTEXT           "*need restart",IDC_TXT_RESTART,36,203,83,14,SS_CENTERIMAGE | NOT WS_VISIBLE

     PUSHBUTTON      "Live Preview",IDC_PREVIEW,219,203,73,14

 END

 

diff --git a/popup/src/config.cpp b/popup/src/config.cpp
index 8649676..5831de5 100644
--- a/popup/src/config.cpp
+++ b/popup/src/config.cpp
@@ -117,7 +117,6 @@ void LoadOptions() {
 		LoadOption_Skins();

 		LoadOption_Actions();

 		LoadOption_AdvOpts();

-		LoadOption_OldOpts();

 	}

 	Check_ReorderPopUps();

 	OptionLoaded = true;

diff --git a/popup/src/headers.h b/popup/src/headers.h
index 0e3f7bc..2174245 100644
--- a/popup/src/headers.h
+++ b/popup/src/headers.h
@@ -154,7 +154,7 @@ Last change by : $Author: Merlin_de $
 	#include "def_settings.h"

 //	#include "notify_imp.h"		//deprecatet

 	#include "opttree.h"

-	#include "opt_old.h"

+//	#include "opt_old.h"		//deprecatet

 	#include "opt_gen.h"

 //	#include "opt_notify.h"		//deprecatet

 	#include "opt_skins.h"