TDE
/
kdiff3
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/kdiff3
0
0
Fork 0
Code Issues Releases Wiki Activity

Replaced various '#define' with actual strings - part 6

Browse Source 
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
pull/16/head
Michele Calgaro 12 months ago
parent 7c9ad54619
commit 1efbeb497b
Signed by: MicheleC
GPG Key ID: 2A75B7CA8ADED5CF
7 changed files with 133 additions and 133 deletions
Show Stats Download Patch File Download Diff File

4
src/difftextwindow.cpp
Unescape View File

@ -1695,8 +1695,8 @@ bool DiffTextWindowFrame::eventFilter( TQObject* o, TQEvent* e )
if ( lst.count() > 0 ) if ( lst.count() > 0 )
{ {
static_cast<TQLineEdit*>(TQT_TQWIDGET(o))->setText( lst[0] ); static_cast<TQLineEdit*>(o)->setText( lst[0] );
static_cast<TQLineEdit*>(TQT_TQWIDGET(o))->setFocus(); static_cast<TQLineEdit*>(o)->setFocus();
emit fileNameChanged( lst[0], pDTW->d->m_winIdx ); emit fileNameChanged( lst[0], pDTW->d->m_winIdx );
return true; return true;
} }

98
src/directorymergewindow.cpp
Unescape View File

