fix windows build

diff --git a/fscomm/FSComm.2008.vcproj b/fscomm/FSComm.2008.vcproj
index 13b15787b5c51c7eeba632e7097ec7aced9a5d22..42a98a81e70f9106520562033a53fd2042d37e91 100644 (file)
--- a/fscomm/FSComm.2008.vcproj
+++ b/fscomm/FSComm.2008.vcproj
@@ -218,6 +218,18 @@
                                RelativePath="call.cpp"\r
                                >\r
                        </File>\r
+                       <File\r
+                               RelativePath=".\channel.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\widgets\codecwidget.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\debugtools\consolewindow.cpp"\r
+                               >\r
+                       </File>\r
                        <File\r
                                RelativePath="fshost.cpp"\r
                                >\r
@@ -250,6 +262,14 @@
                                RelativePath=".\preferences\prefsofia.cpp"\r
                                >\r
                        </File>\r
+                       <File\r
+                               RelativePath=".\debugtools\sortfilterproxymodel.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\debugtools\statedebugdialog.cpp"\r
+                               >\r
+                       </File>\r
                </Filter>\r
                <Filter\r
                        Name="Header Files"\r
@@ -290,6 +310,62 @@
                                RelativePath="call.h"\r
                                >\r
                        </File>\r
+                       <File\r
+                               RelativePath=".\channel.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\widgets\codecwidget.h"\r
+                               >\r
+                               <FileConfiguration\r
+                                       Name="Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCustomBuildTool"\r
+                                               Description="MOC codecwidget.h"\r
+                                               CommandLine="Rem IncrediBuild_AllowRemote&#x0D;&#x0A;Rem IncrediBuild_OutputFile debug\moc_codecwidget.cpp&#x0D;&#x0A;$(QTDIR)\bin\moc.exe  -DUNICODE -DWIN32 -DQT_LARGEFILE_SUPPORT -DQT_DLL -DQT_GUI_LIB -DQT_CORE_LIB -DQT_THREAD_SUPPORT -I&quot;$(QTDIR)\include\QtCore&quot; -I&quot;$(QTDIR)\include\QtGui&quot; -I&quot;$(QTDIR)\include&quot; -I&quot;.&quot; -I&quot;$(QTDIR)\include\ActiveQt&quot; -I&quot;debug&quot; -I&quot;.&quot; -I$(QTDIR)\mkspecs\win32-msvc2008 -D_MSC_VER=1500 -DWIN32 widgets\codecwidget.h -o debug\moc_codecwidget.cpp&#x0D;&#x0A;"\r
+                                               AdditionalDependencies="Rem;codecwidget.h"\r
+                                               Outputs="debug\moc_codecwidget.cpp"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCustomBuildTool"\r
+                                               Description="MOC prefportaudio.h"\r
+                                               CommandLine="Rem IncrediBuild_AllowRemote&#x0D;&#x0A;Rem IncrediBuild_OutputFile release\moc_codecwidget.cpp&#x0D;&#x0A;$(QTDIR)\bin\moc.exe  -DUNICODE -DWIN32 -DQT_LARGEFILE_SUPPORT -DQT_DLL -DQT_NO_DEBUG -DQT_GUI_LIB -DQT_CORE_LIB -DQT_THREAD_SUPPORT -I&quot;$(QTDIR)\include\QtCore&quot; -I&quot;$(QTDIR)\include\QtGui&quot; -I&quot;$(QTDIR)\include&quot; -I&quot;.&quot; -I&quot;$(QTDIR)\include\ActiveQt&quot; -I&quot;release&quot; -I&quot;.&quot; -I$(QTDIR)\mkspecs\win32-msvc2008 -D_MSC_VER=1500 -DWIN32 widgets\codecwidget.h -o release\moc_codecwidget.cpp&#x0D;&#x0A;"\r
+                                               AdditionalDependencies="Rem;codecwidget.h"\r
+                                               Outputs="release\moc_codecwidget.cpp"\r
+                                       />\r
+                               </FileConfiguration>\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\debugtools\consolewindow.h"\r
+                               >\r
+                               <FileConfiguration\r
+                                       Name="Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCustomBuildTool"\r
+                                               Description="MOC consolewindow.h"\r
+                                               CommandLine="Rem IncrediBuild_AllowRemote&#x0D;&#x0A;Rem IncrediBuild_OutputFile debug\moc_consolewindow.cpp&#x0D;&#x0A;$(QTDIR)\bin\moc.exe  -DUNICODE -DWIN32 -DQT_LARGEFILE_SUPPORT -DQT_DLL -DQT_GUI_LIB -DQT_CORE_LIB -DQT_THREAD_SUPPORT -I&quot;$(QTDIR)\include\QtCore&quot; -I&quot;$(QTDIR)\include\QtGui&quot; -I&quot;$(QTDIR)\include&quot; -I&quot;.&quot; -I&quot;$(QTDIR)\include\ActiveQt&quot; -I&quot;debug&quot; -I&quot;.&quot; -I$(QTDIR)\mkspecs\win32-msvc2008 -D_MSC_VER=1500 -DWIN32 debugtools\consolewindow.h -o debug\moc_consolewindow.cpp&#x0D;&#x0A;"\r
+                                               AdditionalDependencies="Rem;consolewindow.h"\r
+                                               Outputs="debug\moc_consolewindow.cpp"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCustomBuildTool"\r
+                                               Description="MOC consolewindow.h"\r
+                                               CommandLine="Rem IncrediBuild_AllowRemote&#x0D;&#x0A;Rem IncrediBuild_OutputFile release\moc_consolewindow.cpp&#x0D;&#x0A;$(QTDIR)\bin\moc.exe  -DUNICODE -DWIN32 -DQT_LARGEFILE_SUPPORT -DQT_DLL -DQT_NO_DEBUG -DQT_GUI_LIB -DQT_CORE_LIB -DQT_THREAD_SUPPORT -I&quot;$(QTDIR)\include\QtCore&quot; -I&quot;$(QTDIR)\include\QtGui&quot; -I&quot;$(QTDIR)\include&quot; -I&quot;.&quot; -I&quot;$(QTDIR)\include\ActiveQt&quot; -I&quot;release&quot; -I&quot;.&quot; -I$(QTDIR)\mkspecs\win32-msvc2008 -D_MSC_VER=1500 -DWIN32 debugtools\consolewindow.h -o release\moc_consolewindow.cpp&#x0D;&#x0A;"\r
+                                               AdditionalDependencies="Rem;consolewindow.h"\r
+                                               Outputs="release\moc_consolewindow.cpp"\r
+                                       />\r
+                               </FileConfiguration>\r
+                       </File>\r
                        <File\r
                                RelativePath="fshost.h"\r
                                >\r
