diff options
| author | Vlad Mironov <mironych@googlemail.com> | 2013-02-21 15:59:28 +0000 |
|---|---|---|
| committer | Vlad Mironov <mironych@googlemail.com> | 2013-02-21 15:59:28 +0000 |
| commit | 3b4342ead0909ee9f5d515db932272f901708a3a (patch) | |
| tree | 7d79f463c8b05e5c14fa8fa1fa532e6facc90047 | |
| parent | df14d39c07a22130218388e7ce421710580408be (diff) | |
СЃ-plus-plusification
git-svn-id: http://svn.miranda-ng.org/main/trunk@3671 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
| -rw-r--r-- | plugins/TrafficCounter/.cproject | 194 | ||||
| -rw-r--r-- | plugins/TrafficCounter/.project | 3 | ||||
| -rw-r--r-- | plugins/TrafficCounter/src/TrafficCounter.cpp (renamed from plugins/TrafficCounter/src/TrafficCounter.c) | 16 | ||||
| -rw-r--r-- | plugins/TrafficCounter/src/commonheaders.c | 1 | ||||
| -rw-r--r-- | plugins/TrafficCounter/src/commonheaders.cpp | 1 | ||||
| -rw-r--r-- | plugins/TrafficCounter/src/commonheaders.h | 11 | ||||
| -rw-r--r-- | plugins/TrafficCounter/src/misc.cpp (renamed from plugins/TrafficCounter/src/misc.c) | 0 | ||||
| -rw-r--r-- | plugins/TrafficCounter/src/opttree.cpp (renamed from plugins/TrafficCounter/src/opttree.c) | 0 | ||||
| -rw-r--r-- | plugins/TrafficCounter/src/statistics.cpp (renamed from plugins/TrafficCounter/src/statistics.c) | 7 | ||||
| -rw-r--r-- | plugins/TrafficCounter/src/vars.cpp (renamed from plugins/TrafficCounter/src/vars.c) | 3 |
10 files changed, 109 insertions, 127 deletions
diff --git a/plugins/TrafficCounter/.cproject b/plugins/TrafficCounter/.cproject index 0f799a8a7d..1ed51ff4fd 100644 --- a/plugins/TrafficCounter/.cproject +++ b/plugins/TrafficCounter/.cproject @@ -1,12 +1,12 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?fileVersion 4.0.0?><cproject storage_type_id="org.eclipse.cdt.core.XmlProjectDescriptionStorage">
<storageModule moduleId="org.eclipse.cdt.core.settings">
- <cconfiguration id="org.eclipse.cdt.msvc.toolchain.dll.debug.1048693141.1332487408">
- <storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="org.eclipse.cdt.msvc.toolchain.dll.debug.1048693141.1332487408" moduleId="org.eclipse.cdt.core.settings" name="Debug">
+ <cconfiguration id="org.eclipse.cdt.msvc.dll.debug.887237590">
+ <storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="org.eclipse.cdt.msvc.dll.debug.887237590" moduleId="org.eclipse.cdt.core.settings" name="Debug">
<externalSettings>
<externalSetting>
- <entry flags="VALUE_WORKSPACE_PATH" kind="includePath" name="/tcounter"/>
- <entry flags="VALUE_WORKSPACE_PATH" kind="libraryPath" name="/tcounter/DebugUnicode"/>
+ <entry flags="VALUE_WORKSPACE_PATH" kind="includePath" name="/TrafficCounter"/>
+ <entry flags="VALUE_WORKSPACE_PATH" kind="libraryPath" name="/TrafficCounter/Debug"/>
<entry flags="RESOLVED" kind="libraryFile" name="TrafficCounter"/>
</externalSetting>
</externalSettings>
@@ -16,65 +16,66 @@ </extensions>
</storageModule>
<storageModule moduleId="cdtBuildSystem" version="4.0.0">
- <configuration artifactExtension="dll" artifactName="TrafficCounter" buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.sharedLib" buildProperties="org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.build.core.buildArtefactType.sharedLib" description="" id="org.eclipse.cdt.msvc.toolchain.dll.debug.1048693141.1332487408" name="Debug" parent="org.eclipse.cdt.build.core.emptycfg">
- <folderInfo id="org.eclipse.cdt.msvc.toolchain.dll.debug.1048693141.1332487408." name="/" resourcePath="">
- <toolChain id="org.eclipse.cdt.msvc.toolchain.dll.debug.1990207893" name="org.eclipse.cdt.msvc.toolchain.dll.debug" superClass="org.eclipse.cdt.msvc.toolchain.dll.debug">
- <targetPlatform id="org.eclipse.cdt.msvc.targetPlatform.dll.debug.835340158" superClass="org.eclipse.cdt.msvc.targetPlatform.dll.debug"/>
- <builder buildPath="${workspace_loc:/tcounter/Debug}" id="org.eclipse.cdt.msvc.builder.806746442" keepEnvironmentInBuildfile="false" managedBuildOn="false" name="CDT Internal Builder" superClass="org.eclipse.cdt.msvc.builder"/>
- <tool commandLinePattern="${COMMAND} ${FLAGS} ${OUTPUT_FLAG}${OUTPUT_PREFIX}${OUTPUT} ${INPUTS}" id="org.eclipse.cdt.msvc.cl.c.dll.debug.80264741" name="C Compiler (cl)" superClass="org.eclipse.cdt.msvc.cl.c.dll.debug">
- <option id="org.eclipse.cdt.msvc.cl.option.includes.2096237909" name="Include Path (/I)" superClass="org.eclipse.cdt.msvc.cl.option.includes" valueType="includePath">
+ <configuration artifactExtension="dll" artifactName="${ProjName}" buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.sharedLib" buildProperties="org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.debug,org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.build.core.buildArtefactType.sharedLib" description="" id="org.eclipse.cdt.msvc.dll.debug.887237590" name="Debug" parent="org.eclipse.cdt.msvc.dll.debug">
+ <folderInfo id="org.eclipse.cdt.msvc.dll.debug.887237590." name="/" resourcePath="">
+ <toolChain id="org.eclipse.cdt.msvc.toolchain.dll.debug.584107603" name="Microsoft Visual C++" superClass="org.eclipse.cdt.msvc.toolchain.dll.debug">
+ <targetPlatform id="org.eclipse.cdt.msvc.targetPlatform.dll.debug.34800030" superClass="org.eclipse.cdt.msvc.targetPlatform.dll.debug"/>
+ <builder buildPath="${workspace_loc:/TrafficCounter/Debug}" id="org.eclipse.cdt.msvc.builder.269199721" keepEnvironmentInBuildfile="false" managedBuildOn="true" name="CDT Internal Builder" superClass="org.eclipse.cdt.msvc.builder"/>
+ <tool command="cl /c" commandLinePattern="${COMMAND} ${FLAGS} ${OUTPUT_FLAG}${OUTPUT_PREFIX}${OUTPUT} ${INPUTS}" id="org.eclipse.cdt.msvc.cl.c.dll.debug.1662826474" name="C Compiler (cl)" superClass="org.eclipse.cdt.msvc.cl.c.dll.debug">
+ <option id="org.eclipse.cdt.msvc.cl.option.optimization.380891803" name="Optimization" superClass="org.eclipse.cdt.msvc.cl.option.optimization" value="org.eclipse.cdt.msvc.cl.option.optimization.default" valueType="enumerated"/>
+ <option id="org.eclipse.cdt.msvc.cl.option.debugFormat.827627616" name="Debug Information Format" superClass="org.eclipse.cdt.msvc.cl.option.debugFormat" value="org.eclipse.cdt.msvc.cl.option.debugFormat.complete" valueType="enumerated"/>
+ <inputType id="org.eclipse.cdt.msvc.cl.inputType.c.470949747" superClass="org.eclipse.cdt.msvc.cl.inputType.c"/>
+ </tool>
+ <tool id="org.eclipse.cdt.msvc.cl.dll.debug.128197682" name="C++ Compiler (cl)" superClass="org.eclipse.cdt.msvc.cl.dll.debug">
+ <option id="org.eclipse.cdt.msvc.cl.option.optimization.1984447989" name="Optimization" superClass="org.eclipse.cdt.msvc.cl.option.optimization" value="org.eclipse.cdt.msvc.cl.option.optimization.default" valueType="enumerated"/>
+ <option id="org.eclipse.cdt.msvc.cl.option.debugFormat.626686810" name="Debug Information Format" superClass="org.eclipse.cdt.msvc.cl.option.debugFormat" value="org.eclipse.cdt.msvc.cl.option.debugFormat.complete" valueType="enumerated"/>
+ <option id="org.eclipse.cdt.msvc.cl.option.includes.441685381" name="Include Path (/I)" superClass="org.eclipse.cdt.msvc.cl.option.includes" valueType="includePath">
<listOptionValue builtIn="false" value=""..\..\..\Include""/>
<listOptionValue builtIn="false" value=""..\..\ExternalAPI""/>
</option>
- <option id="org.eclipse.cdt.msvc.cl.option.exceptions.1946066418" name="Enable C++ Exception Handling (/EHs)" superClass="org.eclipse.cdt.msvc.cl.option.exceptions" value="false" valueType="boolean"/>
- <option id="org.eclipse.cdt.msvc.cl.option.debugFormat.794095692" name="Debug Information Format" superClass="org.eclipse.cdt.msvc.cl.option.debugFormat" value="org.eclipse.cdt.msvc.cl.option.debugFormat.complete" valueType="enumerated"/>
- <option id="org.eclipse.cdt.msvc.cl.option.macros.1069593878" name="Defines (/D)" superClass="org.eclipse.cdt.msvc.cl.option.macros" valueType="definedSymbols">
+ <option id="org.eclipse.cdt.msvc.cl.option.macros.1240665997" name="Defines (/D)" superClass="org.eclipse.cdt.msvc.cl.option.macros" valueType="definedSymbols">
+ <listOptionValue builtIn="false" value="NDEBUG"/>
<listOptionValue builtIn="false" value="UNICODE"/>
<listOptionValue builtIn="false" value="_UNICODE"/>
- <listOptionValue builtIn="false" value="DEBUG"/>
- <listOptionValue builtIn="false" value="_DEBUG"/>
</option>
- <option id="org.eclipse.cdt.msvc.cl.option.optimization.420619238" name="Optimization" superClass="org.eclipse.cdt.msvc.cl.option.optimization" value="org.eclipse.cdt.msvc.cl.option.optimization.default" valueType="enumerated"/>
- <option id="org.eclipse.cdt.msvc.cl.option.runtime.206907603" name="Run-Time Library" superClass="org.eclipse.cdt.msvc.cl.option.runtime" value="org.eclipse.cdt.msvc.cl.option.runtime.mdd" valueType="enumerated"/>
- <inputType id="org.eclipse.cdt.msvc.cl.inputType.c.1358072339" superClass="org.eclipse.cdt.msvc.cl.inputType.c"/>
+ <inputType id="org.eclipse.cdt.msvc.cl.inputType.1397372383" superClass="org.eclipse.cdt.msvc.cl.inputType"/>
</tool>
- <tool id="org.eclipse.cdt.msvc.cl.dll.debug.930330116" name="C++ Compiler (cl)" superClass="org.eclipse.cdt.msvc.cl.dll.debug"/>
- <tool id="org.eclipse.cdt.msvc.rc.dll.debug.199663299" name="Resource Compiler (rc)" superClass="org.eclipse.cdt.msvc.rc.dll.debug">
- <inputType id="org.eclipse.cdt.msvc.rc.inputType.134718322" superClass="org.eclipse.cdt.msvc.rc.inputType"/>
+ <tool id="org.eclipse.cdt.msvc.rc.dll.debug.471866324" name="Resource Compiler (rc)" superClass="org.eclipse.cdt.msvc.rc.dll.debug">
+ <inputType id="org.eclipse.cdt.msvc.rc.inputType.1657877978" superClass="org.eclipse.cdt.msvc.rc.inputType"/>
</tool>
- <tool commandLinePattern="${COMMAND} ${FLAGS} ${OUTPUT_FLAG}${OUTPUT_PREFIX}${BuildArtifactFileName} ${INPUTS}" id="org.eclipse.cdt.msvc.link.dll.debug.273142567" name="Linker (link)" superClass="org.eclipse.cdt.msvc.link.dll.debug">
- <option defaultValue="true" id="org.eclipse.cdt.msvc.link.option.dll.593290687" name="Build a DLL" superClass="org.eclipse.cdt.msvc.link.option.dll" valueType="boolean"/>
- <option id="org.eclipse.cdt.msvc.link.option.libraries.1030862196" name="Libraries" superClass="org.eclipse.cdt.msvc.link.option.libraries" valueType="libs">
- <listOptionValue builtIn="false" value="msvcrtd.lib"/>
- <listOptionValue builtIn="false" value="comctl32.lib"/>
- <listOptionValue builtIn="false" value="msimg32.lib"/>
- <listOptionValue builtIn="false" value="oleaut32.lib"/>
- <listOptionValue builtIn="false" value="gdi32.lib"/>
- <listOptionValue builtIn="false" value="user32.lib"/>
- <listOptionValue builtIn="false" value="kernel32.lib"/>
- <listOptionValue builtIn="false" value="shell32.lib"/>
- <listOptionValue builtIn="false" value="mir_core.lib"/>
- </option>
- <option id="org.eclipse.cdt.msvc.link.option.libpath.1774647005" name="Additional Libpath (/libpath)" superClass="org.eclipse.cdt.msvc.link.option.libpath" valueType="stringList">
+ <tool id="org.eclipse.cdt.msvc.link.dll.debug.533490912" name="Linker (link)" superClass="org.eclipse.cdt.msvc.link.dll.debug">
+ <option defaultValue="true" id="org.eclipse.cdt.msvc.link.option.dll.1543074275" name="Build a DLL" superClass="org.eclipse.cdt.msvc.link.option.dll" valueType="boolean"/>
+ <option id="org.eclipse.cdt.msvc.link.option.debug.621611599" name="Generate Debug Info (/debug)" superClass="org.eclipse.cdt.msvc.link.option.debug" value="true" valueType="boolean"/>
+ <option id="org.eclipse.cdt.msvc.link.option.libpath.1665869906" name="Additional Libpath (/libpath)" superClass="org.eclipse.cdt.msvc.link.option.libpath" valueType="stringList">
<listOptionValue builtIn="false" value=""${WorkspaceDirPath}/lib""/>
</option>
- <option id="org.eclipse.cdt.msvc.link.option.debug.1295398240" name="Generate Debug Info (/debug)" superClass="org.eclipse.cdt.msvc.link.option.debug" value="true" valueType="boolean"/>
- <inputType id="org.eclipse.cdt.msvc.link.inputType.357088970" superClass="org.eclipse.cdt.msvc.link.inputType"/>
- <outputType id="org.eclipse.cdt.msvc.link.outputType.1902556986" outputPrefix="${WorkspaceDirPath}/${ConfigName}/Plugins/" superClass="org.eclipse.cdt.msvc.link.outputType"/>
+ <option id="org.eclipse.cdt.msvc.link.option.others.1923000123" name="Other Options" superClass="org.eclipse.cdt.msvc.link.option.others" valueType="stringList">
+ <listOptionValue builtIn="false" value="/MACHINE:X86"/>
+ </option>
+ <option id="org.eclipse.cdt.msvc.link.option.libraries.1427056229" name="Libraries" superClass="org.eclipse.cdt.msvc.link.option.libraries" valueType="libs">
+ <listOptionValue builtIn="false" value="comdlg32.lib"/>
+ <listOptionValue builtIn="false" value="Comctl32.lib"/>
+ <listOptionValue builtIn="false" value="user32.lib"/>
+ <listOptionValue builtIn="false" value="gdi32.lib"/>
+ <listOptionValue builtIn="false" value="Msimg32.lib"/>
+ <listOptionValue builtIn="false" value="OleAut32.lib"/>
+ </option>
+ <inputType id="org.eclipse.cdt.msvc.link.inputType.1758851328" superClass="org.eclipse.cdt.msvc.link.inputType"/>
+ <outputType id="org.eclipse.cdt.msvc.link.outputType.298512876" outputPrefix="${WorkspaceDirPath}/${ConfigName}/Plugins/" superClass="org.eclipse.cdt.msvc.link.outputType"/>
</tool>
- <tool id="org.eclipse.cdt.msvc.lib.797294379" name="Library Manager (lib)" superClass="org.eclipse.cdt.msvc.lib"/>
+ <tool id="org.eclipse.cdt.msvc.lib.682181251" name="Library Manager (lib)" superClass="org.eclipse.cdt.msvc.lib"/>
</toolChain>
</folderInfo>
</configuration>
</storageModule>
<storageModule moduleId="org.eclipse.cdt.core.externalSettings"/>
</cconfiguration>
- <cconfiguration id="org.eclipse.cdt.msvc.toolchain.dll.debug.1048693141.1332487408.1959521771">
- <storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="org.eclipse.cdt.msvc.toolchain.dll.debug.1048693141.1332487408.1959521771" moduleId="org.eclipse.cdt.core.settings" name="Release">
+ <cconfiguration id="org.eclipse.cdt.msvc.dll.release.461974886">
+ <storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="org.eclipse.cdt.msvc.dll.release.461974886" moduleId="org.eclipse.cdt.core.settings" name="Release">
<externalSettings>
<externalSetting>
- <entry flags="VALUE_WORKSPACE_PATH" kind="includePath" name="/tcounter"/>
- <entry flags="VALUE_WORKSPACE_PATH" kind="libraryPath" name="/tcounter/ReleaseUnicode"/>
+ <entry flags="VALUE_WORKSPACE_PATH" kind="includePath" name="/TrafficCounter"/>
+ <entry flags="VALUE_WORKSPACE_PATH" kind="libraryPath" name="/TrafficCounter/Release"/>
<entry flags="RESOLVED" kind="libraryFile" name="TrafficCounter"/>
</externalSetting>
</externalSettings>
@@ -84,101 +85,72 @@ </extensions>
</storageModule>
<storageModule moduleId="cdtBuildSystem" version="4.0.0">
- <configuration artifactExtension="dll" artifactName="TrafficCounter" buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.sharedLib" buildProperties="org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.build.core.buildArtefactType.sharedLib" description="" id="org.eclipse.cdt.msvc.toolchain.dll.debug.1048693141.1332487408.1959521771" name="Release" parent="org.eclipse.cdt.build.core.emptycfg">
- <folderInfo id="org.eclipse.cdt.msvc.toolchain.dll.debug.1048693141.1332487408.1959521771." name="/" resourcePath="">
- <toolChain id="org.eclipse.cdt.msvc.toolchain.dll.debug.733328292" name="org.eclipse.cdt.msvc.toolchain.dll.debug" superClass="org.eclipse.cdt.msvc.toolchain.dll.debug">
- <targetPlatform id="org.eclipse.cdt.msvc.targetPlatform.dll.debug.825043148" superClass="org.eclipse.cdt.msvc.targetPlatform.dll.debug"/>
- <builder buildPath="${workspace_loc:/tcounter/Debug}" id="org.eclipse.cdt.msvc.builder.1565874418" keepEnvironmentInBuildfile="false" managedBuildOn="false" name="CDT Internal Builder" superClass="org.eclipse.cdt.msvc.builder"/>
- <tool command="cl /c" commandLinePattern="${COMMAND} ${FLAGS} ${OUTPUT_FLAG}${OUTPUT_PREFIX}${OUTPUT} ${INPUTS}" id="org.eclipse.cdt.msvc.cl.c.dll.debug.1520652355" name="C Compiler (cl)" superClass="org.eclipse.cdt.msvc.cl.c.dll.debug">
- <option id="org.eclipse.cdt.msvc.cl.option.includes.929806530" name="Include Path (/I)" superClass="org.eclipse.cdt.msvc.cl.option.includes" valueType="includePath">
+ <configuration artifactExtension="dll" artifactName="${ProjName}" buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.sharedLib" buildProperties="org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.release,org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.build.core.buildArtefactType.sharedLib" description="" id="org.eclipse.cdt.msvc.dll.release.461974886" name="Release" parent="org.eclipse.cdt.msvc.dll.release">
+ <folderInfo id="org.eclipse.cdt.msvc.dll.release.461974886." name="/" resourcePath="">
+ <toolChain id="org.eclipse.cdt.msvc.toolchain.dll.release.752641338" name="Microsoft Visual C++" superClass="org.eclipse.cdt.msvc.toolchain.dll.release">
+ <targetPlatform id="org.eclipse.cdt.msvc.targetPlatform.dll.release.1259241292" superClass="org.eclipse.cdt.msvc.targetPlatform.dll.release"/>
+ <builder buildPath="${workspace_loc:/TrafficCounter/Release}" id="org.eclipse.cdt.msvc.builder.947348140" keepEnvironmentInBuildfile="false" managedBuildOn="true" name="CDT Internal Builder" superClass="org.eclipse.cdt.msvc.builder"/>
+ <tool command="cl /c" commandLinePattern="${COMMAND} ${FLAGS} ${OUTPUT_FLAG}${OUTPUT_PREFIX}${OUTPUT} ${INPUTS}" id="org.eclipse.cdt.msvc.cl.c.dll.release.2005821470" name="C Compiler (cl)" superClass="org.eclipse.cdt.msvc.cl.c.dll.release">
+ <option id="org.eclipse.cdt.msvc.cl.option.optimization.570342597" name="Optimization" superClass="org.eclipse.cdt.msvc.cl.option.optimization"/>
+ <option id="org.eclipse.cdt.msvc.cl.option.debugFormat.252591772" name="Debug Information Format" superClass="org.eclipse.cdt.msvc.cl.option.debugFormat"/>
+ <inputType id="org.eclipse.cdt.msvc.cl.inputType.c.797404818" superClass="org.eclipse.cdt.msvc.cl.inputType.c"/>
+ </tool>
+ <tool id="org.eclipse.cdt.msvc.cl.dll.release.503753211" name="C++ Compiler (cl)" superClass="org.eclipse.cdt.msvc.cl.dll.release">
+ <option id="org.eclipse.cdt.msvc.cl.option.optimization.905639963" name="Optimization" superClass="org.eclipse.cdt.msvc.cl.option.optimization"/>
+ <option id="org.eclipse.cdt.msvc.cl.option.debugFormat.992091112" name="Debug Information Format" superClass="org.eclipse.cdt.msvc.cl.option.debugFormat"/>
+ <option id="org.eclipse.cdt.msvc.cl.option.includes.2040009850" name="Include Path (/I)" superClass="org.eclipse.cdt.msvc.cl.option.includes" valueType="includePath">
<listOptionValue builtIn="false" value=""..\..\..\Include""/>
<listOptionValue builtIn="false" value=""..\..\ExternalAPI""/>
</option>
- <option id="org.eclipse.cdt.msvc.cl.option.exceptions.550376509" name="Enable C++ Exception Handling (/EHs)" superClass="org.eclipse.cdt.msvc.cl.option.exceptions" value="false" valueType="boolean"/>
- <option id="org.eclipse.cdt.msvc.cl.option.debugFormat.679811504" name="Debug Information Format" superClass="org.eclipse.cdt.msvc.cl.option.debugFormat" value="org.eclipse.cdt.msvc.cl.option.debugFormat.none" valueType="enumerated"/>
- <option id="org.eclipse.cdt.msvc.cl.option.macros.1593240491" name="Defines (/D)" superClass="org.eclipse.cdt.msvc.cl.option.macros" valueType="definedSymbols">
+ <option id="org.eclipse.cdt.msvc.cl.option.macros.865983604" name="Defines (/D)" superClass="org.eclipse.cdt.msvc.cl.option.macros" valueType="definedSymbols">
+ <listOptionValue builtIn="false" value="DEBUG"/>
<listOptionValue builtIn="false" value="UNICODE"/>
<listOptionValue builtIn="false" value="_UNICODE"/>
- <listOptionValue builtIn="false" value="NDEBUG"/>
- </option>
- <option id="org.eclipse.cdt.msvc.cl.option.rtti.1766753628" name="Enable Run-Time Type Information (/GR)" superClass="org.eclipse.cdt.msvc.cl.option.rtti" value="false" valueType="boolean"/>
- <option id="org.eclipse.cdt.msvc.cl.option.others.1039051703" name="Other Options" superClass="org.eclipse.cdt.msvc.cl.option.others" valueType="stringList">
- <listOptionValue builtIn="false" value="/Yucommonheaders.h"/>
</option>
- <inputType id="org.eclipse.cdt.msvc.cl.inputType.c.1388236035" superClass="org.eclipse.cdt.msvc.cl.inputType.c"/>
+ <inputType id="org.eclipse.cdt.msvc.cl.inputType.1870081348" superClass="org.eclipse.cdt.msvc.cl.inputType"/>
</tool>
- <tool id="org.eclipse.cdt.msvc.cl.dll.debug.680264934" name="C++ Compiler (cl)" superClass="org.eclipse.cdt.msvc.cl.dll.debug"/>
- <tool id="org.eclipse.cdt.msvc.rc.dll.debug.1200811748" name="Resource Compiler (rc)" superClass="org.eclipse.cdt.msvc.rc.dll.debug">
- <inputType id="org.eclipse.cdt.msvc.rc.inputType.2018864164" superClass="org.eclipse.cdt.msvc.rc.inputType"/>
+ <tool id="org.eclipse.cdt.msvc.rc.dll.release.426267774" name="Resource Compiler (rc)" superClass="org.eclipse.cdt.msvc.rc.dll.release">
+ <inputType id="org.eclipse.cdt.msvc.rc.inputType.210914062" superClass="org.eclipse.cdt.msvc.rc.inputType"/>
</tool>
- <tool commandLinePattern="${COMMAND} ${FLAGS} ${OUTPUT_FLAG}${OUTPUT_PREFIX}${BuildArtifactFileName} ${INPUTS}" id="org.eclipse.cdt.msvc.link.dll.debug.249870992" name="Linker (link)" superClass="org.eclipse.cdt.msvc.link.dll.debug">
- <option defaultValue="true" id="org.eclipse.cdt.msvc.link.option.dll.1576235798" name="Build a DLL" superClass="org.eclipse.cdt.msvc.link.option.dll" valueType="boolean"/>
- <option id="org.eclipse.cdt.msvc.link.option.libraries.231104701" name="Libraries" superClass="org.eclipse.cdt.msvc.link.option.libraries" valueType="libs">
- <listOptionValue builtIn="false" value="msvcrt.lib"/>
- <listOptionValue builtIn="false" value="comctl32.lib"/>
- <listOptionValue builtIn="false" value="msimg32.lib"/>
- <listOptionValue builtIn="false" value="oleaut32.lib"/>
- <listOptionValue builtIn="false" value="gdi32.lib"/>
- <listOptionValue builtIn="false" value="user32.lib"/>
- <listOptionValue builtIn="false" value="kernel32.lib"/>
- <listOptionValue builtIn="false" value="shell32.lib"/>
- <listOptionValue builtIn="false" value="mir_core.lib"/>
+ <tool id="org.eclipse.cdt.msvc.link.dll.release.1456328195" name="Linker (link)" superClass="org.eclipse.cdt.msvc.link.dll.release">
+ <option defaultValue="true" id="org.eclipse.cdt.msvc.link.option.dll.1503109199" name="Build a DLL" superClass="org.eclipse.cdt.msvc.link.option.dll" valueType="boolean"/>
+ <option id="org.eclipse.cdt.msvc.link.option.others.1793370056" name="Other Options" superClass="org.eclipse.cdt.msvc.link.option.others" valueType="stringList">
+ <listOptionValue builtIn="false" value="/MACHINE:X86"/>
</option>
- <option id="org.eclipse.cdt.msvc.link.option.libpath.1359544014" name="Additional Libpath (/libpath)" superClass="org.eclipse.cdt.msvc.link.option.libpath" valueType="stringList">
+ <option id="org.eclipse.cdt.msvc.link.option.libpath.1888833963" name="Additional Libpath (/libpath)" superClass="org.eclipse.cdt.msvc.link.option.libpath" valueType="stringList">
<listOptionValue builtIn="false" value=""${WorkspaceDirPath}/lib""/>
</option>
- <inputType id="org.eclipse.cdt.msvc.link.inputType.418103049" superClass="org.eclipse.cdt.msvc.link.inputType"/>
- <outputType id="org.eclipse.cdt.msvc.link.outputType.601882109" outputPrefix="${WorkspaceDirPath}/${ConfigName}/Plugins/" superClass="org.eclipse.cdt.msvc.link.outputType"/>
- </tool>
- <tool id="org.eclipse.cdt.msvc.lib.908787836" name="Library Manager (lib)" superClass="org.eclipse.cdt.msvc.lib"/>
- </toolChain>
- </folderInfo>
- <folderInfo id="org.eclipse.cdt.msvc.toolchain.dll.debug.1048693141.1332487408.1959521771.1170774501" name="/" resourcePath="res">
- <toolChain id="org.eclipse.cdt.msvc.toolchain.dll.debug.1775412055" name="org.eclipse.cdt.msvc.toolchain.dll.debug" superClass="org.eclipse.cdt.msvc.toolchain.dll.debug" unusedChildren="">
- <targetPlatform id="org.eclipse.cdt.msvc.targetPlatform.dll.debug" superClass="org.eclipse.cdt.msvc.targetPlatform.dll.debug"/>
- <tool id="org.eclipse.cdt.msvc.cl.c.dll.debug.623649956" name="C Compiler (cl)" superClass="org.eclipse.cdt.msvc.cl.c.dll.debug.1520652355">
- <option id="org.eclipse.cdt.msvc.cl.option.includes.2092493535" name="Include Path (/I)" superClass="org.eclipse.cdt.msvc.cl.option.includes" valueType="includePath">
- <listOptionValue builtIn="false" value=""..\..\..\..\Include""/>
- <listOptionValue builtIn="false" value=""..\..\ExternalAPI""/>
+ <option id="org.eclipse.cdt.msvc.link.option.libraries.466686323" name="Libraries" superClass="org.eclipse.cdt.msvc.link.option.libraries" valueType="libs">
+ <listOptionValue builtIn="false" value="comdlg32.lib"/>
+ <listOptionValue builtIn="false" value="Comctl32.lib"/>
+ <listOptionValue builtIn="false" value="user32.lib"/>
+ <listOptionValue builtIn="false" value="gdi32.lib"/>
+ <listOptionValue builtIn="false" value="Msimg32.lib"/>
+ <listOptionValue builtIn="false" value="OleAut32.lib"/>
</option>
- <inputType id="org.eclipse.cdt.msvc.cl.inputType.c.1490061904" superClass="org.eclipse.cdt.msvc.cl.inputType.c"/>
- </tool>
- <tool id="org.eclipse.cdt.msvc.cl.dll.debug.405151662" name="C++ Compiler (cl)" superClass="org.eclipse.cdt.msvc.cl.dll.debug.680264934"/>
- <tool id="org.eclipse.cdt.msvc.rc.dll.debug.1485908904" name="Resource Compiler (rc)" superClass="org.eclipse.cdt.msvc.rc.dll.debug.1200811748">
- <inputType id="org.eclipse.cdt.msvc.rc.inputType.2065231263" superClass="org.eclipse.cdt.msvc.rc.inputType"/>
+ <inputType id="org.eclipse.cdt.msvc.link.inputType.1513815018" superClass="org.eclipse.cdt.msvc.link.inputType"/>
+ <outputType id="org.eclipse.cdt.msvc.link.outputType.1809334500" outputPrefix="${WorkspaceDirPath}/${ConfigName}/Plugins/" superClass="org.eclipse.cdt.msvc.link.outputType"/>
</tool>
- <tool id="org.eclipse.cdt.msvc.link.dll.debug.796823518" name="Linker (link)" superClass="org.eclipse.cdt.msvc.link.dll.debug.249870992"/>
- <tool id="org.eclipse.cdt.msvc.lib.260032509" name="Library Manager (lib)" superClass="org.eclipse.cdt.msvc.lib.908787836"/>
+ <tool id="org.eclipse.cdt.msvc.lib.1541732613" name="Library Manager (lib)" superClass="org.eclipse.cdt.msvc.lib"/>
</toolChain>
</folderInfo>
- <fileInfo id="org.eclipse.cdt.msvc.toolchain.dll.debug.1048693141.1332487408.1959521771.669725565" name="commonheaders.c" rcbsApplicability="disable" resourcePath="src/commonheaders.c" toolsToInvoke="org.eclipse.cdt.msvc.cl.c.dll.debug.1520652355.1446143671">
- <tool id="org.eclipse.cdt.msvc.cl.c.dll.debug.1520652355.1446143671" name="C Compiler (cl)" superClass="org.eclipse.cdt.msvc.cl.c.dll.debug.1520652355">
- <option id="org.eclipse.cdt.msvc.cl.option.others.1967485614" name="Other Options" superClass="org.eclipse.cdt.msvc.cl.option.others" valueType="stringList">
- <listOptionValue builtIn="false" value="/Yccommonheaders.h"/>
- </option>
- <inputType id="org.eclipse.cdt.msvc.cl.inputType.c.2047681164" superClass="org.eclipse.cdt.msvc.cl.inputType.c"/>
- </tool>
- </fileInfo>
</configuration>
</storageModule>
<storageModule moduleId="org.eclipse.cdt.core.externalSettings"/>
</cconfiguration>
</storageModule>
<storageModule moduleId="cdtBuildSystem" version="4.0.0">
- <project id="tcounter.null.444573245" name="tcounter"/>
- </storageModule>
- <storageModule moduleId="refreshScope" versionNumber="1">
- <resource resourceType="PROJECT" workspacePath="/tcounter"/>
+ <project id="TrafficCounter.org.eclipse.cdt.msvc.projectType.dll.1426036801" name="Shared Library" projectType="org.eclipse.cdt.msvc.projectType.dll"/>
</storageModule>
- <storageModule moduleId="org.eclipse.cdt.internal.ui.text.commentOwnerProjectMappings"/>
<storageModule moduleId="scannerConfiguration">
<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
- <scannerConfigBuildInfo instanceId="org.eclipse.cdt.msvc.toolchain.dll.debug.1048693141.1332487408;org.eclipse.cdt.msvc.toolchain.dll.debug.1048693141.1332487408.;org.eclipse.cdt.msvc.cl.c.dll.debug.80264741;org.eclipse.cdt.msvc.cl.inputType.c.1358072339">
+ <scannerConfigBuildInfo instanceId="org.eclipse.cdt.msvc.dll.debug.887237590;org.eclipse.cdt.msvc.dll.debug.887237590.;org.eclipse.cdt.msvc.cl.dll.debug.128197682;org.eclipse.cdt.msvc.cl.inputType.1397372383">
<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="org.eclipse.cdt.msw.build.clScannerInfo"/>
</scannerConfigBuildInfo>
- <scannerConfigBuildInfo instanceId="org.eclipse.cdt.msvc.toolchain.dll.debug.1048693141;org.eclipse.cdt.msvc.toolchain.dll.debug.1048693141.1504787373;org.eclipse.cdt.msvc.cl.c.dll.debug.1512155215;org.eclipse.cdt.msvc.cl.inputType.c.445125206">
+ <scannerConfigBuildInfo instanceId="org.eclipse.cdt.msvc.dll.debug.887237590;org.eclipse.cdt.msvc.dll.debug.887237590.;org.eclipse.cdt.msvc.cl.c.dll.debug.1662826474;org.eclipse.cdt.msvc.cl.inputType.c.470949747">
<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="org.eclipse.cdt.msw.build.clScannerInfo"/>
</scannerConfigBuildInfo>
</storageModule>
+ <storageModule moduleId="refreshScope"/>
<storageModule moduleId="org.eclipse.cdt.make.core.buildtargets"/>
</cproject>
diff --git a/plugins/TrafficCounter/.project b/plugins/TrafficCounter/.project index 9662d3935a..ebb10d548f 100644 --- a/plugins/TrafficCounter/.project +++ b/plugins/TrafficCounter/.project @@ -27,7 +27,7 @@ </dictionary>
<dictionary>
<key>org.eclipse.cdt.make.core.buildLocation</key>
- <value>${workspace_loc:/tcounter/Debug}</value>
+ <value>${workspace_loc:/TrafficCounter/Release}</value>
</dictionary>
<dictionary>
<key>org.eclipse.cdt.make.core.contents</key>
@@ -64,6 +64,7 @@ </buildSpec>
<natures>
<nature>org.eclipse.cdt.core.cnature</nature>
+ <nature>org.eclipse.cdt.core.ccnature</nature>
<nature>org.eclipse.cdt.managedbuilder.core.managedBuildNature</nature>
<nature>org.eclipse.cdt.managedbuilder.core.ScannerConfigNature</nature>
</natures>
diff --git a/plugins/TrafficCounter/src/TrafficCounter.c b/plugins/TrafficCounter/src/TrafficCounter.cpp index a423804e64..8a9611328e 100644 --- a/plugins/TrafficCounter/src/TrafficCounter.c +++ b/plugins/TrafficCounter/src/TrafficCounter.cpp @@ -24,6 +24,14 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. /*-------------------------------------------------------------------------------------------------------------------*/
//GLOBAL
/*-------------------------------------------------------------------------------------------------------------------*/
+uTCFLAGS unOptions;
+PROTOLIST *ProtoList; // Данные обо всех аккаунтах.
+PROTOLIST OverallInfo; // Суммарные данные по видимым аккаунтам.
+int NumberOfAccounts;
+extern WORD Stat_SelAcc;
+HWND TrafficHwnd;
+DWORD mirandaVer;
+
HINSTANCE hInst;
int hLangpack = 0; // Поддержка плагинозависимого перевода.
@@ -109,7 +117,7 @@ PLUGININFOEX pluginInfoEx = {0x82181510, 0x5dfa, 0x49d7, { 0xb4, 0x69, 0x33, 0x87, 0x1e, 0x2a, 0xe8, 0xb5}} // {82181510-5DFA-49d7-B469-33871E2AE8B5}
};
-__declspec(dllexport) PLUGININFOEX *MirandaPluginInfoEx(DWORD mirandaVersion)
+extern "C" __declspec(dllexport) PLUGININFOEX *MirandaPluginInfoEx(DWORD mirandaVersion)
{
mirandaVer = mirandaVersion;
return &pluginInfoEx;
@@ -123,7 +131,7 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) return TRUE;
}
-int __declspec(dllexport) Load(void)
+extern "C" int __declspec(dllexport) Load(void)
{
if (mirandaVer < PLUGIN_MAKE_VERSION(0, 92, 2, 0)) return -1;
@@ -139,7 +147,7 @@ int __declspec(dllexport) Load(void) return 0;
}
-int __declspec(dllexport) Unload(void)
+extern "C" int __declspec(dllexport) Unload(void)
{
return 0;
}
@@ -1137,7 +1145,7 @@ int PaintTrafficCounterWindow(HWND hwnd, HDC hDC) }
mir_free(ItemsList);
}
- dx = CallService(MS_VARS_FREEMEMORY, (WPARAM)(void*)buf, 0);
+ mir_free(buf);
rect.top += Traffic_LineHeight + Traffic_AdditionSpace;
}
diff --git a/plugins/TrafficCounter/src/commonheaders.c b/plugins/TrafficCounter/src/commonheaders.c deleted file mode 100644 index c9fe1b2686..0000000000 --- a/plugins/TrafficCounter/src/commonheaders.c +++ /dev/null @@ -1 +0,0 @@ -#include "commonheaders.h"
\ No newline at end of file diff --git a/plugins/TrafficCounter/src/commonheaders.cpp b/plugins/TrafficCounter/src/commonheaders.cpp new file mode 100644 index 0000000000..14f99f7d71 --- /dev/null +++ b/plugins/TrafficCounter/src/commonheaders.cpp @@ -0,0 +1 @@ +#include "commonheaders.h"
diff --git a/plugins/TrafficCounter/src/commonheaders.h b/plugins/TrafficCounter/src/commonheaders.h index bdc5974519..6b8a521308 100644 --- a/plugins/TrafficCounter/src/commonheaders.h +++ b/plugins/TrafficCounter/src/commonheaders.h @@ -115,7 +115,7 @@ typedef struct //---------------------------------------------------------------------------------------------
// Различные флаги
//---------------------------------------------------------------------------------------------
-union
+typedef union
{
DWORD Flags;
struct
@@ -141,14 +141,7 @@ union unsigned int Reserv1:1; //22
unsigned int DrawTotalTimeCounter:1; //23
};
-} unOptions;
-
-PROTOLIST *ProtoList; // Данные обо всех аккаунтах.
-PROTOLIST OverallInfo; // Суммарные данные по видимым аккаунтам.
-int NumberOfAccounts;
-WORD Stat_SelAcc; // Выбранные аккаунты в окне статистики
-HWND TrafficHwnd;
-DWORD mirandaVer;
+} uTCFLAGS;
#include "misc.h"
#include "opttree.h"
diff --git a/plugins/TrafficCounter/src/misc.c b/plugins/TrafficCounter/src/misc.cpp index 6320117246..6320117246 100644 --- a/plugins/TrafficCounter/src/misc.c +++ b/plugins/TrafficCounter/src/misc.cpp diff --git a/plugins/TrafficCounter/src/opttree.c b/plugins/TrafficCounter/src/opttree.cpp index 05502ee78e..05502ee78e 100644 --- a/plugins/TrafficCounter/src/opttree.c +++ b/plugins/TrafficCounter/src/opttree.cpp diff --git a/plugins/TrafficCounter/src/statistics.c b/plugins/TrafficCounter/src/statistics.cpp index 03e30f2e90..859ecb40a9 100644 --- a/plugins/TrafficCounter/src/statistics.c +++ b/plugins/TrafficCounter/src/statistics.cpp @@ -24,6 +24,11 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include "commonheaders.h"
#include <math.h>
+extern HWND TrafficHwnd;
+extern PROTOLIST *ProtoList;
+extern uTCFLAGS unOptions;
+WORD Stat_SelAcc; // Выбранные аккаунты в окне статистики
+
HWND hListAccs;
INT_PTR CALLBACK DlgProcOptStatistics(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam)
@@ -748,4 +753,4 @@ BYTE Stat_GetEldestAcc(WORD SelectedAccs) }
return Result;
-}
\ No newline at end of file +}
diff --git a/plugins/TrafficCounter/src/vars.c b/plugins/TrafficCounter/src/vars.cpp index bc2cda965f..bca68d5569 100644 --- a/plugins/TrafficCounter/src/vars.c +++ b/plugins/TrafficCounter/src/vars.cpp @@ -23,6 +23,9 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include "commonheaders.h"
+extern PROTOLIST *ProtoList;
+extern PROTOLIST OverallInfo;
+
static TCHAR* GetTraffic(ARGUMENTSINFO *ai)
{
DWORD tmp, tmpsn = 0, tmprn = 0, tmpst = 0, tmprt = 0;
|