Commit 10f46203 authored by Michael Reeves's avatar Michael Reeves
Browse files

*work around implicit cast stupidity in clang.

parent a0ce289f
......@@ -159,7 +159,7 @@ KDiff3App::KDiff3App(QWidget* pParent, const char* /*name*/, KDiff3Part* pKDiff3
// This is just a convenience variable to make code that accesses options more readable
m_pOptions = &m_pOptionDialog->m_options;
m_pOptionDialog->readOptions( isPart() ? ((K4AboutData)m_pKDiff3Part->componentData()).config() : KGlobal::config() );
m_pOptionDialog->readOptions( isPart() ? KComponentData(m_pKDiff3Part->componentData()).config() : KGlobal::config() );
// Option handling: Only when pParent==0 (no parent)
KCmdLineArgs *args = isPart() ? 0 : KCmdLineArgs::parsedArgs();
......@@ -652,7 +652,7 @@ void KDiff3App::saveOptions( KSharedConfigPtr config )
bool KDiff3App::queryClose()
{
saveOptions( isPart() ? ((K4AboutData)m_pKDiff3Part->componentData()).config() : KGlobal::config() );
saveOptions( isPart() ? ((K4AboutData(*m_pKDiff3Part->componentData().aboutData).config() : KGlobal::config() );
if(m_bOutputModified)
{
......
......@@ -71,7 +71,7 @@ KDiff3Part::~KDiff3Part()
{
if ( m_widget!=0 && ! m_bIsShell )
{
m_widget->saveOptions( m_widget->isPart() ? ((K4AboutData)componentData()).config() : KGlobal::config() );
m_widget->saveOptions( m_widget->isPart() ? KComponentData(componentData()).config() : KGlobal::config() );
}
}
......
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