From be1b2c95d4131dc36fee2fcbef9e77694c0ec5b4 Mon Sep 17 00:00:00 2001
From: TheAssassin <theassassin@assassinate-you.net>
Date: Fri, 9 Nov 2018 02:14:48 +0100
Subject: [PATCH] Move type definitions into class

---
 src/core/desktopfilereader.cpp | 8 +-------
 src/core/desktopfilereader.h   | 9 ++++++++-
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/src/core/desktopfilereader.cpp b/src/core/desktopfilereader.cpp
index 2e5d00a..aa04620 100644
--- a/src/core/desktopfilereader.cpp
+++ b/src/core/desktopfilereader.cpp
@@ -14,12 +14,6 @@ namespace bf = boost::filesystem;
 namespace linuxdeploy {
     namespace core {
         namespace desktopfile {
-            // describes a single section
-            typedef std::unordered_map<std::string, DesktopFileEntry> section_t;
-
-            // describes all sections in the desktop file
-            typedef std::unordered_map<std::string, section_t> sections_t;
-
             class DesktopFileReader::PrivateData {
             public:
                 bf::path path;
@@ -152,7 +146,7 @@ namespace linuxdeploy {
                 return d->path;
             }
 
-            section_t DesktopFileReader::operator[](const std::string& name) {
+            DesktopFileReader::section_t DesktopFileReader::operator[](const std::string& name) {
                 auto it = d->sections.find(name);
 
                 // the map would lazy-initialize a new entry in case the section doesn't exist
diff --git a/src/core/desktopfilereader.h b/src/core/desktopfilereader.h
index 8857feb..d879cf7 100644
--- a/src/core/desktopfilereader.h
+++ b/src/core/desktopfilereader.h
@@ -21,6 +21,13 @@ namespace linuxdeploy {
 
                 std::shared_ptr<PrivateData> d;
 
+            public:
+                // describes a single section
+                typedef std::unordered_map<std::string, DesktopFileEntry> section_t;
+
+                // describes all sections in the desktop file
+                typedef std::unordered_map<std::string, section_t> sections_t;
+
             public:
                 // default constructor
                 DesktopFileReader();
@@ -55,7 +62,7 @@ namespace linuxdeploy {
 
                 // get a specific section from the parsed data
                 // throws std::range_error if section does not exist
-                std::unordered_map<std::string, DesktopFileEntry> operator[](const std::string& name);
+                section_t operator[](const std::string& name);
             };
         }
     }