diff options
author | Thiago Macieira <thiago.macieira@intel.com> | 2017-04-01 23:11:55 -0700 |
---|---|---|
committer | Thiago Macieira <thiago.macieira@intel.com> | 2017-04-04 06:31:26 +0000 |
commit | bc4b0a0ace7a0479b5f75c36cb46cb874aeaeb65 (patch) | |
tree | ba5e2b5fdea473d3f948fa0a8ca1f44e59124cea | |
parent | d22bd4cf4f3a6b106f357574f0c2c076c98e6ae7 (diff) | |
download | qttools-bc4b0a0ace7a0479b5f75c36cb46cb874aeaeb65.tar.gz |
Remove unused functions
Found by Clang 5:
layout.cpp:608:26: warning: unused function 'operator<<' [-Wunused-function]
Found by GCC 6:
layout.cpp:660:8: warning: ‘QDebug qdesigner_internal::{anonymous}::Grid::debug(QDebug) const’ defined but not used [-Wunused-function]
qlayout_widget.cpp:103:7: warning: ‘QRect {anonymous}::gridItemInfo(const QFormLayout*, int)’ defined but not used [-Wunused-function]
Found by ICC 17:
signalslot_utils.cpp(169): warning #177: function "<unnamed>::ReverseClassesMemberIterator::operator++(int)" was declared but never referenced
Change-Id: I27b55fdf514247549455fffd14b17fd785680415
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
-rw-r--r-- | src/designer/src/components/signalsloteditor/signalslot_utils.cpp | 2 | ||||
-rw-r--r-- | src/designer/src/lib/shared/layout.cpp | 24 | ||||
-rw-r--r-- | src/designer/src/lib/shared/qlayout_widget.cpp | 10 |
3 files changed, 0 insertions, 36 deletions
diff --git a/src/designer/src/components/signalsloteditor/signalslot_utils.cpp b/src/designer/src/components/signalsloteditor/signalslot_utils.cpp index 42c615245..63c098d36 100644 --- a/src/designer/src/components/signalsloteditor/signalslot_utils.cpp +++ b/src/designer/src/components/signalsloteditor/signalslot_utils.cpp @@ -166,7 +166,6 @@ namespace { ReverseClassesMemberIterator(qdesigner_internal::ClassesMemberFunctions *result); ReverseClassesMemberIterator &operator*() { return *this; } - ReverseClassesMemberIterator &operator++(int) { return *this; } ReverseClassesMemberIterator &operator++() { return *this; } void operator=(const ClassNameSignaturePair &classNameSignature); @@ -200,7 +199,6 @@ namespace { SignatureIterator(QMap<QString, QString> *result) : m_result(result) {} SignatureIterator &operator*() { return *this; } - SignatureIterator &operator++(int) { return *this; } SignatureIterator &operator++() { return *this; } void operator=(const ClassNameSignaturePair &classNameSignature) { m_result->insert(classNameSignature.second, classNameSignature.first); diff --git a/src/designer/src/lib/shared/layout.cpp b/src/designer/src/lib/shared/layout.cpp index cbff00e47..839f6a4ae 100644 --- a/src/designer/src/lib/shared/layout.cpp +++ b/src/designer/src/lib/shared/layout.cpp @@ -604,10 +604,6 @@ public: void simplify(); bool locateWidget(QWidget* w, int& row, int& col, int& rowspan, int& colspan) const; - QDebug debug(QDebug str) const; - friend inline QDebug operator<<(QDebug str, const Grid &g) - { return g.debug(str); } - private: void setCell(int row, int col, QWidget* w) { m_cells[ row * m_ncols + col] = w; } void shrink(); @@ -659,26 +655,6 @@ void Grid::resize(int nrows, int ncols) } } -QDebug Grid::debug(QDebug str) const -{ - str << m_nrows << 'x' << m_ncols << '\n'; - QSet<QWidget *> widgets; - const int cellCount = m_nrows * m_ncols; - int row, col, rowspan, colspan; - for (int c = 0; c < cellCount; c++) - if (QWidget *w = m_cells[c]) - if (!widgets.contains(w)) { - widgets.insert(w); - locateWidget(w, row, col, rowspan, colspan); - str << w << " at " << row << col << rowspan << 'x' << colspan << '\n'; - } - for (int r = 0; r < m_nrows; r++) - for (int c = 0; c < m_ncols; c++) - str << "At " << r << c << cell(r, c) << '\n'; - - return str; -} - void Grid::setCells(const QRect &c, QWidget* w) { const int bottom = c.top() + c.height(); diff --git a/src/designer/src/lib/shared/qlayout_widget.cpp b/src/designer/src/lib/shared/qlayout_widget.cpp index 23a31a6dd..3719c5aa5 100644 --- a/src/designer/src/lib/shared/qlayout_widget.cpp +++ b/src/designer/src/lib/shared/qlayout_widget.cpp @@ -99,15 +99,6 @@ inline void getGridItemPosition(QFormLayout *formLayout, int index, int *row, in { qdesigner_internal::getFormLayoutItemPosition(formLayout, index, row, column, rowspan, colspan); } - -QRect gridItemInfo(const QFormLayout *form, int index) -{ - int row; - int column; - int colspan; - qdesigner_internal::getFormLayoutItemPosition(form, index, &row, &column, 0, &colspan); - return QRect(column, row, colspan, 1); -} } // namespace anonymous QT_BEGIN_NAMESPACE @@ -150,7 +141,6 @@ static QDebug debugGridLikeLayout(QDebug str, const GridLikeLayout &gl) } static inline QDebug operator<<(QDebug str, const QGridLayout &gl) { return debugGridLikeLayout(str, gl); } -static inline QDebug operator<<(QDebug str, const QFormLayout &fl) { return debugGridLikeLayout(str, fl); } static inline bool isEmptyFormLayoutRow(const QFormLayout *fl, int row) { |