Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
VideoLAN
VLMC
Commits
29671581
Commit
29671581
authored
Aug 23, 2009
by
Hugo Beauzee-Luyssen
Browse files
Solved build warning about the "About" name already taken
parent
08078da3
Changes
2
Hide whitespace changes
Inline
Side-by-side
src/gui/About.h
View file @
29671581
...
...
@@ -34,13 +34,13 @@ public:
static
About
*
instance
();
protected:
virtual
void
changeEvent
(
QEvent
*
e
);
virtual
void
changeEvent
(
QEvent
*
e
);
private:
explicit
About
(
QWidget
*
parent
=
0
);
void
setText
(
const
QString
&
filename
,
QPlainTextEdit
*
widget
);
Ui
::
About
m_ui
;
static
About
*
m_instance
;
explicit
About
(
QWidget
*
parent
=
0
);
void
setText
(
const
QString
&
filename
,
QPlainTextEdit
*
widget
);
Ui
::
About
VLMC
m_ui
;
static
About
*
m_instance
;
};
#endif // ABOUT_H
src/gui/ui/About.ui
View file @
29671581
<?xml version="1.0" encoding="UTF-8"?>
<ui
version=
"4.0"
>
<class>
About
</class>
<widget
class=
"QDialog"
name=
"About"
>
<class>
About
VLMC
</class>
<widget
class=
"QDialog"
name=
"About
VLMC
"
>
<property
name=
"geometry"
>
<rect>
<x>
0
</x>
...
...
@@ -69,7 +69,7 @@ p, li { white-space: pre-wrap; }
</sizepolicy>
</property>
<property
name=
"currentIndex"
>
<number>
3
</number>
<number>
0
</number>
</property>
<widget
class=
"QWidget"
name=
"About"
>
<attribute
name=
"title"
>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment