feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

ProjectExplorer: Remove unneeded ifdefs from FolderNavigationWidget.

Browse Source 
Change-Id: I6b7bcb2f469321fdfa9bcd41553aa1ba1ee8a266
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
This commit is contained in:
Christian Kandeler
2013-03-14 11:35:27 +01:00
parent d2e36ac8ff
commit 9815204b82
1 changed files with 8 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/plugins/projectexplorer/foldernavigationwidget.cpp
View File

@@ -45,6 +45,7 @@
#include <texteditor/findinfiles.h> #include <texteditor/findinfiles.h>
#include <utils/environment.h> #include <utils/environment.h>
#include <utils/hostosinfo.h>
#include <utils/pathchooser.h> #include <utils/pathchooser.h>
#include <utils/qtcassert.h> #include <utils/qtcassert.h>
#include <utils/elidinglabel.h> #include <utils/elidinglabel.h>
@@ -76,32 +77,19 @@ public:
explicit DotRemovalFilter(QObject *parent = 0); explicit DotRemovalFilter(QObject *parent = 0);
protected: protected:
virtual bool filterAcceptsRow(int source_row, const QModelIndex &parent) const; virtual bool filterAcceptsRow(int source_row, const QModelIndex &parent) const;
private:
#if defined(Q_OS_UNIX)
const QVariant m_root;
const QVariant m_dotdot;
#endif
const QVariant m_dot;
}; };
DotRemovalFilter::DotRemovalFilter(QObject *parent) : DotRemovalFilter::DotRemovalFilter(QObject *parent) : QSortFilterProxyModel(parent)
QSortFilterProxyModel(parent),
#if defined(Q_OS_UNIX)
m_root(QString(QLatin1Char('/'))),
m_dotdot(QLatin1String("..")),
#endif
m_dot(QString(QLatin1Char('.')))
{ {
} }
bool DotRemovalFilter::filterAcceptsRow(int source_row, const QModelIndex &parent) const bool DotRemovalFilter::filterAcceptsRow(int source_row, const QModelIndex &parent) const
{ {
const QVariant fileName = sourceModel()->data(parent.child(source_row, 0)); const QVariant fileName = sourceModel()->data(parent.child(source_row, 0));
#if defined(Q_OS_UNIX) if (Utils::HostOsInfo::isAnyUnixHost())
if (sourceModel()->data(parent) == m_root && fileName == m_dotdot) if (sourceModel()->data(parent) == QLatin1String("/") && fileName == QLatin1String(".."))
return false; return false;
#endif return fileName != QLatin1String(".");
return fileName != m_dot;
} }
// FolderNavigationModel: Shows path as tooltip. // FolderNavigationModel: Shows path as tooltip.
@@ -145,9 +133,8 @@ FolderNavigationWidget::FolderNavigationWidget(QWidget *parent)
QDir::Filters filters = QDir::AllDirs | QDir::Files | QDir::Drives QDir::Filters filters = QDir::AllDirs | QDir::Files | QDir::Drives
| QDir::Readable| QDir::Writable | QDir::Readable| QDir::Writable
| QDir::Executable | QDir::Hidden; | QDir::Executable | QDir::Hidden;
#ifdef Q_OS_WIN // Symlinked directories can cause file watcher warnings on Win32. if (Utils::HostOsInfo::isWindowsHost()) // Symlinked directories can cause file watcher warnings on Win32.
filters |= QDir::NoSymLinks; filters |= QDir::NoSymLinks;
#endif
m_fileSystemModel->setFilter(filters); m_fileSystemModel->setFilter(filters);
m_filterModel->setSourceModel(m_fileSystemModel); m_filterModel->setSourceModel(m_fileSystemModel);
m_filterHiddenFilesAction->setCheckable(true); m_filterHiddenFilesAction->setCheckable(true);