diff options
Diffstat (limited to 'kompare/komparepart/kompare_part.cpp')
-rw-r--r-- | kompare/komparepart/kompare_part.cpp | 116 |
1 files changed, 58 insertions, 58 deletions
diff --git a/kompare/komparepart/kompare_part.cpp b/kompare/komparepart/kompare_part.cpp index 7cc62ef8..bffcc72a 100644 --- a/kompare/komparepart/kompare_part.cpp +++ b/kompare/komparepart/kompare_part.cpp @@ -76,64 +76,64 @@ KomparePart::KomparePart( TQWidget *parentWidget, const char *widgetName, // This creates the "Model creator" and connects the signals and slots m_modelList = new Diff2::KompareModelList( m_diffSettings, m_info, this, "komparemodellist" ); - connect( m_modelList, TQT_SIGNAL(status( Kompare::Status )), - this, TQT_SLOT(slotSetStatus( Kompare::Status )) ); - connect( m_modelList, TQT_SIGNAL(setStatusBarModelInfo( int, int, int, int, int )), - this, TQT_SIGNAL(setStatusBarModelInfo( int, int, int, int, int )) ); - connect( m_modelList, TQT_SIGNAL(error( TQString )), - this, TQT_SLOT(slotShowError( TQString )) ); - connect( m_modelList, TQT_SIGNAL(applyAllDifferences( bool )), - this, TQT_SLOT(updateActions()) ); - connect( m_modelList, TQT_SIGNAL(applyDifference( bool )), - this, TQT_SLOT(updateActions()) ); - connect( m_modelList, TQT_SIGNAL(applyAllDifferences( bool )), - this, TQT_SIGNAL(appliedChanged()) ); - connect( m_modelList, TQT_SIGNAL(applyDifference( bool )), - this, TQT_SIGNAL(appliedChanged()) ); - - connect( m_modelList, TQT_SIGNAL( setModified( bool ) ), - this, TQT_SLOT( slotSetModified( bool ) ) ); + connect( m_modelList, TQ_SIGNAL(status( Kompare::Status )), + this, TQ_SLOT(slotSetStatus( Kompare::Status )) ); + connect( m_modelList, TQ_SIGNAL(setStatusBarModelInfo( int, int, int, int, int )), + this, TQ_SIGNAL(setStatusBarModelInfo( int, int, int, int, int )) ); + connect( m_modelList, TQ_SIGNAL(error( TQString )), + this, TQ_SLOT(slotShowError( TQString )) ); + connect( m_modelList, TQ_SIGNAL(applyAllDifferences( bool )), + this, TQ_SLOT(updateActions()) ); + connect( m_modelList, TQ_SIGNAL(applyDifference( bool )), + this, TQ_SLOT(updateActions()) ); + connect( m_modelList, TQ_SIGNAL(applyAllDifferences( bool )), + this, TQ_SIGNAL(appliedChanged()) ); + connect( m_modelList, TQ_SIGNAL(applyDifference( bool )), + this, TQ_SIGNAL(appliedChanged()) ); + + connect( m_modelList, TQ_SIGNAL( setModified( bool ) ), + this, TQ_SLOT( slotSetModified( bool ) ) ); // This is the stuff to connect the "interface" of the kompare part to the model inside - connect( m_modelList, TQT_SIGNAL(modelsChanged(const Diff2::DiffModelList*)), - this, TQT_SIGNAL(modelsChanged(const Diff2::DiffModelList*)) ); - - connect( m_modelList, TQT_SIGNAL(setSelection(const Diff2::DiffModel*, const Diff2::Difference*)), - this, TQT_SIGNAL(setSelection(const Diff2::DiffModel*, const Diff2::Difference*)) ); - connect( this, TQT_SIGNAL(selectionChanged(const Diff2::DiffModel*, const Diff2::Difference*)), - m_modelList, TQT_SLOT(slotSelectionChanged(const Diff2::DiffModel*, const Diff2::Difference*)) ); - - connect( m_modelList, TQT_SIGNAL(setSelection(const Diff2::Difference*)), - this, TQT_SIGNAL(setSelection(const Diff2::Difference*)) ); - connect( this, TQT_SIGNAL(selectionChanged(const Diff2::Difference*)), - m_modelList, TQT_SLOT(slotSelectionChanged(const Diff2::Difference*)) ); - - connect( m_modelList, TQT_SIGNAL(applyDifference(bool)), - this, TQT_SIGNAL(applyDifference(bool)) ); - connect( m_modelList, TQT_SIGNAL(applyAllDifferences(bool)), - this, TQT_SIGNAL(applyAllDifferences(bool)) ); - connect( m_modelList, TQT_SIGNAL(applyDifference(const Diff2::Difference*, bool)), - this, TQT_SIGNAL(applyDifference(const Diff2::Difference*, bool)) ); + connect( m_modelList, TQ_SIGNAL(modelsChanged(const Diff2::DiffModelList*)), + this, TQ_SIGNAL(modelsChanged(const Diff2::DiffModelList*)) ); + + connect( m_modelList, TQ_SIGNAL(setSelection(const Diff2::DiffModel*, const Diff2::Difference*)), + this, TQ_SIGNAL(setSelection(const Diff2::DiffModel*, const Diff2::Difference*)) ); + connect( this, TQ_SIGNAL(selectionChanged(const Diff2::DiffModel*, const Diff2::Difference*)), + m_modelList, TQ_SLOT(slotSelectionChanged(const Diff2::DiffModel*, const Diff2::Difference*)) ); + + connect( m_modelList, TQ_SIGNAL(setSelection(const Diff2::Difference*)), + this, TQ_SIGNAL(setSelection(const Diff2::Difference*)) ); + connect( this, TQ_SIGNAL(selectionChanged(const Diff2::Difference*)), + m_modelList, TQ_SLOT(slotSelectionChanged(const Diff2::Difference*)) ); + + connect( m_modelList, TQ_SIGNAL(applyDifference(bool)), + this, TQ_SIGNAL(applyDifference(bool)) ); + connect( m_modelList, TQ_SIGNAL(applyAllDifferences(bool)), + this, TQ_SIGNAL(applyAllDifferences(bool)) ); + connect( m_modelList, TQ_SIGNAL(applyDifference(const Diff2::Difference*, bool)), + this, TQ_SIGNAL(applyDifference(const Diff2::Difference*, bool)) ); // This creates the splitterwidget and connects the signals and slots m_splitter = new KompareSplitter ( m_viewSettings, parentWidget, widgetName ); - connect( m_modelList, TQT_SIGNAL(setSelection(const Diff2::DiffModel*, const Diff2::Difference*)), - m_splitter, TQT_SLOT(slotSetSelection(const Diff2::DiffModel*, const Diff2::Difference*)) ); -// connect( m_splitter, TQT_SIGNAL(selectionChanged(const Diff2::Difference*, const Diff2::Difference*)), -// m_modelList, TQT_SLOT(slotSelectionChanged(const Diff2::Difference*, const Diff2::Difference*)) ); - connect( m_modelList, TQT_SIGNAL(setSelection(const Diff2::Difference*)), - m_splitter, TQT_SLOT(slotSetSelection(const Diff2::Difference*)) ); - connect( m_splitter, TQT_SIGNAL(selectionChanged(const Diff2::Difference*)), - m_modelList, TQT_SLOT(slotSelectionChanged(const Diff2::Difference*)) ); - - connect( m_modelList, TQT_SIGNAL(applyDifference(bool)), - m_splitter, TQT_SLOT(slotApplyDifference(bool)) ); - connect( m_modelList, TQT_SIGNAL(applyAllDifferences(bool)), - m_splitter, TQT_SLOT(slotApplyAllDifferences(bool)) ); - connect( m_modelList, TQT_SIGNAL(applyDifference(const Diff2::Difference*, bool)), - m_splitter, TQT_SLOT(slotApplyDifference(const Diff2::Difference*, bool)) ); - connect( this, TQT_SIGNAL(configChanged()), m_splitter, TQT_SIGNAL(configChanged()) ); + connect( m_modelList, TQ_SIGNAL(setSelection(const Diff2::DiffModel*, const Diff2::Difference*)), + m_splitter, TQ_SLOT(slotSetSelection(const Diff2::DiffModel*, const Diff2::Difference*)) ); +// connect( m_splitter, TQ_SIGNAL(selectionChanged(const Diff2::Difference*, const Diff2::Difference*)), +// m_modelList, TQ_SLOT(slotSelectionChanged(const Diff2::Difference*, const Diff2::Difference*)) ); + connect( m_modelList, TQ_SIGNAL(setSelection(const Diff2::Difference*)), + m_splitter, TQ_SLOT(slotSetSelection(const Diff2::Difference*)) ); + connect( m_splitter, TQ_SIGNAL(selectionChanged(const Diff2::Difference*)), + m_modelList, TQ_SLOT(slotSelectionChanged(const Diff2::Difference*)) ); + + connect( m_modelList, TQ_SIGNAL(applyDifference(bool)), + m_splitter, TQ_SLOT(slotApplyDifference(bool)) ); + connect( m_modelList, TQ_SIGNAL(applyAllDifferences(bool)), + m_splitter, TQ_SLOT(slotApplyAllDifferences(bool)) ); + connect( m_modelList, TQ_SIGNAL(applyDifference(const Diff2::Difference*, bool)), + m_splitter, TQ_SLOT(slotApplyDifference(const Diff2::Difference*, bool)) ); + connect( this, TQ_SIGNAL(configChanged()), m_splitter, TQ_SIGNAL(configChanged()) ); // notify the part that this is our internal widget setWidget( m_splitter->parentWidget() ); @@ -163,19 +163,19 @@ void KomparePart::setupActions() // create our actions m_saveAll = new TDEAction( i18n("Save &All"), "save_all", 0, - this, TQT_SLOT(saveAll()), + this, TQ_SLOT(saveAll()), actionCollection(), "file_save_all" ); m_saveDiff = new TDEAction( i18n("Save .&diff..."), 0, - this, TQT_SLOT(saveDiff()), + this, TQ_SLOT(saveDiff()), actionCollection(), "file_save_diff" ); m_swap = new TDEAction( i18n( "Swap Source with Destination" ), 0, - this, TQT_SLOT(slotSwap()), + this, TQ_SLOT(slotSwap()), actionCollection(), "file_swap" ); m_diffStats = new TDEAction( i18n( "Show Statistics" ), 0, - this, TQT_SLOT(slotShowDiffstats()), + this, TQ_SLOT(slotShowDiffstats()), actionCollection(), "file_diffstats" ); - KStdAction::preferences(this, TQT_SLOT(optionsPreferences()), actionCollection()); + KStdAction::preferences(this, TQ_SLOT(optionsPreferences()), actionCollection()); } void KomparePart::updateActions() @@ -742,7 +742,7 @@ void KomparePart::optionsPreferences() // show preferences KomparePrefDlg* pref = new KomparePrefDlg( m_viewSettings, m_diffSettings ); - connect( pref, TQT_SIGNAL(applyClicked()), this, TQT_SIGNAL(configChanged()) ); + connect( pref, TQ_SIGNAL(applyClicked()), this, TQ_SIGNAL(configChanged()) ); if ( pref->exec() ) emit configChanged(); |