Use DATADIR/plasma/avatars instead of DATADIR/plasma-avatars

Given we have DATADIR/plasma already, this makes more sense.

kcms/users/CMakeLists.txt

@@ -3,5 +3,5 @@ add_definitions(-DTRANSLATION_DOMAIN=\"kcm_users\")
 add_subdirectory(src)
 
 install( FILES kcm_users.desktop  DESTINATION  ${SERVICES_INSTALL_DIR})
-install( DIRECTORY avatars/ DESTINATION ${DATA_INSTALL_DIR}/plasma-avatars )
+install( DIRECTORY avatars/ DESTINATION ${DATA_INSTALL_DIR}/plasma/avatars )
 kpackage_install_package(package kcm_users kcms)

kcms/users/src/kcm.cpp

@@ -58,7 +58,7 @@ KCMUser::KCMUser(QObject *parent, const QVariantList &args)
     auto fm = QFontMetrics(font);
     setColumnWidth(fm.capHeight()*30);
 
-    const auto dirs = QStandardPaths::locateAll(QStandardPaths::GenericDataLocation, QStringLiteral("plasma-avatars"), QStandardPaths::LocateDirectory);
+    const auto dirs = QStandardPaths::locateAll(QStandardPaths::GenericDataLocation, QStringLiteral("plasma/avatars"), QStandardPaths::LocateDirectory);
     for (const auto& dir : dirs) {
         QDirIterator it(
             dir,
@@ -114,7 +114,7 @@ QString KCMUser::initializeString(const QString& stringToGrabInitialsOf)
     if (stringToGrabInitialsOf.isEmpty()) return "";
 
     auto normalized = stringToGrabInitialsOf.normalized(QString::NormalizationForm_D);
-    if (normalized.contains(" ")) { 
+    if (normalized.contains(" ")) {
         QStringList split = normalized.split(" ");
         auto first = split.first();
         auto last = split.last();