Revert "Use consistent aliases for all icons."

This reverts commit 92e9c6606f6ef3ad16d2e31f9f9a8f5fa14f2c1a.

3 files changed, 5 insertions, 5 deletions

diff --git a/qt-models/divelocationmodel.cpp b/qt-models/divelocationmodel.cpp
index d6fb09573..794302fe2 100644
--- a/qt-models/divelocationmodel.cpp
+++ b/qt-models/divelocationmodel.cpp
@@ -80,7 +80,7 @@ QVariant LocationInformationModel::data(const QModelIndex &index, int role) cons
 				}
 				return textField->text();
 			}
-			case Qt::DecorationRole : return QIcon(":list-add-icon");
+			case Qt::DecorationRole : return QIcon(":plus");
 		}
 	}
 
@@ -108,7 +108,7 @@ QVariant LocationInformationModel::data(const QModelIndex &index, int role) cons
 	break;
 	case Qt::DecorationRole : {
 		if (dive_site_has_gps_location(ds))
-			return QIcon(":geotag-icon");
+			return QIcon(":geocode");
 		else
 			return QVariant();
 	}
diff --git a/qt-models/divetripmodel.cpp b/qt-models/divetripmodel.cpp
index b9693fcd2..2a0b29449 100644
--- a/qt-models/divetripmodel.cpp
+++ b/qt-models/divetripmodel.cpp
@@ -85,7 +85,7 @@ QVariant TripItem::data(int column, int role) const
 QVariant DiveItem::data(int column, int role) const
 {
 	QVariant retVal;
-	QString icon_names[4] = {":zero",":photo-in-icon", ":photo-out-icon", ":photo-in-out-icon" };
+	QString icon_names[4] = {":zero",":duringPhoto", ":outsidePhoto", ":inAndOutPhoto" };
 	struct dive *dive = get_dive_by_uniq_id(diveId);
 	if (!dive)
 		return QVariant();
diff --git a/qt-models/models.cpp b/qt-models/models.cpp
index fa9519600..c5bfda745 100644
--- a/qt-models/models.cpp
+++ b/qt-models/models.cpp
@@ -14,13 +14,13 @@
 
 const QPixmap &trashIcon()
 {
-	static QPixmap trash = QPixmap(":list-remove-icon").scaledToHeight(defaultIconMetrics().sz_small);
+	static QPixmap trash = QPixmap(":trash").scaledToHeight(defaultIconMetrics().sz_small);
 	return trash;
 }
 
 const QPixmap &trashForbiddenIcon()
 {
-	static QPixmap trash = QPixmap(":list-remove-disabled-icon").scaledToHeight(defaultIconMetrics().sz_small);
+	static QPixmap trash = QPixmap(":trashForbidden").scaledToHeight(defaultIconMetrics().sz_small);
 	return trash;
 }