@@ -450,6 +526,62 @@
                                        />\r
                                </FileConfiguration>\r
                        </File>\r
+                       <File\r
+                               RelativePath=".\debugtools\sortfilterproxymodel.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\debugtools\sortfilterproxymodel.h"\r
+                               >\r
+                               <FileConfiguration\r
+                                       Name="Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCustomBuildTool"\r
+                                               Description="MOC sortfilterproxymodel.h"\r
+                                               CommandLine="Rem IncrediBuild_AllowRemote&#x0D;&#x0A;Rem IncrediBuild_OutputFile debug\moc_sortfilterproxymodel.cpp&#x0D;&#x0A;$(QTDIR)\bin\moc.exe  -DUNICODE -DWIN32 -DQT_LARGEFILE_SUPPORT -DQT_DLL -DQT_GUI_LIB -DQT_CORE_LIB -DQT_THREAD_SUPPORT -I&quot;$(QTDIR)\include\QtCore&quot; -I&quot;$(QTDIR)\include\QtGui&quot; -I&quot;$(QTDIR)\include&quot; -I&quot;.&quot; -I&quot;$(QTDIR)\include\ActiveQt&quot; -I&quot;debug&quot; -I&quot;.&quot; -I$(QTDIR)\mkspecs\win32-msvc2008 -D_MSC_VER=1500 -DWIN32 debugtools\sortfilterproxymodel.h -o debug\moc_sortfilterproxymodel.cpp&#x0D;&#x0A;"\r
+                                               AdditionalDependencies="Rem;sortfilterproxymodel.h"\r
+                                               Outputs="debug\moc_sortfilterproxymodel.cpp"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCustomBuildTool"\r
+                                               Description="MOC sortfilterproxymodel.h"\r
+                                               CommandLine="Rem IncrediBuild_AllowRemote&#x0D;&#x0A;Rem IncrediBuild_OutputFile release\moc_sortfilterproxymodel.cpp&#x0D;&#x0A;$(QTDIR)\bin\moc.exe  -DUNICODE -DWIN32 -DQT_LARGEFILE_SUPPORT -DQT_DLL -DQT_NO_DEBUG -DQT_GUI_LIB -DQT_CORE_LIB -DQT_THREAD_SUPPORT -I&quot;$(QTDIR)\include\QtCore&quot; -I&quot;$(QTDIR)\include\QtGui&quot; -I&quot;$(QTDIR)\include&quot; -I&quot;.&quot; -I&quot;$(QTDIR)\include\ActiveQt&quot; -I&quot;release&quot; -I&quot;.&quot; -I$(QTDIR)\mkspecs\win32-msvc2008 -D_MSC_VER=1500 -DWIN32 debugtools\sortfilterproxymodel.h -o release\moc_sortfilterproxymodel.cpp&#x0D;&#x0A;"\r
+                                               AdditionalDependencies="Rem;sortfilterproxymodel.h"\r
+                                               Outputs="release\moc_sortfilterproxymodel.cpp"\r
+                                       />\r
+                               </FileConfiguration>\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\debugtools\statedebugdialog.h"\r
+                               >\r
+                               <FileConfiguration\r
+                                       Name="Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCustomBuildTool"\r
+                                               Description="MOC statedebugdialog.h"\r
+                                               CommandLine="Rem IncrediBuild_AllowRemote&#x0D;&#x0A;Rem IncrediBuild_OutputFile debug\moc_statedebugdialog.cpp&#x0D;&#x0A;$(QTDIR)\bin\moc.exe  -DUNICODE -DWIN32 -DQT_LARGEFILE_SUPPORT -DQT_DLL -DQT_GUI_LIB -DQT_CORE_LIB -DQT_THREAD_SUPPORT -I&quot;$(QTDIR)\include\QtCore&quot; -I&quot;$(QTDIR)\include\QtGui&quot; -I&quot;$(QTDIR)\include&quot; -I&quot;.&quot; -I&quot;$(QTDIR)\include\ActiveQt&quot; -I&quot;debug&quot; -I&quot;.&quot; -I$(QTDIR)\mkspecs\win32-msvc2008 -D_MSC_VER=1500 -DWIN32 debugtools\statedebugdialog.h -o debug\moc_statedebugdialog.cpp&#x0D;&#x0A;"\r
+                                               AdditionalDependencies="Rem;statedebugdialog.h"\r
+                                               Outputs="debug\moc_statedebugdialog.cpp"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCustomBuildTool"\r
+                                               Description="MOC prefportaudio.h"\r
+                                               CommandLine="Rem IncrediBuild_AllowRemote&#x0D;&#x0A;Rem IncrediBuild_OutputFile release\moc_statedebugdialog.cpp&#x0D;&#x0A;$(QTDIR)\bin\moc.exe  -DUNICODE -DWIN32 -DQT_LARGEFILE_SUPPORT -DQT_DLL -DQT_NO_DEBUG -DQT_GUI_LIB -DQT_CORE_LIB -DQT_THREAD_SUPPORT -I&quot;$(QTDIR)\include\QtCore&quot; -I&quot;$(QTDIR)\include\QtGui&quot; -I&quot;$(QTDIR)\include&quot; -I&quot;.&quot; -I&quot;$(QTDIR)\include\ActiveQt&quot; -I&quot;release&quot; -I&quot;.&quot; -I$(QTDIR)\mkspecs\win32-msvc2008 -D_MSC_VER=1500 -DWIN32 debugtools\statedebugdialog.h -o release\moc_statedebugdialog.cpp&#x0D;&#x0A;"\r
+                                               AdditionalDependencies="Rem;statedebugdialog.h"\r
+                                               Outputs="release\moc_statedebugdialog.cpp"\r
+                                       />\r
+                               </FileConfiguration>\r
+                       </File>\r
                </Filter>\r
                <Filter\r
                        Name="Generated Files"\r
