Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Command item model #200

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Command item model #200

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
26860ae
fix virtual overrides
antis81 Jul 3, 2021
285f8a0
cleanup filterAcceptsRow
antis81 Jul 3, 2021
3f26075
cleanup lessThan
antis81 Jul 3, 2021
8c58ca7
cleanp itemType
antis81 Jul 3, 2021
fe7d6d0
cleanup data
antis81 Jul 3, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 9 additions & 13 deletions commanditemmodel.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,14 +104,11 @@ bool CommandItemModel::filterAcceptsRow(int sourceRow, const QModelIndex &source

const CommandProviderItem *item = mSourceModel->command(sourceRow);

if (!item)
return false;

bool accept = item->compare(re);
bool accept = item != nullptr && item->compare(re);
if (accept)
{
//check if CustomCommand can be filtered out (equivalent app link is shown)
const CustomCommandItem * cust_i = qobject_cast<const CustomCommandItem *>(item);
auto cust_i = qobject_cast<const CustomCommandItem *>(item);
if (nullptr != cust_i)
{
for (int i = mSourceModel->rowCount(sourceParent); 0 <= i; --i)
Expand Down Expand Up @@ -144,8 +141,8 @@ bool CommandItemModel::lessThan(const QModelIndex &left, const QModelIndex &righ
const auto leftItem = mSourceModel->command(left);
const auto righItem = mSourceModel->command(right);

HistoryItem const * i_left = dynamic_cast<HistoryItem const *>(leftItem);
HistoryItem const * i_right = dynamic_cast<HistoryItem const *>(righItem);
auto i_left = qobject_cast<HistoryItem const *>(leftItem);
auto i_right = qobject_cast<HistoryItem const *>(righItem);
if (nullptr != i_left && nullptr == i_right)
return mShowHistoryFirst;
if (nullptr == i_left && nullptr != i_right)
Expand All @@ -154,8 +151,8 @@ bool CommandItemModel::lessThan(const QModelIndex &left, const QModelIndex &righ
{
QRegExp re(filterRegExp());
//Note: -1 should not be returned if the item passed the filter previously
const int pos_left = re.indexIn(i_left->command());
const int pos_right = re.indexIn(i_right->command());
int pos_left = re.indexIn(i_left->command());
int pos_right = re.indexIn(i_right->command());
Q_ASSERT(-1 != pos_left && -1 != pos_right);
return pos_left < pos_right
|| (pos_left == pos_right && QSortFilterProxyModel::lessThan(left, right));
Expand All @@ -180,10 +177,9 @@ int CommandItemModel::itemType(const QModelIndex &index) const
{
if (index.row() == mSourceModel->customCommandIndex().row())
return 1;
else if (index.row() < mSourceModel->externalProviderStartIndex().row())
if (index.row() < mSourceModel->externalProviderStartIndex().row())
return 2;
else
return 3;
return 3;
}


Expand Down Expand Up @@ -331,7 +327,7 @@ QVariant CommandSourceItemModel::data(const QModelIndex &index, int role) const
if (index.row() >= rowCount())
return QVariant();

const CommandProviderItem *item = command(index);
auto item = command(index);
if (!item)
return QVariant();

Expand Down
12 changes: 6 additions & 6 deletions commanditemmodel.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,10 +41,10 @@ class CommandSourceItemModel: public QAbstractListModel

public:
explicit CommandSourceItemModel(bool useHistory, QObject *parent = 0);
virtual ~CommandSourceItemModel();
~CommandSourceItemModel() override;

int rowCount(const QModelIndex &parent=QModelIndex()) const;
QVariant data(const QModelIndex &index, int role=Qt::DisplayRole) const;
int rowCount(const QModelIndex &parent=QModelIndex()) const override;
QVariant data(const QModelIndex &index, int role=Qt::DisplayRole) const override;

bool isOutDated() const;
const CommandProviderItem *command(const QModelIndex &index) const;
Expand Down Expand Up @@ -80,7 +80,7 @@ class CommandItemModel: public QSortFilterProxyModel

public:
explicit CommandItemModel(bool useHistory, QObject *parent = 0);
virtual ~CommandItemModel();
~CommandItemModel() override;

bool isOutDated() const;
const CommandProviderItem *command(const QModelIndex &index) const;
Expand All @@ -104,8 +104,8 @@ public slots:
void clearHistory();

protected:
bool filterAcceptsRow(int sourceRow, const QModelIndex &sourceParent) const;
bool lessThan(const QModelIndex &left, const QModelIndex &right) const;
bool filterAcceptsRow(int sourceRow, const QModelIndex &sourceParent) const override;
bool lessThan(const QModelIndex &left, const QModelIndex &right) const override;

private:
int itemType(const QModelIndex &index) const;
Expand Down
2 changes: 1 addition & 1 deletion mylistview.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ class MyListView : public QListView
}

protected:
virtual QSize viewportSizeHint() const override
QSize viewportSizeHint() const override
{
QAbstractItemModel * m = model();
if (m == nullptr)
Expand Down
27 changes: 13 additions & 14 deletions providers.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,6 @@ class CommandProviderItem: public QObject

public:
CommandProviderItem(): QObject() {}
virtual ~CommandProviderItem() {}

virtual bool run() const = 0;
virtual bool compare(const QRegExp &regExp) const = 0;
Expand Down Expand Up @@ -95,7 +94,7 @@ class CommandProvider: public QObject, public QList<CommandProviderItem*>

public:
CommandProvider();
virtual ~CommandProvider();
~CommandProvider() override;

virtual void rebuild() {}
virtual bool isOutDated() const { return false; }
Expand Down Expand Up @@ -149,7 +148,7 @@ class AppLinkProvider: public CommandProvider

public:
AppLinkProvider();
virtual ~AppLinkProvider();
~AppLinkProvider() override;

private slots:
void update();
Expand Down Expand Up @@ -195,7 +194,7 @@ class HistoryProvider: public CommandProvider

public:
HistoryProvider();
virtual ~HistoryProvider();
~HistoryProvider() override;

void AddCommand(const QString &command);
void clearHistory();
Expand All @@ -218,14 +217,14 @@ class CustomCommandItem: public CommandProviderItem
public:
CustomCommandItem(CustomCommandProvider *provider);

bool run() const;
bool compare(const QRegExp &regExp) const;
bool run() const override;
bool compare(const QRegExp &regExp) const override;

QString command() const { return mCommand; }
void setCommand(const QString &command);
QString exec() const { return mExec; }

virtual unsigned int rank(const QString &pattern) const;
unsigned int rank(const QString &pattern) const override;
private:
QString mCommand;
QString mExec; //!< the expanded executable (full path)
Expand Down Expand Up @@ -269,9 +268,9 @@ class MathItem: public CommandProviderItem
MathItem();
~MathItem();

bool run() const;
bool compare(const QRegExp &regExp) const;
virtual unsigned int rank(const QString &pattern) const;
bool run() const override;
bool compare(const QRegExp &regExp) const override;
unsigned int rank(const QString &pattern) const override;
private:
QScopedPointer<Parser> mParser;
mutable QString mCachedInput;
Expand All @@ -285,7 +284,7 @@ class MathProvider: public CommandProvider

public:
MathProvider();
//virtual ~MathProvider();
//~MathProvider() override;
};
#endif

Expand All @@ -303,9 +302,9 @@ class VirtualBoxItem: public CommandProviderItem
VirtualBoxItem(const QString & MachineName , const QIcon & Icon);

void setRDEPort (const QString & portNum);
bool run() const;
bool compare(const QRegExp &regExp) const;
virtual unsigned int rank(const QString &pattern) const;
bool run() const override;
bool compare(const QRegExp &regExp) const override;
unsigned int rank(const QString &pattern) const override;
private:
QString m_rdePortNum;
};
Expand Down
4 changes: 0 additions & 4 deletions yamlparser.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,10 +38,6 @@ YamlParser::YamlParser()
state = start;
}

YamlParser::~YamlParser()
{
}

void YamlParser::consumeLine(QString line)
{
static QRegExp documentStart(QSL("---\\s*(\\[\\]\\s*)?"));
Expand Down
1 change: 0 additions & 1 deletion yamlparser.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@ class YamlParser : public QObject
Q_OBJECT
public:
YamlParser();
virtual ~YamlParser();

void consumeLine(QString line);

Expand Down