1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

qtriangulator: Remove a bunch of dead code

Browse Source 
There is no sense in testing the 'm_array' pointer against null, as the
memory was allocated using the 'new' operator. The exception will be
generated in the case of memory allocation error.

Task-number: QTBUG-71156
Change-Id: Ib76d16d38d2b0b0c4c9fae3d8d5bdd86af0d08ff
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
This commit is contained in:
Ivan Komissarov 2018-10-21 12:18:25 +02:00
parent 1bb8627f8f
commit 903666a602
1 changed files with 8 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/gui/painting/qtriangulator.cpp
View File

@ -472,7 +472,7 @@ class QInt64Set
{ {
public: public:
inline QInt64Set(int capacity = 64); inline QInt64Set(int capacity = 64);
inline ~QInt64Set() {if (m_array) delete[] m_array;} inline ~QInt64Set() {delete[] m_array;}
inline bool isValid() const {return m_array;} inline bool isValid() const {return m_array;}
void insert(quint64 key); void insert(quint64 key);
bool contains(quint64 key) const; bool contains(quint64 key) const;
@ -493,10 +493,7 @@ inline QInt64Set::QInt64Set(int capacity)
{ {
m_capacity = primeForCount(capacity); m_capacity = primeForCount(capacity);
m_array = new quint64[m_capacity]; m_array = new quint64[m_capacity];
if (m_array) clear();
clear();
else
m_capacity = 0;
} }
bool QInt64Set::rehash(int capacity) bool QInt64Set::rehash(int capacity)
@ -506,28 +503,19 @@ bool QInt64Set::rehash(int capacity)
m_capacity = capacity; m_capacity = capacity;
m_array = new quint64[m_capacity]; m_array = new quint64[m_capacity];
if (m_array) { clear();
clear(); for (int i = 0; i < oldCapacity; ++i) {
if (oldArray) { if (oldArray[i] != UNUSED)
for (int i = 0; i < oldCapacity; ++i) { insert(oldArray[i]);
if (oldArray[i] != UNUSED)
insert(oldArray[i]);
}
delete[] oldArray;
}
return true;
} else {
m_capacity = oldCapacity;
m_array = oldArray;
return false;
} }
delete[] oldArray;
return true;
} }
void QInt64Set::insert(quint64 key) void QInt64Set::insert(quint64 key)
{ {
if (m_count > 3 * m_capacity / 4) if (m_count > 3 * m_capacity / 4)
rehash(primeForCount(2 * m_capacity)); rehash(primeForCount(2 * m_capacity));
Q_ASSERT_X(m_array, "QInt64Hash<T>::insert", "Hash set not allocated.");
int index = int(key % m_capacity); int index = int(key % m_capacity);
for (int i = 0; i < m_capacity; ++i) { for (int i = 0; i < m_capacity; ++i) {
index += i; index += i;
@ -546,7 +534,6 @@ void QInt64Set::insert(quint64 key)
bool QInt64Set::contains(quint64 key) const bool QInt64Set::contains(quint64 key) const
{ {
Q_ASSERT_X(m_array, "QInt64Hash<T>::contains", "Hash set not allocated.");
int index = int(key % m_capacity); int index = int(key % m_capacity);
for (int i = 0; i < m_capacity; ++i) { for (int i = 0; i < m_capacity; ++i) {
index += i; index += i;
@ -562,7 +549,6 @@ bool QInt64Set::contains(quint64 key) const
inline void QInt64Set::clear() inline void QInt64Set::clear()
{ {
Q_ASSERT_X(m_array, "QInt64Hash<T>::clear", "Hash set not allocated.");
for (int i = 0; i < m_capacity; ++i) for (int i = 0; i < m_capacity; ++i)
m_array[i] = UNUSED; m_array[i] = UNUSED;
m_count = 0; m_count = 0;