@@ -460,6 +592,14 @@
                                RelativePath="ui_accountdialog.h"\r
                                >\r
                        </File>\r
+                       <File\r
+                               RelativePath=".\ui_codecwidget.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\ui_consolewindow.h"\r
+                               >\r
+                       </File>\r
                        <File\r
                                RelativePath="ui_mainwindow.h"\r
                                >\r
@@ -468,6 +608,10 @@
                                RelativePath="ui_prefdialog.h"\r
                                >\r
                        </File>\r
+                       <File\r
+                               RelativePath=".\ui_statedebugdialog.h"\r
+                               >\r
+                       </File>\r
                        <Filter\r
                                Name="Debug"\r
                                >\r
@@ -483,6 +627,30 @@
                                                />\r
                                        </FileConfiguration>\r
                                </File>\r
+                               <File\r
+                                       RelativePath="debug\moc_codecwidget.cpp"\r
+                                       >\r
+                                       <FileConfiguration\r
+                                               Name="Release|Win32"\r
+                                               ExcludedFromBuild="true"\r
+                                               >\r
+                                               <Tool\r
+                                                       Name="VCCLCompilerTool"\r
+                                               />\r
+                                       </FileConfiguration>\r
+                               </File>\r
+                               <File\r
+                                       RelativePath="debug\moc_consolewindow.cpp"\r
+                                       >\r
+                                       <FileConfiguration\r
+                                               Name="Release|Win32"\r
+                                               ExcludedFromBuild="true"\r
+                                               >\r
+                                               <Tool\r
+                                                       Name="VCCLCompilerTool"\r
+                                               />\r
+                                       </FileConfiguration>\r
+                               </File>\r
                                <File\r
                                        RelativePath="Debug\moc_fshost.cpp"\r
                                        >\r
