OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-02-25 18:55:39 -06:00
Code Issues Packages Projects Releases Wiki Activity

Hierarchy dialog. Removed duplicate definition

Browse Source
This commit is contained in:
Bjørn Erik Jensen
2018-04-30 15:33:04 +02:00
parent dc81c889ca
commit b686c1a081
3 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
ApplicationCode/Application/Tools/RiaFilePathTools.cpp
View File

@@ -21,10 +21,11 @@
#include "RiaFilePathTools.h"
#include <QDir>
//--------------------------------------------------------------------------------------------------
/// Internal variables
///
//--------------------------------------------------------------------------------------------------
static QString SEPARATOR = "/";
const QChar RiaFilePathTools::SEPARATOR = '/';
//--------------------------------------------------------------------------------------------------
///

2
ApplicationCode/Application/Tools/RiaFilePathTools.h
View File

@@ -32,6 +32,8 @@
class RiaFilePathTools
{
public:
static const QChar SEPARATOR;
static QString toInternalSeparator(const QString& path);
static QString& appendSeparatorIfNo(QString& path);
static QString relativePath(const QString& rootDir, const QString& dir);

4
ApplicationCode/Commands/RicFileHierarchyDialog.cpp
View File

@@ -61,7 +61,7 @@
//--------------------------------------------------------------------------------------------------
/// Internal variables
//--------------------------------------------------------------------------------------------------
static QString SEPARATOR = "/";
static const QChar SEPARATOR = RiaFilePathTools::SEPARATOR;
//--------------------------------------------------------------------------------------------------
/// Internal functions
@@ -613,7 +613,7 @@ void RicFileHierarchyDialog::updateEffectiveFilter()
do
{
len = internalFilter.size();
internalFilter.replace(SEPARATOR + SEPARATOR, SEPARATOR);
internalFilter.replace(QString("%1%1").arg(SEPARATOR), SEPARATOR);
} while (internalFilter.size() != len);
// Present native separators to the user