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

code cosmetics

Browse Source
This commit is contained in:
hjk
2010-09-16 11:57:37 +02:00
parent 5f5d6c200d
commit 611df80edf
2 changed files with 16 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/libs/utils/historycompleter.cpp
View File

@@ -40,10 +40,10 @@ class HistoryListModel : public QAbstractListModel
public: public:
HistoryListModel(HistoryCompleter *parent); HistoryListModel(HistoryCompleter *parent);
void fetchHistory(); void fetchHistory();
int rowCount(const QModelIndex & parent = QModelIndex()) const; int rowCount(const QModelIndex &parent = QModelIndex()) const;
QVariant data( const QModelIndex & index, int role = Qt::DisplayRole) const; QVariant data( const QModelIndex &index, int role = Qt::DisplayRole) const;
void clearHistory(); void clearHistory();
void saveEntry(const QString & str); void saveEntry(const QString &str);
QStringList list; QStringList list;
HistoryCompleter *q; HistoryCompleter *q;
@@ -76,7 +76,7 @@ void HistoryListModel::fetchHistory()
reset(); reset();
} }
int HistoryListModel::rowCount(const QModelIndex & parent) const int HistoryListModel::rowCount(const QModelIndex &parent) const
{ {
if (lastSeenWidget != q->widget()) { if (lastSeenWidget != q->widget()) {
if (qobject_cast<QLineEdit *>(lastSeenWidget)) if (qobject_cast<QLineEdit *>(lastSeenWidget))
@@ -94,11 +94,13 @@ int HistoryListModel::rowCount(const QModelIndex & parent) const
return list.count(); return list.count();
} }
QVariant HistoryListModel::data(const QModelIndex & index, int role) const QVariant HistoryListModel::data(const QModelIndex &index, int role) const
{ {
if (index.row() >= list.count() || index.column() != 0 || (role != Qt::DisplayRole && role != Qt::EditRole)) if (index.row() >= list.count() || index.column() != 0)
return QVariant(); return QVariant();
return list.at(index.row()); if (role == Qt::DisplayRole || role == Qt::EditRole)
return list.at(index.row());
return QVariant();
} }
void HistoryListModel::clearHistory() void HistoryListModel::clearHistory()
@@ -107,7 +109,7 @@ void HistoryListModel::clearHistory()
reset(); reset();
} }
void HistoryListModel::saveEntry(const QString & str) void HistoryListModel::saveEntry(const QString &str)
{ {
if (list.contains(str)) if (list.contains(str))
return; return;

7
src/libs/utils/historycompleter.h
View File

@@ -39,20 +39,25 @@ QT_FORWARD_DECLARE_CLASS(QSettings)
namespace Utils { namespace Utils {
class HistoryCompleterPrivate; class HistoryCompleterPrivate;
class QTCREATOR_UTILS_EXPORT HistoryCompleter : public QCompleter class QTCREATOR_UTILS_EXPORT HistoryCompleter : public QCompleter
{ {
Q_OBJECT Q_OBJECT
public: public:
HistoryCompleter(QObject *parent = 0); HistoryCompleter(QObject *parent = 0);
QSettings *settings() const; QSettings *settings() const;
int historySize() const; int historySize() const;
int maximalHistorySize() const; int maximalHistorySize() const;
void setMaximalHistorySize(int numberOfEntries); void setMaximalHistorySize(int numberOfEntries);
public Q_SLOTS: public Q_SLOTS:
void clearHistory(); void clearHistory();
void saveHistory(); void saveHistory();
protected: protected:
HistoryCompleterPrivate *d_ptr; HistoryCompleterPrivate *d_ptr;
private: private:
Q_DECLARE_PRIVATE(HistoryCompleter); Q_DECLARE_PRIVATE(HistoryCompleter);
}; };