@@ -555,6 +723,30 @@
                                                />\r
                                        </FileConfiguration>\r
                                </File>\r
+                               <File\r
+                                       RelativePath="debug\moc_sortfilterproxymodel.cpp"\r
+                                       >\r
+                                       <FileConfiguration\r
+                                               Name="Release|Win32"\r
+                                               ExcludedFromBuild="true"\r
+                                               >\r
+                                               <Tool\r
+                                                       Name="VCCLCompilerTool"\r
+                                               />\r
+                                       </FileConfiguration>\r
+                               </File>\r
+                               <File\r
+                                       RelativePath="debug\moc_statedebugdialog.cpp"\r
+                                       >\r
+                                       <FileConfiguration\r
+                                               Name="Release|Win32"\r
+                                               ExcludedFromBuild="true"\r
+                                               >\r
+                                               <Tool\r
+                                                       Name="VCCLCompilerTool"\r
+                                               />\r
+                                       </FileConfiguration>\r
+                               </File>\r
                                <File\r
                                        RelativePath="debug\qrc_resources.cpp"\r
                                        >\r
@@ -583,6 +775,30 @@
                                                />\r
                                        </FileConfiguration>\r
                                </File>\r
+                               <File\r
+                                       RelativePath="release\moc_codecwidget.cpp"\r
+                                       >\r
+                                       <FileConfiguration\r
+                                               Name="Debug|Win32"\r
+                                               ExcludedFromBuild="true"\r
+                                               >\r
+                                               <Tool\r
+                                                       Name="VCCLCompilerTool"\r
+                                               />\r
+                                       </FileConfiguration>\r
+                               </File>\r
+                               <File\r
+                                       RelativePath="release\moc_consolewindow.cpp"\r
+                                       >\r
+                                       <FileConfiguration\r
+                                               Name="Debug|Win32"\r
+                                               ExcludedFromBuild="true"\r
+                                               >\r
+                                               <Tool\r
+                                                       Name="VCCLCompilerTool"\r
+                                               />\r
+                                       </FileConfiguration>\r
+                               </File>\r
                                <File\r
                                        RelativePath="release\moc_fshost.cpp"\r
                                        >\r
@@ -655,6 +871,30 @@
                                                />\r
                                        </FileConfiguration>\r
                                </File>\r
+                               <File\r
+                                       RelativePath="release\moc_sortfilterproxymodel.cpp"\r
+                                       >\r
+                                       <FileConfiguration\r
+                                               Name="Debug|Win32"\r
+                                               ExcludedFromBuild="true"\r
+                                               >\r
+                                               <Tool\r
+                                                       Name="VCCLCompilerTool"\r
+                                               />\r
+                                       </FileConfiguration>\r
+                               </File>\r
+                               <File\r
+                                       RelativePath="release\moc_statedebugdialog.cpp"\r
+                                       >\r
+                                       <FileConfiguration\r
+                                               Name="Debug|Win32"\r
+                                               ExcludedFromBuild="true"\r
+                                               >\r
+                                               <Tool\r
+                                                       Name="VCCLCompilerTool"\r
+                                               />\r
+                                       </FileConfiguration>\r
+                               </File>\r
                                <File\r
                                        RelativePath="release\qrc_resources.cpp"\r
                                        >\r
