diff options
Diffstat (limited to 'RealtimeSync')
| -rw-r--r-- | RealtimeSync/RealtimeSync.ico | bin | 136291 -> 111386 bytes | |||
| -rw-r--r-- | RealtimeSync/RealtimeSync.vcxproj | 1 | ||||
| -rw-r--r-- | RealtimeSync/application.cpp | 11 | ||||
| -rw-r--r-- | RealtimeSync/gui_generated.cpp | 14 | ||||
| -rw-r--r-- | RealtimeSync/main_dlg.cpp | 18 | ||||
| -rw-r--r-- | RealtimeSync/makefile | 64 | ||||
| -rw-r--r-- | RealtimeSync/resource.rc | 44 | ||||
| -rw-r--r-- | RealtimeSync/resources.cpp | 9 | ||||
| -rw-r--r-- | RealtimeSync/tray_menu.cpp | 12 | ||||
| -rw-r--r-- | RealtimeSync/xml_ffs.cpp | 2 | ||||
| -rw-r--r-- | RealtimeSync/xml_proc.cpp | 6 |
11 files changed, 88 insertions, 93 deletions
diff --git a/RealtimeSync/RealtimeSync.ico b/RealtimeSync/RealtimeSync.ico Binary files differindex 1c5a3eb6..f9012b12 100644 --- a/RealtimeSync/RealtimeSync.ico +++ b/RealtimeSync/RealtimeSync.ico diff --git a/RealtimeSync/RealtimeSync.vcxproj b/RealtimeSync/RealtimeSync.vcxproj index 3a2ebf8b..73674abc 100644 --- a/RealtimeSync/RealtimeSync.vcxproj +++ b/RealtimeSync/RealtimeSync.vcxproj @@ -218,6 +218,7 @@ </PostBuildEvent> </ItemDefinitionGroup> <ItemGroup> + <ClCompile Include="..\lib\ffs_paths.cpp" /> <ClCompile Include="..\lib\localization.cpp" /> <ClCompile Include="..\lib\process_xml.cpp" /> <ClCompile Include="..\lib\resolve_path.cpp" /> diff --git a/RealtimeSync/application.cpp b/RealtimeSync/application.cpp index 23e7ab25..1d7640df 100644 --- a/RealtimeSync/application.cpp +++ b/RealtimeSync/application.cpp @@ -6,11 +6,12 @@ #include "application.h" #include "main_dlg.h" +#include <zen/file_handling.h> #include <wx/event.h> #include <wx/log.h> #include <wx/msgdlg.h> #include <wx+/string_conv.h> -#include "resources.h" +//#include "resources.h" #include "xml_ffs.h" #include "../lib/localization.h" #include "../lib/ffs_paths.h" @@ -75,16 +76,17 @@ void Application::OnStartApplication(wxIdleEvent& event) { Disconnect(wxEVT_IDLE, wxIdleEventHandler(Application::OnStartApplication), nullptr, this); + warn_static("fix") + //if appname is not set, the default is the executable's name! - SetAppName(wxT("FreeFileSync")); //use a different app name, to have "GetUserDataDir()" return the same directory as for FreeFileSync + SetAppName(L"FreeFileSync"); //abuse FFS's name, to have "GetUserDataDir()" return the same directory #ifdef FFS_WIN //Quote: "Best practice is that all applications call the process-wide SetErrorMode function with a parameter of //SEM_FAILCRITICALERRORS at startup. This is to prevent error mode dialogs from hanging the application." ::SetErrorMode(SEM_FAILCRITICALERRORS); - #elif defined FFS_LINUX - ::gtk_rc_parse((zen::getResourceDir() + "styles.rc").c_str()); //remove inner border from bitmap buttons + ::gtk_rc_parse((zen::getResourceDir() + "styles.gtk_rc").c_str()); //remove inner border from bitmap buttons #endif //set program language @@ -124,7 +126,6 @@ void Application::OnStartApplication(wxIdleEvent& event) cfgFilename = commandArgs[0]; MainDialog* frame = new MainDialog(nullptr, cfgFilename); - frame->SetIcon(GlobalResources::instance().programIcon); //set application icon frame->Show(); } diff --git a/RealtimeSync/gui_generated.cpp b/RealtimeSync/gui_generated.cpp index b32fa8bb..ca891fc9 100644 --- a/RealtimeSync/gui_generated.cpp +++ b/RealtimeSync/gui_generated.cpp @@ -127,12 +127,12 @@ MainDlgGenerated::MainDlgGenerated( wxWindow* parent, wxWindowID id, const wxStr wxBoxSizer* bSizer20; bSizer20 = new wxBoxSizer( wxHORIZONTAL ); - m_bpButtonAddFolder = new wxBitmapButton( m_panelMainFolder, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 24,24 ), wxBU_AUTODRAW ); + m_bpButtonAddFolder = new wxBitmapButton( m_panelMainFolder, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 25,25 ), wxBU_AUTODRAW ); m_bpButtonAddFolder->SetToolTip( _("Add folder") ); bSizer20->Add( m_bpButtonAddFolder, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 ); - m_bpButtonRemoveTopFolder = new wxBitmapButton( m_panelMainFolder, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 24,24 ), wxBU_AUTODRAW ); + m_bpButtonRemoveTopFolder = new wxBitmapButton( m_panelMainFolder, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 25,25 ), wxBU_AUTODRAW ); m_bpButtonRemoveTopFolder->SetToolTip( _("Remove folder") ); bSizer20->Add( m_bpButtonRemoveTopFolder, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 ); @@ -217,9 +217,9 @@ MainDlgGenerated::MainDlgGenerated( wxWindow* parent, wxWindowID id, const wxStr bSizer141->Add( 0, 0, 1, wxEXPAND, 5 ); - m_buttonStart = new zen::BitmapButton( m_panel4, wxID_OK, _("Start"), wxDefaultPosition, wxSize( -1,50 ), 0 ); + m_buttonStart = new zen::BitmapButton( m_panel4, wxID_OK, _("Start"), wxDefaultPosition, wxSize( -1,-1 ), 0 ); m_buttonStart->SetDefault(); - m_buttonStart->SetFont( wxFont( 14, 74, 90, 92, false, wxT("Arial Black") ) ); + m_buttonStart->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 92, false, wxEmptyString ) ); bSizer141->Add( m_buttonStart, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 5 ); @@ -275,7 +275,7 @@ FolderGenerated::FolderGenerated( wxWindow* parent, wxWindowID id, const wxPoint wxBoxSizer* bSizer114; bSizer114 = new wxBoxSizer( wxHORIZONTAL ); - m_bpButtonRemoveFolder = new wxBitmapButton( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 24,24 ), wxBU_AUTODRAW ); + m_bpButtonRemoveFolder = new wxBitmapButton( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 25,25 ), wxBU_AUTODRAW ); m_bpButtonRemoveFolder->SetToolTip( _("Remove folder") ); bSizer114->Add( m_bpButtonRemoveFolder, 0, wxALIGN_CENTER_VERTICAL, 5 ); @@ -337,12 +337,12 @@ ErrorDlgGenerated::ErrorDlgGenerated( wxWindow* parent, wxWindowID id, const wxS m_buttonRetry = new wxButton( m_panel3, wxID_RETRY, _("&Retry"), wxDefaultPosition, wxSize( -1,30 ), 0 ); m_buttonRetry->SetDefault(); - m_buttonRetry->SetFont( wxFont( 10, 70, 90, 90, false, wxEmptyString ) ); + m_buttonRetry->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 90, false, wxEmptyString ) ); bSizer13->Add( m_buttonRetry, 0, wxTOP|wxBOTTOM|wxLEFT|wxALIGN_CENTER_VERTICAL, 5 ); m_buttonAbort = new wxButton( m_panel3, wxID_CANCEL, _("Cancel"), wxDefaultPosition, wxSize( -1,30 ), 0 ); - m_buttonAbort->SetFont( wxFont( 10, 70, 90, 90, false, wxEmptyString ) ); + m_buttonAbort->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 90, false, wxEmptyString ) ); bSizer13->Add( m_buttonAbort, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); diff --git a/RealtimeSync/main_dlg.cpp b/RealtimeSync/main_dlg.cpp index ca6fa4fa..758babd5 100644 --- a/RealtimeSync/main_dlg.cpp +++ b/RealtimeSync/main_dlg.cpp @@ -14,6 +14,7 @@ #include <wx+/button.h> #include <wx+/string_conv.h> #include <wx+/mouse_move_dlg.h> +#include <wx+/font_size.h> #include <zen/assert_static.h> #include <zen/file_handling.h> #include <zen/build_info.h> @@ -46,8 +47,16 @@ private: MainDialog::MainDialog(wxDialog* dlg, const wxString& cfgFileName) : MainDlgGenerated(dlg) { +#ifdef FFS_WIN + new MouseMoveWindow(*this); //ownership passed to "this" +#endif wxWindowUpdateLocker dummy(this); //avoid display distortion + SetIcon(GlobalResources::instance().programIcon); //set application icon + + setRelativeFontSize(*m_buttonStart, 1.5); + m_buttonStart->setInnerBorderSize(8); + m_bpButtonRemoveTopFolder->Hide(); m_panelMainFolder->Layout(); @@ -61,15 +70,10 @@ MainDialog::MainDialog(wxDialog* dlg, const wxString& cfgFileName) //prepare drag & drop dirNameFirst.reset(new DirectoryName<wxTextCtrl>(*m_panelMainFolder, *m_buttonSelectDirMain, *m_txtCtrlDirectoryMain, m_staticTextFinalPath)); -#ifdef FFS_WIN - new MouseMoveWindow(*this); //ownership passed to "this" -#endif - //--------------------------- load config values ------------------------------------ xmlAccess::XmlRealConfig newConfig; const wxString currentConfigFile = cfgFileName.empty() ? lastConfigFileName() : cfgFileName; - bool loadCfgSuccess = false; if (!cfgFileName.empty() || wxFileExists(lastConfigFileName())) try @@ -139,7 +143,7 @@ const wxString& MainDialog::lastConfigFileName() void MainDialog::OnShowHelp(wxCommandEvent& event) { - zen::displayHelpEntry(L"html/RealtimeSync.html"); + zen::displayHelpEntry(L"html/RealtimeSync.html", this); } @@ -363,7 +367,7 @@ void MainDialog::OnRemoveTopFolder(wxCommandEvent& event) #ifdef FFS_WIN static const size_t MAX_ADD_FOLDERS = 8; -#elif defined FFS_LINUX +#elif defined FFS_LINUX || defined FFS_MAC static const size_t MAX_ADD_FOLDERS = 6; #endif diff --git a/RealtimeSync/makefile b/RealtimeSync/makefile index c0386603..b1c78f61 100644 --- a/RealtimeSync/makefile +++ b/RealtimeSync/makefile @@ -2,23 +2,53 @@ APPNAME = RealtimeSync prefix = /usr BINDIR = $(DESTDIR)$(prefix)/bin -CPPFLAGS = -Wall -pipe -O3 -pthread -std=gnu++0x -DNDEBUG -DwxUSE_UNICODE -DFFS_LINUX -DZEN_PLATFORM_OTHER -DWXINTL_NO_GETTEXT_MACRO -I.. -include "../zen/i18n.h" -include "zen/warn_static.h" -LINKFLAGS = -pthread -lrt +CPPFLAGS = -std=c++11 -Wall -pipe -O3 -DNDEBUG -DwxUSE_UNICODE -DZEN_PLATFORM_OTHER -DWXINTL_NO_GETTEXT_MACRO -I.. -include "zen/i18n.h" -include "zen/warn_static.h" +LINKFLAGS = -ifeq ($(BUILD),release) -#static wxWidgets and boost library linkage for precompiled release -CPPFLAGS += `wx-config --cxxflags --debug=no --unicode=yes --static=yes` -LINKFLAGS += `wx-config --libs --debug=no --unicode=yes --static=yes` -Wl,-Bstatic -lboost_thread -lboost_system -Wl,-Bdynamic +#distinguish Linux/Mac builds +OPERATING_SYSTEM_NAME := $(shell uname) + +#################### Linux ############################ +ifeq ($(OPERATING_SYSTEM_NAME), Linux) +COMPILER_BIN=g++ -pthread +CPPFLAGS += -DFFS_LINUX + +#Gtk - support "no button border" +CPPFLAGS += `pkg-config --cflags gtk+-2.0` +LINKFLAGS += `pkg-config --libs gtk+-2.0` + +ifeq ($(BUILD),Launchpad) +#default build/Launchpad +CPPFLAGS += `wx-config --cxxflags --debug=no` +LINKFLAGS += `wx-config --libs --debug=no` -lboost_thread -lboost_system else -#default build -CPPFLAGS += `wx-config --cxxflags --debug=no --unicode=yes` -LINKFLAGS += `wx-config --libs --debug=no --unicode=yes` -lboost_thread -lboost_system +#static wxWidgets and boost library linkage for precompiled release +WX_CONFIG_BIN =$(HOME)/Desktop/wxGTK-2.8.12/lib/release/bin/wx-config +CPPFLAGS += -I$(HOME)/Desktop/boost_1_53_0 +BOOST_LIB_DIR =$(HOME)/Desktop/boost_1_53_0/stage/lib + +CPPFLAGS += `$(WX_CONFIG_BIN) --cxxflags --debug=no --static=yes` +LINKFLAGS += `$(WX_CONFIG_BIN) --libs --debug=no --static=yes` $(BOOST_LIB_DIR)/libboost_thread.a $(BOOST_LIB_DIR)/libboost_system.a endif -##################################################################################################### -#Gtk - no button border -CPPFLAGS += `pkg-config --cflags gtk+-2.0` -LINKFLAGS += `pkg-config --libs gtk+-2.0` +endif +#################### OS X ############################ +ifeq ($(OPERATING_SYSTEM_NAME), Darwin) +COMPILER_BIN=clang++ -stdlib=libc++ +CPPFLAGS += -DFFS_MAC + +WX_CONFIG_BIN =$(HOME)/Desktop/wxWidgets-2.9.4/lib/release/bin/wx-config +CPPFLAGS += -I$(HOME)/Desktop/boost_1_53_0 +BOOST_LIB_DIR =$(HOME)/Desktop/boost_1_53_0/stage/lib +MACOS_SDK =-mmacosx-version-min=10.7 -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.7.sdk +#-Wl,-Bstatic not supported on OSX! + +# link wxWidgets and boost statically -> check dependencies with: otool -L RealtimeSync +CPPFLAGS += $(MACOS_SDK) `$(WX_CONFIG_BIN) --cxxflags --debug=no --static=yes` +LINKFLAGS += $(MACOS_SDK) `$(WX_CONFIG_BIN) --libs --debug=no --static=yes` $(BOOST_LIB_DIR)/libboost_thread.a $(BOOST_LIB_DIR)/libboost_system.a + +endif +##################################################################################################### CPP_LIST= #internal list of all *.cpp files needed for compilation CPP_LIST+=application.cpp @@ -36,6 +66,7 @@ CPP_LIST+=../lib/localization.cpp CPP_LIST+=../lib/process_xml.cpp CPP_LIST+=../lib/resolve_path.cpp CPP_LIST+=../lib/xml_base.cpp +CPP_LIST+=../lib/ffs_paths.cpp CPP_LIST+=../zen/dir_watcher.cpp CPP_LIST+=../zen/file_handling.cpp CPP_LIST+=../zen/file_io.cpp @@ -43,22 +74,23 @@ CPP_LIST+=../zen/file_traverser.cpp CPP_LIST+=../zen/zstring.cpp CPP_LIST+=../wx+/button.cpp -#list of all *.o files +#list of all *.o files (we need the "RTS" subdirectory to handle "../*.cpp" files OBJECT_LIST=$(CPP_LIST:%.cpp=../OBJ/RTS_Release_GCC_Make/RTS/%.o) all: RealtimeSync ../OBJ/RTS_Release_GCC_Make/RTS/%.o : %.cpp mkdir -p $(dir $@) - g++ $(CPPFLAGS) -c $< -o $@ + $(COMPILER_BIN) $(CPPFLAGS) -c $< -o $@ RealtimeSync: $(OBJECT_LIST) - g++ -o ../BUILD/$(APPNAME) $(OBJECT_LIST) $(LINKFLAGS) + $(COMPILER_BIN) -o ../BUILD/$(APPNAME) $(OBJECT_LIST) $(LINKFLAGS) clean: #-f doesn't work when deleting directories if [ -d ../OBJ/RTS_Release_GCC_Make ]; then rm -rf ../OBJ/RTS_Release_GCC_Make; fi rm -f ../BUILD/$(APPNAME) + rm -f ../wx+/pch.h.gch install: mkdir -p $(BINDIR) diff --git a/RealtimeSync/resource.rc b/RealtimeSync/resource.rc deleted file mode 100644 index ecf568da..00000000 --- a/RealtimeSync/resource.rc +++ /dev/null @@ -1,44 +0,0 @@ -#define IDR_VERSION1 1 - -#include <Winver.h> -#include "../version/version.rc" - -#define wxUSE_NO_MANIFEST 1 //lame resource compiler requires us to define an integer here -#include <wx/msw/wx.rc> -//see comments in FFS resource file on manifests - -//MSDN on manifests: http://msdn.microsoft.com/en-us/library/bb756929.aspx -#define MANIFEST_RESOURCE_ID 1 -#if defined(WX_CPU_AMD64) //check for 64 bit *first* -MANIFEST_RESOURCE_ID RT_MANIFEST "../amd64.manifest" -#elif defined(WX_CPU_X86) -MANIFEST_RESOURCE_ID RT_MANIFEST "../win32.manifest" -#else -#error What is going on? -#endif - - -A_PROGRAM_ICON ICON DISCARDABLE "RealtimeSync.ico" - -IDR_VERSION1 VERSIONINFO -FILEVERSION FREEFILESYNC_VER -PRODUCTVERSION FREEFILESYNC_VER -FILEOS VOS__WINDOWS32 -FILETYPE VFT_APP -BEGIN - BLOCK "StringFileInfo" - BEGIN - BLOCK "FFFF04B0" - BEGIN - VALUE "FileDescription", "Real-time Command Line Launcher\0" - VALUE "FileVersion", FREEFILESYNC_VER_STR - VALUE "ProductName", "RealtimeSync\0" - VALUE "ProductVersion", FREEFILESYNC_VER_STR - VALUE "LegalCopyright", "Zenju - All Rights Reserved\0" - END - END - BLOCK "VarFileInfo" - BEGIN - VALUE "Translation", 0xFFFF, 0x04B0 - END -END diff --git a/RealtimeSync/resources.cpp b/RealtimeSync/resources.cpp index 87bca60f..bde89393 100644 --- a/RealtimeSync/resources.cpp +++ b/RealtimeSync/resources.cpp @@ -6,6 +6,7 @@ #include "resources.h" #include <memory> +#include <zen/utf.h> #include <wx/wfstream.h> #include <wx/zipstrm.h> #include <wx/image.h> @@ -23,7 +24,7 @@ const GlobalResources& GlobalResources::instance() GlobalResources::GlobalResources() { - wxFFileInputStream input(toWx(zen::getResourceDir()) + L"Resources.zip"); + wxFFileInputStream input(utfCvrtTo<wxString>(zen::getResourceDir()) + L"Resources.zip"); if (input.IsOk()) //if not... we don't want to react too harsh here { //activate support for .png files @@ -49,11 +50,11 @@ GlobalResources::GlobalResources() #ifdef FFS_WIN //for compatibility it seems we need to stick with a "real" icon programIcon = wxIcon(L"A_PROGRAM_ICON"); -#else + +#elif defined FFS_LINUX || defined FFS_MAC //use big logo bitmap for better quality - programIcon.CopyFromBitmap(getImageInt(L"RealtimeSync.png")); + programIcon.CopyFromBitmap(getImageInt(L"RealtimeSync")); #endif - } diff --git a/RealtimeSync/tray_menu.cpp b/RealtimeSync/tray_menu.cpp index eec568ad..1e9f2ffe 100644 --- a/RealtimeSync/tray_menu.cpp +++ b/RealtimeSync/tray_menu.cpp @@ -153,10 +153,10 @@ public: void showIconActive() { wxIcon realtimeIcon; -#ifdef FFS_WIN - realtimeIcon.CopyFromBitmap(GlobalResources::getImage(L"RTS_tray_win")); //use a 16x16 bitmap +#if defined FFS_WIN || defined FFS_MAC //16x16 seems to be the only size that is shown correctly on OS X + realtimeIcon.CopyFromBitmap(GlobalResources::getImage(L"RTS_tray_16x16")); //use a 16x16 bitmap #elif defined FFS_LINUX - realtimeIcon.CopyFromBitmap(GlobalResources::getImage(L"RTS_tray_linux")); //use a 22x22 bitmap for perfect fit + realtimeIcon.CopyFromBitmap(GlobalResources::getImage(L"RTS_tray_24x24")); //use a 24x24 bitmap for perfect fit #endif const wxString postFix = jobName_.empty() ? wxString() : (L"\n\"" + jobName_ + L"\""); trayMenu->SetIcon(realtimeIcon, _("Monitoring active...") + postFix); @@ -165,10 +165,10 @@ public: void showIconWaiting() { wxIcon realtimeIcon; -#ifdef FFS_WIN - realtimeIcon.CopyFromBitmap(greyScale(GlobalResources::getImage(L"RTS_tray_win"))); //use a 16x16 bitmap +#if defined FFS_WIN || defined FFS_MAC + realtimeIcon.CopyFromBitmap(greyScale(GlobalResources::getImage(L"RTS_tray_16x16"))); #elif defined FFS_LINUX - realtimeIcon.CopyFromBitmap(greyScale(GlobalResources::getImage(L"RTS_tray_linux"))); //use a 22x22 bitmap for perfect fit + realtimeIcon.CopyFromBitmap(greyScale(GlobalResources::getImage(L"RTS_tray_24x24"))); #endif const wxString postFix = jobName_.empty() ? wxString() : (L"\n\"" + jobName_ + L"\""); trayMenu->SetIcon(realtimeIcon, _("Waiting for missing directories...") + postFix); diff --git a/RealtimeSync/xml_ffs.cpp b/RealtimeSync/xml_ffs.cpp index 8126ec05..1f3fb1b1 100644 --- a/RealtimeSync/xml_ffs.cpp +++ b/RealtimeSync/xml_ffs.cpp @@ -39,7 +39,7 @@ xmlAccess::XmlRealConfig convertBatchToReal(const xmlAccess::XmlBatchConfig& bat std::transform(uniqueFolders.begin(), uniqueFolders.end(), std::back_inserter(output.directories), [](const Zstring & fn) { return toWx(fn); }); - output.commandline = std::wstring(L"\"") + zen::getLauncher() + L"\"" + + output.commandline = std::wstring(L"\"") + zen::getFreeFileSyncLauncher() + L"\"" + L" \"" + filename + L"\""; return output; diff --git a/RealtimeSync/xml_proc.cpp b/RealtimeSync/xml_proc.cpp index a4cd715c..5e645a31 100644 --- a/RealtimeSync/xml_proc.cpp +++ b/RealtimeSync/xml_proc.cpp @@ -18,8 +18,8 @@ namespace void readConfig(const XmlIn& in, XmlRealConfig& config) { in["Directories"](config.directories); - in["Commandline"](config.commandline); in["Delay" ](config.delay); + in["Commandline"](config.commandline); } @@ -58,8 +58,8 @@ namespace void writeConfig(const XmlRealConfig& config, XmlOut& out) { out["Directories"](config.directories); - out["Commandline"](config.commandline); out["Delay" ](config.delay); + out["Commandline"](config.commandline); } } @@ -72,5 +72,5 @@ void xmlAccess::writeRealConfig(const XmlRealConfig& config, const Zstring& file XmlOut out(doc); writeConfig(config, out); - saveXmlDocument(doc, filename); //throw (FfsXmlError) + saveXmlDocument(doc, filename); //throw FfsXmlError } |