AnotherFoxGuy/fuel-scm
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Minor refactoring

Browse Source 
FossilOrigin-Name: ccbdbff89e2354c6d8f38d994587328a04112eaa
This commit is contained in:
kostas 2015-07-10 18:43:33 +00:00
parent a69645064c
commit 0191b4ba5b
4 changed files with 17 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
manifest
View File

@ -1,5 +1,5 @@
C Merged\scustom\sactions\sfeature
D 2015-07-10T18:24:26.540
C Minor\srefactoring
D 2015-07-10T18:43:33.614
F .travis.yml 77966888a81c4ceee1fcc79bce842c9667ad8a35
F debian/changelog eb4304dfcb6bb66850ec740838090eb50ce1249b
F debian/compat b6abd567fa79cbe0196d093a067271361dc6ca8b
@ -236,8 +236,8 @@ F src/Settings.cpp 258d3f466f6a125ce2b8519d6d57a312cbc44a3f
F src/Settings.h 0a10b0b83fe804bdc7dac58eed06b5b6ee422055
F src/SettingsDialog.cpp cab739fb0569bd26550e57f97136c7515fe757fe
F src/SettingsDialog.h 5eb3ae2cbb00ab5544e1889860f5376f69fe47cd
F src/Utils.cpp 876942a44202611d3c778c67f6d0a344e241a000
F src/Utils.h 4613424aaeb6910689b5821a2dd44ca0b6dd301f
F src/Utils.cpp e047c7aaeb4fb4b64c1383df5cb35d269abb87ed
F src/Utils.h cb0499ead8dd5662b184dbeabb6e66c3ae65eebc
F src/Workspace.cpp 7004c2c30f79d2e64691aa9b2c55ee72a84d978b
F src/Workspace.h 0ab9b941a537134a7c43cfccee5299b8ccda143a
F src/main.cpp d8c65ea5e54102e4989fef9fd8cfd4f13ef8a8f0
@ -252,8 +252,7 @@ F ui/MainWindow.ui 10181826a25056ed5aba2b23a7d110159be7c043
F ui/RemoteDialog.ui 95a4750d972ed8c49bb10b95db91ff16cfe2dd0b
F ui/RevisionDialog.ui 27c3b98c665fec014a50cbf3352c0627f75e68cd
F ui/SettingsDialog.ui 47b9a31e28ad523f14a1c4cd361270b6babbdf7d
P d869092a71de1d2294d475f394a17f35740420aa 4270974c3f9f7fb166a74a9d76c9db8a24428fe5
R 59482a1a26cd7b9ebf570bd4be545d73
T +closed 4270974c3f9f7fb166a74a9d76c9db8a24428fe5
P 7cd82ba8f02f659d13a370043f256212f55669db
R b1470ef543fad9773da5e4edf313b8fb
U kostas
Z e952ccb1c86d4465716c40a0723206c8
Z 032611050518136012ef63aed85ba8cb

2
manifest.uuid
View File

@ -1 +1 @@
7cd82ba8f02f659d13a370043f256212f55669db
ccbdbff89e2354c6d8f38d994587328a04112eaa

16
src/Utils.cpp
View File

@ -478,7 +478,7 @@ QString UrlToStringNoCredentials(const QUrl& url)
}
//------------------------------------------------------------------------------
bool SpawnExternalProcess(QObject *procesParent, const QString& command, const QStringList& file_selection, const stringset_t& path_selection, const QString &wkdir, UICallback &ui)
bool SpawnExternalProcess(QObject *processParent, const QString& command, const QStringList& fileList, const stringset_t& pathSet, const QString &workspaceDir, UICallback &uiCallback)
{
QStringList params;
@ -534,7 +534,7 @@ bool SpawnExternalProcess(QObject *procesParent, const QString& command, const Q
{
// Add in-place
QString n = p;
n.replace("$WORKSPACE", wkdir, Qt::CaseInsensitive);
n.replace("$WORKSPACE", workspaceDir, Qt::CaseInsensitive);
params.push_back(n);
continue;
}
@ -544,9 +544,9 @@ bool SpawnExternalProcess(QObject *procesParent, const QString& command, const Q
}
// Build file params
foreach(const QString &f, file_selection)
foreach(const QString &f, fileList)
{
QString path = QFileInfo(wkdir + PATH_SEPARATOR + f).absoluteFilePath();
QString path = QFileInfo(workspaceDir + PATH_SEPARATOR + f).absoluteFilePath();
// Apply macro
if(!macro_file.isEmpty())
@ -560,9 +560,9 @@ bool SpawnExternalProcess(QObject *procesParent, const QString& command, const Q
// Build folder params
foreach(const QString &f, path_selection)
foreach(const QString &f, pathSet)
{
QString path = QFileInfo(wkdir + PATH_SEPARATOR + f).absoluteFilePath();
QString path = QFileInfo(workspaceDir + PATH_SEPARATOR + f).absoluteFilePath();
// Apply macro
if(!macro_folder.isEmpty())
@ -577,8 +577,8 @@ bool SpawnExternalProcess(QObject *procesParent, const QString& command, const Q
if(params.empty())
return false;
ui.logText("<b>"+cmd + " "+params.join(" ")+"</b><br>", true);
uiCallback.logText("<b>"+cmd + " "+params.join(" ")+"</b><br>", true);
QProcess proc(procesParent);
QProcess proc(processParent);
return proc.startDetached(cmd, params);
}

2
src/Utils.h
View File

@ -61,7 +61,7 @@ bool KeychainDelete(QObject* parent, const QUrl& url);
QString HashString(const QString &str);
QString UrlToStringDisplay(const QUrl &url);
QString UrlToStringNoCredentials(const QUrl& url);
bool SpawnExternalProcess(QObject *procesParent, const QString &command, const QStringList &file_selection, const stringset_t &path_selection, const QString& wkdir, UICallback& ui);
bool SpawnExternalProcess(QObject *processParent, const QString& command, const QStringList& fileList, const stringset_t& pathSet, const QString &workspaceDir, UICallback &uiCallback);
typedef QMap<QString, QString> QStringMap;
void ParseProperties(QStringMap &properties, const QStringList &lines, QChar separator=' ');