flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-04-14 00:25:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

Ref T103, Unified naming of directory functions

Browse Source 
* some started with get/some not (removed get, get is normally used for our getters)
* some used swift, getSwiftXZY dir (removed swift)
* used full word "directory", not dir/directory mixed
This commit is contained in:
Klaus Basan
2017-07-06 23:02:13 +02:00
committed by Mathew Sutcliffe
parent debd9c802f
commit a9198e4f13
24 changed files with 124 additions and 118 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/blackgui/components/copyconfigurationcomponent.cpp
View File

@@ -43,8 +43,8 @@ namespace BlackGui
{
ui->setupUi(this);
ui->cb_OtherVersions->clear();
ui->cb_OtherVersions->addItems(CDirectoryUtils::swiftApplicationDataDirectoryList(true, true));
m_otherVersionDirs = CDirectoryUtils::swiftApplicationDataDirectoryList(true, false); // not beautified
ui->cb_OtherVersions->addItems(CDirectoryUtils::applicationDataDirectoryList(true, true));
m_otherVersionDirs = CDirectoryUtils::applicationDataDirectoryList(true, false); // not beautified
connect(ui->rb_Cache, &QRadioButton::toggled, [ = ](bool) { this->initCurrentDirectories(true); });
connect(ui->cb_OtherVersions, &QComboBox::currentTextChanged, [ = ] { this->initCurrentDirectories(true); });
@@ -277,7 +277,7 @@ namespace BlackGui
QString CCopyConfigurationComponent::getOtherVersionsSelectedDirectory() const
{
if (ui->cb_OtherVersions->count() < 1) { return ""; }
const QFileInfoList dirs(CDirectoryUtils::swiftApplicationDataDirectories());
const QFileInfoList dirs(CDirectoryUtils::applicationDataDirectories());
if (dirs.isEmpty()) { return ""; }
const QString otherVersionDir = m_otherVersionDirs.at(ui->cb_OtherVersions->currentIndex());
QString dir;

6
src/blackgui/components/datainfoareacomponent.cpp
View File

@@ -90,7 +90,7 @@ namespace BlackGui
}
// write to disk
bool s = sGui->getWebDataServices()->writeDbDataToDisk(CDirectoryUtils::getSwiftStaticDbFilesDir());
bool s = sGui->getWebDataServices()->writeDbDataToDisk(CDirectoryUtils::staticDbFilesDirectory());
if (s)
{
CLogMessage(this).info("Written DB data");
@@ -105,12 +105,12 @@ namespace BlackGui
bool CDataInfoAreaComponent::readDbDataFromResourceDir()
{
bool s = sGui &&
sGui->getWebDataServices()->readDbDataFromDisk(CDirectoryUtils::getSwiftStaticDbFilesDir(), true);
sGui->getWebDataServices()->readDbDataFromDisk(CDirectoryUtils::staticDbFilesDirectory(), true);
// info
if (s)
{
CLogMessage(this).info("Read DB data from directory: %1") << CDirectoryUtils::getSwiftStaticDbFilesDir();
CLogMessage(this).info("Read DB data from directory: %1") << CDirectoryUtils::staticDbFilesDirectory();
ui->comp_DbAircraftIcao->showLoadIndicator();
ui->comp_DbAirlineIcao->showLoadIndicator();
ui->comp_DbCountries->showLoadIndicator();

2
src/blackgui/components/flightplancomponent.cpp
View File

@@ -599,7 +599,7 @@ namespace BlackGui
QString CFlightPlanComponent::getDefaultFilename(bool load)
{
// some logic to find a useful default name
QString dir = CDirectoryUtils::getDocumentationDirectory();
QString dir = CDirectoryUtils::documentationDirectory();
if (load)
{

2
src/blackgui/guiapplication.cpp
View File

@@ -370,7 +370,7 @@ namespace BlackGui
a = menu.addAction(CIcons::disk16(), "Log directory");
c = connect(a, &QAction::triggered, this, [this]()
{
const QString path(QDir::toNativeSeparators(CDirectoryUtils::getLogDirectory()));
const QString path(QDir::toNativeSeparators(CDirectoryUtils::logDirectory()));
if (QDir(path).exists())
{
QDesktopServices::openUrl(QUrl::fromLocalFile(path));

2
src/blackgui/settings/viewdirectorysettings.h
View File

@@ -31,7 +31,7 @@ namespace BlackGui
static bool isValid(const QString &directory) { Q_UNUSED(directory); return true; }
//! Default, not consolidating
static const QString &defaultValue() { return BlackMisc::CDirectoryUtils::getDocumentationDirectory(); }
static const QString &defaultValue() { return BlackMisc::CDirectoryUtils::documentationDirectory(); }
};
} // ns
} // ns

12
src/blackgui/stylesheetutility.cpp
View File

@@ -133,12 +133,12 @@ namespace BlackGui
bool CStyleSheetUtility::read()
{
QDir directory(CDirectoryUtils::getStylesheetsDir());
QDir directory(CDirectoryUtils::stylesheetsDirectory());
if (!directory.exists()) { return false; }
// qss/css files
const bool needsWatcher = this->m_fileWatcher.files().isEmpty();
if (needsWatcher) { this->m_fileWatcher.addPath(CDirectoryUtils::getStylesheetsDir()); } // directory to deleted file watching
if (needsWatcher) { this->m_fileWatcher.addPath(CDirectoryUtils::stylesheetsDirectory()); } // directory to deleted file watching
directory.setNameFilters({"*.qss", "*.css"});
directory.setFilter(QDir::Files | QDir::Hidden | QDir::NoSymLinks);
@@ -240,7 +240,7 @@ namespace BlackGui
qssWidget.append(qss);
qssWidget.append("}\n");
QFile fontFile(CDirectoryUtils::getStylesheetsDir() + "/" + fileNameFontsModified());
QFile fontFile(CDirectoryUtils::stylesheetsDirectory() + "/" + fileNameFontsModified());
bool ok = fontFile.open(QFile::Text | QFile::WriteOnly);
if (ok)
{
@@ -254,7 +254,7 @@ namespace BlackGui
bool CStyleSheetUtility::resetFont()
{
QFile fontFile(CDirectoryUtils::getStylesheetsDir() + "/" + fileNameFontsModified());
QFile fontFile(CDirectoryUtils::stylesheetsDirectory() + "/" + fileNameFontsModified());
return fontFile.remove();
}
@@ -300,7 +300,7 @@ namespace BlackGui
bool CStyleSheetUtility::deleteModifiedFontFile()
{
const QString fn = CFileUtils::appendFilePaths(CDirectoryUtils::getStylesheetsDir(), fileNameFontsModified());
const QString fn = CFileUtils::appendFilePaths(CDirectoryUtils::stylesheetsDirectory(), fileNameFontsModified());
QFile file(fn);
if (!file.exists()) { return false; }
bool r = file.remove();
@@ -484,7 +484,7 @@ namespace BlackGui
bool CStyleSheetUtility::qssFileExists(const QString &filename)
{
if (filename.isEmpty()) { return false; }
const QFileInfo f(CFileUtils::appendFilePaths(CDirectoryUtils::getStylesheetsDir(), filename));
const QFileInfo f(CFileUtils::appendFilePaths(CDirectoryUtils::stylesheetsDirectory(), filename));
return f.exists() && f.isReadable();
}
} // ns