diff options
Diffstat (limited to 'kompare/kompare_shell.cpp')
| -rw-r--r-- | kompare/kompare_shell.cpp | 64 |
1 files changed, 32 insertions, 32 deletions
diff --git a/kompare/kompare_shell.cpp b/kompare/kompare_shell.cpp index 46dbfb9a..277afbc6 100644 --- a/kompare/kompare_shell.cpp +++ b/kompare/kompare_shell.cpp @@ -140,21 +140,21 @@ KompareShell::KompareShell() } // Hook up the inter part communication - connect( m_viewPart, TQT_SIGNAL( modelsChanged(const Diff2::DiffModelList*) ), - m_navTreePart, TQT_SLOT( slotModelsChanged( const Diff2::DiffModelList*) ) ); + connect( m_viewPart, TQ_SIGNAL( modelsChanged(const Diff2::DiffModelList*) ), + m_navTreePart, TQ_SLOT( slotModelsChanged( const Diff2::DiffModelList*) ) ); - connect( m_viewPart, TQT_SIGNAL( kompareInfo(Kompare::Info*) ), - m_navTreePart, TQT_SLOT( slotKompareInfo(Kompare::Info*) ) ); + connect( m_viewPart, TQ_SIGNAL( kompareInfo(Kompare::Info*) ), + m_navTreePart, TQ_SLOT( slotKompareInfo(Kompare::Info*) ) ); - connect( m_navTreePart, TQT_SIGNAL( selectionChanged(const Diff2::DiffModel*, const Diff2::Difference*) ), - m_viewPart, TQT_SIGNAL( selectionChanged(const Diff2::DiffModel*, const Diff2::Difference*) ) ); - connect( m_viewPart, TQT_SIGNAL( setSelection(const Diff2::DiffModel*, const Diff2::Difference*) ), - m_navTreePart, TQT_SLOT( slotSetSelection(const Diff2::DiffModel*, const Diff2::Difference*) ) ); + connect( m_navTreePart, TQ_SIGNAL( selectionChanged(const Diff2::DiffModel*, const Diff2::Difference*) ), + m_viewPart, TQ_SIGNAL( selectionChanged(const Diff2::DiffModel*, const Diff2::Difference*) ) ); + connect( m_viewPart, TQ_SIGNAL( setSelection(const Diff2::DiffModel*, const Diff2::Difference*) ), + m_navTreePart, TQ_SLOT( slotSetSelection(const Diff2::DiffModel*, const Diff2::Difference*) ) ); - connect( m_navTreePart, TQT_SIGNAL( selectionChanged(const Diff2::Difference*) ), - m_viewPart, TQT_SIGNAL( selectionChanged(const Diff2::Difference*) ) ); - connect( m_viewPart, TQT_SIGNAL( setSelection(const Diff2::Difference*) ), - m_navTreePart, TQT_SLOT( slotSetSelection(const Diff2::Difference*) ) ); + connect( m_navTreePart, TQ_SIGNAL( selectionChanged(const Diff2::Difference*) ), + m_viewPart, TQ_SIGNAL( selectionChanged(const Diff2::Difference*) ) ); + connect( m_viewPart, TQ_SIGNAL( setSelection(const Diff2::Difference*) ), + m_navTreePart, TQ_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. @@ -162,18 +162,18 @@ KompareShell::KompareShell() // from the method with the same name in KompareModelList. // There is currently no applying possible from the navtreepart to the viewpart - connect( m_viewPart, TQT_SIGNAL(applyDifference(bool)), - m_navTreePart, TQT_SLOT(slotApplyDifference(bool)) ); - connect( m_viewPart, TQT_SIGNAL(applyAllDifferences(bool)), - m_navTreePart, TQT_SLOT(slotApplyAllDifferences(bool)) ); - connect( m_viewPart, TQT_SIGNAL(applyDifference(const Diff2::Difference*, bool)), - m_navTreePart, TQT_SLOT(slotApplyDifference(const Diff2::Difference*, bool)) ); + connect( m_viewPart, TQ_SIGNAL(applyDifference(bool)), + m_navTreePart, TQ_SLOT(slotApplyDifference(bool)) ); + connect( m_viewPart, TQ_SIGNAL(applyAllDifferences(bool)), + m_navTreePart, TQ_SLOT(slotApplyAllDifferences(bool)) ); + connect( m_viewPart, TQ_SIGNAL(applyDifference(const Diff2::Difference*, bool)), + m_navTreePart, TQ_SLOT(slotApplyDifference(const Diff2::Difference*, bool)) ); // Hook up the KomparePart -> KompareShell communication - connect( m_viewPart, TQT_SIGNAL( setStatusBarModelInfo( int, int, int, int, int ) ), - this, TQT_SLOT( slotUpdateStatusBar( int, int, int, int, int ) ) ); - connect( m_viewPart, TQT_SIGNAL( setStatusBarText(const TQString&) ), - this, TQT_SLOT( slotSetStatusBarText(const TQString&) ) ); + connect( m_viewPart, TQ_SIGNAL( setStatusBarModelInfo( int, int, int, int, int ) ), + this, TQ_SLOT( slotUpdateStatusBar( int, int, int, int, int ) ) ); + connect( m_viewPart, TQ_SIGNAL( setStatusBarText(const TQString&) ), + this, TQ_SLOT( slotSetStatusBarText(const TQString&) ) ); // Read basic main-view settings, and set to autosave setAutoSaveSettings( "General Options" ); @@ -229,26 +229,26 @@ void KompareShell::blend( const KURL& url1, const KURL& diff ) void KompareShell::setupActions() { - TDEAction* open = KStdAction::open(this, TQT_SLOT(slotFileOpen()), actionCollection()); + TDEAction* open = KStdAction::open(this, TQ_SLOT(slotFileOpen()), actionCollection()); open->setText( i18n( "&Open Diff..." ) ); new TDEAction( i18n("&Compare Files..."), "document-open", TQt::CTRL + TQt::Key_C, - this, TQT_SLOT(slotFileCompareFiles()), + this, TQ_SLOT(slotFileCompareFiles()), actionCollection(), "file_compare_files" ); new TDEAction( i18n("&Blend URL with Diff..."), "fileblend", TQt::CTRL + TQt::Key_B, - this, TQT_SLOT(slotFileBlendURLAndDiff()), + this, TQ_SLOT(slotFileBlendURLAndDiff()), actionCollection(), "file_blend_url" ); - KStdAction::quit( this, TQT_SLOT( slotFileClose() ), actionCollection() ); + KStdAction::quit( this, TQ_SLOT( slotFileClose() ), actionCollection() ); #if TDE_VERSION >= TDE_MAKE_VERSION(3,1,90) createStandardStatusBarAction(); #endif setStandardToolBarMenuEnabled(true); - m_showTextView = new TDEToggleAction( i18n("Show T&ext View"), 0, this, TQT_SLOT(slotShowTextView()), + m_showTextView = new TDEToggleAction( i18n("Show T&ext View"), 0, this, TQ_SLOT(slotShowTextView()), actionCollection(), "options_show_text_view" ); m_showTextView->setCheckedState(i18n("Hide T&ext View")); - KStdAction::keyBindings(this, TQT_SLOT(optionsConfigureKeys()), actionCollection()); - KStdAction::configureToolbars(this, TQT_SLOT(optionsConfigureToolbars()), actionCollection()); + KStdAction::keyBindings(this, TQ_SLOT(optionsConfigureKeys()), actionCollection()); + KStdAction::configureToolbars(this, TQ_SLOT(optionsConfigureToolbars()), actionCollection()); } void KompareShell::setupStatusBar() @@ -445,8 +445,8 @@ void KompareShell::slotShowTextView() m_textView = m_textViewPart->createView( this, 0 ); m_textViewWidget->setWidget( m_textView ); m_textEditIface = editInterface( m_textViewPart ); - connect( m_viewPart, TQT_SIGNAL(diffString(const TQString&)), - this, TQT_SLOT(slotSetDiffString(const TQString&)) ); + connect( m_viewPart, TQ_SIGNAL(diffString(const TQString&)), + this, TQ_SLOT(slotSetDiffString(const TQString&)) ); } } @@ -475,7 +475,7 @@ void KompareShell::optionsConfigureToolbars() saveMainWindowSettings( TDEGlobal::config(), autoSaveGroup() ); // use the standard toolbar editor KEditToolbar dlg(factory()); - connect(&dlg,TQT_SIGNAL(newToolbarConfig()),this,TQT_SLOT(newToolbarConfig())); + connect(&dlg,TQ_SIGNAL(newToolbarConfig()),this,TQ_SLOT(newToolbarConfig())); dlg.exec(); } |