Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Q
qgroundcontrol
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Valentin Platzgummer
qgroundcontrol
Commits
4ea83c50
Commit
4ea83c50
authored
Nov 29, 2014
by
Don Gagne
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Cleanup for use with unit test
Splash screen is optional. Also remove some unused class definition.
parent
6c35a7ff
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
10 deletions
+4
-10
MainWindow.cc
src/ui/MainWindow.cc
+3
-4
MainWindow.h
src/ui/MainWindow.h
+1
-6
No files found.
src/ui/MainWindow.cc
View file @
4ea83c50
...
...
@@ -88,7 +88,6 @@ const QString MainWindow::defaultLightStyle = ":files/styles/style-light.css";
MainWindow
*
MainWindow
::
_create
(
QSplashScreen
*
splashScreen
,
enum
MainWindow
::
CUSTOM_MODE
mode
)
{
Q_ASSERT
(
_instance
==
NULL
);
Q_ASSERT
(
splashScreen
);
new
MainWindow
(
splashScreen
,
mode
);
...
...
@@ -125,12 +124,12 @@ MainWindow::MainWindow(QSplashScreen* splashScreen, enum MainWindow::CUSTOM_MODE
menuActionHelper
(
new
MenuActionHelper
()),
_splashScreen
(
splashScreen
)
{
Q_ASSERT
(
splashScreen
);
Q_ASSERT
(
_instance
==
NULL
);
_instance
=
this
;
connect
(
this
,
&
MainWindow
::
initStatusChanged
,
splashScreen
,
&
QSplashScreen
::
showMessage
);
if
(
splashScreen
)
{
connect
(
this
,
&
MainWindow
::
initStatusChanged
,
splashScreen
,
&
QSplashScreen
::
showMessage
);
}
this
->
setAttribute
(
Qt
::
WA_DeleteOnClose
);
connect
(
menuActionHelper
,
SIGNAL
(
needToShowDockWidget
(
QString
,
bool
)),
SLOT
(
showDockWidget
(
QString
,
bool
)));
...
...
src/ui/MainWindow.h
View file @
4ea83c50
...
...
@@ -468,14 +468,9 @@ private slots:
void
_saveTempFlightDataLog
(
QString
tempLogfile
);
private:
/// Constructor is private since all creation should be through MainWindow::
instance.
/// Constructor is private since all creation should be through MainWindow::
_create
MainWindow
(
QSplashScreen
*
splashScreen
,
enum
MainWindow
::
CUSTOM_MODE
mode
);
/// @brief Two phase construction such that MainWindow::instance is available to code
void
_init
(
void
);
friend
class
QGCApplication
;
void
_hideSplashScreen
(
void
);
void
_openUrl
(
const
QString
&
url
,
const
QString
&
errorMessage
);
...
...
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