From 4b8783950249962bc6f5dd64f0ed992da91e34ff Mon Sep 17 00:00:00 2001
From: Luca Bacci <luca.bacci982@gmail.com>
Date: Tue, 4 Dec 2018 17:46:27 +0100
Subject: [PATCH] port-to-gtk3: Rework Glibmm header includes (#7)

Now that we are compiling against Gtkmm3 there are missing declarations
of Glibmm identifiers due to changes in Gtkmm internal header structure.

All we have to do is bring back the declarations by including the
appropriate headers where needed.

Add necessary Glibmm header includes.

Closes #7 - Port to Gtk3
---
 include/GParted_Core.h       | 2 ++
 include/Utils.h              | 2 +-
 src/CopyBlocks.cc            | 2 ++
 src/DMRaid.cc                | 4 ++++
 src/Dialog_Partition_Info.cc | 1 +
 src/Dialog_Progress.cc       | 2 ++
 src/Dialog_Rescue_Data.cc    | 2 ++
 src/FS_Info.cc               | 2 ++
 src/FileSystem.cc            | 4 ++++
 src/GParted_Core.cc          | 3 +++
 src/LVM2_PV_Info.cc          | 3 +++
 src/Mount_Info.cc            | 1 +
 src/SWRaid_Info.cc           | 1 +
 src/TreeView_Detail.cc       | 1 +
 src/Utils.cc                 | 2 ++
 src/Win_GParted.cc           | 4 ++++
 src/btrfs.cc                 | 3 +++
 src/ext2.cc                  | 3 +++
 src/f2fs.cc                  | 4 ++++
 src/fat16.cc                 | 3 +++
 src/hfs.cc                   | 4 ++++
 src/hfsplus.cc               | 4 ++++
 src/jfs.cc                   | 4 ++++
 src/linux_swap.cc            | 4 ++++
 src/luks.cc                  | 4 ++++
 src/lvm2_pv.cc               | 3 +++
 src/nilfs2.cc                | 4 ++++
 src/ntfs.cc                  | 3 +++
 src/reiser4.cc               | 4 ++++
 src/reiserfs.cc              | 4 ++++
 src/udf.cc                   | 3 +++
 src/xfs.cc                   | 3 +++
 32 files changed, 92 insertions(+), 1 deletion(-)

diff --git a/include/GParted_Core.h b/include/GParted_Core.h
index c0b81445..571b14e7 100644
--- a/include/GParted_Core.h
+++ b/include/GParted_Core.h
@@ -29,6 +29,8 @@
 #include <parted/parted.h>
 #include <vector>
 #include <fstream>
+#include <glibmm/thread.h>
+
 
 namespace GParted
 {
diff --git a/include/Utils.h b/include/Utils.h
index ec5b4904..380d7807 100644
--- a/include/Utils.h
+++ b/include/Utils.h
@@ -28,7 +28,7 @@
 
 #include <gtkmm/label.h>
 #include <glibmm/ustring.h>
-
+#include <glibmm/spawn.h>
 #include <iostream>
 #include <ctime>
 #include <vector>
diff --git a/src/CopyBlocks.cc b/src/CopyBlocks.cc
index ff4a3ecd..2a0aa397 100644
--- a/src/CopyBlocks.cc
+++ b/src/CopyBlocks.cc
@@ -21,6 +21,8 @@
 #include "Utils.h"
 
 #include <glibmm/ustring.h>
+#include <glibmm/thread.h>
+#include <glibmm/stringutils.h>
 #include <gtkmm/main.h>
 #include <errno.h>
 
diff --git a/src/DMRaid.cc b/src/DMRaid.cc
index 7f7671b7..246db27f 100644
--- a/src/DMRaid.cc
+++ b/src/DMRaid.cc
@@ -19,6 +19,10 @@
 
 #include <limits.h>
 #include <stdlib.h>		//atoi function
+#include <glibmm/miscutils.h>
+#include <glibmm/fileutils.h>
+#include <glibmm/shell.h>
+
 
 namespace GParted
 {
diff --git a/src/Dialog_Partition_Info.cc b/src/Dialog_Partition_Info.cc
index d33f3f0e..f899ab9a 100644
--- a/src/Dialog_Partition_Info.cc
+++ b/src/Dialog_Partition_Info.cc
@@ -22,6 +22,7 @@
 #include "Utils.h"
 #include "btrfs.h"
 
+#include <glibmm/miscutils.h>
 #include <gtkmm/alignment.h>
 #include <gtkmm/viewport.h>
 #include <gdkmm/general.h>
diff --git a/src/Dialog_Progress.cc b/src/Dialog_Progress.cc
index 7db4b0d7..5ea00610 100644
--- a/src/Dialog_Progress.cc
+++ b/src/Dialog_Progress.cc
@@ -19,6 +19,8 @@
 #include "OperationDetail.h"
 #include "ProgressBar.h"
 
+#include <glibmm/miscutils.h>
+#include <glibmm/main.h>
 #include <gtkmm/stock.h>
 #include <gtkmm/main.h>
 #include <gtkmm/messagedialog.h>
diff --git a/src/Dialog_Rescue_Data.cc b/src/Dialog_Rescue_Data.cc
index 2f8a03ed..6f3b15ec 100644
--- a/src/Dialog_Rescue_Data.cc
+++ b/src/Dialog_Rescue_Data.cc
@@ -19,6 +19,8 @@
 #include "Dialog_Rescue_Data.h"
 #include "Partition.h"
 
+#include <glibmm/stringutils.h>
+#include <glibmm/shell.h>
 #include <gtk/gtk.h>
 #include <gtkmm/messagedialog.h>
 #include <gtkmm/stock.h>
diff --git a/src/FS_Info.cc b/src/FS_Info.cc
index 7e12af32..fadbbd58 100644
--- a/src/FS_Info.cc
+++ b/src/FS_Info.cc
@@ -20,6 +20,8 @@
 #include "Utils.h"
 
 #include <glibmm/ustring.h>
+#include <glibmm/miscutils.h>
+#include <glibmm/shell.h>
 #include <vector>
 
 namespace GParted
diff --git a/src/FileSystem.cc b/src/FileSystem.cc
index 718f3a98..fb9024e8 100644
--- a/src/FileSystem.cc
+++ b/src/FileSystem.cc
@@ -19,6 +19,10 @@
 
 #include <cerrno>
 #include <iostream>
+#include <glibmm/miscutils.h>
+#include <glibmm/stringutils.h>
+#include <glibmm/shell.h>
+#include <glibmm/main.h>
 #include <gtkmm/main.h>
 #include <signal.h>
 #include <fcntl.h>
diff --git a/src/GParted_Core.cc b/src/GParted_Core.cc
index 90ca83ce..de7c5713 100644
--- a/src/GParted_Core.cc
+++ b/src/GParted_Core.cc
@@ -59,6 +59,9 @@
 #include <sys/types.h>
 #include <stdlib.h>
 #include <unistd.h>
+#include <glibmm/miscutils.h>
+#include <glibmm/fileutils.h>
+#include <glibmm/shell.h>
 #include <gtkmm/messagedialog.h>
 #include <gtkmm/main.h>
 
diff --git a/src/LVM2_PV_Info.cc b/src/LVM2_PV_Info.cc
index f0e2b694..9dfb1ee9 100644
--- a/src/LVM2_PV_Info.cc
+++ b/src/LVM2_PV_Info.cc
@@ -17,6 +17,9 @@
 #include "LVM2_PV_Info.h"
 #include "BlockSpecial.h"
 
+#include <glibmm/miscutils.h>
+
+
 namespace GParted
 {
 
diff --git a/src/Mount_Info.cc b/src/Mount_Info.cc
index 09936c57..9ef69f1a 100644
--- a/src/Mount_Info.cc
+++ b/src/Mount_Info.cc
@@ -19,6 +19,7 @@
 #include "Utils.h"
 
 #include <glibmm/ustring.h>
+#include <glibmm/fileutils.h>
 #include <stdio.h>
 #include <limits.h>
 #include <stdlib.h>
diff --git a/src/SWRaid_Info.cc b/src/SWRaid_Info.cc
index ef4b0efd..7017fc1c 100644
--- a/src/SWRaid_Info.cc
+++ b/src/SWRaid_Info.cc
@@ -19,6 +19,7 @@
 #include "Utils.h"
 
 #include <glibmm/ustring.h>
+#include <glibmm/miscutils.h>
 #include <fstream>
 
 namespace GParted
diff --git a/src/TreeView_Detail.cc b/src/TreeView_Detail.cc
index c95d4ebc..1a99f479 100644
--- a/src/TreeView_Detail.cc
+++ b/src/TreeView_Detail.cc
@@ -24,6 +24,7 @@
 #include <gtkmm/cellrenderer.h>
 #include <gtkmm/cellrenderertext.h>
 #include <pangomm/layout.h>
+#include <glibmm/miscutils.h>
 #include <glibmm/ustring.h>
 
 namespace GParted
diff --git a/src/Utils.cc b/src/Utils.cc
index 0af62890..509bd7f6 100644
--- a/src/Utils.cc
+++ b/src/Utils.cc
@@ -28,6 +28,8 @@
 #include <cerrno>
 #include <sys/statvfs.h>
 #include <glibmm/ustring.h>
+#include <glibmm/stringutils.h>
+#include <glibmm/shell.h>
 #include <gtkmm/main.h>
 #include <fcntl.h>
 #include <sys/types.h>
diff --git a/src/Win_GParted.cc b/src/Win_GParted.cc
index 4ed8cb47..370271e1 100644
--- a/src/Win_GParted.cc
+++ b/src/Win_GParted.cc
@@ -54,6 +54,10 @@
 #include <gtkmm/main.h>
 #include <gtkmm/separator.h>
 #include <glibmm/ustring.h>
+#include <glibmm/miscutils.h>
+#include <glibmm/shell.h>
+#include <glibmm/main.h>
+
 
 namespace GParted
 {
diff --git a/src/btrfs.cc b/src/btrfs.cc
index 356af2b2..671311cf 100644
--- a/src/btrfs.cc
+++ b/src/btrfs.cc
@@ -22,6 +22,9 @@
 #include "Partition.h"
 
 #include <ctype.h>
+#include <glibmm/miscutils.h>
+#include <glibmm/shell.h>
+
 
 namespace GParted
 {
diff --git a/src/ext2.cc b/src/ext2.cc
index 645d14dd..df86b2ed 100644
--- a/src/ext2.cc
+++ b/src/ext2.cc
@@ -22,6 +22,9 @@
 #include "Utils.h"
 
 #include <glibmm/ustring.h>
+#include <glibmm/miscutils.h>
+#include <glibmm/shell.h>
+
 
 namespace GParted
 {
diff --git a/src/f2fs.cc b/src/f2fs.cc
index c315900c..9bb945c3 100644
--- a/src/f2fs.cc
+++ b/src/f2fs.cc
@@ -18,6 +18,10 @@
 #include "FileSystem.h"
 #include "Partition.h"
 
+#include <glibmm/miscutils.h>
+#include <glibmm/shell.h>
+
+
 namespace GParted
 {
 
diff --git a/src/fat16.cc b/src/fat16.cc
index 032b7ad4..d7c4e3b7 100644
--- a/src/fat16.cc
+++ b/src/fat16.cc
@@ -19,6 +19,9 @@
 #include "FileSystem.h"
 #include "Partition.h"
 
+#include <glibmm/miscutils.h>
+#include <glibmm/shell.h>
+
 /*****
 //For some reason unknown, this works without these include statements.
 #include <stdlib.h>    // 'C' library for mkstemp()
diff --git a/src/hfs.cc b/src/hfs.cc
index 1c1be0c1..ac835b7e 100644
--- a/src/hfs.cc
+++ b/src/hfs.cc
@@ -19,6 +19,10 @@
 #include "FileSystem.h"
 #include "Partition.h"
 
+#include <glibmm/miscutils.h>
+#include <glibmm/shell.h>
+
+
 namespace GParted
 {
 
diff --git a/src/hfsplus.cc b/src/hfsplus.cc
index da39b740..1320e6a4 100644
--- a/src/hfsplus.cc
+++ b/src/hfsplus.cc
@@ -19,6 +19,10 @@
 #include "FileSystem.h"
 #include "Partition.h"
 
+#include <glibmm/miscutils.h>
+#include <glibmm/shell.h>
+
+
 namespace GParted
 {
 
diff --git a/src/jfs.cc b/src/jfs.cc
index d5c9ec1e..720eb877 100644
--- a/src/jfs.cc
+++ b/src/jfs.cc
@@ -19,6 +19,10 @@
 #include "FileSystem.h"
 #include "Partition.h"
 
+#include <glibmm/miscutils.h>
+#include <glibmm/shell.h>
+
+
 namespace GParted
 {
 
diff --git a/src/linux_swap.cc b/src/linux_swap.cc
index 3b6d0546..86954cfe 100644
--- a/src/linux_swap.cc
+++ b/src/linux_swap.cc
@@ -21,6 +21,10 @@
 #include "Partition.h"
 
 #include <cerrno>
+#include <glibmm/miscutils.h>
+#include <glibmm/stringutils.h>
+#include <glibmm/shell.h>
+
 
 namespace GParted
 {
diff --git a/src/luks.cc b/src/luks.cc
index 0a803e5a..fa72e5c9 100644
--- a/src/luks.cc
+++ b/src/luks.cc
@@ -19,6 +19,10 @@
 #include "Utils.h"
 #include "luks.h"
 
+#include <glibmm/miscutils.h>
+#include <glibmm/shell.h>
+
+
 namespace GParted
 {
 
diff --git a/src/lvm2_pv.cc b/src/lvm2_pv.cc
index 69193e30..05977787 100644
--- a/src/lvm2_pv.cc
+++ b/src/lvm2_pv.cc
@@ -19,6 +19,9 @@
 #include "lvm2_pv.h"
 #include "Partition.h"
 
+#include <glibmm/shell.h>
+
+
 namespace GParted
 {
 
diff --git a/src/nilfs2.cc b/src/nilfs2.cc
index a2d2bdbf..f6921d83 100644
--- a/src/nilfs2.cc
+++ b/src/nilfs2.cc
@@ -18,6 +18,10 @@
 #include "FileSystem.h"
 #include "Partition.h"
 
+#include <glibmm/miscutils.h>
+#include <glibmm/shell.h>
+
+
 namespace GParted
 {
 
diff --git a/src/ntfs.cc b/src/ntfs.cc
index 87f74092..ed54b98c 100644
--- a/src/ntfs.cc
+++ b/src/ntfs.cc
@@ -22,6 +22,9 @@
 #include "Utils.h"
 
 #include <glibmm/ustring.h>
+#include <glibmm/miscutils.h>
+#include <glibmm/shell.h>
+
 
 namespace GParted
 {
diff --git a/src/reiser4.cc b/src/reiser4.cc
index c0a75354..30e68e63 100644
--- a/src/reiser4.cc
+++ b/src/reiser4.cc
@@ -19,6 +19,10 @@
 #include "FileSystem.h"
 #include "Partition.h"
 
+#include <glibmm/miscutils.h>
+#include <glibmm/shell.h>
+
+
 namespace GParted
 {
 
diff --git a/src/reiserfs.cc b/src/reiserfs.cc
index d77dfd4b..2efdfbbf 100644
--- a/src/reiserfs.cc
+++ b/src/reiserfs.cc
@@ -19,6 +19,10 @@
 #include "FileSystem.h"
 #include "Partition.h"
 
+#include <glibmm/miscutils.h>
+#include <glibmm/shell.h>
+
+
 namespace GParted
 {
 
diff --git a/src/udf.cc b/src/udf.cc
index 46c91d60..4903eec6 100644
--- a/src/udf.cc
+++ b/src/udf.cc
@@ -22,6 +22,9 @@
 #include <stddef.h>
 #include <stdlib.h>
 #include <glibmm/ustring.h>
+#include <glibmm/miscutils.h>
+#include <glibmm/shell.h>
+
 
 namespace GParted
 {
diff --git a/src/xfs.cc b/src/xfs.cc
index 9c753c7b..56f99cfb 100644
--- a/src/xfs.cc
+++ b/src/xfs.cc
@@ -22,6 +22,9 @@
 #include "Utils.h"
 
 #include <glibmm/ustring.h>
+#include <glibmm/miscutils.h>
+#include <glibmm/shell.h>
+
 
 namespace GParted
 {