Menu
▾
▴
[Codelite-git] codelite git: codelite branch master updated. 8239a54d9e1b28ac5bcf1dfe1fae812a2dc7da37
|
From: Eran I. <no...@so...> - 2013-12-22 15:09:12
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "codelite".
The branch, master has been updated
via 8239a54d9e1b28ac5bcf1dfe1fae812a2dc7da37 (commit)
from ba81e03055071a6bb7b22bf6f0b9c5556e0a6415 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
https://sourceforge.net/p/codelite/codelitegit/ci/8239a54d9e1b28ac5bcf1dfe1fae812a2dc7da37
commit 8239a54d9e1b28ac5bcf1dfe1fae812a2dc7da37
Author: Eran <era...@gm...>
Date: Sun Dec 22 17:08:53 2013 +0200
Added new class clStandardPaths which will be used to override the default ~/.codelite folder to something else (this can be used later to allow running multiple instances of codelite without them getting clobbered)
diff --git a/CodeLite/CodeLite.project b/CodeLite/CodeLite.project
index 823e0ff..6895e17 100644
--- a/CodeLite/CodeLite.project
+++ b/CodeLite/CodeLite.project
@@ -190,6 +190,8 @@
<File Name="cJSON.h"/>
<File Name="cl_config.cpp"/>
<File Name="cl_config.h"/>
+ <File Name="cl_standard_paths.h"/>
+ <File Name="cl_standard_paths.cpp"/>
</VirtualDirectory>
<VirtualDirectory Name="ssh">
<File Name="cl_sftp.cpp"/>
diff --git a/CodeLite/cl_config.cpp b/CodeLite/cl_config.cpp
index ad197e8..12549aa 100644
--- a/CodeLite/cl_config.cpp
+++ b/CodeLite/cl_config.cpp
@@ -3,19 +3,20 @@
#include <wx/filefn.h>
#include <wx/log.h>
#include <algorithm>
+#include "cl_standard_paths.h"
clConfig::clConfig(const wxString& filename)
{
if ( wxFileName(filename).IsAbsolute() ) {
m_filename = filename;
} else {
- m_filename = wxStandardPaths::Get().GetUserDataDir() + wxFileName::GetPathSeparator() + "config" + wxFileName::GetPathSeparator() + filename;
+ m_filename = clStandardPaths::Get().GetUserDataDir() + wxFileName::GetPathSeparator() + "config" + wxFileName::GetPathSeparator() + filename;
}
{
// Make sure that the directory exists
wxLogNull noLog;
- wxMkdir( wxStandardPaths::Get().GetUserDataDir() );
+ wxMkdir( clStandardPaths::Get().GetUserDataDir() );
wxMkdir( m_filename.GetPath() );
}
diff --git a/CodeLite/cl_standard_paths.cpp b/CodeLite/cl_standard_paths.cpp
new file mode 100644
index 0000000..4f04271
--- /dev/null
+++ b/CodeLite/cl_standard_paths.cpp
@@ -0,0 +1,36 @@
+#include "cl_standard_paths.h"
+#include <wx/stdpaths.h>
+#include <wx/filename.h>
+
+clStandardPaths::clStandardPaths()
+{
+}
+
+clStandardPaths::~clStandardPaths()
+{
+}
+
+clStandardPaths& clStandardPaths::Get()
+{
+ static clStandardPaths codelitePaths;
+ return codelitePaths;
+}
+
+wxString clStandardPaths::GetUserDataDir() const
+{
+#ifdef __WXGTK__
+
+#ifndef NDEBUG
+ // Debug mode
+ wxFileName fn(wxStandardPaths::Get().GetUserDataDir());
+ fn.SetFullName("codelite-dbg");
+ return fn.GetFullPath();
+
+#else
+ // Release mode
+ return wxStandardPaths::Get().GetUserDataDir();
+
+#endif // Windows / OSX
+ return wxStandardPaths::Get().GetUserDataDir();
+#endif
+}
diff --git a/CodeLite/cl_standard_paths.h b/CodeLite/cl_standard_paths.h
new file mode 100644
index 0000000..6da62ac
--- /dev/null
+++ b/CodeLite/cl_standard_paths.h
@@ -0,0 +1,24 @@
+#ifndef CLSTANDARDPATHS_H
+#define CLSTANDARDPATHS_H
+
+#include <wx/string.h>
+#include "codelite_exports.h"
+
+class WXDLLIMPEXP_CL clStandardPaths
+{
+private:
+ clStandardPaths();
+ virtual ~clStandardPaths();
+
+public:
+ static clStandardPaths& Get();
+ /**
+ * @brief return the user local data folder. Usually this is ~/.codelite or %APPDATA%\CodeLite
+ * However, under Linux, this function will return ~/.codelite-dbg to avoid cloberring with the release
+ * settings
+ */
+ wxString GetUserDataDir() const;
+
+};
+
+#endif // CLSTANDARDPATHS_H
diff --git a/CodeLite/ctags_manager.cpp b/CodeLite/ctags_manager.cpp
index 4e09321..5e6c017 100644
--- a/CodeLite/ctags_manager.cpp
+++ b/CodeLite/ctags_manager.cpp
@@ -61,6 +61,7 @@
#include "code_completion_api.h"
#include <wx/stdpaths.h>
#include "tags_storage_sqlite3.h"
+#include "cl_standard_paths.h"
//#define __PERFORMANCE
@@ -315,7 +316,7 @@ void TagsManager::StartCodeLiteIndexer()
// concatenate the PID to identifies this channel to this instance of codelite
cmd << wxT("\"") << m_codeliteIndexerPath.GetFullPath() << wxT("\" ") << uid << wxT(" --pid");
- m_codeliteIndexerProcess = CreateAsyncProcess(this, cmd, IProcessCreateDefault, wxStandardPaths::Get().GetUserDataDir());
+ m_codeliteIndexerProcess = CreateAsyncProcess(this, cmd, IProcessCreateDefault, clStandardPaths::Get().GetUserDataDir());
}
void TagsManager::RestartCodeLiteIndexer()
@@ -410,7 +411,7 @@ void TagsManager::SourceToTags(const wxFileName& source, wxString& tags)
AddEnumClassData(tags);
#if 0
- wxFFile fff(wxStandardPaths::Get().GetUserDataDir() + wxT("\\tmp_tags"), wxT("w+"));
+ wxFFile fff(clStandardPaths::Get().GetUserDataDir() + wxT("\\tmp_tags"), wxT("w+"));
if(fff.IsOpened()) {
fff.Write(tags);
}
diff --git a/CodeLite/file_logger.cpp b/CodeLite/file_logger.cpp
index 07cc6f8..e41d773 100644
--- a/CodeLite/file_logger.cpp
+++ b/CodeLite/file_logger.cpp
@@ -4,6 +4,7 @@
#include <sys/time.h>
#include <wx/log.h>
#include <wx/crt.h>
+#include "cl_standard_paths.h"
static FileLogger theLogger;
static bool initialized = false;
@@ -75,7 +76,7 @@ FileLogger* FileLogger::Get()
{
if(!initialized) {
wxString filename;
- filename << wxStandardPaths::Get().GetUserDataDir() << wxFileName::GetPathSeparator() << wxT("codelite.log");
+ filename << clStandardPaths::Get().GetUserDataDir() << wxFileName::GetPathSeparator() << wxT("codelite.log");
theLogger.m_fp = wxFopen(filename, wxT("a+"));
initialized = true;
}
diff --git a/Interfaces/debugger.h b/Interfaces/debugger.h
index f4eada0..af4fbf5 100644
--- a/Interfaces/debugger.h
+++ b/Interfaces/debugger.h
@@ -34,6 +34,7 @@
#include "vector"
#include "macros.h"
#include <wx/stdpaths.h>
+#include "cl_standard_paths.h"
enum DebuggerCommands {
DBG_PAUSE = 0,
@@ -464,7 +465,7 @@ public:
arch.ReadCData(wxT("startupCommands"), startupCommands);
- wxFileName codeliteInstallDir = wxFileName(wxStandardPaths::Get().GetUserDataDir(), "gdb_printers");
+ wxFileName codeliteInstallDir = wxFileName(clStandardPaths::Get().GetUserDataDir(), "gdb_printers");
startupCommands.Replace("$CodeLiteGdbPrinters", codeliteInstallDir.GetFullPath());
startupCommands.Trim();
diff --git a/LiteEditor.workspace b/LiteEditor.workspace
index ac7c81d..8b5cb81 100644
--- a/LiteEditor.workspace
+++ b/LiteEditor.workspace
@@ -111,7 +111,7 @@
<Project Name="CallGraph" ConfigName="WinDebugUnicode"/>
<Project Name="abbreviation" ConfigName="WinDebugUnicode"/>
</WorkspaceConfiguration>
- <WorkspaceConfiguration Name="CMake_Release" Selected="yes">
+ <WorkspaceConfiguration Name="CMake_Release" Selected="no">
<Project Name="ZoomNavigator" ConfigName="DebugUnicode"/>
<Project Name="wxsqlite3" ConfigName="WinReleaseUnicode"/>
<Project Name="wxshapeframework" ConfigName="WinReleaseUnicode"/>
@@ -145,7 +145,7 @@
<Project Name="SFTP" ConfigName="DebugUnicode"/>
<Project Name="Tweaks" ConfigName="DebugUnicode"/>
</WorkspaceConfiguration>
- <WorkspaceConfiguration Name="CMake_Debug" Selected="no">
+ <WorkspaceConfiguration Name="CMake_Debug" Selected="yes">
<Project Name="ZoomNavigator" ConfigName="WinReleaseUnicode"/>
<Project Name="wxsqlite3" ConfigName="WinReleaseUnicode"/>
<Project Name="wxshapeframework" ConfigName="WinReleaseUnicode"/>
diff --git a/LiteEditor/acceltabledlg.cpp b/LiteEditor/acceltabledlg.cpp
index 122d9d3..cbb42c4 100644
--- a/LiteEditor/acceltabledlg.cpp
+++ b/LiteEditor/acceltabledlg.cpp
@@ -224,7 +224,7 @@ void AccelTableDlg::OnButtonOk(wxCommandEvent &e)
}
wxString fileName;
- fileName = wxStandardPaths::Get().GetUserDataDir() + wxFileName::GetPathSeparator() + wxT("config/accelerators.conf");
+ fileName = clStandardPaths::Get().GetUserDataDir() + wxFileName::GetPathSeparator() + wxT("config/accelerators.conf");
wxFFile file;
if (!file.Open(fileName, wxT("w+b"))) {
diff --git a/LiteEditor/app.cpp b/LiteEditor/app.cpp
index 15350c0..d2b30f9 100644
--- a/LiteEditor/app.cpp
+++ b/LiteEditor/app.cpp
@@ -347,7 +347,7 @@ bool CodeLiteApp::OnInit()
#if defined (__WXGTK__)
if (homeDir.IsEmpty()) {
SetAppName(wxT("codelite"));
- homeDir = wxStandardPaths::Get().GetUserDataDir(); // ~/Library/Application Support/codelite or ~/.codelite
+ homeDir = clStandardPaths::Get().GetUserDataDir(); // ~/Library/Application Support/codelite or ~/.codelite
//Create the directory structure
wxLogNull noLog;
@@ -372,7 +372,7 @@ bool CodeLiteApp::OnInit()
#elif defined (__WXMAC__)
SetAppName(wxT("codelite"));
- homeDir = wxStandardPaths::Get().GetUserDataDir();
+ homeDir = clStandardPaths::Get().GetUserDataDir();
{
wxLogNull noLog;
@@ -453,7 +453,7 @@ bool CodeLiteApp::OnInit()
#ifdef __WXMSW__
{
wxLogNull noLog;
- wxMkdir(wxStandardPaths::Get().GetUserDataDir());
+ wxMkdir(clStandardPaths::Get().GetUserDataDir());
}
#endif
@@ -466,7 +466,7 @@ bool CodeLiteApp::OnInit()
#ifdef __WXGTK__
// Redirect stdout/error to a file
- wxFileName stdout_err(wxStandardPaths::Get().GetUserDataDir(), "codelite-stdout-stderr.log");
+ wxFileName stdout_err(clStandardPaths::Get().GetUserDataDir(), "codelite-stdout-stderr.log");
FILE* new_stdout = ::freopen(stdout_err.GetFullPath().mb_str(wxConvISO8859_1).data(), "a+b", stdout);
FILE* new_stderr = ::freopen(stdout_err.GetFullPath().mb_str(wxConvISO8859_1).data(), "a+b", stderr);
wxUnusedVar(new_stderr);
@@ -639,7 +639,7 @@ void CodeLiteApp::OnFatalException()
{
#if wxUSE_STACKWALKER
wxString startdir;
- startdir << wxStandardPaths::Get().GetUserDataDir() << wxT("/crash.log");
+ startdir << clStandardPaths::Get().GetUserDataDir() << wxT("/crash.log");
wxFileOutputStream outfile(startdir);
wxTextOutputStream out(outfile);
@@ -782,7 +782,7 @@ void CodeLiteApp::MSWReadRegistry()
wxString CodeLiteApp::DoFindMenuFile(const wxString& installDirectory, const wxString &requiredVersion)
{
wxString defaultMenuFile = installDirectory + wxFileName::GetPathSeparator() + wxT("rc") + wxFileName::GetPathSeparator() + wxT("menu.xrc");
- wxFileName menuFile(wxStandardPaths::Get().GetUserDataDir() + wxFileName::GetPathSeparator() + wxT("rc") + wxFileName::GetPathSeparator() + wxT("menu.xrc"));
+ wxFileName menuFile(clStandardPaths::Get().GetUserDataDir() + wxFileName::GetPathSeparator() + wxT("rc") + wxFileName::GetPathSeparator() + wxT("menu.xrc"));
if(menuFile.FileExists()) {
// if we find the user's file menu, check that it has the required version
{
@@ -811,7 +811,7 @@ void CodeLiteApp::DoCopyGdbPrinters()
// copy the files to ~/.codelite/gdb_printers
wxLogNull nolog;
- wxFileName targetDir(wxStandardPaths::Get().GetUserDataDir(), "gdb_printers");
+ wxFileName targetDir(clStandardPaths::Get().GetUserDataDir(), "gdb_printers");
::wxMkdir(targetDir.GetFullPath());
::CopyDir(printersInstallDir.GetFullPath(), targetDir.GetFullPath());
}
diff --git a/LiteEditor/editorsettingsmiscpanel.cpp b/LiteEditor/editorsettingsmiscpanel.cpp
index 0a0d498..1c39423 100644
--- a/LiteEditor/editorsettingsmiscpanel.cpp
+++ b/LiteEditor/editorsettingsmiscpanel.cpp
@@ -306,7 +306,7 @@ void EditorSettingsMiscPanel::OnShowLogFile(wxCommandEvent& event)
{
wxUnusedVar(event);
wxString logfile;
- logfile << wxStandardPaths::Get().GetUserDataDir()
+ logfile << clStandardPaths::Get().GetUserDataDir()
<< wxFileName::GetPathSeparator()
<< wxT("codelite.log");
diff --git a/LiteEditor/frame.cpp b/LiteEditor/frame.cpp
index 648f3e4..08404f5 100644
--- a/LiteEditor/frame.cpp
+++ b/LiteEditor/frame.cpp
@@ -1009,7 +1009,7 @@ void clMainFrame::CreateGUIControls(void)
DebuggerMgr::Get().LoadDebuggers();
wxString sessConfFile;
- sessConfFile << wxStandardPaths::Get().GetUserDataDir() << wxT("/config/sessions.xml");
+ sessConfFile << clStandardPaths::Get().GetUserDataDir() << wxT("/config/sessions.xml");
SessionManager::Get().Load(sessConfFile);
// Now the session's loaded, it's safe to fill the tabgroups tab
@@ -4532,7 +4532,7 @@ void clMainFrame::StartTimer()
void clMainFrame::OnLoadPerspective(wxCommandEvent& e)
{
wxString file;
- file << wxStandardPaths::Get().GetUserDataDir() << wxT("/config/codelite.layout");
+ file << clStandardPaths::Get().GetUserDataDir() << wxT("/config/codelite.layout");
wxFileName oldLayoutFile(file);
if(oldLayoutFile.FileExists(file)) {
diff --git a/LiteEditor/keyboardmanager.cpp b/LiteEditor/keyboardmanager.cpp
index 5579f39..0d95811 100644
--- a/LiteEditor/keyboardmanager.cpp
+++ b/LiteEditor/keyboardmanager.cpp
@@ -109,7 +109,7 @@ void KeyboardManager::Update(const MenuItemDataMap& accelMap)
content << wxT("\n");
}
- wxString fileName = wxStandardPaths::Get().GetUserDataDir() + wxFileName::GetPathSeparator() + wxT("config/accelerators.conf");
+ wxString fileName = clStandardPaths::Get().GetUserDataDir() + wxFileName::GetPathSeparator() + wxT("config/accelerators.conf");
wxFFile file;
if (!file.Open(fileName, wxT("w+b"))) {
return;
diff --git a/LiteEditor/manager.cpp b/LiteEditor/manager.cpp
index 99a9580..412ce5e 100644
--- a/LiteEditor/manager.cpp
+++ b/LiteEditor/manager.cpp
@@ -1844,7 +1844,7 @@ void Manager::GetAcceleratorMap ( MenuItemDataMap& accelMap )
void Manager::DoGetAccelFiles ( wxArrayString& files )
{
//try to locate the user's settings
- wxFileName fileName ( wxStandardPaths::Get().GetUserDataDir() + wxFileName::GetPathSeparator() + wxT("config/accelerators.conf") );
+ wxFileName fileName ( clStandardPaths::Get().GetUserDataDir() + wxFileName::GetPathSeparator() + wxT("config/accelerators.conf") );
if ( !fileName.FileExists() ) {
//use the default settings
diff --git a/LiteEditor/perspectivemanager.cpp b/LiteEditor/perspectivemanager.cpp
index 715245d..83ccfee 100644
--- a/LiteEditor/perspectivemanager.cpp
+++ b/LiteEditor/perspectivemanager.cpp
@@ -28,7 +28,7 @@ PerspectiveManager::~PerspectiveManager()
void PerspectiveManager::DeleteAllPerspectives()
{
wxArrayString files;
- wxDir::GetAllFiles(wxStandardPaths::Get().GetUserDataDir() + wxT("/config/"), &files, wxT("*.layout"));
+ wxDir::GetAllFiles(clStandardPaths::Get().GetUserDataDir() + wxT("/config/"), &files, wxT("*.layout"));
wxLogNull noLog;
for(size_t i=0; i<files.GetCount(); i++) {
@@ -95,7 +95,7 @@ void PerspectiveManager::SavePerspective(const wxString& name, bool notify)
wxArrayString PerspectiveManager::GetAllPerspectives()
{
wxArrayString files, perspectives;
- wxDir::GetAllFiles(wxStandardPaths::Get().GetUserDataDir() + wxT("/config/"), &files, wxT("*.layout"));
+ wxDir::GetAllFiles(clStandardPaths::Get().GetUserDataDir() + wxT("/config/"), &files, wxT("*.layout"));
for(size_t i=0; i<files.GetCount(); i++) {
wxFileName fn(files.Item(i));
@@ -167,7 +167,7 @@ wxString PerspectiveManager::DoGetPathFromName(const wxString& name)
filename << wxT(".layout");
}
- file << wxStandardPaths::Get().GetUserDataDir() << wxT("/config/") << filename;
+ file << clStandardPaths::Get().GetUserDataDir() << wxT("/config/") << filename;
return file;
}
diff --git a/LiteEditor/tabgroupmanager.cpp b/LiteEditor/tabgroupmanager.cpp
index 7fed903..9475e90 100644
--- a/LiteEditor/tabgroupmanager.cpp
+++ b/LiteEditor/tabgroupmanager.cpp
@@ -69,7 +69,7 @@ wxString TabgroupManager::GetTabgroupDirectory()
void TabgroupManager::SetTabgroupDirectory()
{
- wxFileName TabgrpPath = wxFileName::DirName( wxStandardPaths::Get().GetUserDataDir() + wxT("/tabgroups/") );
+ wxFileName TabgrpPath = wxFileName::DirName( clStandardPaths::Get().GetUserDataDir() + wxT("/tabgroups/") );
if (!TabgrpPath.DirExists()) {
TabgrpPath.Mkdir(0777, wxPATH_MKDIR_FULL);
}
diff --git a/Outline/outline_settings.cpp b/Outline/outline_settings.cpp
index 7f78bb1..dc56b06 100644
--- a/Outline/outline_settings.cpp
+++ b/Outline/outline_settings.cpp
@@ -12,7 +12,7 @@ OutlineSettings::~OutlineSettings()
void OutlineSettings::Load()
{
-/* wxFileName fn(wxStandardPaths::Get().GetUserDataDir() + wxFileName::GetPathSeparator() + wxT("config"), wxT("outline.conf"));
+/* wxFileName fn(clStandardPaths::Get().GetUserDataDir() + wxFileName::GetPathSeparator() + wxT("config"), wxT("outline.conf"));
JSONRoot json(fn);
if( json.isOk() ) {
@@ -21,7 +21,7 @@ void OutlineSettings::Load()
void OutlineSettings::Save()
{
-/* wxFileName fn(wxStandardPaths::Get().GetUserDataDir() + wxFileName::GetPathSeparator() + wxT("config"), wxT("outline.conf"));
+/* wxFileName fn(clStandardPaths::Get().GetUserDataDir() + wxFileName::GetPathSeparator() + wxT("config"), wxT("outline.conf"));
JSONRoot json(cJSON_Object);
json.save(fn);*/
diff --git a/Plugin/bitmap_loader.cpp b/Plugin/bitmap_loader.cpp
index 0a30fa1..7ba3277 100644
--- a/Plugin/bitmap_loader.cpp
+++ b/Plugin/bitmap_loader.cpp
@@ -5,6 +5,7 @@
#include "globals.h"
#include "editor_config.h"
#include "optionsconfig.h"
+#include "cl_standard_paths.h"
std::map<wxString, wxBitmap> BitmapLoader::m_toolbarsBitmaps;
std::map<wxString, wxString> BitmapLoader::m_manifest;
@@ -57,7 +58,7 @@ const wxBitmap& BitmapLoader::LoadBitmap(const wxString& name)
void BitmapLoader::doLoadManifest()
{
wxString targetFile;
- if(ExtractFileFromZip(m_zipPath.GetFullPath(), wxT("manifest.ini"), wxStandardPaths::Get().GetUserDataDir(), targetFile)) {
+ if(ExtractFileFromZip(m_zipPath.GetFullPath(), wxT("manifest.ini"), clStandardPaths::Get().GetUserDataDir(), targetFile)) {
// we got the file extracted, read it
wxFileName manifest(targetFile);
wxFFile fp(manifest.GetFullPath(), wxT("r"));
@@ -109,7 +110,7 @@ void BitmapLoader::doLoadManifest()
wxBitmap BitmapLoader::doLoadBitmap(const wxString& filepath)
{
wxString bitmapFile;
- if(ExtractFileFromZip(m_zipPath.GetFullPath(), filepath, wxStandardPaths::Get().GetUserDataDir(), bitmapFile)) {
+ if(ExtractFileFromZip(m_zipPath.GetFullPath(), filepath, clStandardPaths::Get().GetUserDataDir(), bitmapFile)) {
wxBitmap bmp;
if(bmp.LoadFile(bitmapFile, wxBITMAP_TYPE_PNG)) {
wxRemoveFile(bitmapFile);
diff --git a/Plugin/conffilelocator.cpp b/Plugin/conffilelocator.cpp
index a3b08a0..da0da4b 100644
--- a/Plugin/conffilelocator.cpp
+++ b/Plugin/conffilelocator.cpp
@@ -26,6 +26,7 @@
#include "conffilelocator.h"
#include <wx/filename.h>
#include <wx/stdpaths.h>
+#include "cl_standard_paths.h"
ConfFileLocator* ConfFileLocator::ms_instance = 0;
@@ -81,7 +82,7 @@ void ConfFileLocator::DeleteLocalCopy(const wxString& basename)
wxString ConfFileLocator::GetLocalCopy(const wxString& baseName)
{
- return wxStandardPaths::Get().GetUserDataDir() + wxT("/") + baseName;
+ return clStandardPaths::Get().GetUserDataDir() + wxT("/") + baseName;
}
wxString ConfFileLocator::GetDefaultCopy(const wxString& baseName)
diff --git a/Plugin/configurationtoolbase.cpp b/Plugin/configurationtoolbase.cpp
index 79679fc..3420fba 100644
--- a/Plugin/configurationtoolbase.cpp
+++ b/Plugin/configurationtoolbase.cpp
@@ -29,6 +29,7 @@
#include <wx/stdpaths.h>
#include "wx/filename.h"
#include "wx/ffile.h"
+#include "cl_standard_paths.h"
ConfigurationToolBase::ConfigurationToolBase()
: m_fileName(wxEmptyString)
@@ -42,7 +43,7 @@ ConfigurationToolBase::~ConfigurationToolBase()
bool ConfigurationToolBase::Load(const wxString &fileName)
{
// Try to open the file from the user data settings first
- wxFileName userFile(wxStandardPaths::Get().GetUserDataDir() + wxT("/") + fileName);
+ wxFileName userFile(clStandardPaths::Get().GetUserDataDir() + wxT("/") + fileName);
m_fileName = userFile.GetFullPath();
... 201 lines suppressed ...
hooks/post-receive
--
codelite
|
