Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
OpenWalnut
OpenWalnut Core
Commits
c353fbad
Commit
c353fbad
authored
Apr 12, 2010
by
Sebastian Eichelbaum
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[CHANGE
#295
] - renamed run to load which is more a telling name
parent
e24411c5
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
5 additions
and
5 deletions
+5
-5
src/common/WProjectFile.cpp
src/common/WProjectFile.cpp
+2
-2
src/common/WProjectFile.h
src/common/WProjectFile.h
+1
-1
src/gui/qt4/WMainWindow.cpp
src/gui/qt4/WMainWindow.cpp
+1
-1
src/gui/qt4/WQt4Gui.cpp
src/gui/qt4/WQt4Gui.cpp
+1
-1
No files found.
src/common/WProjectFile.cpp
View file @
c353fbad
...
...
@@ -56,13 +56,13 @@ WProjectFile::~WProjectFile()
// cleanup
}
void
WProjectFile
::
run
()
void
WProjectFile
::
load
()
{
// the instance needs to be added here, as it else could be freed before the thread finishes ( remember: it is a shared_ptr ).
WKernel
::
getRunningKernel
()
->
getRootContainer
()
->
addPendingThread
(
shared_from_this
()
);
// actually run
WThreadedRunner
::
run
();
run
();
}
void
WProjectFile
::
threadMain
()
...
...
src/common/WProjectFile.h
View file @
c353fbad
...
...
@@ -57,7 +57,7 @@ public:
/**
* Parses the project file and applies it. It applies the project file asynchronously!
*/
virtual
void
run
();
virtual
void
load
();
protected:
...
...
src/gui/qt4/WMainWindow.cpp
View file @
c353fbad
...
...
@@ -396,7 +396,7 @@ void WMainWindow::projectLoad()
);
// This call is asynchronous. It parses the file and the starts a thread to actually do all the stuff
proj
->
run
();
proj
->
load
();
}
}
...
...
src/gui/qt4/WQt4Gui.cpp
View file @
c353fbad
...
...
@@ -172,7 +172,7 @@ int WQt4Gui::run()
);
// This call is asynchronous. It parses the file and the starts a thread to actually do all the stuff
proj
->
run
();
proj
->
load
();
}
catch
(
const
WException
&
e
)
{
...
...
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