Skip to content

Commit 45ffe60

Browse files
committed
* Using RapidAssist version 0.7.0.
* Using win32Clipboard version 0.2.0.
1 parent f016c54 commit 45ffe60

32 files changed

+389
-1196
lines changed

CHANGES

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
Changes for 0.3.0
22

3-
N/A
3+
* Using RapidAssist version 0.7.0.
4+
* Using win32Clipboard version 0.2.0.
45

56

67
Changes for 0.2.0

INSTALL.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ The following software must be installed on the system for compiling source code
2525
* [Google C++ Testing Framework v1.8.0](https://github.com/google/googletest/tree/release-1.8.0)
2626
* [Google Logging Library v0.4.0](https://github.com/google/glog/tree/v0.4.0)
2727
* [TinyXML 2 v6.2.0](https://github.com/leethomason/tinyxml2/tree/6.2.0)
28-
* [RapidAssist v0.5.0](https://github.com/end2endzone/RapidAssist/tree/0.5.0)
29-
* [win32Clipboard v0.1.0](https://github.com/end2endzone/win32Clipboard/tree/0.1.0)
28+
* [RapidAssist v0.7.0](https://github.com/end2endzone/RapidAssist/tree/0.5.0)
29+
* [win32Clipboard v0.2.0](https://github.com/end2endzone/win32Clipboard/tree/0.1.0)
3030
* [CMake](http://www.cmake.org/) v3.4.3 (or newer)
3131

3232

ci/appveyor/emulate_appveyor.bat

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ set APPVEYOR=True
66
set APPVEYOR_BUILD_FOLDER=%cd%
77
set Configuration=Debug
88
set Platform=x64
9-
set PlatformToolset=v100
9+
REM set PlatformToolset=v100
1010
REM set Platform=Win32
11-
REM set PlatformToolset=Windows7.1SDK
11+
set PlatformToolset=Windows7.1SDK
1212

1313
echo Emulating appveyor's environment.
1414
echo APPVEYOR_BUILD_FOLDER set to '%APPVEYOR_BUILD_FOLDER%'

ci/appveyor/install_rapidassist.bat

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ git clone "https://github.com/end2endzone/RapidAssist.git"
1919
cd RapidAssist
2020
echo.
2121

22-
echo Checking out version v0.5.0...
23-
git checkout 0.5.0
22+
echo Checking out version v0.7.0...
23+
git checkout 0.7.0
2424
echo.
2525

2626
echo ============================================================================

ci/appveyor/install_win32Clipboard.bat

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ git clone "https://github.com/end2endzone/win32Clipboard.git"
1919
cd win32Clipboard
2020
echo.
2121

22-
echo Checking out version v0.1.0...
23-
git checkout 0.1.0
22+
echo Checking out version v0.2.0...
23+
git checkout 0.2.0
2424
echo.
2525

2626
echo ============================================================================

src/ActionExecute.cpp

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
*********************************************************************************/
2424

2525
#include "shellanything/ActionExecute.h"
26+
#include "rapidassist/process.h"
2627
#include "PropertyManager.h"
2728
#include "Platform.h"
2829

@@ -69,14 +70,14 @@ namespace shellanything
6970
{
7071
//if a single file was selected
7172
const std::string & selected_file = elements[0];
72-
const std::string parent_dir = ra::filesystem::getParentPath(selected_file);
73+
const std::string parent_dir = ra::filesystem::GetParentPath(selected_file);
7374
basedir = parent_dir;
7475
}
7576
else if (num_dir == 0 && num_files >= 2 && elements.size() >= 1)
7677
{
7778
//if a multiple files was selected
7879
const std::string & first_selected_file = elements[0];
79-
const std::string first_parent_dir = ra::filesystem::getParentPath(first_selected_file);
80+
const std::string first_parent_dir = ra::filesystem::GetParentPath(first_selected_file);
8081
basedir = first_parent_dir;
8182
}
8283
}
@@ -95,7 +96,7 @@ namespace shellanything
9596
//debug
9697
LOG(INFO) << "Running '" << path << "' from directory '" << basedir << "' with arguments '" << arguments << "'";
9798

98-
uint32_t pId = startProcess(path, arguments, basedir);
99+
uint32_t pId = ra::process::StartProcess(path, arguments, basedir);
99100

100101
bool success = pId != 0;
101102
if (success)

src/ActionOpen.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
*********************************************************************************/
2424

2525
#include "shellanything/ActionOpen.h"
26+
#include "rapidassist/process.h"
2627
#include "PropertyManager.h"
2728
#include "Platform.h"
2829

@@ -50,7 +51,7 @@ namespace shellanything
5051
//debug
5152
LOG(INFO) << "Open file '" << path << "'";
5253

53-
uint32_t pId = openDocument(path);
54+
uint32_t pId = ra::process::OpenDocument(path);
5455

5556
return pId != 0;
5657
}

src/ActionPrompt.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,13 +45,13 @@ namespace shellanything
4545

4646
bool ActionPrompt::isYesNoQuestion() const
4747
{
48-
bool yes_no_question = (!mType.empty() && ra::strings::uppercase(mType) == "YESNO");
48+
bool yes_no_question = (!mType.empty() && ra::strings::Uppercase(mType) == "YESNO");
4949
return yes_no_question;
5050
}
5151

5252
bool ActionPrompt::isOkQuestion() const
5353
{
54-
bool ok_question = (!mType.empty() && ra::strings::uppercase(mType) == "OK");
54+
bool ok_question = (!mType.empty() && ra::strings::Uppercase(mType) == "OK");
5555
return ok_question;
5656
}
5757

src/ConfigManager.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -71,8 +71,8 @@ namespace shellanything
7171
//compare the file's date at the load time and the current date
7272
const std::string & file_path = config->getFilePath();
7373
const uint64_t & old_file_date = config->getFileModifiedDate();
74-
const uint64_t new_file_date = ra::filesystem::getFileModifiedDate(file_path);
75-
if (ra::filesystem::fileExists(file_path.c_str()) && old_file_date == new_file_date)
74+
const uint64_t new_file_date = ra::filesystem::GetFileModifiedDate(file_path);
75+
if (ra::filesystem::FileExists(file_path.c_str()) && old_file_date == new_file_date)
7676
{
7777
//current configuration is up to date
7878
LOG(INFO) << "Configuration file '" << file_path << "' is up to date.";
@@ -95,7 +95,7 @@ namespace shellanything
9595

9696
//search files in each directory
9797
ra::strings::StringVector files;
98-
bool dir_found = ra::filesystem::findFiles(files, path.c_str());
98+
bool dir_found = ra::filesystem::FindFiles(files, path.c_str());
9999
if (dir_found)
100100
{
101101
//search through each files for *.xml files

src/Configuration.cpp

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,11 @@
4141
#define WIN32_LEAN_AND_MEAN 1
4242
#endif
4343
#include <Windows.h>
44+
#undef GetEnvironmentVariable
45+
#undef DeleteFile
46+
#undef CreateDirectory
47+
#undef CopyFile
48+
#undef CreateFile
4449

4550
using namespace tinyxml2;
4651

@@ -61,13 +66,13 @@ namespace shellanything
6166
{
6267
error = "";
6368

64-
if (!ra::filesystem::fileExists(path.c_str()))
69+
if (!ra::filesystem::FileExists(path.c_str()))
6570
{
6671
error = "File '" + path + "' not found.";
6772
return NULL;
6873
}
6974

70-
uint64_t file_modified_date = ra::filesystem::getFileModifiedDate(path.c_str());
75+
uint64_t file_modified_date = ra::filesystem::GetFileModifiedDate(path.c_str());
7176

7277
//Parse the xml file
7378
//http://leethomason.github.io/tinyxml2/
@@ -131,13 +136,13 @@ namespace shellanything
131136

132137
bool Configuration::isValidConfigFile(const std::string & path)
133138
{
134-
std::string file_extension = ra::filesystem::getFileExtention(path);
135-
file_extension = ra::strings::uppercase(file_extension);
139+
std::string file_extension = ra::filesystem::GetFileExtention(path);
140+
file_extension = ra::strings::Uppercase(file_extension);
136141
if (file_extension == "XML")
137142
{
138143
//read the beginning of the file
139144
std::string content;
140-
bool readed = peekFile(path.c_str(), 1024, content);
145+
bool readed = ra::filesystem::PeekFile(path.c_str(), 1024, content);
141146
if (readed)
142147
{
143148
//and look for special XML tags

0 commit comments

Comments
 (0)