|
1
|
+Description: Dynamic exception specs are deprecated since C++11 and fail with C++17 (gcc-11).
|
|
2
|
+Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
|
|
3
|
+
|
|
4
|
+
|
|
5
|
+--- a/src/acl_manager.hpp
|
|
6
|
++++ b/src/acl_manager.hpp
|
|
7
|
+@@ -169,7 +169,7 @@
|
|
8
|
+ const static int PERM_WRITE = 1;
|
|
9
|
+ const static int PERM_EXEC = 2;
|
|
10
|
+
|
|
11
|
+- ACLManager(const string& filename) throw (ACLManagerException);
|
|
12
|
++ ACLManager(const string& filename);
|
|
13
|
+
|
|
14
|
+ string get_acl_access() const { return _text_acl_access; }
|
|
15
|
+ string get_acl_default() const { return _text_acl_default; }
|
|
16
|
+--- a/src/acl_manager.cpp
|
|
17
|
++++ b/src/acl_manager.cpp
|
|
18
|
+@@ -19,7 +19,7 @@
|
|
19
|
+ #include "acl_manager.hpp"
|
|
20
|
+
|
|
21
|
+
|
|
22
|
+-ACLManager::ACLManager(const string& filename) throw (ACLManagerException)
|
|
23
|
++ACLManager::ACLManager(const string& filename)
|
|
24
|
+ : _filename(filename)
|
|
25
|
+ {
|
|
26
|
+ // Get first UGO permissions and info about the file
|
|
27
|
+--- a/src/xattr_manager.cpp
|
|
28
|
++++ b/src/xattr_manager.cpp
|
|
29
|
+@@ -18,7 +18,7 @@
|
|
30
|
+ */
|
|
31
|
+ #include "xattr_manager.hpp"
|
|
32
|
+
|
|
33
|
+-XAttrManager::XAttrManager(const Glib::ustring& filename) throw (XAttrManagerException)
|
|
34
|
++XAttrManager::XAttrManager(const Glib::ustring& filename)
|
|
35
|
+ : _filename(filename)
|
|
36
|
+ {
|
|
37
|
+ // Check it is an ordinary file or a directory
|
|
38
|
+@@ -41,7 +41,7 @@
|
|
39
|
+ }
|
|
40
|
+
|
|
41
|
+ // We should find better ways to test xattr support
|
|
42
|
+-void XAttrManager::read_test() throw (XAttrManagerException)
|
|
43
|
++void XAttrManager::read_test()
|
|
44
|
+ {
|
|
45
|
+ Glib::ustring qualified_attr_name = "user.test";
|
|
46
|
+ int buffer_length;
|
|
47
|
+@@ -62,7 +62,7 @@
|
|
48
|
+ delete[] buffer;
|
|
49
|
+ }
|
|
50
|
+
|
|
51
|
+-std::vector<std::string> XAttrManager::get_xattr_list() throw (XAttrManagerException)
|
|
52
|
++std::vector<std::string> XAttrManager::get_xattr_list()
|
|
53
|
+ {
|
|
54
|
+ std::vector<std::string> result;
|
|
55
|
+
|
|
56
|
+@@ -133,7 +133,7 @@
|
|
57
|
+ return result;
|
|
58
|
+ }
|
|
59
|
+
|
|
60
|
+-std::string XAttrManager::get_attribute_value(const std::string& attr_name) throw (XAttrManagerException)
|
|
61
|
++std::string XAttrManager::get_attribute_value(const std::string& attr_name)
|
|
62
|
+ {
|
|
63
|
+ int size = 30;
|
|
64
|
+ char* buffer = new char[size];
|
|
65
|
+--- a/src/xattr_manager.hpp
|
|
66
|
++++ b/src/xattr_manager.hpp
|
|
67
|
+@@ -60,7 +60,7 @@
|
|
68
|
+ public:
|
|
69
|
+ typedef std::map<std::string, std::string> attributes_t;
|
|
70
|
+
|
|
71
|
+- XAttrManager(const Glib::ustring& filename) throw (XAttrManagerException);
|
|
72
|
++ XAttrManager(const Glib::ustring& filename);
|
|
73
|
+
|
|
74
|
+ attributes_t get_attributes_list();
|
|
75
|
+ void remove_attribute(std::string attr_name);
|
|
76
|
+@@ -74,10 +74,10 @@
|
|
77
|
+ }
|
|
78
|
+
|
|
79
|
+ private:
|
|
80
|
+- std::vector<std::string> get_xattr_list() throw (XAttrManagerException);
|
|
81
|
+- std::string get_attribute_value(const std::string& attr_name) throw (XAttrManagerException);
|
|
82
|
++ std::vector<std::string> get_xattr_list();
|
|
83
|
++ std::string get_attribute_value(const std::string& attr_name);
|
|
84
|
+
|
|
85
|
+- void read_test() throw (XAttrManagerException);
|
|
86
|
++ void read_test();
|
|
87
|
+
|
|
88
|
+ Glib::ustring _filename;
|
|
89
|
+
|
|
90
|
+--- a/src/eiciel_xattr_controller.cpp
|
|
91
|
++++ b/src/eiciel_xattr_controller.cpp
|
|
92
|
+@@ -24,7 +24,7 @@
|
|
93
|
+ {
|
|
94
|
+ }
|
|
95
|
+
|
|
96
|
+-void EicielXAttrController::open_file(const Glib::ustring& filename) throw (XAttrManagerException)
|
|
97
|
++void EicielXAttrController::open_file(const Glib::ustring& filename)
|
|
98
|
+ {
|
|
99
|
+ if (_xattr_manager != NULL)
|
|
100
|
+ {
|
|
101
|
+@@ -52,22 +52,22 @@
|
|
102
|
+ }
|
|
103
|
+ }
|
|
104
|
+
|
|
105
|
+-void EicielXAttrController::remove_attribute(const Glib::ustring& nomAtrib) throw (XAttrManagerException)
|
|
106
|
++void EicielXAttrController::remove_attribute(const Glib::ustring& nomAtrib)
|
|
107
|
+ {
|
|
108
|
+ _xattr_manager->remove_attribute(nomAtrib);
|
|
109
|
+ }
|
|
110
|
+
|
|
111
|
+-void EicielXAttrController::add_attribute(const Glib::ustring& nomAtrib, const Glib::ustring& valorAtrib) throw (XAttrManagerException)
|
|
112
|
++void EicielXAttrController::add_attribute(const Glib::ustring& nomAtrib, const Glib::ustring& valorAtrib)
|
|
113
|
+ {
|
|
114
|
+ _xattr_manager->add_attribute(nomAtrib, valorAtrib);
|
|
115
|
+ }
|
|
116
|
+
|
|
117
|
+-void EicielXAttrController::update_attribute_value(const Glib::ustring& nomAtrib, const Glib::ustring& valorNouAtrib) throw (XAttrManagerException)
|
|
118
|
++void EicielXAttrController::update_attribute_value(const Glib::ustring& nomAtrib, const Glib::ustring& valorNouAtrib)
|
|
119
|
+ {
|
|
120
|
+ _xattr_manager->add_attribute(nomAtrib, valorNouAtrib);
|
|
121
|
+ }
|
|
122
|
+
|
|
123
|
+-void EicielXAttrController::update_attribute_name(const Glib::ustring& nomAnticAtribut, const Glib::ustring& nomNouAtribut) throw (XAttrManagerException)
|
|
124
|
++void EicielXAttrController::update_attribute_name(const Glib::ustring& nomAnticAtribut, const Glib::ustring& nomNouAtribut)
|
|
125
|
+ {
|
|
126
|
+ _xattr_manager->change_attribute_name(nomAnticAtribut, nomNouAtribut);
|
|
127
|
+ }
|
|
128
|
+--- a/src/eiciel_xattr_controller.hpp
|
|
129
|
++++ b/src/eiciel_xattr_controller.hpp
|
|
130
|
+@@ -32,21 +32,21 @@
|
|
131
|
+ EicielXAttrWindow* _window;
|
|
132
|
+ bool _opened_file;
|
|
133
|
+
|
|
134
|
+- void remove_attribute(const Glib::ustring& attrib_name) throw (XAttrManagerException);
|
|
135
|
++ void remove_attribute(const Glib::ustring& attrib_name);
|
|
136
|
+
|
|
137
|
+ void add_attribute(const Glib::ustring& attrib_name,
|
|
138
|
+- const Glib::ustring& attrib_value) throw (XAttrManagerException);
|
|
139
|
++ const Glib::ustring& attrib_value);
|
|
140
|
+ void update_attribute_value(const Glib::ustring& attrib_name,
|
|
141
|
+- const Glib::ustring& attrib_new_value) throw (XAttrManagerException) ;
|
|
142
|
++ const Glib::ustring& attrib_new_value);
|
|
143
|
+ void update_attribute_name(const Glib::ustring& old_attribute_name,
|
|
144
|
+- const Glib::ustring& new_attribute_name) throw (XAttrManagerException);
|
|
145
|
++ const Glib::ustring& new_attribute_name);
|
|
146
|
+
|
|
147
|
+ void check_editable();
|
|
148
|
+ public:
|
|
149
|
+ EicielXAttrController();
|
|
150
|
+ bool opened_file() { return _opened_file; };
|
|
151
|
+
|
|
152
|
+- void open_file(const Glib::ustring& filename) throw (XAttrManagerException);
|
|
153
|
++ void open_file(const Glib::ustring& filename);
|
|
154
|
+
|
|
155
|
+ friend class EicielXAttrWindow;
|
|
156
|
+ }
|