Katana_mirror/katie
1
0
Fork 0
mirror of https://bitbucket.org/smil3y/katie.git synced 2025-02-23 18:32:55 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

apply upstream commit

Browse source 
9b67d89c24

Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
This commit is contained in:
Ivailo Monev 2019-05-05 05:11:09 +00:00
parent df49f5412e
commit 8db0d36301
15 changed files with 19 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/core/kernel/qabstractitemmodel.cpp
View file

@ -664,7 +664,7 @@ void QAbstractItemModelPrivate::itemsAboutToBeMoved(const QModelIndex &srcParent
column value depending on the value of \a orientation. The indexes may also be moved to a different parent if \a parent
differs from the existing parent for the index.
*/
void QAbstractItemModelPrivate::movePersistentIndexes(QVector<QPersistentModelIndexData *> indexes, int change, const QModelIndex &parent, Qt::Orientation orientation)
void QAbstractItemModelPrivate::movePersistentIndexes(const QVector<QPersistentModelIndexData *> &indexes, int change, const QModelIndex &parent, Qt::Orientation orientation)
{
QVector<QPersistentModelIndexData *>::const_iterator it;
const QVector<QPersistentModelIndexData *>::const_iterator begin = indexes.constBegin();

2
src/core/kernel/qabstractitemmodel_p.h
View file

@ -79,7 +79,7 @@ class Q_CORE_EXPORT QAbstractItemModelPrivate : public QObjectPrivate
public:
QAbstractItemModelPrivate() : QObjectPrivate(), supportedDragActions(-1), roleNames(defaultRoleNames()) {}
void removePersistentIndexData(QPersistentModelIndexData *data);
void movePersistentIndexes(QVector<QPersistentModelIndexData *> indexes, int change, const QModelIndex &parent, Qt::Orientation orientation);
void movePersistentIndexes(const QVector<QPersistentModelIndexData *> &indexes, int change, const QModelIndex &parent, Qt::Orientation orientation);
void rowsAboutToBeInserted(const QModelIndex &parent, int first, int last);
void rowsInserted(const QModelIndex &parent, int first, int last);
void rowsAboutToBeRemoved(const QModelIndex &parent, int first, int last);

4
src/gui/dialogs/qfiledialog.cpp
View file

@ -910,7 +910,7 @@ QStringList QFileDialogPrivate::typedFiles() const
return addDefaultSuffixToFiles(files);
}
QStringList QFileDialogPrivate::addDefaultSuffixToFiles(const QStringList filesToFix) const
QStringList QFileDialogPrivate::addDefaultSuffixToFiles(const QStringList &filesToFix) const
{
QStringList files;
for (int i=0; i<filesToFix.size(); ++i) {
@ -2918,7 +2918,7 @@ void QFileDialogPrivate::_q_rowsInserted(const QModelIndex &parent)
return;
}
void QFileDialogPrivate::_q_fileRenamed(const QString &path, const QString oldName, const QString newName)
void QFileDialogPrivate::_q_fileRenamed(const QString &path, const QString &oldName, const QString &newName)
{
if (fileMode == QFileDialog::Directory || fileMode == QFileDialog::DirectoryOnly) {
if (path == rootPath() && lineEdit()->text() == oldName)

6
src/gui/dialogs/qfiledialog_p.h
View file

@ -125,7 +125,7 @@ public:
static QString workingDirectory(const QString &path);
static QString initialSelection(const QString &path);
QStringList typedFiles() const;
QStringList addDefaultSuffixToFiles(const QStringList filesToFix) const;
QStringList addDefaultSuffixToFiles(const QStringList &filesToFix) const;
bool removeDirectory(const QString &path);
inline QModelIndex mapToSource(const QModelIndex &index) const;
@ -188,8 +188,8 @@ public:
void _q_selectionChanged();
void _q_goToUrl(const QUrl &url);
void _q_autoCompleteFileName(const QString &);
void _q_rowsInserted(const QModelIndex & parent);
void _q_fileRenamed(const QString &path, const QString oldName, const QString newName);
void _q_rowsInserted(const QModelIndex &parent);
void _q_fileRenamed(const QString &path, const QString &oldName, const QString &newName);
// layout
#ifndef QT_NO_PROXYMODEL

2
src/gui/dialogs/qfilesystemmodel_p.h
View file

@ -155,7 +155,7 @@ public:
}
// children shouldn't normally be accessed directly, use node()
inline int visibleLocation(QString childName) {
inline int visibleLocation(const QString &childName) {
return visibleChildren.indexOf(childName);
}
void updateIcon(QFileIconProvider *iconProvider, const QString &path) {

2
src/gui/graphicsview/qgraphicsanchorlayout_p.cpp
View file

@ -2034,7 +2034,7 @@ void QGraphicsAnchorLayoutPrivate::calculateGraphs()
// ### Maybe getGraphParts could return the variables when traversing, at least
// for trunk...
QList<AnchorData *> getVariables(QList<QSimplexConstraint *> constraints)
QList<AnchorData *> getVariables(const QList<QSimplexConstraint *> &constraints)
{
QSet<AnchorData *> variableSet;
for (int i = 0; i < constraints.count(); ++i) {

2
src/gui/graphicsview/qsimplex_p.cpp
View file

@ -126,7 +126,7 @@ void QSimplex::clearDataStructures()
This method sets the new constraints, normalizes them, creates the simplex matrix
and runs the first simplex phase.
*/
bool QSimplex::setConstraints(const QList<QSimplexConstraint *> newConstraints)
bool QSimplex::setConstraints(const QList<QSimplexConstraint *> &newConstraints)
{
////////////////////////////
// Reset to initial state //

2
src/gui/graphicsview/qsimplex_p.h
View file

@ -155,7 +155,7 @@ public:
qreal solveMin();
qreal solveMax();
bool setConstraints(const QList<QSimplexConstraint *> constraints);
bool setConstraints(const QList<QSimplexConstraint *> &constraints);
void setObjective(QSimplexConstraint *objective);
void dumpMatrix();

2
src/gui/util/qcompleter_p.h
View file

@ -108,7 +108,7 @@ class QIndexMapper
public:
QIndexMapper() : v(false), f(0), t(-1) { }
QIndexMapper(int f, int t) : v(false), f(f), t(t) { }
QIndexMapper(QVector<int> vec) : v(true), vector(vec), f(-1), t(-1) { }
QIndexMapper(const QVector<int> &vec) : v(true), vector(vec), f(-1), t(-1) { }
inline int count() const { return v ? vector.count() : t - f + 1; }
inline int operator[] (int index) const { return v ? vector[index] : f + index; }

2
src/gui/widgets/qlineedit.h
View file

@ -233,7 +233,7 @@ private:
Q_PRIVATE_SLOT(d_func(), void _q_textEdited(const QString &))
Q_PRIVATE_SLOT(d_func(), void _q_cursorPositionChanged(int, int))
#ifndef QT_NO_COMPLETER
Q_PRIVATE_SLOT(d_func(), void _q_completionHighlighted(QString))
Q_PRIVATE_SLOT(d_func(), void _q_completionHighlighted(const QString&))
#endif
#ifdef QT_KEYPAD_NAVIGATION
Q_PRIVATE_SLOT(d_func(), void _q_editFocusChange(bool))

4
src/gui/widgets/qlineedit_p.cpp
View file

@ -76,8 +76,7 @@ QRect QLineEditPrivate::cursorRect() const
}
#ifndef QT_NO_COMPLETER
void QLineEditPrivate::_q_completionHighlighted(QString newText)
void QLineEditPrivate::_q_completionHighlighted(const QString &newText)
{
Q_Q(QLineEdit);
if (control->completer()->completionMode() != QCompleter::InlineCompletion) {
@ -90,7 +89,6 @@ void QLineEditPrivate::_q_completionHighlighted(QString newText)
control->moveCursor(c, true);
}
}
#endif // QT_NO_COMPLETER
void QLineEditPrivate::_q_handleWindowActivate()

2
src/gui/widgets/qlineedit_p.h
View file

@ -125,7 +125,7 @@ public:
void _q_selectionChanged();
void _q_updateNeeded(const QRect &);
#ifndef QT_NO_COMPLETER
void _q_completionHighlighted(QString);
void _q_completionHighlighted(const QString&);
#endif
#ifndef QT_NO_DRAGANDDROP
QPoint dndPos;

2
src/plugins/sqldrivers/psql/qsql_psql.cpp
View file

@ -549,7 +549,7 @@ static QString qReplacePlaceholderMarkers(const QString &query)
return result;
}
static QString qCreateParamString(const QVector<QVariant> boundValues, const QSqlDriver *driver)
static QString qCreateParamString(const QVector<QVariant> &boundValues, const QSqlDriver *driver)
{
if (boundValues.isEmpty())
return QString();

4
src/tools/uic/cpp/cppwriteicondata.cpp
View file

@ -50,7 +50,7 @@ QT_BEGIN_NAMESPACE
namespace CPP {
static QByteArray transformImageData(QString data)
static QByteArray transformImageData(const QString &data)
{
int baSize = data.length() / 2;
uchar *ba = new uchar[baSize];
@ -74,7 +74,7 @@ static QByteArray transformImageData(QString data)
return ret;
}
static QByteArray unzipXPM(QString data, ulong& length)
static QByteArray unzipXPM(const QString &data, ulong& length)
{
#ifndef QT_NO_COMPRESS
const int lengthOffset = 4;

2
util/qlalr/main.cpp
View file

@ -83,7 +83,7 @@ int main (int argc, char *argv[])
QStringList args = app.arguments ();
args.removeFirst ();
foreach (QString arg, args)
foreach (const QString &arg, args)
{
if (arg == QLatin1String ("-h") || arg == QLatin1String ("--help"))
help_me ();