Commit f392c80d authored by ledig's avatar ledig
Browse files

[FIX] Crash after loading in Win -> i can finaly see something fancy

parent 606340ec
......@@ -104,9 +104,9 @@ std::string WTerminalColor::operator()() const
return m_colorString;
}
std::string WTerminalColor::operator+( const std::string& in ) const
std::string WTerminalColor::operator+( const std::string& istr ) const
{
return m_colorString + in;
return m_colorString + istr;
}
void WTerminalColor::setEnabled( bool enabled )
......
......@@ -131,7 +131,7 @@ public:
*
* \return the concatenated string.
*/
std::string operator+( const std::string& in ) const;
std::string operator+( const std::string& istr ) const;
/**
* Resets the color and returns control string.
......
......@@ -51,7 +51,7 @@
*/
class WThreadedRunner
#if !USE_BOOST_THREADS
: OpenThreads::Thread
: public OpenThreads::Thread
#endif
{
public:
......
......@@ -131,7 +131,11 @@ int WQt4Gui::run()
m_mainWindow->show();
// connect out loader signal with kernel
#ifdef _WIN32
getLoadButtonSignal()->connect( boost::bind( &WKernel::loadDataSetsSynchronously, m_kernel, _1 ) );
#else
getLoadButtonSignal()->connect( boost::bind( &WKernel::loadDataSets, m_kernel, _1 ) );
#endif
m_mainWindow->getModuleButtonSignal()->connect( boost::bind( &WKernel::applyModule, m_kernel, _1, _2 ) );
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment