Tiny cleanup

qreal · Feb 27, 2017 · 5514c73 · 5514c73
1 parent af237e5
commit 5514c73
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 11 deletions.
diff --git a/qrmc/diagram.cpp b/qrmc/diagram.cpp
@@ -125,11 +125,10 @@ Editor* Diagram::editor() const
 
 Type* Diagram::findType(const QString &name) const
 {
-	if (mTypes.contains(name)) {
-		return mTypes[name];
-	}
-
-	return mEditor.findType(name);
+	auto res = mTypes.value(name, nullptr);
+	if (!res)
+	       res = mEditor.findType(name);
+	return res;
 }
 
 const QMap<QString, Type *> &Diagram::types() const

diff --git a/qrmc/editor.cpp b/qrmc/editor.cpp
@@ -117,11 +117,7 @@ QSet<EnumType*> Editor::getAllEnumTypes() const
 
 Diagram* Editor::findDiagram(const QString &name) const
 {
-	if (mDiagrams.contains(name)) {
-		return mDiagrams[name];
-	}
-
-	return nullptr;
+	return mDiagrams.value(name, nullptr);
 }
 
 QStringList Editor::getAllPortNames() const

diff --git a/qrutils/pluginManagers/details/pluginManagerImplementation.cpp b/qrutils/pluginManagers/details/pluginManagerImplementation.cpp
@@ -132,5 +132,5 @@ QString PluginManagerImplementation::fileName(QObject *plugin) const
 
 QObject *PluginManagerImplementation::pluginByName(const QString &pluginName) const
 {
-	return mFileNameAndPlugin[pluginName];
+	return mFileNameAndPlugin.value(pluginName, nullptr);
 }