mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

core: convert git_info to std::string

Browse source 
Quite a bit of fallout in users of this structure.

Conveniently, since git-access.cpp is now C++ we can move
some helpers from the monstrous qthelper.cpp to git-access.cpp.

Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
This commit is contained in:
Berthold Stoeger 2024-03-11 21:41:14 +01:00 • committed by bstoeger
parent ae299d5e66
commit a123589efb
13 changed files with 290 additions and 319 deletions
Download patch file Download diff file Expand all files Collapse all files

50
core/qthelper.cpp
View file

@ -22,7 +22,6 @@
#include "tag.h"
#include "imagedownloader.h"
#include "xmlparams.h"
#include "core/git-access.h" // for CLOUD_HOST definitions
#include <QFile>
#include <QRegularExpression>
#include <QDir>
@ -331,31 +330,31 @@ extern "C" xsltStylesheetPtr get_stylesheet(const char *name)
return xslt;
}
extern "C" char *move_away(const char *old_path)
std::string move_away(const std::string &old_path)
{
if (verbose > 1)
qDebug() << "move away" << old_path;
QDir oldDir(old_path);
qDebug() << "move away" << old_path.c_str();
QDir oldDir(old_path.c_str());
QDir newDir;
QString newPath;
std::string newPath;
int i = 0;
do {
newPath = QString(old_path) + QString(".%1").arg(++i);
newDir.setPath(newPath);
newPath = old_path + "." + std::to_string(++i);
newDir.setPath(newPath.c_str());
} while(newDir.exists());
if (verbose > 1)
qDebug() << "renaming to" << newPath;
if (!oldDir.rename(old_path, newPath)) {
qDebug() << "renaming to" << newPath.c_str();
if (!oldDir.rename(old_path.c_str(), newPath.c_str())) {
if (verbose)
qDebug() << "rename of" << old_path << "to" << newPath << "failed";
qDebug() << "rename of" << old_path.c_str() << "to" << newPath.c_str() << "failed";
// this next one we only try on Windows... if we are on a different platform
// we simply give up and return an empty string
#ifdef WIN32
if (subsurface_dir_rename(old_path, qPrintable(newPath)) == 0)
if (subsurface_dir_rename(old_path.c_str(), newPath.c_str()) == 0)
#endif
return strdup("");
return std::string();
}
return copy_qstring(newPath);
return newPath;
}
std::string get_file_name(const char *fileName)
@ -1375,31 +1374,6 @@ extern "C" char *cloud_url()
return copy_qstring(filename);
}
std::string normalize_cloud_name(const char *remote_in)
{
// replace ssrf-cloud-XX.subsurface... names with cloud.subsurface... names
// that trailing '/' is to match old code
QString ri(remote_in);
ri.replace(QRegularExpression(CLOUD_HOST_PATTERN), CLOUD_HOST_GENERIC "/");
return ri.toStdString();
}
extern "C" bool getProxyString(char **buffer)
{
if (prefs.proxy_type == QNetworkProxy::HttpProxy) {
QString proxy;
if (prefs.proxy_auth)
proxy = QString("http://%1:%2@%3:%4").arg(prefs.proxy_user).arg(prefs.proxy_pass)
.arg(prefs.proxy_host).arg(prefs.proxy_port);
else
proxy = QString("http://%1:%2").arg(prefs.proxy_host).arg(prefs.proxy_port);
if (buffer)
*buffer = copy_qstring(proxy);
return true;
}
return false;
}
extern "C" void subsurface_mkdir(const char *dir)
{
QDir directory;