Use normalized string-based signal/slot connections

parent 1e22237f
......@@ -101,21 +101,21 @@ KompareShell::KompareShell()
}
// Hook up the inter part communication
connect( m_viewPart, SIGNAL( modelsChanged(const Diff2::DiffModelList*) ),
m_navTreePart, SLOT( slotModelsChanged( const Diff2::DiffModelList*) ) );
connect( m_viewPart, SIGNAL(modelsChanged(const Diff2::DiffModelList*)),
m_navTreePart, SLOT(slotModelsChanged(const Diff2::DiffModelList*)) );
connect( m_viewPart, SIGNAL( kompareInfo(Kompare::Info*) ),
m_navTreePart, SLOT( slotKompareInfo(Kompare::Info*) ) );
connect( m_viewPart, SIGNAL(kompareInfo(Kompare::Info*)),
m_navTreePart, SLOT(slotKompareInfo(Kompare::Info*)) );
connect( m_navTreePart, SIGNAL( selectionChanged(const Diff2::DiffModel*, const Diff2::Difference*) ),
m_viewPart, SIGNAL( selectionChanged(const Diff2::DiffModel*, const Diff2::Difference*) ) );
connect( m_viewPart, SIGNAL( setSelection(const Diff2::DiffModel*, const Diff2::Difference*) ),
m_navTreePart, SLOT( slotSetSelection(const Diff2::DiffModel*, const Diff2::Difference*) ) );
connect( m_navTreePart, SIGNAL(selectionChanged(const Diff2::DiffModel*,const Diff2::Difference*)),
m_viewPart, SIGNAL(selectionChanged(const Diff2::DiffModel*,const Diff2::Difference*)) );
connect( m_viewPart, SIGNAL(setSelection(const Diff2::DiffModel*,const Diff2::Difference*)),
m_navTreePart, SLOT(slotSetSelection(const Diff2::DiffModel*,const Diff2::Difference*)) );
connect( m_navTreePart, SIGNAL( selectionChanged(const Diff2::Difference*) ),
m_viewPart, SIGNAL( selectionChanged(const Diff2::Difference*) ) );
connect( m_viewPart, SIGNAL( setSelection(const Diff2::Difference*) ),
m_navTreePart, SLOT( slotSetSelection(const Diff2::Difference*) ) );
connect( m_navTreePart, SIGNAL(selectionChanged(const Diff2::Difference*)),
m_viewPart, SIGNAL(selectionChanged(const Diff2::Difference*)) );
connect( m_viewPart, SIGNAL(setSelection(const Diff2::Difference*)),
m_navTreePart, SLOT(slotSetSelection(const Diff2::Difference*)) );
// This is the interpart interface, it is signal and slot based so no "real" nterface here
// All you have to do is connect the parts from your application.
......@@ -127,17 +127,17 @@ KompareShell::KompareShell()
m_navTreePart, SLOT(slotApplyDifference(bool)) );
connect( m_viewPart, SIGNAL(applyAllDifferences(bool)),
m_navTreePart, SLOT(slotApplyAllDifferences(bool)) );
connect( m_viewPart, SIGNAL(applyDifference(const Diff2::Difference*, bool)),
m_navTreePart, SLOT(slotApplyDifference(const Diff2::Difference*, bool)) );
connect( m_viewPart, SIGNAL(applyDifference(const Diff2::Difference*,bool)),
m_navTreePart, SLOT(slotApplyDifference(const Diff2::Difference*,bool)) );
// Hook up the KomparePart -> KompareShell communication
connect( m_viewPart, SIGNAL( setStatusBarModelInfo( int, int, int, int, int ) ),
this, SLOT( slotUpdateStatusBar( int, int, int, int, int ) ) );
connect( m_viewPart, SIGNAL( setStatusBarText(const QString&) ),
this, SLOT( slotSetStatusBarText(const QString&) ) );
connect( m_viewPart, SIGNAL(setStatusBarModelInfo(int,int,int,int,int)),
this, SLOT(slotUpdateStatusBar(int,int,int,int,int)) );
connect( m_viewPart, SIGNAL(setStatusBarText(QString)),
this, SLOT(slotSetStatusBarText(QString)) );
connect( m_viewPart, SIGNAL(diffString(const QString&)),
this, SLOT(slotSetDiffString(const QString&)) );
connect( m_viewPart, SIGNAL(diffString(QString)),
this, SLOT(slotSetDiffString(QString)) );
// Read basic main-view settings, and set to autosave
setAutoSaveSettings(QStringLiteral("General Options"));
......
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