@ -267,13 +267,13 @@ static int s_WhiteCol = 9; // Nr of white deltas (for 2 input files)
DirectoryMergeWindow::DirectoryMergeWindow( TQWidget* pParent, OptionDialog* pOptions, TDEIconLoader* pIconLoader ) DirectoryMergeWindow::DirectoryMergeWindow( TQWidget* pParent, OptionDialog* pOptions, TDEIconLoader* pIconLoader )
: TQListView( pParent ) : TQListView( pParent )
{ {
connect( TQT_TQOBJECT(this), TQT_SIGNAL(doubleClicked(TQListViewItem*)), TQT_TQOBJECT(this), TQT_SLOT(onDoubleClick(TQListViewItem*))); connect( this, TQT_SIGNAL(doubleClicked(TQListViewItem*)), this, TQT_SLOT(onDoubleClick(TQListViewItem*)));
connect( TQT_TQOBJECT(this), TQT_SIGNAL(returnPressed(TQListViewItem*)), TQT_TQOBJECT(this), TQT_SLOT(onDoubleClick(TQListViewItem*))); connect( this, TQT_SIGNAL(returnPressed(TQListViewItem*)), this, TQT_SLOT(onDoubleClick(TQListViewItem*)));
connect( TQT_TQOBJECT(this), TQT_SIGNAL( mouseButtonPressed(int,TQListViewItem*,const TQPoint&, int)), connect( this, TQT_SIGNAL( mouseButtonPressed(int,TQListViewItem*,const TQPoint&, int)),
TQT_TQOBJECT(this), TQT_SLOT( onClick(int,TQListViewItem*,const TQPoint&, int)) ); this, TQT_SLOT( onClick(int,TQListViewItem*,const TQPoint&, int)) );
connect( TQT_TQOBJECT(this), TQT_SIGNAL(contextMenuRequested(TQListViewItem*,const TQPoint &,int)), connect( this, TQT_SIGNAL(contextMenuRequested(TQListViewItem*,const TQPoint &,int)),
TQT_TQOBJECT(this), TQT_SLOT( slotShowContextMenu(TQListViewItem*,const TQPoint &,int))); this, TQT_SLOT( slotShowContextMenu(TQListViewItem*,const TQPoint &,int)));
connect( TQT_TQOBJECT(this), TQT_SIGNAL(selectionChanged(TQListViewItem*)), TQT_TQOBJECT(this), TQT_SLOT(onSelectionChanged(TQListViewItem*))); connect( this, TQT_SIGNAL(selectionChanged(TQListViewItem*)), this, TQT_SLOT(onSelectionChanged(TQListViewItem*)));
m_pOptions = pOptions; m_pOptions = pOptions;
m_pIconLoader = pIconLoader; m_pIconLoader = pIconLoader;
m_pDirectoryMergeInfo = 0; m_pDirectoryMergeInfo = 0;
@ -2917,51 +2917,51 @@ void DirectoryMergeWindow::initDirectoryMergeActions( TQObject* pKDiff3App, TDEA
#include "xpm/showfilesonlyinc.xpm" #include "xpm/showfilesonlyinc.xpm"
DirectoryMergeWindow* p = this; DirectoryMergeWindow* p = this;
m_pDirStartOperation = new TDEAction(i18n("Start/Continue Directory Merge"), TQt::Key_F7, TQT_TQOBJECT(p), TQT_SLOT(slotRunOperationForAllItems()), ac, "dir_start_operation"); m_pDirStartOperation = new TDEAction(i18n("Start/Continue Directory Merge"), TQt::Key_F7, p, TQT_SLOT(slotRunOperationForAllItems()), ac, "dir_start_operation");
m_pDirRunOperationForCurrentItem = new TDEAction(i18n("Run Operation for Current Item"), TQt::Key_F6, TQT_TQOBJECT(p), TQT_SLOT(slotRunOperationForCurrentItem()), ac, "dir_run_operation_for_current_item"); m_pDirRunOperationForCurrentItem = new TDEAction(i18n("Run Operation for Current Item"), TQt::Key_F6, p, TQT_SLOT(slotRunOperationForCurrentItem()), ac, "dir_run_operation_for_current_item");
m_pDirCompareCurrent = new TDEAction(i18n("Compare Selected File"), 0, TQT_TQOBJECT(p), TQT_SLOT(compareCurrentFile()), ac, "dir_compare_current"); m_pDirCompareCurrent = new TDEAction(i18n("Compare Selected File"), 0, p, TQT_SLOT(compareCurrentFile()), ac, "dir_compare_current");
m_pDirMergeCurrent = new TDEAction(i18n("Merge Current File"), TQIconSet(TQPixmap(startmerge)), 0, TQT_TQOBJECT(pKDiff3App), TQT_SLOT(slotMergeCurrentFile()), ac, "merge_current"); m_pDirMergeCurrent = new TDEAction(i18n("Merge Current File"), TQIconSet(TQPixmap(startmerge)), 0, pKDiff3App, TQT_SLOT(slotMergeCurrentFile()), ac, "merge_current");
m_pDirFoldAll = new TDEAction(i18n("Fold All Subdirs"), 0, TQT_TQOBJECT(p), TQT_SLOT(slotFoldAllSubdirs()), ac, "dir_fold_all"); m_pDirFoldAll = new TDEAction(i18n("Fold All Subdirs"), 0, p, TQT_SLOT(slotFoldAllSubdirs()), ac, "dir_fold_all");
m_pDirUnfoldAll = new TDEAction(i18n("Unfold All Subdirs"), 0, TQT_TQOBJECT(p), TQT_SLOT(slotUnfoldAllSubdirs()), ac, "dir_unfold_all"); m_pDirUnfoldAll = new TDEAction(i18n("Unfold All Subdirs"), 0, p, TQT_SLOT(slotUnfoldAllSubdirs()), ac, "dir_unfold_all");
m_pDirRescan = new TDEAction(i18n("Rescan"), TQt::SHIFT+TQt::Key_F5, TQT_TQOBJECT(p), TQT_SLOT(reload()), ac, "dir_rescan"); m_pDirRescan = new TDEAction(i18n("Rescan"), TQt::SHIFT+TQt::Key_F5, p, TQT_SLOT(reload()), ac, "dir_rescan");
m_pDirSaveMergeState = 0; //new TDEAction(i18n("Save Directory Merge State ..."), 0, TQT_TQOBJECT(p), TQT_SLOT(slotSaveMergeState()), ac, "dir_save_merge_state"); m_pDirSaveMergeState = 0; //new TDEAction(i18n("Save Directory Merge State ..."), 0, p, TQT_SLOT(slotSaveMergeState()), ac, "dir_save_merge_state");
m_pDirLoadMergeState = 0; //new TDEAction(i18n("Load Directory Merge State ..."), 0, TQT_TQOBJECT(p), TQT_SLOT(slotLoadMergeState()), ac, "dir_load_merge_state"); m_pDirLoadMergeState = 0; //new TDEAction(i18n("Load Directory Merge State ..."), 0, p, TQT_SLOT(slotLoadMergeState()), ac, "dir_load_merge_state");
m_pDirChooseAEverywhere = new TDEAction(i18n("Choose A for All Items"), 0, TQT_TQOBJECT(p), TQT_SLOT(slotChooseAEverywhere()), ac, "dir_choose_a_everywhere"); m_pDirChooseAEverywhere = new TDEAction(i18n("Choose A for All Items"), 0, p, TQT_SLOT(slotChooseAEverywhere()), ac, "dir_choose_a_everywhere");
m_pDirChooseBEverywhere = new TDEAction(i18n("Choose B for All Items"), 0, TQT_TQOBJECT(p), TQT_SLOT(slotChooseBEverywhere()), ac, "dir_choose_b_everywhere"); m_pDirChooseBEverywhere = new TDEAction(i18n("Choose B for All Items"), 0, p, TQT_SLOT(slotChooseBEverywhere()), ac, "dir_choose_b_everywhere");
m_pDirChooseCEverywhere = new TDEAction(i18n("Choose C for All Items"), 0, TQT_TQOBJECT(p), TQT_SLOT(slotChooseCEverywhere()), ac, "dir_choose_c_everywhere"); m_pDirChooseCEverywhere = new TDEAction(i18n("Choose C for All Items"), 0, p, TQT_SLOT(slotChooseCEverywhere()), ac, "dir_choose_c_everywhere");
m_pDirAutoChoiceEverywhere = new TDEAction(i18n("Auto-Choose Operation for All Items"), 0, TQT_TQOBJECT(p), TQT_SLOT(slotAutoChooseEverywhere()), ac, "dir_autochoose_everywhere"); m_pDirAutoChoiceEverywhere = new TDEAction(i18n("Auto-Choose Operation for All Items"), 0, p, TQT_SLOT(slotAutoChooseEverywhere()), ac, "dir_autochoose_everywhere");
m_pDirDoNothingEverywhere = new TDEAction(i18n("No Operation for All Items"), 0, TQT_TQOBJECT(p), TQT_SLOT(slotNoOpEverywhere()), ac, "dir_nothing_everywhere"); m_pDirDoNothingEverywhere = new TDEAction(i18n("No Operation for All Items"), 0, p, TQT_SLOT(slotNoOpEverywhere()), ac, "dir_nothing_everywhere");
// m_pDirSynchronizeDirectories = new TDEToggleAction(i18n("Synchronize Directories"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotSynchronizeDirectories()), ac, "dir_synchronize_directories"); // m_pDirSynchronizeDirectories = new TDEToggleAction(i18n("Synchronize Directories"), 0, this, TQT_SLOT(slotSynchronizeDirectories()), ac, "dir_synchronize_directories");
// m_pDirChooseNewerFiles = new TDEToggleAction(i18n("Copy Newer Files Instead of Merging"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotChooseNewerFiles()), ac, "dir_choose_newer_files"); // m_pDirChooseNewerFiles = new TDEToggleAction(i18n("Copy Newer Files Instead of Merging"), 0, this, TQT_SLOT(slotChooseNewerFiles()), ac, "dir_choose_newer_files");
m_pDirShowIdenticalFiles = new TDEToggleAction(i18n("Show Identical Files"), TQIconSet(TQPixmap(showequalfiles)), 0, TQT_TQOBJECT(this), TQT_SLOT(slotShowIdenticalFiles()), ac, "dir_show_identical_files"); m_pDirShowIdenticalFiles = new TDEToggleAction(i18n("Show Identical Files"), TQIconSet(TQPixmap(showequalfiles)), 0, this, TQT_SLOT(slotShowIdenticalFiles()), ac, "dir_show_identical_files");
m_pDirShowDifferentFiles = new TDEToggleAction(i18n("Show Different Files"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotShowDifferentFiles()), ac, "dir_show_different_files"); m_pDirShowDifferentFiles = new TDEToggleAction(i18n("Show Different Files"), 0, this, TQT_SLOT(slotShowDifferentFiles()), ac, "dir_show_different_files");
m_pDirShowFilesOnlyInA = new TDEToggleAction(i18n("Show Files only in A"), TQIconSet(TQPixmap(showfilesonlyina)), 0, TQT_TQOBJECT(this), TQT_SLOT(slotShowFilesOnlyInA()), ac, "dir_show_files_only_in_a"); m_pDirShowFilesOnlyInA = new TDEToggleAction(i18n("Show Files only in A"), TQIconSet(TQPixmap(showfilesonlyina)), 0, this, TQT_SLOT(slotShowFilesOnlyInA()), ac, "dir_show_files_only_in_a");
m_pDirShowFilesOnlyInB = new TDEToggleAction(i18n("Show Files only in B"), TQIconSet(TQPixmap(showfilesonlyinb)), 0, TQT_TQOBJECT(this), TQT_SLOT(slotShowFilesOnlyInB()), ac, "dir_show_files_only_in_b"); m_pDirShowFilesOnlyInB = new TDEToggleAction(i18n("Show Files only in B"), TQIconSet(TQPixmap(showfilesonlyinb)), 0, this, TQT_SLOT(slotShowFilesOnlyInB()), ac, "dir_show_files_only_in_b");
m_pDirShowFilesOnlyInC = new TDEToggleAction(i18n("Show Files only in C"), TQIconSet(TQPixmap(showfilesonlyinc)), 0, TQT_TQOBJECT(this), TQT_SLOT(slotShowFilesOnlyInC()), ac, "dir_show_files_only_in_c"); m_pDirShowFilesOnlyInC = new TDEToggleAction(i18n("Show Files only in C"), TQIconSet(TQPixmap(showfilesonlyinc)), 0, this, TQT_SLOT(slotShowFilesOnlyInC()), ac, "dir_show_files_only_in_c");
m_pDirShowIdenticalFiles->setChecked( m_pOptions->m_bDmShowIdenticalFiles ); m_pDirShowIdenticalFiles->setChecked( m_pOptions->m_bDmShowIdenticalFiles );
m_pDirCompareExplicit = new TDEAction(i18n("Compare Explicitly Selected Files"), 0, TQT_TQOBJECT(p), TQT_SLOT(slotCompareExplicitlySelectedFiles()), ac, "dir_compare_explicitly_selected_files"); m_pDirCompareExplicit = new TDEAction(i18n("Compare Explicitly Selected Files"), 0, p, TQT_SLOT(slotCompareExplicitlySelectedFiles()), ac, "dir_compare_explicitly_selected_files");
m_pDirMergeExplicit = new TDEAction(i18n("Merge Explicitly Selected Files"), 0, TQT_TQOBJECT(p), TQT_SLOT(slotMergeExplicitlySelectedFiles()), ac, "dir_merge_explicitly_selected_files"); m_pDirMergeExplicit = new TDEAction(i18n("Merge Explicitly Selected Files"), 0, p, TQT_SLOT(slotMergeExplicitlySelectedFiles()), ac, "dir_merge_explicitly_selected_files");
m_pDirCurrentDoNothing = new TDEAction(i18n("Do Nothing"), 0, TQT_TQOBJECT(p), TQT_SLOT(slotCurrentDoNothing()), ac, "dir_current_do_nothing"); m_pDirCurrentDoNothing = new TDEAction(i18n("Do Nothing"), 0, p, TQT_SLOT(slotCurrentDoNothing()), ac, "dir_current_do_nothing");
m_pDirCurrentChooseA = new TDEAction(i18n("A"), 0, TQT_TQOBJECT(p), TQT_SLOT(slotCurrentChooseA()), ac, "dir_current_choose_a"); m_pDirCurrentChooseA = new TDEAction(i18n("A"), 0, p, TQT_SLOT(slotCurrentChooseA()), ac, "dir_current_choose_a");
m_pDirCurrentChooseB = new TDEAction(i18n("B"), 0, TQT_TQOBJECT(p), TQT_SLOT(slotCurrentChooseB()), ac, "dir_current_choose_b"); m_pDirCurrentChooseB = new TDEAction(i18n("B"), 0, p, TQT_SLOT(slotCurrentChooseB()), ac, "dir_current_choose_b");
m_pDirCurrentChooseC = new TDEAction(i18n("C"), 0, TQT_TQOBJECT(p), TQT_SLOT(slotCurrentChooseC()), ac, "dir_current_choose_c"); m_pDirCurrentChooseC = new TDEAction(i18n("C"), 0, p, TQT_SLOT(slotCurrentChooseC()), ac, "dir_current_choose_c");
m_pDirCurrentMerge = new TDEAction(i18n("Merge"), 0, TQT_TQOBJECT(p), TQT_SLOT(slotCurrentMerge()), ac, "dir_current_merge"); m_pDirCurrentMerge = new TDEAction(i18n("Merge"), 0, p, TQT_SLOT(slotCurrentMerge()), ac, "dir_current_merge");
m_pDirCurrentDelete = new TDEAction(i18n("Delete (if exists)"), 0, TQT_TQOBJECT(p), TQT_SLOT(slotCurrentDelete()), ac, "dir_current_delete"); m_pDirCurrentDelete = new TDEAction(i18n("Delete (if exists)"), 0, p, TQT_SLOT(slotCurrentDelete()), ac, "dir_current_delete");
m_pDirCurrentSyncDoNothing = new TDEAction(i18n("Do Nothing"), 0, TQT_TQOBJECT(p), TQT_SLOT(slotCurrentDoNothing()), ac, "dir_current_sync_do_nothing"); m_pDirCurrentSyncDoNothing = new TDEAction(i18n("Do Nothing"), 0, p, TQT_SLOT(slotCurrentDoNothing()), ac, "dir_current_sync_do_nothing");
m_pDirCurrentSyncCopyAToB = new TDEAction(i18n("Copy A to B"), 0, TQT_TQOBJECT(p), TQT_SLOT(slotCurrentCopyAToB()), ac, "dir_current_sync_copy_a_to_b" ); m_pDirCurrentSyncCopyAToB = new TDEAction(i18n("Copy A to B"), 0, p, TQT_SLOT(slotCurrentCopyAToB()), ac, "dir_current_sync_copy_a_to_b" );
m_pDirCurrentSyncCopyBToA = new TDEAction(i18n("Copy B to A"), 0, TQT_TQOBJECT(p), TQT_SLOT(slotCurrentCopyBToA()), ac, "dir_current_sync_copy_b_to_a" ); m_pDirCurrentSyncCopyBToA = new TDEAction(i18n("Copy B to A"), 0, p, TQT_SLOT(slotCurrentCopyBToA()), ac, "dir_current_sync_copy_b_to_a" );
m_pDirCurrentSyncDeleteA = new TDEAction(i18n("Delete A"), 0, TQT_TQOBJECT(p), TQT_SLOT(slotCurrentDeleteA()), ac,"dir_current_sync_delete_a"); m_pDirCurrentSyncDeleteA = new TDEAction(i18n("Delete A"), 0, p, TQT_SLOT(slotCurrentDeleteA()), ac,"dir_current_sync_delete_a");
m_pDirCurrentSyncDeleteB = new TDEAction(i18n("Delete B"), 0, TQT_TQOBJECT(p), TQT_SLOT(slotCurrentDeleteB()), ac,"dir_current_sync_delete_b"); m_pDirCurrentSyncDeleteB = new TDEAction(i18n("Delete B"), 0, p, TQT_SLOT(slotCurrentDeleteB()), ac,"dir_current_sync_delete_b");
m_pDirCurrentSyncDeleteAAndB = new TDEAction(i18n("Delete A && B"), 0, TQT_TQOBJECT(p), TQT_SLOT(slotCurrentDeleteAAndB()), ac,"dir_current_sync_delete_a_and_b"); m_pDirCurrentSyncDeleteAAndB = new TDEAction(i18n("Delete A && B"), 0, p, TQT_SLOT(slotCurrentDeleteAAndB()), ac,"dir_current_sync_delete_a_and_b");
m_pDirCurrentSyncMergeToA = new TDEAction(i18n("Merge to A"), 0, TQT_TQOBJECT(p), TQT_SLOT(slotCurrentMergeToA()), ac,"dir_current_sync_merge_to_a"); m_pDirCurrentSyncMergeToA = new TDEAction(i18n("Merge to A"), 0, p, TQT_SLOT(slotCurrentMergeToA()), ac,"dir_current_sync_merge_to_a");
m_pDirCurrentSyncMergeToB = new TDEAction(i18n("Merge to B"), 0, TQT_TQOBJECT(p), TQT_SLOT(slotCurrentMergeToB()), ac,"dir_current_sync_merge_to_b"); m_pDirCurrentSyncMergeToB = new TDEAction(i18n("Merge to B"), 0, p, TQT_SLOT(slotCurrentMergeToB()), ac,"dir_current_sync_merge_to_b");
m_pDirCurrentSyncMergeToAAndB = new TDEAction(i18n("Merge to A && B"), 0, TQT_TQOBJECT(p), TQT_SLOT(slotCurrentMergeToAAndB()), ac,"dir_current_sync_merge_to_a_and_b"); m_pDirCurrentSyncMergeToAAndB = new TDEAction(i18n("Merge to A && B"), 0, p, TQT_SLOT(slotCurrentMergeToAAndB()), ac,"dir_current_sync_merge_to_a_and_b");
} }

152
src/kdiff3.cpp
Unescape View File

@ -128,7 +128,7 @@ KDiff3App::KDiff3App(TQWidget* pParent, const char* name, KDiff3Part* pKDiff3Par
// All default values must be set before calling readOptions(). // All default values must be set before calling readOptions().
m_pOptionDialog = new OptionDialog( m_pKDiff3Shell!=0, this ); m_pOptionDialog = new OptionDialog( m_pKDiff3Shell!=0, this );
connect( m_pOptionDialog, TQT_SIGNAL(applyClicked()), TQT_TQOBJECT(this), TQT_SLOT(slotRefresh()) ); connect( m_pOptionDialog, TQT_SIGNAL(applyClicked()), this, TQT_SLOT(slotRefresh()) );
m_pOptionDialog->readOptions( isPart() ? m_pKDiff3Part->instance()->config() : kapp->config() ); m_pOptionDialog->readOptions( isPart() ? m_pKDiff3Part->instance()->config() : kapp->config() );
@ -243,7 +243,7 @@ KDiff3App::KDiff3App(TQWidget* pParent, const char* name, KDiff3Part* pKDiff3Par
initStatusBar(); initStatusBar();
m_pFindDialog = new FindDialog( this ); m_pFindDialog = new FindDialog( this );
connect( m_pFindDialog, TQT_SIGNAL(findNext()), TQT_TQOBJECT(this), TQT_SLOT(slotEditFindNext())); connect( m_pFindDialog, TQT_SIGNAL(findNext()), this, TQT_SLOT(slotEditFindNext()));
autoAdvance->setChecked( m_pOptionDialog->m_bAutoAdvance ); autoAdvance->setChecked( m_pOptionDialog->m_bAutoAdvance );
showWhiteSpaceCharacters->setChecked( m_pOptionDialog->m_bShowWhiteSpaceCharacters ); showWhiteSpaceCharacters->setChecked( m_pOptionDialog->m_bShowWhiteSpaceCharacters );
@ -281,14 +281,14 @@ KDiff3App::KDiff3App(TQWidget* pParent, const char* name, KDiff3Part* pKDiff3Par
m_pDirectoryMergeInfo = new DirectoryMergeInfo( m_pDirectoryMergeSplitter ); m_pDirectoryMergeInfo = new DirectoryMergeInfo( m_pDirectoryMergeSplitter );
m_pDirectoryMergeWindow->setDirectoryMergeInfo( m_pDirectoryMergeInfo ); m_pDirectoryMergeWindow->setDirectoryMergeInfo( m_pDirectoryMergeInfo );
connect( m_pDirectoryMergeWindow, TQT_SIGNAL(startDiffMerge(TQString,TQString,TQString,TQString,TQString,TQString,TQString,TotalDiffStatus*)), connect( m_pDirectoryMergeWindow, TQT_SIGNAL(startDiffMerge(TQString,TQString,TQString,TQString,TQString,TQString,TQString,TotalDiffStatus*)),
TQT_TQOBJECT(this), TQT_SLOT( slotFileOpen2(TQString,TQString,TQString,TQString,TQString,TQString,TQString,TotalDiffStatus*))); this, TQT_SLOT( slotFileOpen2(TQString,TQString,TQString,TQString,TQString,TQString,TQString,TotalDiffStatus*)));
connect( m_pDirectoryMergeWindow, TQT_SIGNAL(selectionChanged()), TQT_TQOBJECT(this), TQT_SLOT(slotUpdateAvailabilities())); connect( m_pDirectoryMergeWindow, TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(slotUpdateAvailabilities()));
connect( m_pDirectoryMergeWindow, TQT_SIGNAL(currentChanged(TQListViewItem*)), TQT_TQOBJECT(this), TQT_SLOT(slotUpdateAvailabilities())); connect( m_pDirectoryMergeWindow, TQT_SIGNAL(currentChanged(TQListViewItem*)), this, TQT_SLOT(slotUpdateAvailabilities()));
connect( m_pDirectoryMergeWindow, TQT_SIGNAL(checkIfCanContinue(bool*)), TQT_TQOBJECT(this), TQT_SLOT(slotCheckIfCanContinue(bool*))); connect( m_pDirectoryMergeWindow, TQT_SIGNAL(checkIfCanContinue(bool*)), this, TQT_SLOT(slotCheckIfCanContinue(bool*)));
connect( m_pDirectoryMergeWindow, TQT_SIGNAL(updateAvailabilities()), TQT_TQOBJECT(this), TQT_SLOT(slotUpdateAvailabilities())); connect( m_pDirectoryMergeWindow, TQT_SIGNAL(updateAvailabilities()), this, TQT_SLOT(slotUpdateAvailabilities()));
connect( m_pDirectoryMergeWindow, TQT_SIGNAL(statusBarMessage(const TQString&)), TQT_TQOBJECT(this), TQT_SLOT(slotStatusMsg(const TQString&))); connect( m_pDirectoryMergeWindow, TQT_SIGNAL(statusBarMessage(const TQString&)), this, TQT_SLOT(slotStatusMsg(const TQString&)));
m_pDirectoryMergeWindow->initDirectoryMergeActions( TQT_TQOBJECT(this), actionCollection() ); m_pDirectoryMergeWindow->initDirectoryMergeActions( this, actionCollection() );
if ( args!=0 ) args->clear(); // Free up some memory. if ( args!=0 ) args->clear(); // Free up some memory.
@ -430,37 +430,37 @@ void KDiff3App::initActions( TDEActionCollection* ac )
{ {
if (ac==0) KMessageBox::error(0, "actionCollection==0"); if (ac==0) KMessageBox::error(0, "actionCollection==0");
fileOpen = KStdAction::open(TQT_TQOBJECT(this), TQT_SLOT(slotFileOpen()), ac); fileOpen = KStdAction::open(this, TQT_SLOT(slotFileOpen()), ac);
fileOpen->setStatusText(i18n("Opens documents for comparison...")); fileOpen->setStatusText(i18n("Opens documents for comparison..."));
fileReload = new TDEAction(i18n("Reload"), /*TQIconSet(TQPixmap(reloadIcon)),*/ Key_F5, TQT_TQOBJECT(this), TQT_SLOT(slotReload()), ac, "file_reload"); fileReload = new TDEAction(i18n("Reload"), /*TQIconSet(TQPixmap(reloadIcon)),*/ Key_F5, this, TQT_SLOT(slotReload()), ac, "file_reload");
fileSave = KStdAction::save(TQT_TQOBJECT(this), TQT_SLOT(slotFileSave()), ac); fileSave = KStdAction::save(this, TQT_SLOT(slotFileSave()), ac);
fileSave->setStatusText(i18n("Saves the merge result. All conflicts must be solved!")); fileSave->setStatusText(i18n("Saves the merge result. All conflicts must be solved!"));
fileSaveAs = KStdAction::saveAs(TQT_TQOBJECT(this), TQT_SLOT(slotFileSaveAs()), ac); fileSaveAs = KStdAction::saveAs(this, TQT_SLOT(slotFileSaveAs()), ac);
fileSaveAs->setStatusText(i18n("Saves the current document as...")); fileSaveAs->setStatusText(i18n("Saves the current document as..."));
filePrint = KStdAction::print(TQT_TQOBJECT(this), TQT_SLOT(slotFilePrint()), ac); filePrint = KStdAction::print(this, TQT_SLOT(slotFilePrint()), ac);
filePrint->setStatusText(i18n("Print the differences")); filePrint->setStatusText(i18n("Print the differences"));
fileQuit = KStdAction::quit(TQT_TQOBJECT(this), TQT_SLOT(slotFileQuit()), ac); fileQuit = KStdAction::quit(this, TQT_SLOT(slotFileQuit()), ac);
fileQuit->setStatusText(i18n("Quits the application")); fileQuit->setStatusText(i18n("Quits the application"));
editCut = KStdAction::cut(TQT_TQOBJECT(this), TQT_SLOT(slotEditCut()), ac); editCut = KStdAction::cut(this, TQT_SLOT(slotEditCut()), ac);
editCut->setStatusText(i18n("Cuts the selected section and puts it to the clipboard")); editCut->setStatusText(i18n("Cuts the selected section and puts it to the clipboard"));
editCopy = KStdAction::copy(TQT_TQOBJECT(this), TQT_SLOT(slotEditCopy()), ac); editCopy = KStdAction::copy(this, TQT_SLOT(slotEditCopy()), ac);
editCopy->setStatusText(i18n("Copies the selected section to the clipboard")); editCopy->setStatusText(i18n("Copies the selected section to the clipboard"));
editPaste = KStdAction::paste(TQT_TQOBJECT(this), TQT_SLOT(slotEditPaste()), ac); editPaste = KStdAction::paste(this, TQT_SLOT(slotEditPaste()), ac);
editPaste->setStatusText(i18n("Pastes the clipboard contents to actual position")); editPaste->setStatusText(i18n("Pastes the clipboard contents to actual position"));
editSelectAll = KStdAction::selectAll(TQT_TQOBJECT(this), TQT_SLOT(slotEditSelectAll()), ac); editSelectAll = KStdAction::selectAll(this, TQT_SLOT(slotEditSelectAll()), ac);
editSelectAll->setStatusText(i18n("Select everything in current window")); editSelectAll->setStatusText(i18n("Select everything in current window"));
editFind = KStdAction::find(TQT_TQOBJECT(this), TQT_SLOT(slotEditFind()), ac); editFind = KStdAction::find(this, TQT_SLOT(slotEditFind()), ac);
editFind->setStatusText(i18n("Search for a string")); editFind->setStatusText(i18n("Search for a string"));
editFindNext = KStdAction::findNext(TQT_TQOBJECT(this), TQT_SLOT(slotEditFindNext()), ac); editFindNext = KStdAction::findNext(this, TQT_SLOT(slotEditFindNext()), ac);
editFindNext->setStatusText(i18n("Search again for the string")); editFindNext->setStatusText(i18n("Search again for the string"));
viewToolBar = KStdAction::showToolbar(TQT_TQOBJECT(this), TQT_SLOT(slotViewToolBar()), ac); viewToolBar = KStdAction::showToolbar(this, TQT_SLOT(slotViewToolBar()), ac);
viewToolBar->setStatusText(i18n("Enables/disables the toolbar")); viewToolBar->setStatusText(i18n("Enables/disables the toolbar"));
viewStatusBar = KStdAction::showStatusbar(TQT_TQOBJECT(this), TQT_SLOT(slotViewStatusBar()), ac); viewStatusBar = KStdAction::showStatusbar(this, TQT_SLOT(slotViewStatusBar()), ac);
viewStatusBar->setStatusText(i18n("Enables/disables the statusbar")); viewStatusBar->setStatusText(i18n("Enables/disables the statusbar"));
KStdAction::keyBindings(TQT_TQOBJECT(this), TQT_SLOT(slotConfigureKeys()), ac); KStdAction::keyBindings(this, TQT_SLOT(slotConfigureKeys()), ac);
TDEAction* pAction = KStdAction::preferences(TQT_TQOBJECT(this), TQT_SLOT(slotConfigure()), ac ); TDEAction* pAction = KStdAction::preferences(this, TQT_SLOT(slotConfigure()), ac );
if ( isPart() ) if ( isPart() )
pAction->setText(i18n("Configure KDiff3...")); pAction->setText(i18n("Configure KDiff3..."));
@ -483,70 +483,70 @@ void KDiff3App::initActions( TDEActionCollection* ac )
#include "xpm/showlinenumbers.xpm" #include "xpm/showlinenumbers.xpm"
//#include "reload.xpm" //#include "reload.xpm"
goCurrent = new TDEAction(i18n("Go to Current Delta"), TQIconSet(TQPixmap(currentpos)), CTRL+Key_Space, TQT_TQOBJECT(this), TQT_SLOT(slotGoCurrent()), ac, "go_current"); goCurrent = new TDEAction(i18n("Go to Current Delta"), TQIconSet(TQPixmap(currentpos)), CTRL+Key_Space, this, TQT_SLOT(slotGoCurrent()), ac, "go_current");
goTop = new TDEAction(i18n("Go to First Delta"), TQIconSet(TQPixmap(upend)), 0, TQT_TQOBJECT(this), TQT_SLOT(slotGoTop()), ac, "go_top"); goTop = new TDEAction(i18n("Go to First Delta"), TQIconSet(TQPixmap(upend)), 0, this, TQT_SLOT(slotGoTop()), ac, "go_top");
goBottom = new TDEAction(i18n("Go to Last Delta"), TQIconSet(TQPixmap(downend)), 0, TQT_TQOBJECT(this), TQT_SLOT(slotGoBottom()), ac, "go_bottom"); goBottom = new TDEAction(i18n("Go to Last Delta"), TQIconSet(TQPixmap(downend)), 0, this, TQT_SLOT(slotGoBottom()), ac, "go_bottom");
TQString omitsWhitespace = ".\n" + i18n("(Skips white space differences when \"Show White Space\" is disabled.)"); TQString omitsWhitespace = ".\n" + i18n("(Skips white space differences when \"Show White Space\" is disabled.)");
TQString includeWhitespace = ".\n" + i18n("(Does not skip white space differences even when \"Show White Space\" is disabled.)"); TQString includeWhitespace = ".\n" + i18n("(Does not skip white space differences even when \"Show White Space\" is disabled.)");
goPrevDelta = new TDEAction(i18n("Go to Previous Delta"), TQIconSet(TQPixmap(up1arrow)), CTRL+Key_Up, TQT_TQOBJECT(this), TQT_SLOT(slotGoPrevDelta()), ac, "go_prev_delta"); goPrevDelta = new TDEAction(i18n("Go to Previous Delta"), TQIconSet(TQPixmap(up1arrow)), CTRL+Key_Up, this, TQT_SLOT(slotGoPrevDelta()), ac, "go_prev_delta");
goPrevDelta->setToolTip( goPrevDelta->text() + omitsWhitespace ); goPrevDelta->setToolTip( goPrevDelta->text() + omitsWhitespace );
goNextDelta = new TDEAction(i18n("Go to Next Delta"), TQIconSet(TQPixmap(down1arrow)), CTRL+Key_Down, TQT_TQOBJECT(this), TQT_SLOT(slotGoNextDelta()), ac, "go_next_delta"); goNextDelta = new TDEAction(i18n("Go to Next Delta"), TQIconSet(TQPixmap(down1arrow)), CTRL+Key_Down, this, TQT_SLOT(slotGoNextDelta()), ac, "go_next_delta");
goNextDelta->setToolTip( goNextDelta->text() + omitsWhitespace ); goNextDelta->setToolTip( goNextDelta->text() + omitsWhitespace );
goPrevConflict = new TDEAction(i18n("Go to Previous Conflict"), TQIconSet(TQPixmap(up2arrow)), CTRL+Key_PageUp, TQT_TQOBJECT(this), TQT_SLOT(slotGoPrevConflict()), ac, "go_prev_conflict"); goPrevConflict = new TDEAction(i18n("Go to Previous Conflict"), TQIconSet(TQPixmap(up2arrow)), CTRL+Key_PageUp, this, TQT_SLOT(slotGoPrevConflict()), ac, "go_prev_conflict");
goPrevConflict->setToolTip( goPrevConflict->text() + omitsWhitespace ); goPrevConflict->setToolTip( goPrevConflict->text() + omitsWhitespace );
goNextConflict = new TDEAction(i18n("Go to Next Conflict"), TQIconSet(TQPixmap(down2arrow)), CTRL+Key_PageDown, TQT_TQOBJECT(this), TQT_SLOT(slotGoNextConflict()), ac, "go_next_conflict"); goNextConflict = new TDEAction(i18n("Go to Next Conflict"), TQIconSet(TQPixmap(down2arrow)), CTRL+Key_PageDown, this, TQT_SLOT(slotGoNextConflict()), ac, "go_next_conflict");
goNextConflict->setToolTip( goNextConflict->text() + omitsWhitespace ); goNextConflict->setToolTip( goNextConflict->text() + omitsWhitespace );
goPrevUnsolvedConflict = new TDEAction(i18n("Go to Previous Unsolved Conflict"), TQIconSet(TQPixmap(prevunsolved)), 0, TQT_TQOBJECT(this), TQT_SLOT(slotGoPrevUnsolvedConflict()), ac, "go_prev_unsolved_conflict"); goPrevUnsolvedConflict = new TDEAction(i18n("Go to Previous Unsolved Conflict"), TQIconSet(TQPixmap(prevunsolved)), 0, this, TQT_SLOT(slotGoPrevUnsolvedConflict()), ac, "go_prev_unsolved_conflict");
goPrevUnsolvedConflict->setToolTip( goPrevUnsolvedConflict->text() + includeWhitespace ); goPrevUnsolvedConflict->setToolTip( goPrevUnsolvedConflict->text() + includeWhitespace );
goNextUnsolvedConflict = new TDEAction(i18n("Go to Next Unsolved Conflict"), TQIconSet(TQPixmap(nextunsolved)), 0, TQT_TQOBJECT(this), TQT_SLOT(slotGoNextUnsolvedConflict()), ac, "go_next_unsolved_conflict"); goNextUnsolvedConflict = new TDEAction(i18n("Go to Next Unsolved Conflict"), TQIconSet(TQPixmap(nextunsolved)), 0, this, TQT_SLOT(slotGoNextUnsolvedConflict()), ac, "go_next_unsolved_conflict");
goNextUnsolvedConflict->setToolTip( goNextUnsolvedConflict->text() + includeWhitespace ); goNextUnsolvedConflict->setToolTip( goNextUnsolvedConflict->text() + includeWhitespace );
chooseA = new TDEToggleAction(i18n("Select Line(s) From A"), TQIconSet(TQPixmap(iconA)), CTRL+Key_1, TQT_TQOBJECT(this), TQT_SLOT(slotChooseA()), ac, "merge_choose_a"); chooseA = new TDEToggleAction(i18n("Select Line(s) From A"), TQIconSet(TQPixmap(iconA)), CTRL+Key_1, this, TQT_SLOT(slotChooseA()), ac, "merge_choose_a");
chooseB = new TDEToggleAction(i18n("Select Line(s) From B"), TQIconSet(TQPixmap(iconB)), CTRL+Key_2, TQT_TQOBJECT(this), TQT_SLOT(slotChooseB()), ac, "merge_choose_b"); chooseB = new TDEToggleAction(i18n("Select Line(s) From B"), TQIconSet(TQPixmap(iconB)), CTRL+Key_2, this, TQT_SLOT(slotChooseB()), ac, "merge_choose_b");
chooseC = new TDEToggleAction(i18n("Select Line(s) From C"), TQIconSet(TQPixmap(iconC)), CTRL+Key_3, TQT_TQOBJECT(this), TQT_SLOT(slotChooseC()), ac, "merge_choose_c"); chooseC = new TDEToggleAction(i18n("Select Line(s) From C"), TQIconSet(TQPixmap(iconC)), CTRL+Key_3, this, TQT_SLOT(slotChooseC()), ac, "merge_choose_c");
autoAdvance = new TDEToggleAction(i18n("Automatically Go to Next Unsolved Conflict After Source Selection"), TQIconSet(TQPixmap(autoadvance)), 0, TQT_TQOBJECT(this), TQT_SLOT(slotAutoAdvanceToggled()), ac, "merge_autoadvance"); autoAdvance = new TDEToggleAction(i18n("Automatically Go to Next Unsolved Conflict After Source Selection"), TQIconSet(TQPixmap(autoadvance)), 0, this, TQT_SLOT(slotAutoAdvanceToggled()), ac, "merge_autoadvance");
showWhiteSpaceCharacters = new TDEToggleAction(i18n("Show Space && Tabulator Characters for Differences"), TQIconSet(TQPixmap(showwhitespacechars)), 0, TQT_TQOBJECT(this), TQT_SLOT(slotShowWhiteSpaceToggled()), ac, "diff_show_whitespace_characters"); showWhiteSpaceCharacters = new TDEToggleAction(i18n("Show Space && Tabulator Characters for Differences"), TQIconSet(TQPixmap(showwhitespacechars)), 0, this, TQT_SLOT(slotShowWhiteSpaceToggled()), ac, "diff_show_whitespace_characters");
showWhiteSpace = new TDEToggleAction(i18n("Show White Space"), TQIconSet(TQPixmap(showwhitespace)), 0, TQT_TQOBJECT(this), TQT_SLOT(slotShowWhiteSpaceToggled()), ac, "diff_show_whitespace"); showWhiteSpace = new TDEToggleAction(i18n("Show White Space"), TQIconSet(TQPixmap(showwhitespace)), 0, this, TQT_SLOT(slotShowWhiteSpaceToggled()), ac, "diff_show_whitespace");
showLineNumbers = new TDEToggleAction(i18n("Show Line Numbers"), TQIconSet(TQPixmap(showlinenumbers)), 0, TQT_TQOBJECT(this), TQT_SLOT(slotShowLineNumbersToggled()), ac, "diff_showlinenumbers"); showLineNumbers = new TDEToggleAction(i18n("Show Line Numbers"), TQIconSet(TQPixmap(showlinenumbers)), 0, this, TQT_SLOT(slotShowLineNumbersToggled()), ac, "diff_showlinenumbers");
chooseAEverywhere = new TDEAction(i18n("Choose A Everywhere"), CTRL+SHIFT+Key_1, TQT_TQOBJECT(this), TQT_SLOT(slotChooseAEverywhere()), ac, "merge_choose_a_everywhere"); chooseAEverywhere = new TDEAction(i18n("Choose A Everywhere"), CTRL+SHIFT+Key_1, this, TQT_SLOT(slotChooseAEverywhere()), ac, "merge_choose_a_everywhere");
chooseBEverywhere = new TDEAction(i18n("Choose B Everywhere"), CTRL+SHIFT+Key_2, TQT_TQOBJECT(this), TQT_SLOT(slotChooseBEverywhere()), ac, "merge_choose_b_everywhere"); chooseBEverywhere = new TDEAction(i18n("Choose B Everywhere"), CTRL+SHIFT+Key_2, this, TQT_SLOT(slotChooseBEverywhere()), ac, "merge_choose_b_everywhere");
chooseCEverywhere = new TDEAction(i18n("Choose C Everywhere"), CTRL+SHIFT+Key_3, TQT_TQOBJECT(this), TQT_SLOT(slotChooseCEverywhere()), ac, "merge_choose_c_everywhere"); chooseCEverywhere = new TDEAction(i18n("Choose C Everywhere"), CTRL+SHIFT+Key_3, this, TQT_SLOT(slotChooseCEverywhere()), ac, "merge_choose_c_everywhere");
chooseAForUnsolvedConflicts = new TDEAction(i18n("Choose A for All Unsolved Conflicts"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotChooseAForUnsolvedConflicts()), ac, "merge_choose_a_for_unsolved_conflicts"); chooseAForUnsolvedConflicts = new TDEAction(i18n("Choose A for All Unsolved Conflicts"), 0, this, TQT_SLOT(slotChooseAForUnsolvedConflicts()), ac, "merge_choose_a_for_unsolved_conflicts");
chooseBForUnsolvedConflicts = new TDEAction(i18n("Choose B for All Unsolved Conflicts"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotChooseBForUnsolvedConflicts()), ac, "merge_choose_b_for_unsolved_conflicts"); chooseBForUnsolvedConflicts = new TDEAction(i18n("Choose B for All Unsolved Conflicts"), 0, this, TQT_SLOT(slotChooseBForUnsolvedConflicts()), ac, "merge_choose_b_for_unsolved_conflicts");
chooseCForUnsolvedConflicts = new TDEAction(i18n("Choose C for All Unsolved Conflicts"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotChooseCForUnsolvedConflicts()), ac, "merge_choose_c_for_unsolved_conflicts"); chooseCForUnsolvedConflicts = new TDEAction(i18n("Choose C for All Unsolved Conflicts"), 0, this, TQT_SLOT(slotChooseCForUnsolvedConflicts()), ac, "merge_choose_c_for_unsolved_conflicts");
chooseAForUnsolvedWhiteSpaceConflicts = new TDEAction(i18n("Choose A for All Unsolved Whitespace Conflicts"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotChooseAForUnsolvedWhiteSpaceConflicts()), ac, "merge_choose_a_for_unsolved_whitespace_conflicts"); chooseAForUnsolvedWhiteSpaceConflicts = new TDEAction(i18n("Choose A for All Unsolved Whitespace Conflicts"), 0, this, TQT_SLOT(slotChooseAForUnsolvedWhiteSpaceConflicts()), ac, "merge_choose_a_for_unsolved_whitespace_conflicts");
chooseBForUnsolvedWhiteSpaceConflicts = new TDEAction(i18n("Choose B for All Unsolved Whitespace Conflicts"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotChooseBForUnsolvedWhiteSpaceConflicts()), ac, "merge_choose_b_for_unsolved_whitespace_conflicts"); chooseBForUnsolvedWhiteSpaceConflicts = new TDEAction(i18n("Choose B for All Unsolved Whitespace Conflicts"), 0, this, TQT_SLOT(slotChooseBForUnsolvedWhiteSpaceConflicts()), ac, "merge_choose_b_for_unsolved_whitespace_conflicts");
chooseCForUnsolvedWhiteSpaceConflicts = new TDEAction(i18n("Choose C for All Unsolved Whitespace Conflicts"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotChooseCForUnsolvedWhiteSpaceConflicts()), ac, "merge_choose_c_for_unsolved_whitespace_conflicts"); chooseCForUnsolvedWhiteSpaceConflicts = new TDEAction(i18n("Choose C for All Unsolved Whitespace Conflicts"), 0, this, TQT_SLOT(slotChooseCForUnsolvedWhiteSpaceConflicts()), ac, "merge_choose_c_for_unsolved_whitespace_conflicts");
autoSolve = new TDEAction(i18n("Automatically Solve Simple Conflicts"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotAutoSolve()), ac, "merge_autosolve"); autoSolve = new TDEAction(i18n("Automatically Solve Simple Conflicts"), 0, this, TQT_SLOT(slotAutoSolve()), ac, "merge_autosolve");
unsolve = new TDEAction(i18n("Set Deltas to Conflicts"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotUnsolve()), ac, "merge_autounsolve"); unsolve = new TDEAction(i18n("Set Deltas to Conflicts"), 0, this, TQT_SLOT(slotUnsolve()), ac, "merge_autounsolve");
mergeRegExp = new TDEAction(i18n("Run Regular Expression Auto Merge"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotRegExpAutoMerge()),ac, "merge_regexp_automerge" ); mergeRegExp = new TDEAction(i18n("Run Regular Expression Auto Merge"), 0, this, TQT_SLOT(slotRegExpAutoMerge()),ac, "merge_regexp_automerge" );
mergeHistory = new TDEAction(i18n("Automatically Solve History Conflicts"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotMergeHistory()), ac, "merge_versioncontrol_history" ); mergeHistory = new TDEAction(i18n("Automatically Solve History Conflicts"), 0, this, TQT_SLOT(slotMergeHistory()), ac, "merge_versioncontrol_history" );
splitDiff = new TDEAction(i18n("Split Diff At Selection"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotSplitDiff()), ac, "merge_splitdiff"); splitDiff = new TDEAction(i18n("Split Diff At Selection"), 0, this, TQT_SLOT(slotSplitDiff()), ac, "merge_splitdiff");
joinDiffs = new TDEAction(i18n("Join Selected Diffs"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotJoinDiffs()), ac, "merge_joindiffs"); joinDiffs = new TDEAction(i18n("Join Selected Diffs"), 0, this, TQT_SLOT(slotJoinDiffs()), ac, "merge_joindiffs");
showWindowA = new TDEToggleAction(i18n("Show Window A"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotShowWindowAToggled()), ac, "win_show_a"); showWindowA = new TDEToggleAction(i18n("Show Window A"), 0, this, TQT_SLOT(slotShowWindowAToggled()), ac, "win_show_a");
showWindowB = new TDEToggleAction(i18n("Show Window B"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotShowWindowBToggled()), ac, "win_show_b"); showWindowB = new TDEToggleAction(i18n("Show Window B"), 0, this, TQT_SLOT(slotShowWindowBToggled()), ac, "win_show_b");
showWindowC = new TDEToggleAction(i18n("Show Window C"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotShowWindowCToggled()), ac, "win_show_c"); showWindowC = new TDEToggleAction(i18n("Show Window C"), 0, this, TQT_SLOT(slotShowWindowCToggled()), ac, "win_show_c");
winFocusNext = new TDEAction(i18n("Focus Next Window"), ALT+Key_Right, TQT_TQOBJECT(this), TQT_SLOT(slotWinFocusNext()), ac, "win_focus_next"); winFocusNext = new TDEAction(i18n("Focus Next Window"), ALT+Key_Right, this, TQT_SLOT(slotWinFocusNext()), ac, "win_focus_next");
overviewModeNormal = new TDEToggleAction(i18n("Normal Overview"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotOverviewNormal()), ac, "diff_overview_normal"); overviewModeNormal = new TDEToggleAction(i18n("Normal Overview"), 0, this, TQT_SLOT(slotOverviewNormal()), ac, "diff_overview_normal");
overviewModeAB = new TDEToggleAction(i18n("A vs. B Overview"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotOverviewAB()), ac, "diff_overview_ab"); overviewModeAB = new TDEToggleAction(i18n("A vs. B Overview"), 0, this, TQT_SLOT(slotOverviewAB()), ac, "diff_overview_ab");
overviewModeAC = new TDEToggleAction(i18n("A vs. C Overview"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotOverviewAC()), ac, "diff_overview_ac"); overviewModeAC = new TDEToggleAction(i18n("A vs. C Overview"), 0, this, TQT_SLOT(slotOverviewAC()), ac, "diff_overview_ac");
overviewModeBC = new TDEToggleAction(i18n("B vs. C Overview"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotOverviewBC()), ac, "diff_overview_bc"); overviewModeBC = new TDEToggleAction(i18n("B vs. C Overview"), 0, this, TQT_SLOT(slotOverviewBC()), ac, "diff_overview_bc");
wordWrap = new TDEToggleAction(i18n("Word Wrap Diff Windows"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotWordWrapToggled()), ac, "diff_wordwrap"); wordWrap = new TDEToggleAction(i18n("Word Wrap Diff Windows"), 0, this, TQT_SLOT(slotWordWrapToggled()), ac, "diff_wordwrap");
addManualDiffHelp = new TDEAction(i18n("Add Manual Diff Alignment"), TQt::CTRL+TQt::Key_Y, TQT_TQOBJECT(this), TQT_SLOT(slotAddManualDiffHelp()), ac, "diff_add_manual_diff_help"); addManualDiffHelp = new TDEAction(i18n("Add Manual Diff Alignment"), TQt::CTRL+TQt::Key_Y, this, TQT_SLOT(slotAddManualDiffHelp()), ac, "diff_add_manual_diff_help");
clearManualDiffHelpList = new TDEAction(i18n("Clear All Manual Diff Alignments"), TQt::CTRL+TQt::SHIFT+TQt::Key_Y, TQT_TQOBJECT(this), TQT_SLOT(slotClearManualDiffHelpList()), ac, "diff_clear_manual_diff_help_list"); clearManualDiffHelpList = new TDEAction(i18n("Clear All Manual Diff Alignments"), TQt::CTRL+TQt::SHIFT+TQt::Key_Y, this, TQT_SLOT(slotClearManualDiffHelpList()), ac, "diff_clear_manual_diff_help_list");
#ifdef _WIN32 #ifdef _WIN32
new TDEAction(i18n("Focus Next Window"), TQt::CTRL+TQt::Key_Tab, TQT_TQOBJECT(this), TQT_SLOT(slotWinFocusNext()), ac, "win_focus_next", false, false); new TDEAction(i18n("Focus Next Window"), TQt::CTRL+TQt::Key_Tab, this, TQT_SLOT(slotWinFocusNext()), ac, "win_focus_next", false, false);
#endif #endif
winFocusPrev = new TDEAction(i18n("Focus Prev Window"), TQt::ALT+TQt::Key_Left, TQT_TQOBJECT(this), TQT_SLOT(slotWinFocusPrev()), ac, "win_focus_prev"); winFocusPrev = new TDEAction(i18n("Focus Prev Window"), TQt::ALT+TQt::Key_Left, this, TQT_SLOT(slotWinFocusPrev()), ac, "win_focus_prev");
winToggleSplitOrientation = new TDEAction(i18n("Toggle Split Orientation"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotWinToggleSplitterOrientation()), ac, "win_toggle_split_orientation"); winToggleSplitOrientation = new TDEAction(i18n("Toggle Split Orientation"), 0, this, TQT_SLOT(slotWinToggleSplitterOrientation()), ac, "win_toggle_split_orientation");
dirShowBoth = new TDEToggleAction(i18n("Dir && Text Split Screen View"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotDirShowBoth()), ac, "win_dir_show_both"); dirShowBoth = new TDEToggleAction(i18n("Dir && Text Split Screen View"), 0, this, TQT_SLOT(slotDirShowBoth()), ac, "win_dir_show_both");
dirShowBoth->setChecked( true ); dirShowBoth->setChecked( true );
dirViewToggle = new TDEAction(i18n("Toggle Between Dir && Text View"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotDirViewToggle()), actionCollection(), "win_dir_view_toggle"); dirViewToggle = new TDEAction(i18n("Toggle Between Dir && Text View"), 0, this, TQT_SLOT(slotDirViewToggle()), actionCollection(), "win_dir_view_toggle");
m_pMergeEditorPopupMenu = new TQPopupMenu( this ); m_pMergeEditorPopupMenu = new TQPopupMenu( this );
chooseA->plug( m_pMergeEditorPopupMenu ); chooseA->plug( m_pMergeEditorPopupMenu );

2
src/kdiff3_shell.cpp
Unescape View File

@ -55,7 +55,7 @@ KDiff3Shell::KDiff3Shell(bool bCompleteInit)
{ {
// now that the Part is loaded, we cast it to a Part to get // now that the Part is loaded, we cast it to a Part to get
// our hands on it // our hands on it
m_part = static_cast<KParts::ReadWritePart *>(factory->create(TQT_TQOBJECT(this), m_part = static_cast<KParts::ReadWritePart *>(factory->create(this,
"kdiff3_part", "KParts::ReadWritePart" )); "kdiff3_part", "KParts::ReadWritePart" ));
if (m_part) if (m_part)

4
src/mergeresultwindow.cpp
Unescape View File

@ -3210,8 +3210,8 @@ bool WindowTitleWidget::eventFilter( TQObject* o, TQEvent* e )
if ( lst.count() > 0 ) if ( lst.count() > 0 )
{ {
static_cast<TQLineEdit*>(TQT_TQWIDGET(o))->setText( lst[0] ); static_cast<TQLineEdit*>(o)->setText( lst[0] );
static_cast<TQLineEdit*>(TQT_TQWIDGET(o))->setFocus(); static_cast<TQLineEdit*>(o)->setFocus();
return true; return true;
} }
} }

2
src/optiondialog.cpp
Unescape View File

@ -263,7 +263,7 @@ public:
{ {
m_pVar = pVar; m_pVar = pVar;
m_defaultVal = defaultVal; m_defaultVal = defaultVal;
TQIntValidator* v = new TQIntValidator(TQT_TQOBJECT(this)); TQIntValidator* v = new TQIntValidator(this);
v->setRange( rangeMin, rangeMax ); v->setRange( rangeMin, rangeMax );
setValidator( v ); setValidator( v );
} }

4
src/smalldialogs.cpp
Unescape View File

@ -200,8 +200,8 @@ bool OpenDialog::eventFilter(TQObject* o, TQEvent* e)
if ( lst.count() > 0 ) if ( lst.count() > 0 )
{ {
static_cast<TQLineEdit*>(TQT_TQWIDGET(o))->setText( lst[0] ); static_cast<TQLineEdit*>(o)->setText( lst[0] );
static_cast<TQLineEdit*>(TQT_TQWIDGET(o))->setFocus(); static_cast<TQLineEdit*>(o)->setFocus();
} }
return true; return true;

Write Preview
Loading…
Cancel
Save