Skip to content

Commit 60ec919

Browse files
oktonionoktonion
committed
Update PhWidgetsFunc.cpp
check for nullptr
1 parent 5adf0e3 commit 60ec919

File tree

1 file changed

+77
-74
lines changed

1 file changed

+77
-74
lines changed

‎src/service/PhWidgetsFunc.cpp

Lines changed: 77 additions & 74 deletions
Original file line numberDiff line numberDiff line change
@@ -20,80 +20,83 @@ namespace PhWidgets
2020
{
2121
const char * WidgetClassName(PtWidget_t *wdg)
2222
{
23-
RETURN_PHWIDGETS_CLASS_NAME(wdg, PtArc);
24-
RETURN_PHWIDGETS_CLASS_NAME(wdg, PtBarGraph);
25-
RETURN_PHWIDGETS_CLASS_NAME(wdg, PtBasic);
26-
RETURN_PHWIDGETS_CLASS_NAME(wdg, PtBezier);
27-
RETURN_PHWIDGETS_CLASS_NAME(wdg, PtBkgd);
28-
RETURN_PHWIDGETS_CLASS_NAME(wdg, PtButton);
29-
RETURN_PHWIDGETS_CLASS_NAME(wdg, PtCalendar);
30-
RETURN_PHWIDGETS_CLASS_NAME(wdg, PtClient);
31-
RETURN_PHWIDGETS_CLASS_NAME(wdg, PtClock);
32-
RETURN_PHWIDGETS_CLASS_NAME(wdg, PtColorPanel);
33-
RETURN_PHWIDGETS_CLASS_NAME(wdg, PtColorPatch);
34-
RETURN_PHWIDGETS_CLASS_NAME(wdg, PtColorSel);
35-
RETURN_PHWIDGETS_CLASS_NAME(wdg, PtColorSelGroup);
36-
RETURN_PHWIDGETS_CLASS_NAME(wdg, PtColorWell);
37-
RETURN_PHWIDGETS_CLASS_NAME(wdg, PtComboBox);
38-
RETURN_PHWIDGETS_CLASS_NAME(wdg, PtCompound);
39-
RETURN_PHWIDGETS_CLASS_NAME(wdg, PtContainer);
40-
RETURN_PHWIDGETS_CLASS_NAME(wdg, PtDisjoint);
41-
RETURN_PHWIDGETS_CLASS_NAME(wdg, PtDivider);
42-
RETURN_PHWIDGETS_CLASS_NAME(wdg, PtEllipse);
43-
RETURN_PHWIDGETS_CLASS_NAME(wdg, PtFileSel);
44-
RETURN_PHWIDGETS_CLASS_NAME(wdg, PtFontSel);
45-
RETURN_PHWIDGETS_CLASS_NAME(wdg, PtGauge);
46-
RETURN_PHWIDGETS_CLASS_NAME(wdg, PtGenList);
47-
RETURN_PHWIDGETS_CLASS_NAME(wdg, PtGenTree);
48-
RETURN_PHWIDGETS_CLASS_NAME(wdg, PtGraphic);
49-
RETURN_PHWIDGETS_CLASS_NAME(wdg, PtGrid);
50-
RETURN_PHWIDGETS_CLASS_NAME(wdg, PtGroup);
51-
RETURN_PHWIDGETS_CLASS_NAME(wdg, PtImageArea);
52-
RETURN_PHWIDGETS_CLASS_NAME(wdg, PtLabel);
53-
RETURN_PHWIDGETS_CLASS_NAME(wdg, PtLine);
54-
RETURN_PHWIDGETS_CLASS_NAME(wdg, PtList);
55-
RETURN_PHWIDGETS_CLASS_NAME(wdg, PtMenu);
56-
RETURN_PHWIDGETS_CLASS_NAME(wdg, PtMenuBar);
57-
RETURN_PHWIDGETS_CLASS_NAME(wdg, PtMenuButton);
58-
RETURN_PHWIDGETS_CLASS_NAME(wdg, PtMeter);
59-
RETURN_PHWIDGETS_CLASS_NAME(wdg, PtMtrend);
60-
RETURN_PHWIDGETS_CLASS_NAME(wdg, PtMultitext);
61-
RETURN_PHWIDGETS_CLASS_NAME(wdg, PtNumeric);
62-
RETURN_PHWIDGETS_CLASS_NAME(wdg, PtNumericFloat);
63-
RETURN_PHWIDGETS_CLASS_NAME(wdg, PtNumericInteger);
64-
RETURN_PHWIDGETS_CLASS_NAME(wdg, PtOnOffButton);
65-
RETURN_PHWIDGETS_CLASS_NAME(wdg, PtOSContainer);
66-
RETURN_PHWIDGETS_CLASS_NAME(wdg, PtPane);
67-
RETURN_PHWIDGETS_CLASS_NAME(wdg, PtPanelGroup);
68-
RETURN_PHWIDGETS_CLASS_NAME(wdg, PtPixel);
69-
RETURN_PHWIDGETS_CLASS_NAME(wdg, PtPolygon);
70-
RETURN_PHWIDGETS_CLASS_NAME(wdg, PtPrintSel);
71-
RETURN_PHWIDGETS_CLASS_NAME(wdg, PtProgress);
72-
RETURN_PHWIDGETS_CLASS_NAME(wdg, PtRaw);
73-
RETURN_PHWIDGETS_CLASS_NAME(wdg, PtRawList);
74-
RETURN_PHWIDGETS_CLASS_NAME(wdg, PtRawTree);
75-
RETURN_PHWIDGETS_CLASS_NAME(wdg, PtRect);
76-
RETURN_PHWIDGETS_CLASS_NAME(wdg, PtRegion);
77-
RETURN_PHWIDGETS_CLASS_NAME(wdg, PtScrollArea);
78-
RETURN_PHWIDGETS_CLASS_NAME(wdg, PtScrollBar);
79-
RETURN_PHWIDGETS_CLASS_NAME(wdg, PtScrollContainer);
80-
RETURN_PHWIDGETS_CLASS_NAME(wdg, PtSeparator);
81-
RETURN_PHWIDGETS_CLASS_NAME(wdg, PtServer);
82-
RETURN_PHWIDGETS_CLASS_NAME(wdg, PtSlider);
83-
RETURN_PHWIDGETS_CLASS_NAME(wdg, PtTab);
84-
RETURN_PHWIDGETS_CLASS_NAME(wdg, PtTerminal);
85-
RETURN_PHWIDGETS_CLASS_NAME(wdg, PtText);
86-
RETURN_PHWIDGETS_CLASS_NAME(wdg, PtTimer);
87-
RETURN_PHWIDGETS_CLASS_NAME(wdg, PtToggleButton);
88-
RETURN_PHWIDGETS_CLASS_NAME(wdg, PtToolbar);
89-
RETURN_PHWIDGETS_CLASS_NAME(wdg, PtToolbarGroup);
90-
RETURN_PHWIDGETS_CLASS_NAME(wdg, PtTree);
91-
RETURN_PHWIDGETS_CLASS_NAME(wdg, PtTrend);
92-
RETURN_PHWIDGETS_CLASS_NAME(wdg, PtTty);
93-
RETURN_PHWIDGETS_CLASS_NAME(wdg, PtUpDown);
94-
RETURN_PHWIDGETS_CLASS_NAME(wdg, PtWebClient);
95-
RETURN_PHWIDGETS_CLASS_NAME(wdg, PtWidget);
96-
RETURN_PHWIDGETS_CLASS_NAME(wdg, PtWindow);
23+
if(wdg)
24+
{
25+
RETURN_PHWIDGETS_CLASS_NAME(wdg, PtArc);
26+
RETURN_PHWIDGETS_CLASS_NAME(wdg, PtBarGraph);
27+
RETURN_PHWIDGETS_CLASS_NAME(wdg, PtBasic);
28+
RETURN_PHWIDGETS_CLASS_NAME(wdg, PtBezier);
29+
RETURN_PHWIDGETS_CLASS_NAME(wdg, PtBkgd);
30+
RETURN_PHWIDGETS_CLASS_NAME(wdg, PtButton);
31+
RETURN_PHWIDGETS_CLASS_NAME(wdg, PtCalendar);
32+
RETURN_PHWIDGETS_CLASS_NAME(wdg, PtClient);
33+
RETURN_PHWIDGETS_CLASS_NAME(wdg, PtClock);
34+
RETURN_PHWIDGETS_CLASS_NAME(wdg, PtColorPanel);
35+
RETURN_PHWIDGETS_CLASS_NAME(wdg, PtColorPatch);
36+
RETURN_PHWIDGETS_CLASS_NAME(wdg, PtColorSel);
37+
RETURN_PHWIDGETS_CLASS_NAME(wdg, PtColorSelGroup);
38+
RETURN_PHWIDGETS_CLASS_NAME(wdg, PtColorWell);
39+
RETURN_PHWIDGETS_CLASS_NAME(wdg, PtComboBox);
40+
RETURN_PHWIDGETS_CLASS_NAME(wdg, PtCompound);
41+
RETURN_PHWIDGETS_CLASS_NAME(wdg, PtContainer);
42+
RETURN_PHWIDGETS_CLASS_NAME(wdg, PtDisjoint);
43+
RETURN_PHWIDGETS_CLASS_NAME(wdg, PtDivider);
44+
RETURN_PHWIDGETS_CLASS_NAME(wdg, PtEllipse);
45+
RETURN_PHWIDGETS_CLASS_NAME(wdg, PtFileSel);
46+
RETURN_PHWIDGETS_CLASS_NAME(wdg, PtFontSel);
47+
RETURN_PHWIDGETS_CLASS_NAME(wdg, PtGauge);
48+
RETURN_PHWIDGETS_CLASS_NAME(wdg, PtGenList);
49+
RETURN_PHWIDGETS_CLASS_NAME(wdg, PtGenTree);
50+
RETURN_PHWIDGETS_CLASS_NAME(wdg, PtGraphic);
51+
RETURN_PHWIDGETS_CLASS_NAME(wdg, PtGrid);
52+
RETURN_PHWIDGETS_CLASS_NAME(wdg, PtGroup);
53+
RETURN_PHWIDGETS_CLASS_NAME(wdg, PtImageArea);
54+
RETURN_PHWIDGETS_CLASS_NAME(wdg, PtLabel);
55+
RETURN_PHWIDGETS_CLASS_NAME(wdg, PtLine);
56+
RETURN_PHWIDGETS_CLASS_NAME(wdg, PtList);
57+
RETURN_PHWIDGETS_CLASS_NAME(wdg, PtMenu);
58+
RETURN_PHWIDGETS_CLASS_NAME(wdg, PtMenuBar);
59+
RETURN_PHWIDGETS_CLASS_NAME(wdg, PtMenuButton);
60+
RETURN_PHWIDGETS_CLASS_NAME(wdg, PtMeter);
61+
RETURN_PHWIDGETS_CLASS_NAME(wdg, PtMtrend);
62+
RETURN_PHWIDGETS_CLASS_NAME(wdg, PtMultitext);
63+
RETURN_PHWIDGETS_CLASS_NAME(wdg, PtNumeric);
64+
RETURN_PHWIDGETS_CLASS_NAME(wdg, PtNumericFloat);
65+
RETURN_PHWIDGETS_CLASS_NAME(wdg, PtNumericInteger);
66+
RETURN_PHWIDGETS_CLASS_NAME(wdg, PtOnOffButton);
67+
RETURN_PHWIDGETS_CLASS_NAME(wdg, PtOSContainer);
68+
RETURN_PHWIDGETS_CLASS_NAME(wdg, PtPane);
69+
RETURN_PHWIDGETS_CLASS_NAME(wdg, PtPanelGroup);
70+
RETURN_PHWIDGETS_CLASS_NAME(wdg, PtPixel);
71+
RETURN_PHWIDGETS_CLASS_NAME(wdg, PtPolygon);
72+
RETURN_PHWIDGETS_CLASS_NAME(wdg, PtPrintSel);
73+
RETURN_PHWIDGETS_CLASS_NAME(wdg, PtProgress);
74+
RETURN_PHWIDGETS_CLASS_NAME(wdg, PtRaw);
75+
RETURN_PHWIDGETS_CLASS_NAME(wdg, PtRawList);
76+
RETURN_PHWIDGETS_CLASS_NAME(wdg, PtRawTree);
77+
RETURN_PHWIDGETS_CLASS_NAME(wdg, PtRect);
78+
RETURN_PHWIDGETS_CLASS_NAME(wdg, PtRegion);
79+
RETURN_PHWIDGETS_CLASS_NAME(wdg, PtScrollArea);
80+
RETURN_PHWIDGETS_CLASS_NAME(wdg, PtScrollBar);
81+
RETURN_PHWIDGETS_CLASS_NAME(wdg, PtScrollContainer);
82+
RETURN_PHWIDGETS_CLASS_NAME(wdg, PtSeparator);
83+
RETURN_PHWIDGETS_CLASS_NAME(wdg, PtServer);
84+
RETURN_PHWIDGETS_CLASS_NAME(wdg, PtSlider);
85+
RETURN_PHWIDGETS_CLASS_NAME(wdg, PtTab);
86+
RETURN_PHWIDGETS_CLASS_NAME(wdg, PtTerminal);
87+
RETURN_PHWIDGETS_CLASS_NAME(wdg, PtText);
88+
RETURN_PHWIDGETS_CLASS_NAME(wdg, PtTimer);
89+
RETURN_PHWIDGETS_CLASS_NAME(wdg, PtToggleButton);
90+
RETURN_PHWIDGETS_CLASS_NAME(wdg, PtToolbar);
91+
RETURN_PHWIDGETS_CLASS_NAME(wdg, PtToolbarGroup);
92+
RETURN_PHWIDGETS_CLASS_NAME(wdg, PtTree);
93+
RETURN_PHWIDGETS_CLASS_NAME(wdg, PtTrend);
94+
RETURN_PHWIDGETS_CLASS_NAME(wdg, PtTty);
95+
RETURN_PHWIDGETS_CLASS_NAME(wdg, PtUpDown);
96+
RETURN_PHWIDGETS_CLASS_NAME(wdg, PtWebClient);
97+
RETURN_PHWIDGETS_CLASS_NAME(wdg, PtWidget);
98+
RETURN_PHWIDGETS_CLASS_NAME(wdg, PtWindow);
99+
}
97100

98101
return "Unknown";
99102
}

0 commit comments

Comments
 (0)