1From 18562671982ad97549bccb444fdbb5905b6e9335 Mon Sep 17 00:00:00 2001 2From: Khem Raj <raj.khem@gmail.com> 3Date: Tue, 24 Apr 2018 15:06:14 -0700 4Subject: [PATCH] Fix build with clang 5 6Fix warnings found with clang 7 8error: class 'YButtonBoxPrivate' was previously declared as a struct [-Werror,-Wmismatched-tags] 9| friend class YButtonBoxPrivate; 10 11YTimezoneSelector.cc:35:9: error: private field 'dummy' is not used [-Werror,-Wunused-private-field] 12 bool dummy; 13 ^ 14 15Signed-off-by: Khem Raj <raj.khem@gmail.com> 16--- 17Upstream-Status: Submitted [https://github.com/libyui/libyui/pull/123] 18 19 src/YAlignment.h | 2 +- 20 src/YBarGraph.h | 2 +- 21 src/YBusyIndicator.h | 2 +- 22 src/YButtonBox.h | 4 ++-- 23 src/YCheckBox.h | 2 +- 24 src/YCheckBoxFrame.h | 2 +- 25 src/YComboBox.h | 2 +- 26 src/YCommandLine.h | 2 +- 27 src/YContextMenu.h | 2 +- 28 src/YDateField.h | 2 +- 29 src/YDialog.h | 2 +- 30 src/YDownloadProgress.h | 2 +- 31 src/YDumbTab.h | 2 +- 32 src/YEmpty.h | 2 +- 33 src/YEventFilter.h | 2 +- 34 src/YFrame.h | 2 +- 35 src/YGraph.h | 2 +- 36 src/YImage.h | 2 +- 37 src/YInputField.h | 2 +- 38 src/YIntField.h | 2 +- 39 src/YLabel.h | 2 +- 40 src/YLayoutBox.h | 2 +- 41 src/YLogView.h | 2 +- 42 src/YMenuButton.h | 2 +- 43 src/YMultiLineEdit.h | 2 +- 44 src/YMultiProgressMeter.h | 2 +- 45 src/YMultiSelectionBox.h | 2 +- 46 src/YPartitionSplitter.h | 2 +- 47 src/YProgressBar.h | 2 +- 48 src/YPushButton.h | 2 +- 49 src/YRadioButton.h | 2 +- 50 src/YRadioButtonGroup.h | 2 +- 51 src/YRichText.h | 2 +- 52 src/YSelectionBox.h | 2 +- 53 src/YSelectionWidget.h | 2 +- 54 src/YSimpleInputField.h | 2 +- 55 src/YSlider.h | 2 +- 56 src/YSpacing.h | 2 +- 57 src/YSquash.h | 2 +- 58 src/YTable.h | 2 +- 59 src/YTableHeader.h | 2 +- 60 src/YTimeField.h | 2 +- 61 src/YTimezoneSelector.cc | 2 +- 62 src/YTree.h | 2 +- 63 src/YUILog.h | 2 +- 64 src/YWidget.h | 2 +- 65 src/YWizard.h | 2 +- 66 47 files changed, 48 insertions(+), 48 deletions(-) 67 68--- a/src/YAlignment.h 69+++ b/src/YAlignment.h 70@@ -28,7 +28,7 @@ 71 #include "YSingleChildContainerWidget.h" 72 73 74-class YAlignmentPrivate; 75+struct YAlignmentPrivate; 76 77 /** 78 * Implementation of all the alignment widgets: 79--- a/src/YBarGraph.h 80+++ b/src/YBarGraph.h 81@@ -29,7 +29,7 @@ 82 #include "YColor.h" 83 84 85-class YBarGraphPrivate; 86+struct YBarGraphPrivate; 87 class YBarGraphSegment; 88 89 /** 90--- a/src/YBusyIndicator.h 91+++ b/src/YBusyIndicator.h 92@@ -27,7 +27,7 @@ 93 94 #include "YWidget.h" 95 96-class YBusyIndicatorPrivate; 97+struct YBusyIndicatorPrivate; 98 99 100 /** 101--- a/src/YButtonBox.h 102+++ b/src/YButtonBox.h 103@@ -30,7 +30,7 @@ 104 #include "YWidget.h" 105 #include "YPushButton.h" 106 107-class YButtonBoxPrivate; 108+struct YButtonBoxPrivate; 109 class YPushButton; 110 111 112@@ -147,7 +147,7 @@ struct YButtonBoxMargins 113 **/ 114 class YButtonBox : public YWidget 115 { 116- friend class YButtonBoxPrivate; 117+ friend struct YButtonBoxPrivate; 118 119 protected: 120 /** 121--- a/src/YCheckBox.h 122+++ b/src/YCheckBox.h 123@@ -30,7 +30,7 @@ 124 #include "YWidget.h" 125 #include "ImplPtr.h" 126 127-class YCheckBoxPrivate; 128+struct YCheckBoxPrivate; 129 130 enum YCheckBoxState 131 { 132--- a/src/YCheckBoxFrame.h 133+++ b/src/YCheckBoxFrame.h 134@@ -29,7 +29,7 @@ 135 #include "YSingleChildContainerWidget.h" 136 #include "ImplPtr.h" 137 138-class YCheckBoxFramePrivate; 139+struct YCheckBoxFramePrivate; 140 141 142 /** 143--- a/src/YComboBox.h 144+++ b/src/YComboBox.h 145@@ -27,7 +27,7 @@ 146 147 #include "YSelectionWidget.h" 148 149-class YComboBoxPrivate; 150+struct YComboBoxPrivate; 151 152 153 /** 154--- a/src/YCommandLine.h 155+++ b/src/YCommandLine.h 156@@ -28,7 +28,7 @@ 157 #include <string> 158 #include "ImplPtr.h" 159 160-class YCommandLinePrivate; 161+struct YCommandLinePrivate; 162 163 164 /** 165--- a/src/YContextMenu.h 166+++ b/src/YContextMenu.h 167@@ -29,7 +29,7 @@ 168 #include "YMenuItem.h" 169 170 class YMenuItem; 171-class YContextMenuPrivate; 172+struct YContextMenuPrivate; 173 174 175 /** 176--- a/src/YDateField.h 177+++ b/src/YDateField.h 178@@ -27,7 +27,7 @@ 179 180 #include "YSimpleInputField.h" 181 182-class YDateFieldPrivate; 183+struct YDateFieldPrivate; 184 185 /** 186 * Input field for entering a date. 187--- a/src/YDialog.h 188+++ b/src/YDialog.h 189@@ -32,7 +32,7 @@ 190 191 class YShortcutManager; 192 class YPushButton; 193-class YDialogPrivate; 194+struct YDialogPrivate; 195 class YEvent; 196 class YEventFilter; 197 198--- a/src/YDownloadProgress.h 199+++ b/src/YDownloadProgress.h 200@@ -28,7 +28,7 @@ 201 #include "YWidget.h" 202 203 204-class YDownloadProgressPrivate; 205+struct YDownloadProgressPrivate; 206 207 /** 208 * DownloadProgress: A progress bar that monitors downloading a file by 209--- a/src/YDumbTab.h 210+++ b/src/YDumbTab.h 211@@ -27,7 +27,7 @@ 212 213 #include "YSelectionWidget.h" 214 215-class YDumbTabPrivate; 216+struct YDumbTabPrivate; 217 218 /** 219 * DumbTab: A very simple tab widget that can display and switch between a 220--- a/src/YEmpty.h 221+++ b/src/YEmpty.h 222@@ -29,7 +29,7 @@ 223 #include "ImplPtr.h" 224 225 226-class YEmptyPrivate; 227+struct YEmptyPrivate; 228 229 /** 230 * A widget with zero size, useful as a placeholder. 231--- a/src/YEventFilter.h 232+++ b/src/YEventFilter.h 233@@ -32,7 +32,7 @@ 234 class YEvent; 235 class YDialog; 236 237-class YEventFilterPrivate; 238+struct YEventFilterPrivate; 239 240 241 /** 242--- a/src/YFrame.h 243+++ b/src/YFrame.h 244@@ -29,7 +29,7 @@ 245 #include "YSingleChildContainerWidget.h" 246 #include "ImplPtr.h" 247 248-class YFramePrivate; 249+struct YFramePrivate; 250 251 252 /** 253--- a/src/YGraph.h 254+++ b/src/YGraph.h 255@@ -37,7 +37,7 @@ 256 * For that reason a lot of functions simply take a void* instead of graph_t*. 257 */ 258 259-class YGraphPrivate; 260+struct YGraphPrivate; 261 262 /** 263 * A graph with nodes and edges, rendered with Graphviz. 264--- a/src/YImage.h 265+++ b/src/YImage.h 266@@ -29,7 +29,7 @@ 267 #include <string> 268 269 270-class YImagePrivate; 271+struct YImagePrivate; 272 273 /** 274 * A picture, possibly animated, loaded from a file. 275--- a/src/YInputField.h 276+++ b/src/YInputField.h 277@@ -28,7 +28,7 @@ 278 #include <string> 279 #include "YWidget.h" 280 281-class YInputFieldPrivate; 282+struct YInputFieldPrivate; 283 284 285 286--- a/src/YIntField.h 287+++ b/src/YIntField.h 288@@ -27,7 +27,7 @@ 289 290 #include "YWidget.h" 291 292-class YIntFieldPrivate; 293+struct YIntFieldPrivate; 294 295 296 297--- a/src/YLabel.h 298+++ b/src/YLabel.h 299@@ -30,7 +30,7 @@ 300 #include "ImplPtr.h" 301 302 303-class YLabelPrivate; 304+struct YLabelPrivate; 305 306 /** 307 * Implementation of the Label, Heading and OutputField widgets 308--- a/src/YLayoutBox.h 309+++ b/src/YLayoutBox.h 310@@ -29,7 +29,7 @@ 311 #include "YWidget.h" 312 313 314-class YLayoutBoxPrivate; 315+struct YLayoutBoxPrivate; 316 317 /** 318 * A vertical or horizontal stacking of widgets, implementing HBox and VBox. 319--- a/src/YLogView.h 320+++ b/src/YLogView.h 321@@ -27,7 +27,7 @@ 322 323 #include "YWidget.h" 324 325-class YLogViewPrivate; 326+struct YLogViewPrivate; 327 328 329 /** 330--- a/src/YMenuButton.h 331+++ b/src/YMenuButton.h 332@@ -28,7 +28,7 @@ 333 #include "YMenuWidget.h" 334 #include "YMenuItem.h" 335 336-class YMenuButtonPrivate; 337+struct YMenuButtonPrivate; 338 339 340 /** 341--- a/src/YMultiLineEdit.h 342+++ b/src/YMultiLineEdit.h 343@@ -27,7 +27,7 @@ 344 345 #include "YWidget.h" 346 347-class YMultiLineEditPrivate; 348+struct YMultiLineEditPrivate; 349 350 /** 351 * A multi-line plain-text area 352--- a/src/YMultiProgressMeter.h 353+++ b/src/YMultiProgressMeter.h 354@@ -28,7 +28,7 @@ 355 #include "YWidget.h" 356 #include <vector> 357 358-class YMultiProgressMeterPrivate; 359+struct YMultiProgressMeterPrivate; 360 361 362 /** 363--- a/src/YMultiSelectionBox.h 364+++ b/src/YMultiSelectionBox.h 365@@ -27,7 +27,7 @@ 366 367 #include "YSelectionWidget.h" 368 369-class YMultiSelectionBoxPrivate; 370+struct YMultiSelectionBoxPrivate; 371 372 373 /** 374--- a/src/YPartitionSplitter.h 375+++ b/src/YPartitionSplitter.h 376@@ -28,7 +28,7 @@ 377 #include "YWidget.h" 378 379 380-class YPartitionSplitterPrivate; 381+struct YPartitionSplitterPrivate; 382 383 384 /** 385--- a/src/YProgressBar.h 386+++ b/src/YProgressBar.h 387@@ -27,7 +27,7 @@ 388 389 #include "YWidget.h" 390 391-class YProgressBarPrivate; 392+struct YProgressBarPrivate; 393 394 395 /** 396--- a/src/YPushButton.h 397+++ b/src/YPushButton.h 398@@ -27,7 +27,7 @@ 399 400 #include "YWidget.h" 401 402-class YPushButtonPrivate; 403+struct YPushButtonPrivate; 404 405 406 407--- a/src/YRadioButton.h 408+++ b/src/YRadioButton.h 409@@ -28,7 +28,7 @@ 410 #include "YWidget.h" 411 412 class YRadioButtonGroup; 413-class YRadioButtonPrivate; 414+struct YRadioButtonPrivate; 415 416 417 /** 418--- a/src/YRadioButtonGroup.h 419+++ b/src/YRadioButtonGroup.h 420@@ -28,7 +28,7 @@ 421 #include "YSingleChildContainerWidget.h" 422 423 class YRadioButton; 424-class YRadioButtonGroupPrivate; 425+struct YRadioButtonGroupPrivate; 426 427 typedef std::list<YRadioButton *> YRadioButtonList; 428 typedef YRadioButtonList::iterator YRadioButtonListIterator; 429--- a/src/YRichText.h 430+++ b/src/YRichText.h 431@@ -31,7 +31,7 @@ 432 #include "ImplPtr.h" 433 434 435-class YRichTextPrivate; 436+struct YRichTextPrivate; 437 438 439 /** 440--- a/src/YSelectionBox.h 441+++ b/src/YSelectionBox.h 442@@ -27,7 +27,7 @@ 443 444 #include "YSelectionWidget.h" 445 446-class YSelectionBoxPrivate; 447+struct YSelectionBoxPrivate; 448 449 450 /** 451--- a/src/YSelectionWidget.h 452+++ b/src/YSelectionWidget.h 453@@ -29,7 +29,7 @@ 454 #include "YItem.h" 455 #include "ImplPtr.h" 456 457-class YSelectionWidgetPrivate; 458+struct YSelectionWidgetPrivate; 459 460 /** 461 * Base class for various kinds of multi-value widgets. 462--- a/src/YSimpleInputField.h 463+++ b/src/YSimpleInputField.h 464@@ -27,7 +27,7 @@ 465 466 #include "YWidget.h" 467 468-class YSimpleInputFieldPrivate; 469+struct YSimpleInputFieldPrivate; 470 471 472 /** 473--- a/src/YSlider.h 474+++ b/src/YSlider.h 475@@ -27,7 +27,7 @@ 476 477 #include "YIntField.h" 478 479-class YSliderPrivate; 480+struct YSliderPrivate; 481 482 483 /** 484--- a/src/YSpacing.h 485+++ b/src/YSpacing.h 486@@ -28,7 +28,7 @@ 487 #include "YWidget.h" 488 #include "ImplPtr.h" 489 490-class YSpacingPrivate; 491+struct YSpacingPrivate; 492 493 494 /** 495--- a/src/YSquash.h 496+++ b/src/YSquash.h 497@@ -29,7 +29,7 @@ 498 #include "ImplPtr.h" 499 500 501-class YSquashPrivate; 502+struct YSquashPrivate; 503 504 /** 505 * HSquash, VSquash HVSquash: reduce child to its preferred size. 506--- a/src/YTable.h 507+++ b/src/YTable.h 508@@ -30,7 +30,7 @@ 509 #include "YTableItem.h" 510 #include "YTableHeader.h" 511 512-class YTablePrivate; 513+struct YTablePrivate; 514 515 516 517--- a/src/YTableHeader.h 518+++ b/src/YTableHeader.h 519@@ -31,7 +31,7 @@ 520 521 522 523-class YTableHeaderPrivate; 524+struct YTableHeaderPrivate; 525 526 /** 527 * Helper class for YTable for table column properties: 528--- a/src/YTimeField.h 529+++ b/src/YTimeField.h 530@@ -27,7 +27,7 @@ 531 532 #include "YSimpleInputField.h" 533 534-class YTimeFieldPrivate; 535+struct YTimeFieldPrivate; 536 537 538 /** 539--- a/src/YTimezoneSelector.cc 540+++ b/src/YTimezoneSelector.cc 541@@ -34,7 +34,7 @@ using std::string; 542 543 class YTimezoneSelectorPrivate 544 { 545- bool dummy; 546+// bool dummy; 547 }; 548 549 550--- a/src/YTree.h 551+++ b/src/YTree.h 552@@ -28,7 +28,7 @@ 553 #include "YSelectionWidget.h" 554 555 class YTreeItem; 556-class YTreePrivate; 557+struct YTreePrivate; 558 559 560 /** 561--- a/src/YUILog.h 562+++ b/src/YUILog.h 563@@ -66,7 +66,7 @@ using std::endl; 564 565 566 567-class YUILogPrivate; 568+struct YUILogPrivate; 569 570 enum YUILogLevel_t 571 { 572--- a/src/YWidget.h 573+++ b/src/YWidget.h 574@@ -45,7 +45,7 @@ typedef YChildrenManager<YWidget> YWidge 575 typedef YSingleChildManager<YWidget> YSingleWidgetChildManager; 576 typedef YChildrenRejector<YWidget> YWidgetChildrenRejector; 577 578-class YWidgetPrivate; 579+struct YWidgetPrivate; 580 581 582 /** 583--- a/src/YWizard.h 584+++ b/src/YWizard.h 585@@ -28,7 +28,7 @@ 586 #include "YWidget.h" 587 588 class YMacroRecorder; 589-class YWizardPrivate; 590+struct YWizardPrivate; 591 class YPushButton; 592 class YReplacePoint; 593 594