aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMontel Laurent <[email protected]>2017-05-02 21:34:20 +0200
committerMontel Laurent <[email protected]>2017-05-02 21:34:20 +0200
commita22b1692e442642594f6e4e95ab9366af0456199 (patch)
tree3960424b5e1d08003b9dd3b0e206ec17182b9598
parentdd7dbc0c702e64ea8dd7263802b11fbd34cb5bfa (diff)
Remove deprecated method
-rw-r--r--CMakeLists.txt1
-rw-r--r--src/addresseelist.cpp4
2 files changed, 3 insertions, 2 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index fb71181..d57112f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -40,6 +40,7 @@ find_package(KF5 ${KF5_VERSION} REQUIRED COMPONENTS CoreAddons I18n Config Codec
add_definitions(-DTRANSLATION_DOMAIN=\"kcontacts5\")
add_definitions("-DQT_NO_CAST_FROM_ASCII -DQT_NO_CAST_TO_ASCII")
add_definitions( -DQT_NO_NARROWING_CONVERSIONS_IN_CONNECT )
+add_definitions( -DQT_DISABLE_DEPRECATED_BEFORE=0x060000 )
add_subdirectory(src)
if(BUILD_TESTING)
diff --git a/src/addresseelist.cpp b/src/addresseelist.cpp
index 8e77af1..e04608a 100644
--- a/src/addresseelist.cpp
+++ b/src/addresseelist.cpp
@@ -333,7 +333,7 @@ void AddresseeList::sortByField(Field *field)
KContacts::FieldSortMode *mode = new KContacts::FieldSortMode(sActiveField, !d->mReverseSorting);
KContacts::Addressee::setSortMode(mode);
- qSort(*this);
+ std::sort((*this).begin(), (*this).end());
KContacts::Addressee::setSortMode(nullptr);
delete mode;
@@ -346,7 +346,7 @@ void AddresseeList::sortByMode(SortMode *mode)
}
KContacts::Addressee::setSortMode(mode);
- qSort(*this);
+ std::sort((*this).begin(), (*this).end());
KContacts::Addressee::setSortMode(nullptr);
}