Mercurial > octave

comparison libgui/src/dialog.h @ 31626:9034cf663768

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
eliminate unnecessary base_qobject object from GUI dialog classes * dialog.h, dialog.cc (QUIWidgetCreator::m_octave_qobj): Delete unnecessary data member. (QUIWidgetCreator::QUIWidgetCreator, MessageDialog::MessageDialog, ListDialog::ListDialog, InputDialog::InputDialog, FileDialog::FileDialog): Eliminate base_qobject argument. Change all uses.
author John W. Eaton <jwe@octave.org>
date Sat, 03 Dec 2022 01:00:04 -0500
parents 796f54d4ddbf
children 431f80aba37a
comparison
equal deleted inserted replaced
31625:b26b768f23a4 31626:9034cf663768
42 // Defined for purposes of sending QList<float> as part of signal. 42 // Defined for purposes of sending QList<float> as part of signal.
43 typedef QList<float> QFloatList; 43 typedef QList<float> QFloatList;
44 44
45 namespace octave 45 namespace octave
46 { 46 {
47 class base_qobject;
48
49 class QUIWidgetCreator : public QObject 47 class QUIWidgetCreator : public QObject
50 { 48 {
51 Q_OBJECT 49 Q_OBJECT
52 50
53 public: 51 public:
54 52
55 QUIWidgetCreator (base_qobject& oct_qobj); 53 QUIWidgetCreator (void);
56 54
57 ~QUIWidgetCreator (void) = default; 55 ~QUIWidgetCreator (void) = default;
58 56
59 public: 57 public:
60 58
146 void filedialog_finished (const QStringList& files, const QString& path, 144 void filedialog_finished (const QStringList& files, const QString& path,
147 int filterindex); 145 int filterindex);
148 146
149 private: 147 private:
150 148
151 base_qobject& m_octave_qobj;
152
153 int m_dialog_result; 149 int m_dialog_result;
154 QString m_dialog_button; 150 QString m_dialog_button;
155 151
156 // A copy of the dialogs button texts 152 // A copy of the dialogs button texts
157 QStringList m_button_list; 153 QStringList m_button_list;
174 { 170 {
175 Q_OBJECT 171 Q_OBJECT
176 172
177 public: 173 public:
178 174
179 MessageDialog (base_qobject& oct_qobj, const QString& message, 175 MessageDialog (const QString& message,
180 const QString& title, const QString& icon, 176 const QString& title, const QString& icon,
181 const QStringList& button, const QString& defbutton, 177 const QStringList& button, const QString& defbutton,
182 const QStringList& role); 178 const QStringList& role);
183 179
184 ~MessageDialog (void) = default; 180 ~MessageDialog (void) = default;
199 195
200 QItemSelectionModel *selector; 196 QItemSelectionModel *selector;
201 197
202 public: 198 public:
203 199
204 ListDialog (base_qobject& oct_qobj, const QStringList& list, 200 ListDialog (const QStringList& list,
205 const QString& mode, int width, int height, 201 const QString& mode, int width, int height,
206 const QList<int>& initial, const QString& name, 202 const QList<int>& initial, const QString& name,
207 const QStringList& prompt, const QString& ok_string, 203 const QStringList& prompt, const QString& ok_string,
208 const QString& cancel_string); 204 const QString& cancel_string);
209 205
234 230
235 QList<QLineEdit *> input_line; 231 QList<QLineEdit *> input_line;
236 232
237 public: 233 public:
238 234
239 InputDialog (base_qobject& oct_qobj, const QStringList& prompt, 235 InputDialog (const QStringList& prompt,
240 const QString& title, const QFloatList& nr, 236 const QString& title, const QFloatList& nr,
241 const QFloatList& nc, const QStringList& defaults); 237 const QFloatList& nc, const QStringList& defaults);
242 238
243 ~InputDialog (void) = default; 239 ~InputDialog (void) = default;
244 240
259 { 255 {
260 Q_OBJECT 256 Q_OBJECT
261 257
262 public: 258 public:
263 259
264 FileDialog (base_qobject& oct_qobj, const QStringList& filters, 260 FileDialog (const QStringList& filters,
265 const QString& title, const QString& filename, 261 const QString& title, const QString& filename,
266 const QString& dirname, const QString& multimode); 262 const QString& dirname, const QString& multimode);
267 263
268 ~FileDialog (void) = default; 264 ~FileDialog (void) = default;
269 265