Remove portable, we dont use it

This commit is contained in:
Jonas Kvinge
2019-11-25 00:35:48 +01:00
parent 7039234471
commit 337e47269f
7 changed files with 3 additions and 47 deletions

View File

@@ -86,8 +86,6 @@
# include "moodbar/moodbarloader.h"
#endif
bool Application::kIsPortable = false;
class ApplicationImpl {
public:
explicit ApplicationImpl(Application *app) :

View File

@@ -68,8 +68,6 @@ class Application : public QObject {
Q_OBJECT
public:
static bool kIsPortable;
explicit Application(QObject *parent = nullptr);
~Application();

View File

@@ -427,15 +427,7 @@ void Song::set_bitdepth(int v) { d->bitdepth_ = v; }
void Song::set_source(Source v) { d->source_ = v; }
void Song::set_directory_id(int v) { d->directory_id_ = v; }
void Song::set_url(const QUrl &v) {
if (Application::kIsPortable) {
QUrl base = QUrl::fromLocalFile(QCoreApplication::applicationDirPath() + "/");
d->url_ = base.resolved(v);
}
else {
d->url_ = v;
}
}
void Song::set_url(const QUrl &v) { d->url_ = v; }
void Song::set_basefilename(const QString &v) { d->basefilename_ = v; }
void Song::set_filetype(FileType v) { d->filetype_ = v; }
void Song::set_filesize(int v) { d->filesize_ = v; }
@@ -1288,18 +1280,7 @@ void Song::BindToQuery(QSqlQuery *query) const {
query->bindValue(":source", d->source_);
query->bindValue(":directory_id", notnullintval(d->directory_id_));
QString url;
if (d->url_.isValid()) {
if (Application::kIsPortable && Utilities::UrlOnSameDriveAsStrawberry(d->url_)) {
url = Utilities::GetRelativePathToStrawberryBin(d->url_).toEncoded();
}
else {
url = d->url_.toEncoded();
}
}
query->bindValue(":url", url);
query->bindValue(":url", d->url_.toString(QUrl::FullyEncoded));
query->bindValue(":filetype", d->filetype_);
query->bindValue(":filesize", notnullintval(d->filesize_));
query->bindValue(":mtime", notnullintval(d->mtime_));

View File

@@ -736,19 +736,6 @@ void IncreaseFDLimit() {
}
void CheckPortable() {
QFile f(QApplication::applicationDirPath() + QDir::separator() + "data");
if (f.exists()) {
// We are portable. Set the bool and change the qsettings path
Application::kIsPortable = true;
QSettings::setDefaultFormat(QSettings::IniFormat);
QSettings::setPath(QSettings::IniFormat, QSettings::UserScope, f.fileName());
}
}
QString GetRandomStringWithChars(const int len) {
const QString UseCharacters("ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz");
return GetRandomString(len, UseCharacters);

View File

@@ -124,7 +124,6 @@ QString FiddleFileExtension(const QString &filename, const QString &new_extensio
QString GetEnv(const QString &key);
void SetEnv(const char *key, const QString &value);
void IncreaseFDLimit();
void CheckPortable();
// Borrowed from schedutils
enum IoPriority {