Resolved merge conflicts.

This comment format is just tiring for the eyes. Imagine being on 1080p and not being able to read more than 5 method definitions due to comments.

1 files changed, 35 insertions, 30 deletions

diff --git a/src/serverdata.cpp b/src/serverdata.cpp
index b8a08df8..5b3d139d 100644
--- a/src/serverdata.cpp
+++ b/src/serverdata.cpp
@@ -3,38 +3,43 @@
 #include <QUrl>
 #include <QVariant>
 
-namespace server {
-  bool ServerData::get_feature(const BASE_FEATURE_SET &f_feature) const
+namespace server
+{
+bool ServerData::get_feature(const BASE_FEATURE_SET &f_feature) const
+{
+  return get_feature(QVariant::fromValue(f_feature).toString());
+}
+
+bool ServerData::get_feature(const QString &f_feature) const
+{
+  return m_features.contains(f_feature, Qt::CaseInsensitive);
+}
+
+void ServerData::set_features(const QStringList &f_feature_list)
+{
+  m_features = f_feature_list;
+}
+
+void ServerData::set_server_software(const QString &newServer_software)
+{
+  m_server_software = newServer_software;
+}
+
+QString ServerData::get_asset_url() const
+{
+  return m_asset_url;
+}
+
+void ServerData::set_asset_url(const QString &f_asset_url)
+{
+  QUrl l_asset_url = QUrl::fromPercentEncoding(f_asset_url.toUtf8());
+
+  if (l_asset_url.isValid())
   {
-    return get_feature(QVariant::fromValue(f_feature).toString());
+    m_asset_url = l_asset_url.toString();
   }
 
-  bool ServerData::get_feature(const QString &f_feature) const
-  {
-    return m_features.contains(f_feature, Qt::CaseInsensitive);
-  }
-
-  void ServerData::set_features(const QStringList &f_feature_list)
-  {
-    m_features = f_feature_list;
-  }
-
-  void ServerData::set_server_software(const QString &newServer_software)
-  {
-    m_server_software = newServer_software;
-  }
-
-  QString ServerData::get_asset_url() const { return m_asset_url; }
-
-  void ServerData::set_asset_url(const QString &f_asset_url)
-  {
-    QUrl l_asset_url = QUrl::fromPercentEncoding(f_asset_url.toUtf8());
-
-    if (l_asset_url.isValid()) {
-      m_asset_url = l_asset_url.toString();
-    }
-
-    m_asset_url = f_asset_url;
-  }
+  m_asset_url = f_asset_url;
+}
 
 } // namespace server