@@ -701,6 +941,58 @@
                                        />\r
                                </FileConfiguration>\r
                        </File>\r
+                       <File\r
+                               RelativePath=".\widgets\codecwidget.ui"\r
+                               >\r
+                               <FileConfiguration\r
+                                       Name="Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCustomBuildTool"\r
+                                               Description="UIC codecwidget.ui"\r
+                                               CommandLine="Rem IncrediBuild_AllowRemote&#x0D;&#x0A;Rem IncrediBuild_OutputFile .\ui_codecwidget.h&#x0D;&#x0A;$(QTDIR)\bin\uic.exe widgets\codecwidget.ui -o ui_codecwidget.h&#x0D;&#x0A;"\r
+                                               AdditionalDependencies="Rem;codecwidgets.ui"\r
+                                               Outputs="ui_codecwidget.h"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCustomBuildTool"\r
+                                               Description="UIC codecwidget.ui"\r
+                                               CommandLine="Rem IncrediBuild_AllowRemote&#x0D;&#x0A;Rem IncrediBuild_OutputFile .\ui_codecwidget.h&#x0D;&#x0A;$(QTDIR)\bin\uic.exe widgets\codecwidget.ui -o ui_codecwidget.h&#x0D;&#x0A;"\r
+                                               AdditionalDependencies="Rem;codecwidget.ui"\r
+                                               Outputs="ui_codecwidget.h"\r
+                                       />\r
+                               </FileConfiguration>\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\debugtools\consolewindow.ui"\r
+                               >\r
+                               <FileConfiguration\r
+                                       Name="Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCustomBuildTool"\r
+                                               Description="UIC consolewindow.ui"\r
+                                               CommandLine="Rem IncrediBuild_AllowRemote&#x0D;&#x0A;Rem IncrediBuild_OutputFile .\ui_consolewindow.h&#x0D;&#x0A;$(QTDIR)\bin\uic.exe debugtools\consolewindow.ui -o ui_consolewindow.h&#x0D;&#x0A;"\r
+                                               AdditionalDependencies="Rem;consolewindow.ui"\r
+                                               Outputs="ui_consolewindow.h"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCustomBuildTool"\r
+                                               Description="UIC accountdialog.ui"\r
+                                               CommandLine="Rem IncrediBuild_AllowRemote&#x0D;&#x0A;Rem IncrediBuild_OutputFile .\ui_consolewindow.h&#x0D;&#x0A;$(QTDIR)\bin\uic.exe debugtools\consolewindow.ui -o ui_consolewindow.h&#x0D;&#x0A;"\r
+                                               AdditionalDependencies="Rem;accountdialog.ui"\r
+                                               Outputs="ui_consolewindow.h"\r
+                                       />\r
+                               </FileConfiguration>\r
+                       </File>\r
                        <File\r
                                RelativePath="mainwindow.ui"\r
                                >\r
@@ -753,6 +1045,32 @@
                                        />\r
                                </FileConfiguration>\r
                        </File>\r
+                       <File\r
+                               RelativePath=".\debugtools\statedebugdialog.ui"\r
+                               >\r
+                               <FileConfiguration\r
+                                       Name="Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCustomBuildTool"\r
+                                               Description="UIC statedebugdialog.ui"\r
+                                               CommandLine="Rem IncrediBuild_AllowRemote&#x0D;&#x0A;Rem IncrediBuild_OutputFile .\ui_statedebugdialog.h&#x0D;&#x0A;$(QTDIR)\bin\uic.exe debugtools\statedebugdialog.ui -o ui_statedebugdialog.h&#x0D;&#x0A;"\r
+                                               AdditionalDependencies="Rem;statedebugdialog.ui"\r
+                                               Outputs="ui_statedebugdialog.h"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCustomBuildTool"\r
+                                               Description="UIC statedebugdialog.ui"\r
+                                               CommandLine="Rem IncrediBuild_AllowRemote&#x0D;&#x0A;Rem IncrediBuild_OutputFile .\ui_statedebugdialog.h&#x0D;&#x0A;$(QTDIR)\bin\uic.exe debugtools\statedebugdialog.ui -o ui_statedebugdialog.h&#x0D;&#x0A;"\r
+                                               AdditionalDependencies="Rem;statedebugdialog.ui"\r
+                                               Outputs="ui_statedebugdialog.h"\r
+                                       />\r
+                               </FileConfiguration>\r
+                       </File>\r
                </Filter>\r
                <Filter\r
                        Name="Resource Files"\r