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

Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines

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

18
kdiff3plugin/kdiff3plugin.cpp
Unescape View File

@ -102,21 +102,21 @@ KDiff3Plugin::KDiff3Plugin( KonqPopupMenu* pPopupmenu, const char *name, const T
{ {
int historyCount = s_pHistory ? s_pHistory->count() : 0; int historyCount = s_pHistory ? s_pHistory->count() : 0;
s = i18n("Compare with %1").arg( historyCount>0 ? s_pHistory->front() : TQString() ); s = i18n("Compare with %1").arg( historyCount>0 ? s_pHistory->front() : TQString() );
pAction = new TDEAction ( s,0, this, TQT_SLOT(slotCompareWith()), actionCollection()); pAction = new TDEAction ( s,0, this, TQ_SLOT(slotCompareWith()), actionCollection());
pAction->setEnabled( m_list.count()>0 && historyCount>0 ); pAction->setEnabled( m_list.count()>0 && historyCount>0 );
pActionMenu->insert (pAction); pActionMenu->insert (pAction);
s = i18n("Merge with %1").arg( historyCount>0 ? s_pHistory->front() : TQString() ); s = i18n("Merge with %1").arg( historyCount>0 ? s_pHistory->front() : TQString() );
pAction = new TDEAction( s, 0, this, TQT_SLOT(slotMergeWith()), actionCollection()); pAction = new TDEAction( s, 0, this, TQ_SLOT(slotMergeWith()), actionCollection());
pAction->setEnabled( m_list.count()>0 && historyCount>0 ); pAction->setEnabled( m_list.count()>0 && historyCount>0 );
pActionMenu->insert (pAction); pActionMenu->insert (pAction);
s = i18n("Save '%1' for later").arg( ( m_list.front() ) ); s = i18n("Save '%1' for later").arg( ( m_list.front() ) );
pAction = new TDEAction ( s, 0, this, TQT_SLOT(slotSaveForLater()), actionCollection()); pAction = new TDEAction ( s, 0, this, TQ_SLOT(slotSaveForLater()), actionCollection());
pAction->setEnabled( m_list.count()>0 ); pAction->setEnabled( m_list.count()>0 );
pActionMenu->insert(pAction); pActionMenu->insert(pAction);
pAction = new TDEAction (i18n("3-way merge with base"), 0, this, TQT_SLOT(slotMergeThreeWay()), actionCollection()); pAction = new TDEAction (i18n("3-way merge with base"), 0, this, TQ_SLOT(slotMergeThreeWay()), actionCollection());
pAction->setEnabled( m_list.count()>0 && historyCount>=2 ); pAction->setEnabled( m_list.count()>0 && historyCount>=2 );
pActionMenu->insert (pAction); pActionMenu->insert (pAction);
@ -127,26 +127,26 @@ KDiff3Plugin::KDiff3Plugin( KonqPopupMenu* pPopupmenu, const char *name, const T
pActionMenu->insert(pHistoryMenu); pActionMenu->insert(pHistoryMenu);
for (TQStringList::iterator i = s_pHistory->begin(); i!=s_pHistory->end(); ++i) for (TQStringList::iterator i = s_pHistory->begin(); i!=s_pHistory->end(); ++i)
{ {
pAction = new TDEAction( *i, "History", 0, this, TQT_SLOT(slotCompareWithHistoryItem()), actionCollection()); pAction = new TDEAction( *i, "History", 0, this, TQ_SLOT(slotCompareWithHistoryItem()), actionCollection());
pHistoryMenu->insert (pAction); pHistoryMenu->insert (pAction);
} }
pAction = new TDEAction (i18n("Clear list"), 0, this, TQT_SLOT(slotClearList()), actionCollection()); pAction = new TDEAction (i18n("Clear list"), 0, this, TQ_SLOT(slotClearList()), actionCollection());
pActionMenu->insert (pAction); pActionMenu->insert (pAction);
pAction->setEnabled( historyCount>0 ); pAction->setEnabled( historyCount>0 );
} }
} }
else if(m_list.count() == 2) else if(m_list.count() == 2)
{ {
pAction = new TDEAction (i18n("Compare"), 0, this, TQT_SLOT(slotCompareTwoFiles()), actionCollection()); pAction = new TDEAction (i18n("Compare"), 0, this, TQ_SLOT(slotCompareTwoFiles()), actionCollection());
pActionMenu->insert (pAction); pActionMenu->insert (pAction);
} }
else if ( m_list.count() == 3 ) else if ( m_list.count() == 3 )
{ {
pAction = new TDEAction (i18n("3 way comparison"), 0, this, TQT_SLOT(slotCompareThreeFiles()), actionCollection()); pAction = new TDEAction (i18n("3 way comparison"), 0, this, TQ_SLOT(slotCompareThreeFiles()), actionCollection());
pActionMenu->insert (pAction); pActionMenu->insert (pAction);
} }
pAction = new TDEAction (i18n("About KDiff3 menu plugin ..."), 0, this, TQT_SLOT(slotAbout()), actionCollection()); pAction = new TDEAction (i18n("About KDiff3 menu plugin ..."), 0, this, TQ_SLOT(slotAbout()), actionCollection());
pActionMenu->insert (pAction); pActionMenu->insert (pAction);
addSeparator(); addSeparator();

4
src/difftextwindow.cpp
Unescape View File

@ -1577,8 +1577,8 @@ DiffTextWindowFrame::DiffTextWindowFrame( TQWidget* pParent, TQStatusBar* pStatu
d->m_pFileSelection = new TQLineEdit(d->m_pTopLineWidget); d->m_pFileSelection = new TQLineEdit(d->m_pTopLineWidget);
d->m_pBrowseButton = new TQPushButton( "...",d->m_pTopLineWidget ); d->m_pBrowseButton = new TQPushButton( "...",d->m_pTopLineWidget );
d->m_pBrowseButton->setFixedWidth( 30 ); d->m_pBrowseButton->setFixedWidth( 30 );
connect(d->m_pBrowseButton,TQT_SIGNAL(clicked()), this, TQT_SLOT(slotBrowseButtonClicked())); connect(d->m_pBrowseButton,TQ_SIGNAL(clicked()), this, TQ_SLOT(slotBrowseButtonClicked()));
connect(d->m_pFileSelection,TQT_SIGNAL(returnPressed()), this, TQT_SLOT(slotReturnPressed())); connect(d->m_pFileSelection,TQ_SIGNAL(returnPressed()), this, TQ_SLOT(slotReturnPressed()));
d->m_pLabel = new TQLabel("A:",d->m_pTopLineWidget); d->m_pLabel = new TQLabel("A:",d->m_pTopLineWidget);
d->m_pTopLine = new TQLabel(d->m_pTopLineWidget); d->m_pTopLine = new TQLabel(d->m_pTopLineWidget);

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( this, TQT_SIGNAL(doubleClicked(TQListViewItem*)), this, TQT_SLOT(onDoubleClick(TQListViewItem*))); connect( this, TQ_SIGNAL(doubleClicked(TQListViewItem*)), this, TQ_SLOT(onDoubleClick(TQListViewItem*)));
connect( this, TQT_SIGNAL(returnPressed(TQListViewItem*)), this, TQT_SLOT(onDoubleClick(TQListViewItem*))); connect( this, TQ_SIGNAL(returnPressed(TQListViewItem*)), this, TQ_SLOT(onDoubleClick(TQListViewItem*)));
connect( this, TQT_SIGNAL( mouseButtonPressed(int,TQListViewItem*,const TQPoint&, int)), connect( this, TQ_SIGNAL( mouseButtonPressed(int,TQListViewItem*,const TQPoint&, int)),
this, TQT_SLOT( onClick(int,TQListViewItem*,const TQPoint&, int)) ); this, TQ_SLOT( onClick(int,TQListViewItem*,const TQPoint&, int)) );
connect( this, TQT_SIGNAL(contextMenuRequested(TQListViewItem*,const TQPoint &,int)), connect( this, TQ_SIGNAL(contextMenuRequested(TQListViewItem*,const TQPoint &,int)),
this, TQT_SLOT( slotShowContextMenu(TQListViewItem*,const TQPoint &,int))); this, TQ_SLOT( slotShowContextMenu(TQListViewItem*,const TQPoint &,int)));
connect( this, TQT_SIGNAL(selectionChanged(TQListViewItem*)), this, TQT_SLOT(onSelectionChanged(TQListViewItem*))); connect( this, TQ_SIGNAL(selectionChanged(TQListViewItem*)), this, TQ_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, p, TQT_SLOT(slotRunOperationForAllItems()), ac, "dir_start_operation"); m_pDirStartOperation = new TDEAction(i18n("Start/Continue Directory Merge"), TQt::Key_F7, p, TQ_SLOT(slotRunOperationForAllItems()), ac, "dir_start_operation");
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_pDirRunOperationForCurrentItem = new TDEAction(i18n("Run Operation for Current Item"), TQt::Key_F6, p, TQ_SLOT(slotRunOperationForCurrentItem()), ac, "dir_run_operation_for_current_item");
m_pDirCompareCurrent = new TDEAction(i18n("Compare Selected File"), 0, p, TQT_SLOT(compareCurrentFile()), ac, "dir_compare_current"); m_pDirCompareCurrent = new TDEAction(i18n("Compare Selected File"), 0, p, TQ_SLOT(compareCurrentFile()), ac, "dir_compare_current");
m_pDirMergeCurrent = new TDEAction(i18n("Merge Current File"), TQIconSet(TQPixmap(startmerge)), 0, pKDiff3App, TQT_SLOT(slotMergeCurrentFile()), ac, "merge_current"); m_pDirMergeCurrent = new TDEAction(i18n("Merge Current File"), TQIconSet(TQPixmap(startmerge)), 0, pKDiff3App, TQ_SLOT(slotMergeCurrentFile()), ac, "merge_current");
m_pDirFoldAll = new TDEAction(i18n("Fold All Subdirs"), 0, p, TQT_SLOT(slotFoldAllSubdirs()), ac, "dir_fold_all"); m_pDirFoldAll = new TDEAction(i18n("Fold All Subdirs"), 0, p, TQ_SLOT(slotFoldAllSubdirs()), ac, "dir_fold_all");
m_pDirUnfoldAll = new TDEAction(i18n("Unfold All Subdirs"), 0, p, TQT_SLOT(slotUnfoldAllSubdirs()), ac, "dir_unfold_all"); m_pDirUnfoldAll = new TDEAction(i18n("Unfold All Subdirs"), 0, p, TQ_SLOT(slotUnfoldAllSubdirs()), ac, "dir_unfold_all");
m_pDirRescan = new TDEAction(i18n("Rescan"), TQt::SHIFT+TQt::Key_F5, p, TQT_SLOT(reload()), ac, "dir_rescan"); m_pDirRescan = new TDEAction(i18n("Rescan"), TQt::SHIFT+TQt::Key_F5, p, TQ_SLOT(reload()), ac, "dir_rescan");
m_pDirSaveMergeState = 0; //new TDEAction(i18n("Save Directory Merge State ..."), 0, p, TQT_SLOT(slotSaveMergeState()), ac, "dir_save_merge_state"); m_pDirSaveMergeState = 0; //new TDEAction(i18n("Save Directory Merge State ..."), 0, p, TQ_SLOT(slotSaveMergeState()), ac, "dir_save_merge_state");
m_pDirLoadMergeState = 0; //new TDEAction(i18n("Load Directory Merge State ..."), 0, p, TQT_SLOT(slotLoadMergeState()), ac, "dir_load_merge_state"); m_pDirLoadMergeState = 0; //new TDEAction(i18n("Load Directory Merge State ..."), 0, p, TQ_SLOT(slotLoadMergeState()), ac, "dir_load_merge_state");
m_pDirChooseAEverywhere = new TDEAction(i18n("Choose A for All Items"), 0, p, TQT_SLOT(slotChooseAEverywhere()), ac, "dir_choose_a_everywhere"); m_pDirChooseAEverywhere = new TDEAction(i18n("Choose A for All Items"), 0, p, TQ_SLOT(slotChooseAEverywhere()), ac, "dir_choose_a_everywhere");
m_pDirChooseBEverywhere = new TDEAction(i18n("Choose B for All Items"), 0, p, TQT_SLOT(slotChooseBEverywhere()), ac, "dir_choose_b_everywhere"); m_pDirChooseBEverywhere = new TDEAction(i18n("Choose B for All Items"), 0, p, TQ_SLOT(slotChooseBEverywhere()), ac, "dir_choose_b_everywhere");
m_pDirChooseCEverywhere = new TDEAction(i18n("Choose C for All Items"), 0, p, TQT_SLOT(slotChooseCEverywhere()), ac, "dir_choose_c_everywhere"); m_pDirChooseCEverywhere = new TDEAction(i18n("Choose C for All Items"), 0, p, TQ_SLOT(slotChooseCEverywhere()), ac, "dir_choose_c_everywhere");
m_pDirAutoChoiceEverywhere = new TDEAction(i18n("Auto-Choose Operation for All Items"), 0, p, TQT_SLOT(slotAutoChooseEverywhere()), ac, "dir_autochoose_everywhere"); m_pDirAutoChoiceEverywhere = new TDEAction(i18n("Auto-Choose Operation for All Items"), 0, p, TQ_SLOT(slotAutoChooseEverywhere()), ac, "dir_autochoose_everywhere");
m_pDirDoNothingEverywhere = new TDEAction(i18n("No Operation for All Items"), 0, p, TQT_SLOT(slotNoOpEverywhere()), ac, "dir_nothing_everywhere"); m_pDirDoNothingEverywhere = new TDEAction(i18n("No Operation for All Items"), 0, p, TQ_SLOT(slotNoOpEverywhere()), ac, "dir_nothing_everywhere");
// m_pDirSynchronizeDirectories = new TDEToggleAction(i18n("Synchronize Directories"), 0, this, TQT_SLOT(slotSynchronizeDirectories()), ac, "dir_synchronize_directories"); // m_pDirSynchronizeDirectories = new TDEToggleAction(i18n("Synchronize Directories"), 0, this, TQ_SLOT(slotSynchronizeDirectories()), ac, "dir_synchronize_directories");
// m_pDirChooseNewerFiles = new TDEToggleAction(i18n("Copy Newer Files Instead of Merging"), 0, this, TQT_SLOT(slotChooseNewerFiles()), ac, "dir_choose_newer_files"); // m_pDirChooseNewerFiles = new TDEToggleAction(i18n("Copy Newer Files Instead of Merging"), 0, this, TQ_SLOT(slotChooseNewerFiles()), ac, "dir_choose_newer_files");
m_pDirShowIdenticalFiles = new TDEToggleAction(i18n("Show Identical Files"), TQIconSet(TQPixmap(showequalfiles)), 0, this, TQT_SLOT(slotShowIdenticalFiles()), ac, "dir_show_identical_files"); m_pDirShowIdenticalFiles = new TDEToggleAction(i18n("Show Identical Files"), TQIconSet(TQPixmap(showequalfiles)), 0, this, TQ_SLOT(slotShowIdenticalFiles()), ac, "dir_show_identical_files");
m_pDirShowDifferentFiles = new TDEToggleAction(i18n("Show Different Files"), 0, this, TQT_SLOT(slotShowDifferentFiles()), ac, "dir_show_different_files"); m_pDirShowDifferentFiles = new TDEToggleAction(i18n("Show Different Files"), 0, this, TQ_SLOT(slotShowDifferentFiles()), ac, "dir_show_different_files");
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_pDirShowFilesOnlyInA = new TDEToggleAction(i18n("Show Files only in A"), TQIconSet(TQPixmap(showfilesonlyina)), 0, this, TQ_SLOT(slotShowFilesOnlyInA()), ac, "dir_show_files_only_in_a");
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_pDirShowFilesOnlyInB = new TDEToggleAction(i18n("Show Files only in B"), TQIconSet(TQPixmap(showfilesonlyinb)), 0, this, TQ_SLOT(slotShowFilesOnlyInB()), ac, "dir_show_files_only_in_b");
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_pDirShowFilesOnlyInC = new TDEToggleAction(i18n("Show Files only in C"), TQIconSet(TQPixmap(showfilesonlyinc)), 0, this, TQ_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, p, TQT_SLOT(slotCompareExplicitlySelectedFiles()), ac, "dir_compare_explicitly_selected_files"); m_pDirCompareExplicit = new TDEAction(i18n("Compare Explicitly Selected Files"), 0, p, TQ_SLOT(slotCompareExplicitlySelectedFiles()), ac, "dir_compare_explicitly_selected_files");
m_pDirMergeExplicit = new TDEAction(i18n("Merge Explicitly Selected Files"), 0, p, TQT_SLOT(slotMergeExplicitlySelectedFiles()), ac, "dir_merge_explicitly_selected_files"); m_pDirMergeExplicit = new TDEAction(i18n("Merge Explicitly Selected Files"), 0, p, TQ_SLOT(slotMergeExplicitlySelectedFiles()), ac, "dir_merge_explicitly_selected_files");
m_pDirCurrentDoNothing = new TDEAction(i18n("Do Nothing"), 0, p, TQT_SLOT(slotCurrentDoNothing()), ac, "dir_current_do_nothing"); m_pDirCurrentDoNothing = new TDEAction(i18n("Do Nothing"), 0, p, TQ_SLOT(slotCurrentDoNothing()), ac, "dir_current_do_nothing");
m_pDirCurrentChooseA = new TDEAction(i18n("A"), 0, p, TQT_SLOT(slotCurrentChooseA()), ac, "dir_current_choose_a"); m_pDirCurrentChooseA = new TDEAction(i18n("A"), 0, p, TQ_SLOT(slotCurrentChooseA()), ac, "dir_current_choose_a");
m_pDirCurrentChooseB = new TDEAction(i18n("B"), 0, p, TQT_SLOT(slotCurrentChooseB()), ac, "dir_current_choose_b"); m_pDirCurrentChooseB = new TDEAction(i18n("B"), 0, p, TQ_SLOT(slotCurrentChooseB()), ac, "dir_current_choose_b");
m_pDirCurrentChooseC = new TDEAction(i18n("C"), 0, p, TQT_SLOT(slotCurrentChooseC()), ac, "dir_current_choose_c"); m_pDirCurrentChooseC = new TDEAction(i18n("C"), 0, p, TQ_SLOT(slotCurrentChooseC()), ac, "dir_current_choose_c");
m_pDirCurrentMerge = new TDEAction(i18n("Merge"), 0, p, TQT_SLOT(slotCurrentMerge()), ac, "dir_current_merge"); m_pDirCurrentMerge = new TDEAction(i18n("Merge"), 0, p, TQ_SLOT(slotCurrentMerge()), ac, "dir_current_merge");
m_pDirCurrentDelete = new TDEAction(i18n("Delete (if exists)"), 0, p, TQT_SLOT(slotCurrentDelete()), ac, "dir_current_delete"); m_pDirCurrentDelete = new TDEAction(i18n("Delete (if exists)"), 0, p, TQ_SLOT(slotCurrentDelete()), ac, "dir_current_delete");
m_pDirCurrentSyncDoNothing = new TDEAction(i18n("Do Nothing"), 0, p, TQT_SLOT(slotCurrentDoNothing()), ac, "dir_current_sync_do_nothing"); m_pDirCurrentSyncDoNothing = new TDEAction(i18n("Do Nothing"), 0, p, TQ_SLOT(slotCurrentDoNothing()), ac, "dir_current_sync_do_nothing");
m_pDirCurrentSyncCopyAToB = new TDEAction(i18n("Copy A to B"), 0, p, TQT_SLOT(slotCurrentCopyAToB()), ac, "dir_current_sync_copy_a_to_b" ); m_pDirCurrentSyncCopyAToB = new TDEAction(i18n("Copy A to B"), 0, p, TQ_SLOT(slotCurrentCopyAToB()), ac, "dir_current_sync_copy_a_to_b" );
m_pDirCurrentSyncCopyBToA = new TDEAction(i18n("Copy B to A"), 0, p, TQT_SLOT(slotCurrentCopyBToA()), ac, "dir_current_sync_copy_b_to_a" ); m_pDirCurrentSyncCopyBToA = new TDEAction(i18n("Copy B to A"), 0, p, TQ_SLOT(slotCurrentCopyBToA()), ac, "dir_current_sync_copy_b_to_a" );
m_pDirCurrentSyncDeleteA = new TDEAction(i18n("Delete A"), 0, p, TQT_SLOT(slotCurrentDeleteA()), ac,"dir_current_sync_delete_a"); m_pDirCurrentSyncDeleteA = new TDEAction(i18n("Delete A"), 0, p, TQ_SLOT(slotCurrentDeleteA()), ac,"dir_current_sync_delete_a");
m_pDirCurrentSyncDeleteB = new TDEAction(i18n("Delete B"), 0, p, TQT_SLOT(slotCurrentDeleteB()), ac,"dir_current_sync_delete_b"); m_pDirCurrentSyncDeleteB = new TDEAction(i18n("Delete B"), 0, p, TQ_SLOT(slotCurrentDeleteB()), ac,"dir_current_sync_delete_b");
m_pDirCurrentSyncDeleteAAndB = new TDEAction(i18n("Delete A && B"), 0, p, TQT_SLOT(slotCurrentDeleteAAndB()), ac,"dir_current_sync_delete_a_and_b"); m_pDirCurrentSyncDeleteAAndB = new TDEAction(i18n("Delete A && B"), 0, p, TQ_SLOT(slotCurrentDeleteAAndB()), ac,"dir_current_sync_delete_a_and_b");
m_pDirCurrentSyncMergeToA = new TDEAction(i18n("Merge to A"), 0, p, TQT_SLOT(slotCurrentMergeToA()), ac,"dir_current_sync_merge_to_a"); m_pDirCurrentSyncMergeToA = new TDEAction(i18n("Merge to A"), 0, p, TQ_SLOT(slotCurrentMergeToA()), ac,"dir_current_sync_merge_to_a");
m_pDirCurrentSyncMergeToB = new TDEAction(i18n("Merge to B"), 0, p, TQT_SLOT(slotCurrentMergeToB()), ac,"dir_current_sync_merge_to_b"); m_pDirCurrentSyncMergeToB = new TDEAction(i18n("Merge to B"), 0, p, TQ_SLOT(slotCurrentMergeToB()), ac,"dir_current_sync_merge_to_b");
m_pDirCurrentSyncMergeToAAndB = new TDEAction(i18n("Merge to A && B"), 0, p, TQT_SLOT(slotCurrentMergeToAAndB()), ac,"dir_current_sync_merge_to_a_and_b"); m_pDirCurrentSyncMergeToAAndB = new TDEAction(i18n("Merge to A && B"), 0, p, TQ_SLOT(slotCurrentMergeToAAndB()), ac,"dir_current_sync_merge_to_a_and_b");
} }

48
src/fileaccess.cpp
Unescape View File

@ -654,7 +654,7 @@ bool FileAccessJobHandler::stat( int detail, bool bWantToWrite )
m_pFileAccess->m_statusText = TQString(); m_pFileAccess->m_statusText = TQString();
TDEIO::StatJob* pStatJob = TDEIO::stat( m_pFileAccess->m_url, ! bWantToWrite, detail, false ); TDEIO::StatJob* pStatJob = TDEIO::stat( m_pFileAccess->m_url, ! bWantToWrite, detail, false );
connect( pStatJob, TQT_SIGNAL(result(TDEIO::Job*)), this, TQT_SLOT(slotStatResult(TDEIO::Job*))); connect( pStatJob, TQ_SIGNAL(result(TDEIO::Job*)), this, TQ_SLOT(slotStatResult(TDEIO::Job*)));
g_pProgressDialog->enterEventLoop( pStatJob, i18n("Getting file status: %1").arg(m_pFileAccess->prettyAbsPath()) ); g_pProgressDialog->enterEventLoop( pStatJob, i18n("Getting file status: %1").arg(m_pFileAccess->prettyAbsPath()) );
@ -695,9 +695,9 @@ bool FileAccessJobHandler::get(void* pDestBuffer, long maxLength )
m_bSuccess = false; m_bSuccess = false;
m_pFileAccess->m_statusText = TQString(); m_pFileAccess->m_statusText = TQString();
connect( pJob, TQT_SIGNAL(result(TDEIO::Job*)), this, TQT_SLOT(slotSimpleJobResult(TDEIO::Job*))); connect( pJob, TQ_SIGNAL(result(TDEIO::Job*)), this, TQ_SLOT(slotSimpleJobResult(TDEIO::Job*)));
connect( pJob, TQT_SIGNAL(data(TDEIO::Job*,const TQByteArray &)), this, TQT_SLOT(slotGetData(TDEIO::Job*, const TQByteArray&))); connect( pJob, TQ_SIGNAL(data(TDEIO::Job*,const TQByteArray &)), this, TQ_SLOT(slotGetData(TDEIO::Job*, const TQByteArray&)));
connect( pJob, TQT_SIGNAL(percent(TDEIO::Job*,unsigned long)), this, TQT_SLOT(slotPercent(TDEIO::Job*, unsigned long))); connect( pJob, TQ_SIGNAL(percent(TDEIO::Job*,unsigned long)), this, TQ_SLOT(slotPercent(TDEIO::Job*, unsigned long)));
g_pProgressDialog->enterEventLoop( pJob, i18n("Reading file: %1").arg(m_pFileAccess->prettyAbsPath()) ); g_pProgressDialog->enterEventLoop( pJob, i18n("Reading file: %1").arg(m_pFileAccess->prettyAbsPath()) );
return m_bSuccess; return m_bSuccess;
@ -731,9 +731,9 @@ bool FileAccessJobHandler::put(const void* pSrcBuffer, long maxLength, bool bOve
m_bSuccess = false; m_bSuccess = false;
m_pFileAccess->m_statusText = TQString(); m_pFileAccess->m_statusText = TQString();
connect( pJob, TQT_SIGNAL(result(TDEIO::Job*)), this, TQT_SLOT(slotPutJobResult(TDEIO::Job*))); connect( pJob, TQ_SIGNAL(result(TDEIO::Job*)), this, TQ_SLOT(slotPutJobResult(TDEIO::Job*)));
connect( pJob, TQT_SIGNAL(dataReq(TDEIO::Job*, TQByteArray&)), this, TQT_SLOT(slotPutData(TDEIO::Job*, TQByteArray&))); connect( pJob, TQ_SIGNAL(dataReq(TDEIO::Job*, TQByteArray&)), this, TQ_SLOT(slotPutData(TDEIO::Job*, TQByteArray&)));
connect( pJob, TQT_SIGNAL(percent(TDEIO::Job*,unsigned long)), this, TQT_SLOT(slotPercent(TDEIO::Job*, unsigned long))); connect( pJob, TQ_SIGNAL(percent(TDEIO::Job*,unsigned long)), this, TQ_SLOT(slotPercent(TDEIO::Job*, unsigned long)));
g_pProgressDialog->enterEventLoop( pJob, i18n("Writing file: %1").arg(m_pFileAccess->prettyAbsPath()) ); g_pProgressDialog->enterEventLoop( pJob, i18n("Writing file: %1").arg(m_pFileAccess->prettyAbsPath()) );
return m_bSuccess; return m_bSuccess;
@ -796,7 +796,7 @@ bool FileAccessJobHandler::mkDir( const TQString& dirName )
{ {
m_bSuccess = false; m_bSuccess = false;
TDEIO::SimpleJob* pJob = TDEIO::mkdir( dirURL ); TDEIO::SimpleJob* pJob = TDEIO::mkdir( dirURL );
connect( pJob, TQT_SIGNAL(result(TDEIO::Job*)), this, TQT_SLOT(slotSimpleJobResult(TDEIO::Job*))); connect( pJob, TQ_SIGNAL(result(TDEIO::Job*)), this, TQ_SLOT(slotSimpleJobResult(TDEIO::Job*)));
g_pProgressDialog->enterEventLoop( pJob, i18n("Making directory: %1").arg(dirName) ); g_pProgressDialog->enterEventLoop( pJob, i18n("Making directory: %1").arg(dirName) );
return m_bSuccess; return m_bSuccess;
@ -816,7 +816,7 @@ bool FileAccessJobHandler::rmDir( const TQString& dirName )
{ {
m_bSuccess = false; m_bSuccess = false;
TDEIO::SimpleJob* pJob = TDEIO::rmdir( dirURL ); TDEIO::SimpleJob* pJob = TDEIO::rmdir( dirURL );
connect( pJob, TQT_SIGNAL(result(TDEIO::Job*)), this, TQT_SLOT(slotSimpleJobResult(TDEIO::Job*))); connect( pJob, TQ_SIGNAL(result(TDEIO::Job*)), this, TQ_SLOT(slotSimpleJobResult(TDEIO::Job*)));
g_pProgressDialog->enterEventLoop(pJob, i18n("Removing directory: %1").arg(dirName)); g_pProgressDialog->enterEventLoop(pJob, i18n("Removing directory: %1").arg(dirName));
return m_bSuccess; return m_bSuccess;
@ -831,7 +831,7 @@ bool FileAccessJobHandler::removeFile( const TQString& fileName )
{ {
m_bSuccess = false; m_bSuccess = false;
TDEIO::SimpleJob* pJob = TDEIO::file_delete( KURL::fromPathOrURL(fileName), false ); TDEIO::SimpleJob* pJob = TDEIO::file_delete( KURL::fromPathOrURL(fileName), false );
connect( pJob, TQT_SIGNAL(result(TDEIO::Job*)), this, TQT_SLOT(slotSimpleJobResult(TDEIO::Job*))); connect( pJob, TQ_SIGNAL(result(TDEIO::Job*)), this, TQ_SLOT(slotSimpleJobResult(TDEIO::Job*)));
g_pProgressDialog->enterEventLoop( pJob, i18n("Removing file: %1").arg(fileName) ); g_pProgressDialog->enterEventLoop( pJob, i18n("Removing file: %1").arg(fileName) );
return m_bSuccess; return m_bSuccess;
@ -846,7 +846,7 @@ bool FileAccessJobHandler::symLink( const TQString& linkTarget, const TQString&
{ {
m_bSuccess = false; m_bSuccess = false;
TDEIO::CopyJob* pJob = TDEIO::link( KURL::fromPathOrURL(linkTarget), KURL::fromPathOrURL(linkLocation), false ); TDEIO::CopyJob* pJob = TDEIO::link( KURL::fromPathOrURL(linkTarget), KURL::fromPathOrURL(linkLocation), false );
connect( pJob, TQT_SIGNAL(result(TDEIO::Job*)), this, TQT_SLOT(slotSimpleJobResult(TDEIO::Job*))); connect( pJob, TQ_SIGNAL(result(TDEIO::Job*)), this, TQ_SLOT(slotSimpleJobResult(TDEIO::Job*)));
g_pProgressDialog->enterEventLoop( pJob, g_pProgressDialog->enterEventLoop( pJob,
i18n("Creating symbolic link: %1 -> %2").arg(linkLocation).arg(linkTarget) ); i18n("Creating symbolic link: %1 -> %2").arg(linkLocation).arg(linkTarget) );
@ -875,8 +875,8 @@ bool FileAccessJobHandler::rename( const TQString& dest )
int permissions=-1; int permissions=-1;
m_bSuccess = false; m_bSuccess = false;
TDEIO::FileCopyJob* pJob = TDEIO::file_move( m_pFileAccess->m_url, kurl, permissions, bOverwrite, bResume, bShowProgress ); TDEIO::FileCopyJob* pJob = TDEIO::file_move( m_pFileAccess->m_url, kurl, permissions, bOverwrite, bResume, bShowProgress );
connect( pJob, TQT_SIGNAL(result(TDEIO::Job*)), this, TQT_SLOT(slotSimpleJobResult(TDEIO::Job*))); connect( pJob, TQ_SIGNAL(result(TDEIO::Job*)), this, TQ_SLOT(slotSimpleJobResult(TDEIO::Job*)));
connect( pJob, TQT_SIGNAL(percent(TDEIO::Job*,unsigned long)), this, TQT_SLOT(slotPercent(TDEIO::Job*, unsigned long))); connect( pJob, TQ_SIGNAL(percent(TDEIO::Job*,unsigned long)), this, TQ_SLOT(slotPercent(TDEIO::Job*, unsigned long)));
g_pProgressDialog->enterEventLoop( pJob, g_pProgressDialog->enterEventLoop( pJob,
i18n("Renaming file: %1 -> %2").arg(m_pFileAccess->prettyAbsPath()).arg(dest) ); i18n("Renaming file: %1 -> %2").arg(m_pFileAccess->prettyAbsPath()).arg(dest) );
@ -912,8 +912,8 @@ bool FileAccessJobHandler::copyFile( const TQString& dest )
int permissions = (m_pFileAccess->isExecutable()?0111:0)+(m_pFileAccess->isWritable()?0222:0)+(m_pFileAccess->isReadable()?0444:0); int permissions = (m_pFileAccess->isExecutable()?0111:0)+(m_pFileAccess->isWritable()?0222:0)+(m_pFileAccess->isReadable()?0444:0);
m_bSuccess = false; m_bSuccess = false;
TDEIO::FileCopyJob* pJob = TDEIO::file_copy ( m_pFileAccess->m_url, destUrl, permissions, bOverwrite, bResume, bShowProgress ); TDEIO::FileCopyJob* pJob = TDEIO::file_copy ( m_pFileAccess->m_url, destUrl, permissions, bOverwrite, bResume, bShowProgress );
connect( pJob, TQT_SIGNAL(result(TDEIO::Job*)), this, TQT_SLOT(slotSimpleJobResult(TDEIO::Job*))); connect( pJob, TQ_SIGNAL(result(TDEIO::Job*)), this, TQ_SLOT(slotSimpleJobResult(TDEIO::Job*)));
connect( pJob, TQT_SIGNAL(percent(TDEIO::Job*,unsigned long)), this, TQT_SLOT(slotPercent(TDEIO::Job*, unsigned long))); connect( pJob, TQ_SIGNAL(percent(TDEIO::Job*,unsigned long)), this, TQ_SLOT(slotPercent(TDEIO::Job*, unsigned long)));
g_pProgressDialog->enterEventLoop( pJob, g_pProgressDialog->enterEventLoop( pJob,
i18n("Copying file: %1 -> %2").arg(m_pFileAccess->prettyAbsPath()).arg(dest) ); i18n("Copying file: %1 -> %2").arg(m_pFileAccess->prettyAbsPath()).arg(dest) );
@ -1363,16 +1363,16 @@ bool FileAccessJobHandler::listDir( t_DirectoryList* pDirList, bool bRecursive,
m_bSuccess = false; m_bSuccess = false;
if ( pListJob!=0 ) if ( pListJob!=0 )
{ {
connect( pListJob, TQT_SIGNAL( entries( TDEIO::Job *, const TDEIO::UDSEntryList& ) ), connect( pListJob, TQ_SIGNAL( entries( TDEIO::Job *, const TDEIO::UDSEntryList& ) ),
this, TQT_SLOT( slotListDirProcessNewEntries( TDEIO::Job *, const TDEIO::UDSEntryList& )) ); this, TQ_SLOT( slotListDirProcessNewEntries( TDEIO::Job *, const TDEIO::UDSEntryList& )) );
connect( pListJob, TQT_SIGNAL( result( TDEIO::Job* )), connect( pListJob, TQ_SIGNAL( result( TDEIO::Job* )),
this, TQT_SLOT( slotSimpleJobResult(TDEIO::Job*) ) ); this, TQ_SLOT( slotSimpleJobResult(TDEIO::Job*) ) );
connect( pListJob, TQT_SIGNAL( infoMessage(TDEIO::Job*, const TQString&)), connect( pListJob, TQ_SIGNAL( infoMessage(TDEIO::Job*, const TQString&)),
this, TQT_SLOT( slotListDirInfoMessage(TDEIO::Job*, const TQString&) )); this, TQ_SLOT( slotListDirInfoMessage(TDEIO::Job*, const TQString&) ));
// This line makes the transfer via fish unreliable.:-( // This line makes the transfer via fish unreliable.:-(
//connect( pListJob, TQT_SIGNAL(percent(TDEIO::Job*,unsigned long)), this, TQT_SLOT(slotPercent(TDEIO::Job*, unsigned long))); //connect( pListJob, TQ_SIGNAL(percent(TDEIO::Job*,unsigned long)), this, TQ_SLOT(slotPercent(TDEIO::Job*, unsigned long)));
g_pProgressDialog->enterEventLoop( pListJob, g_pProgressDialog->enterEventLoop( pListJob,
i18n("Listing directory: %1").arg(m_pFileAccess->prettyAbsPath()) ); i18n("Listing directory: %1").arg(m_pFileAccess->prettyAbsPath()) );
@ -1506,7 +1506,7 @@ ProgressDialog::ProgressDialog( TQWidget* pParent )
hlayout->addStretch(1); hlayout->addStretch(1);
m_pAbortButton = new TQPushButton( i18n("&Cancel"), this); m_pAbortButton = new TQPushButton( i18n("&Cancel"), this);
hlayout->addWidget( m_pAbortButton ); hlayout->addWidget( m_pAbortButton );
connect( m_pAbortButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotAbort()) ); connect( m_pAbortButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotAbort()) );
m_progressDelayTimer = 0; m_progressDelayTimer = 0;
resize( 400, 100 ); resize( 400, 100 );
@ -1713,7 +1713,7 @@ void ProgressDialog::hide()
killTimer( m_progressDelayTimer ); killTimer( m_progressDelayTimer );
m_progressDelayTimer = 0; m_progressDelayTimer = 0;
// Calling TQDialog::hide() directly doesn't always work. (?) // Calling TQDialog::hide() directly doesn't always work. (?)
TQTimer::singleShot( 100, this, TQT_SLOT(delayedHide()) ); TQTimer::singleShot( 100, this, TQ_SLOT(delayedHide()) );
} }
void ProgressDialog::delayedHide() void ProgressDialog::delayedHide()

154
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()), this, TQT_SLOT(slotRefresh()) ); connect( m_pOptionDialog, TQ_SIGNAL(applyClicked()), this, TQ_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()), this, TQT_SLOT(slotEditFindNext())); connect( m_pFindDialog, TQ_SIGNAL(findNext()), this, TQ_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 );
@ -280,13 +280,13 @@ KDiff3App::KDiff3App(TQWidget* pParent, const char* name, KDiff3Part* pKDiff3Par
TDEApplication::kApplication()->iconLoader() ); TDEApplication::kApplication()->iconLoader() );
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, TQ_SIGNAL(startDiffMerge(TQString,TQString,TQString,TQString,TQString,TQString,TQString,TotalDiffStatus*)),
this, TQT_SLOT( slotFileOpen2(TQString,TQString,TQString,TQString,TQString,TQString,TQString,TotalDiffStatus*))); this, TQ_SLOT( slotFileOpen2(TQString,TQString,TQString,TQString,TQString,TQString,TQString,TotalDiffStatus*)));
connect( m_pDirectoryMergeWindow, TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(slotUpdateAvailabilities())); connect( m_pDirectoryMergeWindow, TQ_SIGNAL(selectionChanged()), this, TQ_SLOT(slotUpdateAvailabilities()));
connect( m_pDirectoryMergeWindow, TQT_SIGNAL(currentChanged(TQListViewItem*)), this, TQT_SLOT(slotUpdateAvailabilities())); connect( m_pDirectoryMergeWindow, TQ_SIGNAL(currentChanged(TQListViewItem*)), this, TQ_SLOT(slotUpdateAvailabilities()));
connect( m_pDirectoryMergeWindow, TQT_SIGNAL(checkIfCanContinue(bool*)), this, TQT_SLOT(slotCheckIfCanContinue(bool*))); connect( m_pDirectoryMergeWindow, TQ_SIGNAL(checkIfCanContinue(bool*)), this, TQ_SLOT(slotCheckIfCanContinue(bool*)));
connect( m_pDirectoryMergeWindow, TQT_SIGNAL(updateAvailabilities()), this, TQT_SLOT(slotUpdateAvailabilities())); connect( m_pDirectoryMergeWindow, TQ_SIGNAL(updateAvailabilities()), this, TQ_SLOT(slotUpdateAvailabilities()));
connect( m_pDirectoryMergeWindow, TQT_SIGNAL(statusBarMessage(const TQString&)), this, TQT_SLOT(slotStatusMsg(const TQString&))); connect( m_pDirectoryMergeWindow, TQ_SIGNAL(statusBarMessage(const TQString&)), this, TQ_SLOT(slotStatusMsg(const TQString&)));
m_pDirectoryMergeWindow->initDirectoryMergeActions( this, actionCollection() ); m_pDirectoryMergeWindow->initDirectoryMergeActions( this, actionCollection() );
@ -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(this, TQT_SLOT(slotFileOpen()), ac); fileOpen = KStdAction::open(this, TQ_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, this, TQT_SLOT(slotReload()), ac, "file_reload"); fileReload = new TDEAction(i18n("Reload"), /*TQIconSet(TQPixmap(reloadIcon)),*/ Key_F5, this, TQ_SLOT(slotReload()), ac, "file_reload");
fileSave = KStdAction::save(this, TQT_SLOT(slotFileSave()), ac); fileSave = KStdAction::save(this, TQ_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(this, TQT_SLOT(slotFileSaveAs()), ac); fileSaveAs = KStdAction::saveAs(this, TQ_SLOT(slotFileSaveAs()), ac);
fileSaveAs->setStatusText(i18n("Saves the current document as...")); fileSaveAs->setStatusText(i18n("Saves the current document as..."));
filePrint = KStdAction::print(this, TQT_SLOT(slotFilePrint()), ac); filePrint = KStdAction::print(this, TQ_SLOT(slotFilePrint()), ac);
filePrint->setStatusText(i18n("Print the differences")); filePrint->setStatusText(i18n("Print the differences"));
fileQuit = KStdAction::quit(this, TQT_SLOT(slotFileQuit()), ac); fileQuit = KStdAction::quit(this, TQ_SLOT(slotFileQuit()), ac);
fileQuit->setStatusText(i18n("Quits the application")); fileQuit->setStatusText(i18n("Quits the application"));
editCut = KStdAction::cut(this, TQT_SLOT(slotEditCut()), ac); editCut = KStdAction::cut(this, TQ_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(this, TQT_SLOT(slotEditCopy()), ac); editCopy = KStdAction::copy(this, TQ_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(this, TQT_SLOT(slotEditPaste()), ac); editPaste = KStdAction::paste(this, TQ_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(this, TQT_SLOT(slotEditSelectAll()), ac); editSelectAll = KStdAction::selectAll(this, TQ_SLOT(slotEditSelectAll()), ac);
editSelectAll->setStatusText(i18n("Select everything in current window")); editSelectAll->setStatusText(i18n("Select everything in current window"));
editFind = KStdAction::find(this, TQT_SLOT(slotEditFind()), ac); editFind = KStdAction::find(this, TQ_SLOT(slotEditFind()), ac);
editFind->setStatusText(i18n("Search for a string")); editFind->setStatusText(i18n("Search for a string"));
editFindNext = KStdAction::findNext(this, TQT_SLOT(slotEditFindNext()), ac); editFindNext = KStdAction::findNext(this, TQ_SLOT(slotEditFindNext()), ac);
editFindNext->setStatusText(i18n("Search again for the string")); editFindNext->setStatusText(i18n("Search again for the string"));
viewToolBar = KStdAction::showToolbar(this, TQT_SLOT(slotViewToolBar()), ac); viewToolBar = KStdAction::showToolbar(this, TQ_SLOT(slotViewToolBar()), ac);
viewToolBar->setStatusText(i18n("Enables/disables the toolbar")); viewToolBar->setStatusText(i18n("Enables/disables the toolbar"));
viewStatusBar = KStdAction::showStatusbar(this, TQT_SLOT(slotViewStatusBar()), ac); viewStatusBar = KStdAction::showStatusbar(this, TQ_SLOT(slotViewStatusBar()), ac);
viewStatusBar->setStatusText(i18n("Enables/disables the statusbar")); viewStatusBar->setStatusText(i18n("Enables/disables the statusbar"));
KStdAction::keyBindings(this, TQT_SLOT(slotConfigureKeys()), ac); KStdAction::keyBindings(this, TQ_SLOT(slotConfigureKeys()), ac);
TDEAction* pAction = KStdAction::preferences(this, TQT_SLOT(slotConfigure()), ac ); TDEAction* pAction = KStdAction::preferences(this, TQ_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, this, TQT_SLOT(slotGoCurrent()), ac, "go_current"); goCurrent = new TDEAction(i18n("Go to Current Delta"), TQIconSet(TQPixmap(currentpos)), CTRL+Key_Space, this, TQ_SLOT(slotGoCurrent()), ac, "go_current");
goTop = new TDEAction(i18n("Go to First Delta"), TQIconSet(TQPixmap(upend)), 0, this, TQT_SLOT(slotGoTop()), ac, "go_top"); goTop = new TDEAction(i18n("Go to First Delta"), TQIconSet(TQPixmap(upend)), 0, this, TQ_SLOT(slotGoTop()), ac, "go_top");
goBottom = new TDEAction(i18n("Go to Last Delta"), TQIconSet(TQPixmap(downend)), 0, this, TQT_SLOT(slotGoBottom()), ac, "go_bottom"); goBottom = new TDEAction(i18n("Go to Last Delta"), TQIconSet(TQPixmap(downend)), 0, this, TQ_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, this, TQT_SLOT(slotGoPrevDelta()), ac, "go_prev_delta"); goPrevDelta = new TDEAction(i18n("Go to Previous Delta"), TQIconSet(TQPixmap(up1arrow)), CTRL+Key_Up, this, TQ_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, this, TQT_SLOT(slotGoNextDelta()), ac, "go_next_delta"); goNextDelta = new TDEAction(i18n("Go to Next Delta"), TQIconSet(TQPixmap(down1arrow)), CTRL+Key_Down, this, TQ_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, this, TQT_SLOT(slotGoPrevConflict()), ac, "go_prev_conflict"); goPrevConflict = new TDEAction(i18n("Go to Previous Conflict"), TQIconSet(TQPixmap(up2arrow)), CTRL+Key_PageUp, this, TQ_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, this, TQT_SLOT(slotGoNextConflict()), ac, "go_next_conflict"); goNextConflict = new TDEAction(i18n("Go to Next Conflict"), TQIconSet(TQPixmap(down2arrow)), CTRL+Key_PageDown, this, TQ_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, this, TQT_SLOT(slotGoPrevUnsolvedConflict()), ac, "go_prev_unsolved_conflict"); goPrevUnsolvedConflict = new TDEAction(i18n("Go to Previous Unsolved Conflict"), TQIconSet(TQPixmap(prevunsolved)), 0, this, TQ_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, this, TQT_SLOT(slotGoNextUnsolvedConflict()), ac, "go_next_unsolved_conflict"); goNextUnsolvedConflict = new TDEAction(i18n("Go to Next Unsolved Conflict"), TQIconSet(TQPixmap(nextunsolved)), 0, this, TQ_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, this, TQT_SLOT(slotChooseA()), ac, "merge_choose_a"); chooseA = new TDEToggleAction(i18n("Select Line(s) From A"), TQIconSet(TQPixmap(iconA)), CTRL+Key_1, this, TQ_SLOT(slotChooseA()), ac, "merge_choose_a");
chooseB = new TDEToggleAction(i18n("Select Line(s) From B"), TQIconSet(TQPixmap(iconB)), CTRL+Key_2, this, TQT_SLOT(slotChooseB()), ac, "merge_choose_b"); chooseB = new TDEToggleAction(i18n("Select Line(s) From B"), TQIconSet(TQPixmap(iconB)), CTRL+Key_2, this, TQ_SLOT(slotChooseB()), ac, "merge_choose_b");
chooseC = new TDEToggleAction(i18n("Select Line(s) From C"), TQIconSet(TQPixmap(iconC)), CTRL+Key_3, this, TQT_SLOT(slotChooseC()), ac, "merge_choose_c"); chooseC = new TDEToggleAction(i18n("Select Line(s) From C"), TQIconSet(TQPixmap(iconC)), CTRL+Key_3, this, TQ_SLOT(slotChooseC()), ac, "merge_choose_c");
autoAdvance = new TDEToggleAction(i18n("Automatically Go to Next Unsolved Conflict After Source Selection"), TQIconSet(TQPixmap(autoadvance)), 0, 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, TQ_SLOT(slotAutoAdvanceToggled()), ac, "merge_autoadvance");
showWhiteSpaceCharacters = new TDEToggleAction(i18n("Show Space && Tabulator Characters for Differences"), TQIconSet(TQPixmap(showwhitespacechars)), 0, this, TQT_SLOT(slotShowWhiteSpaceToggled()), ac, "diff_show_whitespace_characters"); showWhiteSpaceCharacters = new TDEToggleAction(i18n("Show Space && Tabulator Characters for Differences"), TQIconSet(TQPixmap(showwhitespacechars)), 0, this, TQ_SLOT(slotShowWhiteSpaceToggled()), ac, "diff_show_whitespace_characters");
showWhiteSpace = new TDEToggleAction(i18n("Show White Space"), TQIconSet(TQPixmap(showwhitespace)), 0, this, TQT_SLOT(slotShowWhiteSpaceToggled()), ac, "diff_show_whitespace"); showWhiteSpace = new TDEToggleAction(i18n("Show White Space"), TQIconSet(TQPixmap(showwhitespace)), 0, this, TQ_SLOT(slotShowWhiteSpaceToggled()), ac, "diff_show_whitespace");
showLineNumbers = new TDEToggleAction(i18n("Show Line Numbers"), TQIconSet(TQPixmap(showlinenumbers)), 0, this, TQT_SLOT(slotShowLineNumbersToggled()), ac, "diff_showlinenumbers"); showLineNumbers = new TDEToggleAction(i18n("Show Line Numbers"), TQIconSet(TQPixmap(showlinenumbers)), 0, this, TQ_SLOT(slotShowLineNumbersToggled()), ac, "diff_showlinenumbers");
chooseAEverywhere = new TDEAction(i18n("Choose A Everywhere"), CTRL+SHIFT+Key_1, this, TQT_SLOT(slotChooseAEverywhere()), ac, "merge_choose_a_everywhere"); chooseAEverywhere = new TDEAction(i18n("Choose A Everywhere"), CTRL+SHIFT+Key_1, this, TQ_SLOT(slotChooseAEverywhere()), ac, "merge_choose_a_everywhere");
chooseBEverywhere = new TDEAction(i18n("Choose B Everywhere"), CTRL+SHIFT+Key_2, this, TQT_SLOT(slotChooseBEverywhere()), ac, "merge_choose_b_everywhere"); chooseBEverywhere = new TDEAction(i18n("Choose B Everywhere"), CTRL+SHIFT+Key_2, this, TQ_SLOT(slotChooseBEverywhere()), ac, "merge_choose_b_everywhere");
chooseCEverywhere = new TDEAction(i18n("Choose C Everywhere"), CTRL+SHIFT+Key_3, this, TQT_SLOT(slotChooseCEverywhere()), ac, "merge_choose_c_everywhere"); chooseCEverywhere = new TDEAction(i18n("Choose C Everywhere"), CTRL+SHIFT+Key_3, this, TQ_SLOT(slotChooseCEverywhere()), ac, "merge_choose_c_everywhere");
chooseAForUnsolvedConflicts = new TDEAction(i18n("Choose A for All Unsolved Conflicts"), 0, this, TQT_SLOT(slotChooseAForUnsolvedConflicts()), ac, "merge_choose_a_for_unsolved_conflicts"); chooseAForUnsolvedConflicts = new TDEAction(i18n("Choose A for All Unsolved Conflicts"), 0, this, TQ_SLOT(slotChooseAForUnsolvedConflicts()), ac, "merge_choose_a_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"); chooseBForUnsolvedConflicts = new TDEAction(i18n("Choose B for All Unsolved Conflicts"), 0, this, TQ_SLOT(slotChooseBForUnsolvedConflicts()), ac, "merge_choose_b_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"); chooseCForUnsolvedConflicts = new TDEAction(i18n("Choose C for All Unsolved Conflicts"), 0, this, TQ_SLOT(slotChooseCForUnsolvedConflicts()), ac, "merge_choose_c_for_unsolved_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"); chooseAForUnsolvedWhiteSpaceConflicts = new TDEAction(i18n("Choose A for All Unsolved Whitespace Conflicts"), 0, this, TQ_SLOT(slotChooseAForUnsolvedWhiteSpaceConflicts()), ac, "merge_choose_a_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"); chooseBForUnsolvedWhiteSpaceConflicts = new TDEAction(i18n("Choose B for All Unsolved Whitespace Conflicts"), 0, this, TQ_SLOT(slotChooseBForUnsolvedWhiteSpaceConflicts()), ac, "merge_choose_b_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"); chooseCForUnsolvedWhiteSpaceConflicts = new TDEAction(i18n("Choose C for All Unsolved Whitespace Conflicts"), 0, this, TQ_SLOT(slotChooseCForUnsolvedWhiteSpaceConflicts()), ac, "merge_choose_c_for_unsolved_whitespace_conflicts");
autoSolve = new TDEAction(i18n("Automatically Solve Simple Conflicts"), 0, this, TQT_SLOT(slotAutoSolve()), ac, "merge_autosolve"); autoSolve = new TDEAction(i18n("Automatically Solve Simple Conflicts"), 0, this, TQ_SLOT(slotAutoSolve()), ac, "merge_autosolve");
unsolve = new TDEAction(i18n("Set Deltas to Conflicts"), 0, this, TQT_SLOT(slotUnsolve()), ac, "merge_autounsolve"); unsolve = new TDEAction(i18n("Set Deltas to Conflicts"), 0, this, TQ_SLOT(slotUnsolve()), ac, "merge_autounsolve");
mergeRegExp = new TDEAction(i18n("Run Regular Expression Auto Merge"), 0, this, TQT_SLOT(slotRegExpAutoMerge()),ac, "merge_regexp_automerge" ); mergeRegExp = new TDEAction(i18n("Run Regular Expression Auto Merge"), 0, this, TQ_SLOT(slotRegExpAutoMerge()),ac, "merge_regexp_automerge" );
mergeHistory = new TDEAction(i18n("Automatically Solve History Conflicts"), 0, this, TQT_SLOT(slotMergeHistory()), ac, "merge_versioncontrol_history" ); mergeHistory = new TDEAction(i18n("Automatically Solve History Conflicts"), 0, this, TQ_SLOT(slotMergeHistory()), ac, "merge_versioncontrol_history" );
splitDiff = new TDEAction(i18n("Split Diff At Selection"), 0, this, TQT_SLOT(slotSplitDiff()), ac, "merge_splitdiff"); splitDiff = new TDEAction(i18n("Split Diff At Selection"), 0, this, TQ_SLOT(slotSplitDiff()), ac, "merge_splitdiff");
joinDiffs = new TDEAction(i18n("Join Selected Diffs"), 0, this, TQT_SLOT(slotJoinDiffs()), ac, "merge_joindiffs"); joinDiffs = new TDEAction(i18n("Join Selected Diffs"), 0, this, TQ_SLOT(slotJoinDiffs()), ac, "merge_joindiffs");
showWindowA = new TDEToggleAction(i18n("Show Window A"), 0, this, TQT_SLOT(slotShowWindowAToggled()), ac, "win_show_a"); showWindowA = new TDEToggleAction(i18n("Show Window A"), 0, this, TQ_SLOT(slotShowWindowAToggled()), ac, "win_show_a");
showWindowB = new TDEToggleAction(i18n("Show Window B"), 0, this, TQT_SLOT(slotShowWindowBToggled()), ac, "win_show_b"); showWindowB = new TDEToggleAction(i18n("Show Window B"), 0, this, TQ_SLOT(slotShowWindowBToggled()), ac, "win_show_b");
showWindowC = new TDEToggleAction(i18n("Show Window C"), 0, this, TQT_SLOT(slotShowWindowCToggled()), ac, "win_show_c"); showWindowC = new TDEToggleAction(i18n("Show Window C"), 0, this, TQ_SLOT(slotShowWindowCToggled()), ac, "win_show_c");
winFocusNext = new TDEAction(i18n("Focus Next Window"), ALT+Key_Right, this, TQT_SLOT(slotWinFocusNext()), ac, "win_focus_next"); winFocusNext = new TDEAction(i18n("Focus Next Window"), ALT+Key_Right, this, TQ_SLOT(slotWinFocusNext()), ac, "win_focus_next");
overviewModeNormal = new TDEToggleAction(i18n("Normal Overview"), 0, this, TQT_SLOT(slotOverviewNormal()), ac, "diff_overview_normal"); overviewModeNormal = new TDEToggleAction(i18n("Normal Overview"), 0, this, TQ_SLOT(slotOverviewNormal()), ac, "diff_overview_normal");
overviewModeAB = new TDEToggleAction(i18n("A vs. B Overview"), 0, this, TQT_SLOT(slotOverviewAB()), ac, "diff_overview_ab"); overviewModeAB = new TDEToggleAction(i18n("A vs. B Overview"), 0, this, TQ_SLOT(slotOverviewAB()), ac, "diff_overview_ab");
overviewModeAC = new TDEToggleAction(i18n("A vs. C Overview"), 0, this, TQT_SLOT(slotOverviewAC()), ac, "diff_overview_ac"); overviewModeAC = new TDEToggleAction(i18n("A vs. C Overview"), 0, this, TQ_SLOT(slotOverviewAC()), ac, "diff_overview_ac");
overviewModeBC = new TDEToggleAction(i18n("B vs. C Overview"), 0, this, TQT_SLOT(slotOverviewBC()), ac, "diff_overview_bc"); overviewModeBC = new TDEToggleAction(i18n("B vs. C Overview"), 0, this, TQ_SLOT(slotOverviewBC()), ac, "diff_overview_bc");
wordWrap = new TDEToggleAction(i18n("Word Wrap Diff Windows"), 0, this, TQT_SLOT(slotWordWrapToggled()), ac, "diff_wordwrap"); wordWrap = new TDEToggleAction(i18n("Word Wrap Diff Windows"), 0, this, TQ_SLOT(slotWordWrapToggled()), ac, "diff_wordwrap");
addManualDiffHelp = new TDEAction(i18n("Add Manual Diff Alignment"), TQt::CTRL+TQt::Key_Y, this, TQT_SLOT(slotAddManualDiffHelp()), ac, "diff_add_manual_diff_help"); addManualDiffHelp = new TDEAction(i18n("Add Manual Diff Alignment"), TQt::CTRL+TQt::Key_Y, this, TQ_SLOT(slotAddManualDiffHelp()), ac, "diff_add_manual_diff_help");
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"); clearManualDiffHelpList = new TDEAction(i18n("Clear All Manual Diff Alignments"), TQt::CTRL+TQt::SHIFT+TQt::Key_Y, this, TQ_SLOT(slotClearManualDiffHelpList()), ac, "diff_clear_manual_diff_help_list");
#ifdef _WIN32 #ifdef _WIN32
new TDEAction(i18n("Focus Next Window"), TQt::CTRL+TQt::Key_Tab, this, TQT_SLOT(slotWinFocusNext()), ac, "win_focus_next", false, false); new TDEAction(i18n("Focus Next Window"), TQt::CTRL+TQt::Key_Tab, this, TQ_SLOT(slotWinFocusNext()), ac, "win_focus_next", false, false);
#endif #endif
winFocusPrev = new TDEAction(i18n("Focus Prev Window"), TQt::ALT+TQt::Key_Left, this, TQT_SLOT(slotWinFocusPrev()), ac, "win_focus_prev"); winFocusPrev = new TDEAction(i18n("Focus Prev Window"), TQt::ALT+TQt::Key_Left, this, TQ_SLOT(slotWinFocusPrev()), ac, "win_focus_prev");
winToggleSplitOrientation = new TDEAction(i18n("Toggle Split Orientation"), 0, this, TQT_SLOT(slotWinToggleSplitterOrientation()), ac, "win_toggle_split_orientation"); winToggleSplitOrientation = new TDEAction(i18n("Toggle Split Orientation"), 0, this, TQ_SLOT(slotWinToggleSplitterOrientation()), ac, "win_toggle_split_orientation");
dirShowBoth = new TDEToggleAction(i18n("Dir && Text Split Screen View"), 0, this, TQT_SLOT(slotDirShowBoth()), ac, "win_dir_show_both"); dirShowBoth = new TDEToggleAction(i18n("Dir && Text Split Screen View"), 0, this, TQ_SLOT(slotDirShowBoth()), ac, "win_dir_show_both");
dirShowBoth->setChecked( true ); dirShowBoth->setChecked( true );
dirViewToggle = new TDEAction(i18n("Toggle Between Dir && Text View"), 0, this, TQT_SLOT(slotDirViewToggle()), actionCollection(), "win_dir_view_toggle"); dirViewToggle = new TDEAction(i18n("Toggle Between Dir && Text View"), 0, this, TQ_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 );
@ -629,7 +629,7 @@ bool KDiff3App::queryClose()
///////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////
// TQT_SLOT IMPLEMENTATION // TQ_SLOT IMPLEMENTATION
///////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////

2
src/kdiff3.h
Unescape View File

@ -72,7 +72,7 @@ public:
{ {
m_pbRightToLeftLanguage=pbRightToLeftLanguage; m_pbRightToLeftLanguage=pbRightToLeftLanguage;
m_realVal=0; m_realVal=0;
connect( this, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(slotValueChanged(int))); connect( this, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(slotValueChanged(int)));
} }
void setAgain(){ setValue(m_realVal); } void setAgain(){ setValue(m_realVal); }
public slots: public slots:

6
src/kdiff3_part.cpp
Unescape View File

@ -52,9 +52,9 @@ KDiff3Part::KDiff3Part( TQWidget *parentWidget, const char *widgetName,
setWidget(m_widget); setWidget(m_widget);
// create our actions // create our actions
//KStdAction::open(this, TQT_SLOT(fileOpen()), actionCollection()); //KStdAction::open(this, TQ_SLOT(fileOpen()), actionCollection());
//KStdAction::saveAs(this, TQT_SLOT(fileSaveAs()), actionCollection()); //KStdAction::saveAs(this, TQ_SLOT(fileSaveAs()), actionCollection());
//KStdAction::save(this, TQT_SLOT(save()), actionCollection()); //KStdAction::save(this, TQ_SLOT(save()), actionCollection());
setXMLFile("kdiff3_part.rc"); setXMLFile("kdiff3_part.rc");

6
src/kdiff3_shell.cpp
Unescape View File

@ -68,7 +68,7 @@ KDiff3Shell::KDiff3Shell(bool bCompleteInit)
if (bCompleteInit) if (bCompleteInit)
((KDiff3App*)m_part->widget())->completeInit(); ((KDiff3App*)m_part->widget())->completeInit();
connect(((KDiff3App*)m_part->widget()), TQT_SIGNAL(createNewInstance(const TQString&, const TQString&, const TQString&)), this, TQT_SLOT(slotNewInstance(const TQString&, const TQString&, const TQString&))); connect(((KDiff3App*)m_part->widget()), TQ_SIGNAL(createNewInstance(const TQString&, const TQString&, const TQString&)), this, TQ_SLOT(slotNewInstance(const TQString&, const TQString&, const TQString&)));
} }
} }
else else
@ -164,8 +164,8 @@ void KDiff3Shell::optionsConfigureToolbars()
// use the standard toolbar editor // use the standard toolbar editor
KEditToolbar dlg(factory()); KEditToolbar dlg(factory());
connect(&dlg, TQT_SIGNAL(newToolbarConfig()), connect(&dlg, TQ_SIGNAL(newToolbarConfig()),
this, TQT_SLOT(applyNewToolbarConfig())); this, TQ_SLOT(applyNewToolbarConfig()));
dlg.exec(); dlg.exec();
} }

20
src/kreplacements/kreplacements.cpp
Unescape View File

@ -172,9 +172,9 @@ KDialogBase::KDialogBase( int, const TQString& caption, int, int, TQWidget* pare
setOkButton(); setOkButton();
setDefaultButton(); setDefaultButton();
connect( this, TQT_SIGNAL( defaultButtonPressed() ), this, TQT_SLOT(slotDefault()) ); connect( this, TQ_SIGNAL( defaultButtonPressed() ), this, TQ_SLOT(slotDefault()) );
connect( this, TQT_SIGNAL( helpButtonPressed() ), this, TQT_SLOT(slotHelp())); connect( this, TQ_SIGNAL( helpButtonPressed() ), this, TQ_SLOT(slotHelp()));
connect( this, TQT_SIGNAL( applyButtonPressed() ), this, TQT_SLOT( slotApply() )); connect( this, TQ_SIGNAL( applyButtonPressed() ), this, TQ_SLOT( slotApply() ));
} }
KDialogBase::~KDialogBase() KDialogBase::~KDialogBase()
@ -352,8 +352,8 @@ TDEActionCollection* TDEMainWindow::actionCollection()
void TDEMainWindow::createGUI() void TDEMainWindow::createGUI()
{ {
KStdAction::help(this, TQT_SLOT(slotHelp()), actionCollection()); KStdAction::help(this, TQ_SLOT(slotHelp()), actionCollection());
KStdAction::about(this, TQT_SLOT(slotAbout()), actionCollection()); KStdAction::about(this, TQ_SLOT(slotAbout()), actionCollection());
KStdAction::aboutTQt(actionCollection()); KStdAction::aboutTQt(actionCollection());
} }
@ -480,10 +480,10 @@ void TDEAction::init(TQObject* receiver, const char* slot, TDEActionCollection*
if( slot!=0 ) if( slot!=0 )
{ {
if (!bToggle) if (!bToggle)
connect(this, TQT_SIGNAL(activated()), receiver, slot); connect(this, TQ_SIGNAL(activated()), receiver, slot);
else else
{ {
connect(this, TQT_SIGNAL(toggled(bool)), receiver, slot); connect(this, TQ_SIGNAL(toggled(bool)), receiver, slot);
} }
} }
@ -696,7 +696,7 @@ TDEAction* KStdAction::about( TQWidget* parent, const char* slot, TDEActionColle
TDEAction* KStdAction::aboutTQt( TDEActionCollection* actionCollection ) TDEAction* KStdAction::aboutTQt( TDEActionCollection* actionCollection )
{ {
TDEMainWindow* p = actionCollection->m_pMainWindow; TDEMainWindow* p = actionCollection->m_pMainWindow;
TDEAction* a = new TDEAction( i18n("About")+" TQt", 0, tqApp, TQT_SLOT(aboutTQt()), actionCollection, "about_qt", false, false ); TDEAction* a = new TDEAction( i18n("About")+" TQt", 0, tqApp, TQ_SLOT(aboutTQt()), actionCollection, "about_qt", false, false );
if(p) a->addTo( p->helpMenu ); if(p) a->addTo( p->helpMenu );
return a; return a;
} }
@ -733,7 +733,7 @@ TDEFontChooser::TDEFontChooser( TQWidget* pParent, const TQString& /*name*/, boo
m_pParent = pParent; m_pParent = pParent;
TQVBoxLayout* pLayout = new TQVBoxLayout( this ); TQVBoxLayout* pLayout = new TQVBoxLayout( this );
m_pSelectFont = new TQPushButton(i18n("Select Font"), this ); m_pSelectFont = new TQPushButton(i18n("Select Font"), this );
connect(m_pSelectFont, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotSelectFont())); connect(m_pSelectFont, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotSelectFont()));
pLayout->addWidget(m_pSelectFont); pLayout->addWidget(m_pSelectFont);
m_pLabel = new TQLabel( "", this ); m_pLabel = new TQLabel( "", this );
@ -788,7 +788,7 @@ void TDEFontChooser::slotSelectFont()
KColorButton::KColorButton(TQWidget* parent) KColorButton::KColorButton(TQWidget* parent)
: TQPushButton(parent) : TQPushButton(parent)
{ {
connect( this, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotClicked())); connect( this, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotClicked()));
} }
TQColor KColorButton::color() TQColor KColorButton::color()

4
src/mergeresultwindow.cpp
Unescape View File

@ -84,7 +84,7 @@ MergeResultWindow::MergeResultWindow(
m_cursorYPos=0; m_cursorYPos=0;
m_bCursorOn = true; m_bCursorOn = true;
m_bCursorUpdate = false; m_bCursorUpdate = false;
connect( &m_cursorTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT( slotCursorUpdate() ) ); connect( &m_cursorTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT( slotCursorUpdate() ) );
m_cursorTimer.start( 500 /*ms*/, true /*single shot*/ ); m_cursorTimer.start( 500 /*ms*/, true /*single shot*/ );
m_selection.reset(); m_selection.reset();
@ -3068,7 +3068,7 @@ WindowTitleWidget::WindowTitleWidget(OptionDialog* pOptionDialog, TQWidget* pPar
//m_pBrowseButton = new TQPushButton("..."); //m_pBrowseButton = new TQPushButton("...");
//pHLayout->addWidget( m_pBrowseButton, 0 ); //pHLayout->addWidget( m_pBrowseButton, 0 );
//connect( m_pBrowseButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotBrowseButtonClicked())); //connect( m_pBrowseButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotBrowseButtonClicked()));
m_pModifiedLabel = new TQLabel(i18n("[Modified]"),this); m_pModifiedLabel = new TQLabel(i18n("[Modified]"),this);
pHLayout->addWidget( m_pModifiedLabel ); pHLayout->addWidget( m_pModifiedLabel );

18
src/optiondialog.cpp
Unescape View File

@ -936,7 +936,7 @@ void OptionDialog::setupMergePage( void )
"See the documentation for details."); "See the documentation for details.");
TQToolTip::add( label, s_historyEntryStartSortKeyOrderToolTip ); TQToolTip::add( label, s_historyEntryStartSortKeyOrderToolTip );
m_pHistorySortKeyOrderLineEdit->setEnabled(false); m_pHistorySortKeyOrderLineEdit->setEnabled(false);
connect( m_pHistoryMergeSorting, TQT_SIGNAL(toggled(bool)), m_pHistorySortKeyOrderLineEdit, TQT_SLOT(setEnabled(bool))); connect( m_pHistoryMergeSorting, TQ_SIGNAL(toggled(bool)), m_pHistorySortKeyOrderLineEdit, TQ_SLOT(setEnabled(bool)));
++line; ++line;
m_pHistoryAutoMerge = new OptionCheckBox( i18n("Merge version control history on merge start"), false, "RunHistoryAutoMergeOnMergeStart", &m_bRunHistoryAutoMergeOnMergeStart, page, this ); m_pHistoryAutoMerge = new OptionCheckBox( i18n("Merge version control history on merge start"), false, "RunHistoryAutoMergeOnMergeStart", &m_bRunHistoryAutoMergeOnMergeStart, page, this );
@ -954,7 +954,7 @@ void OptionDialog::setupMergePage( void )
TQPushButton* pButton = new TQPushButton( i18n("Test your regular expressions"), page ); TQPushButton* pButton = new TQPushButton( i18n("Test your regular expressions"), page );
gbox->addWidget( pButton, line, 0 ); gbox->addWidget( pButton, line, 0 );
connect( pButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotHistoryMergeRegExpTester())); connect( pButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotHistoryMergeRegExpTester()));
++line; ++line;
label = new TQLabel( i18n("Irrelevant merge command:"), page ); label = new TQLabel( i18n("Irrelevant merge command:"), page );
@ -1117,7 +1117,7 @@ void OptionDialog::setupDirectoryMergePage( void )
TQToolTip::add( pWhiteSpaceDiffsEqual, i18n( TQToolTip::add( pWhiteSpaceDiffsEqual, i18n(
"If files differ only by white space consider them equal.\n" "If files differ only by white space consider them equal.\n"
"This is only active when full analysis is chosen." ) ); "This is only active when full analysis is chosen." ) );
connect(pFullAnalysis, TQT_SIGNAL(toggled(bool)), pWhiteSpaceDiffsEqual, TQT_SLOT(setEnabled(bool))); connect(pFullAnalysis, TQ_SIGNAL(toggled(bool)), pWhiteSpaceDiffsEqual, TQ_SLOT(setEnabled(bool)));
pWhiteSpaceDiffsEqual->setEnabled(false); pWhiteSpaceDiffsEqual->setEnabled(false);
++line; ++line;
@ -1418,10 +1418,10 @@ static char* countryMap[]={
gbox->addWidget( m_pEncodingPPComboBox, line, 1 ); gbox->addWidget( m_pEncodingPPComboBox, line, 1 );
++line; ++line;
connect(m_pSameEncoding, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotEncodingChanged())); connect(m_pSameEncoding, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotEncodingChanged()));
connect(m_pEncodingAComboBox, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotEncodingChanged())); connect(m_pEncodingAComboBox, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotEncodingChanged()));
connect(m_pAutoDetectUnicodeA, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotEncodingChanged())); connect(m_pAutoDetectUnicodeA, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotEncodingChanged()));
connect(m_pAutoSelectOutEncoding, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotEncodingChanged())); connect(m_pAutoSelectOutEncoding, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotEncodingChanged()));
OptionCheckBox* pRightToLeftLanguage = new OptionCheckBox( i18n("Right To Left Language"), false, "RightToLeftLanguage", &m_bRightToLeftLanguage, page, this ); OptionCheckBox* pRightToLeftLanguage = new OptionCheckBox( i18n("Right To Left Language"), false, "RightToLeftLanguage", &m_bRightToLeftLanguage, page, this );
gbox->addMultiCellWidget( pRightToLeftLanguage, line, line, 0, 1 ); gbox->addMultiCellWidget( pRightToLeftLanguage, line, line, 0, 1 );
@ -1468,14 +1468,14 @@ void OptionDialog::setupIntegrationPage( void )
"Integrate with Rational ClearCase from IBM.\n" "Integrate with Rational ClearCase from IBM.\n"
"Modifies the \"map\" file in ClearCase-subdir \"lib/mgrs\"\n" "Modifies the \"map\" file in ClearCase-subdir \"lib/mgrs\"\n"
"(Only enabled when ClearCase \"bin\" directory is in the path.)")); "(Only enabled when ClearCase \"bin\" directory is in the path.)"));
connect(pIntegrateWithClearCase, TQT_SIGNAL(clicked()),this, TQT_SLOT(slotIntegrateWithClearCase()) ); connect(pIntegrateWithClearCase, TQ_SIGNAL(clicked()),this, TQ_SLOT(slotIntegrateWithClearCase()) );
pIntegrateWithClearCase->setEnabled( integrateWithClearCase( "existsClearCase", "" )!=0 ); pIntegrateWithClearCase->setEnabled( integrateWithClearCase( "existsClearCase", "" )!=0 );
TQPushButton* pRemoveClearCaseIntegration = new TQPushButton( i18n("Remove ClearCase Integration"), page); TQPushButton* pRemoveClearCaseIntegration = new TQPushButton( i18n("Remove ClearCase Integration"), page);
gbox->addWidget( pRemoveClearCaseIntegration, line, 1 ); gbox->addWidget( pRemoveClearCaseIntegration, line, 1 );
TQToolTip::add( pRemoveClearCaseIntegration, i18n( TQToolTip::add( pRemoveClearCaseIntegration, i18n(
"Restore the old \"map\" file from before doing the Clearcase integration.")); "Restore the old \"map\" file from before doing the Clearcase integration."));
connect(pRemoveClearCaseIntegration, TQT_SIGNAL(clicked()),this, TQT_SLOT(slotRemoveClearCaseIntegration()) ); connect(pRemoveClearCaseIntegration, TQ_SIGNAL(clicked()),this, TQ_SLOT(slotRemoveClearCaseIntegration()) );
pRemoveClearCaseIntegration->setEnabled( integrateWithClearCase( "existsClearCase", "" )!=0 ); pRemoveClearCaseIntegration->setEnabled( integrateWithClearCase( "existsClearCase", "" )!=0 );
++line; ++line;

102
src/pdiff.cpp
Unescape View File

@ -533,7 +533,7 @@ void KDiff3App::init( bool bAuto, TotalDiffStatus* pTotalDiffStatus, bool bLoadF
} }
} }
TQTimer::singleShot( 10, this, TQT_SLOT(slotAfterFirstPaint()) ); TQTimer::singleShot( 10, this, TQ_SLOT(slotAfterFirstPaint()) );
if ( bVisibleMergeResultWindow && m_pMergeResultWindow ) if ( bVisibleMergeResultWindow && m_pMergeResultWindow )
{ {
@ -650,8 +650,8 @@ void KDiff3App::initView()
m_pOverview = new Overview( pDiffWindowFrame, m_pOptionDialog ); m_pOverview = new Overview( pDiffWindowFrame, m_pOptionDialog );
pDiffHLayout->addWidget(m_pOverview); pDiffHLayout->addWidget(m_pOverview);
connect( m_pOverview, TQT_SIGNAL(setLine(int)), this, TQT_SLOT(setDiff3Line(int)) ); connect( m_pOverview, TQ_SIGNAL(setLine(int)), this, TQ_SLOT(setDiff3Line(int)) );
//connect( m_pOverview, TQT_SIGNAL(afterFirstPaint()), this, TQT_SLOT(slotAfterFirstPaint())); //connect( m_pOverview, TQ_SIGNAL(afterFirstPaint()), this, TQ_SLOT(slotAfterFirstPaint()));
m_pDiffVScrollBar = new TQScrollBar( TQt::Vertical, pDiffWindowFrame ); m_pDiffVScrollBar = new TQScrollBar( TQt::Vertical, pDiffWindowFrame );
pDiffHLayout->addWidget( m_pDiffVScrollBar ); pDiffHLayout->addWidget( m_pDiffVScrollBar );
@ -662,9 +662,9 @@ void KDiff3App::initView()
m_pDiffTextWindow1 = m_pDiffTextWindowFrame1->getDiffTextWindow(); m_pDiffTextWindow1 = m_pDiffTextWindowFrame1->getDiffTextWindow();
m_pDiffTextWindow2 = m_pDiffTextWindowFrame2->getDiffTextWindow(); m_pDiffTextWindow2 = m_pDiffTextWindowFrame2->getDiffTextWindow();
m_pDiffTextWindow3 = m_pDiffTextWindowFrame3->getDiffTextWindow(); m_pDiffTextWindow3 = m_pDiffTextWindowFrame3->getDiffTextWindow();
connect(m_pDiffTextWindowFrame1, TQT_SIGNAL(fileNameChanged(const TQString&,int)), this, TQT_SLOT(slotFileNameChanged(const TQString&,int))); connect(m_pDiffTextWindowFrame1, TQ_SIGNAL(fileNameChanged(const TQString&,int)), this, TQ_SLOT(slotFileNameChanged(const TQString&,int)));
connect(m_pDiffTextWindowFrame2, TQT_SIGNAL(fileNameChanged(const TQString&,int)), this, TQT_SLOT(slotFileNameChanged(const TQString&,int))); connect(m_pDiffTextWindowFrame2, TQ_SIGNAL(fileNameChanged(const TQString&,int)), this, TQ_SLOT(slotFileNameChanged(const TQString&,int)));
connect(m_pDiffTextWindowFrame3, TQT_SIGNAL(fileNameChanged(const TQString&,int)), this, TQT_SLOT(slotFileNameChanged(const TQString&,int))); connect(m_pDiffTextWindowFrame3, TQ_SIGNAL(fileNameChanged(const TQString&,int)), this, TQ_SLOT(slotFileNameChanged(const TQString&,int)));
// Merge window // Merge window
m_pMergeWindowFrame = new TQWidget( pVSplitter ); m_pMergeWindowFrame = new TQWidget( pVSplitter );
@ -699,61 +699,61 @@ void KDiff3App::initView()
pHScrollBarLayout->addWidget( m_pCornerWidget ); pHScrollBarLayout->addWidget( m_pCornerWidget );
connect( m_pDiffVScrollBar, TQT_SIGNAL(valueChanged(int)), m_pOverview, TQT_SLOT(setFirstLine(int))); connect( m_pDiffVScrollBar, TQ_SIGNAL(valueChanged(int)), m_pOverview, TQ_SLOT(setFirstLine(int)));
connect( m_pDiffVScrollBar, TQT_SIGNAL(valueChanged(int)), m_pDiffTextWindow1, TQT_SLOT(setFirstLine(int))); connect( m_pDiffVScrollBar, TQ_SIGNAL(valueChanged(int)), m_pDiffTextWindow1, TQ_SLOT(setFirstLine(int)));
connect( m_pHScrollBar, TQT_SIGNAL(valueChanged2(int)), m_pDiffTextWindow1, TQT_SLOT(setFirstColumn(int))); connect( m_pHScrollBar, TQ_SIGNAL(valueChanged2(int)), m_pDiffTextWindow1, TQ_SLOT(setFirstColumn(int)));
connect( m_pDiffTextWindow1, TQT_SIGNAL(newSelection()), this, TQT_SLOT(slotSelectionStart())); connect( m_pDiffTextWindow1, TQ_SIGNAL(newSelection()), this, TQ_SLOT(slotSelectionStart()));
connect( m_pDiffTextWindow1, TQT_SIGNAL(selectionEnd()), this, TQT_SLOT(slotSelectionEnd())); connect( m_pDiffTextWindow1, TQ_SIGNAL(selectionEnd()), this, TQ_SLOT(slotSelectionEnd()));
connect( m_pDiffTextWindow1, TQT_SIGNAL(scroll(int,int)), this, TQT_SLOT(scrollDiffTextWindow(int,int))); connect( m_pDiffTextWindow1, TQ_SIGNAL(scroll(int,int)), this, TQ_SLOT(scrollDiffTextWindow(int,int)));
m_pDiffTextWindow1->installEventFilter( this ); m_pDiffTextWindow1->installEventFilter( this );
connect( m_pDiffVScrollBar, TQT_SIGNAL(valueChanged(int)), m_pDiffTextWindow2, TQT_SLOT(setFirstLine(int))); connect( m_pDiffVScrollBar, TQ_SIGNAL(valueChanged(int)), m_pDiffTextWindow2, TQ_SLOT(setFirstLine(int)));
connect( m_pHScrollBar, TQT_SIGNAL(valueChanged2(int)), m_pDiffTextWindow2, TQT_SLOT(setFirstColumn(int))); connect( m_pHScrollBar, TQ_SIGNAL(valueChanged2(int)), m_pDiffTextWindow2, TQ_SLOT(setFirstColumn(int)));
connect( m_pDiffTextWindow2, TQT_SIGNAL(newSelection()), this, TQT_SLOT(slotSelectionStart())); connect( m_pDiffTextWindow2, TQ_SIGNAL(newSelection()), this, TQ_SLOT(slotSelectionStart()));
connect( m_pDiffTextWindow2, TQT_SIGNAL(selectionEnd()), this, TQT_SLOT(slotSelectionEnd())); connect( m_pDiffTextWindow2, TQ_SIGNAL(selectionEnd()), this, TQ_SLOT(slotSelectionEnd()));
connect( m_pDiffTextWindow2, TQT_SIGNAL(scroll(int,int)), this, TQT_SLOT(scrollDiffTextWindow(int,int))); connect( m_pDiffTextWindow2, TQ_SIGNAL(scroll(int,int)), this, TQ_SLOT(scrollDiffTextWindow(int,int)));
m_pDiffTextWindow2->installEventFilter( this ); m_pDiffTextWindow2->installEventFilter( this );
connect( m_pDiffVScrollBar, TQT_SIGNAL(valueChanged(int)), m_pDiffTextWindow3, TQT_SLOT(setFirstLine(int))); connect( m_pDiffVScrollBar, TQ_SIGNAL(valueChanged(int)), m_pDiffTextWindow3, TQ_SLOT(setFirstLine(int)));
connect( m_pHScrollBar, TQT_SIGNAL(valueChanged2(int)), m_pDiffTextWindow3, TQT_SLOT(setFirstColumn(int))); connect( m_pHScrollBar, TQ_SIGNAL(valueChanged2(int)), m_pDiffTextWindow3, TQ_SLOT(setFirstColumn(int)));
connect( m_pDiffTextWindow3, TQT_SIGNAL(newSelection()), this, TQT_SLOT(slotSelectionStart())); connect( m_pDiffTextWindow3, TQ_SIGNAL(newSelection()), this, TQ_SLOT(slotSelectionStart()));
connect( m_pDiffTextWindow3, TQT_SIGNAL(selectionEnd()), this, TQT_SLOT(slotSelectionEnd())); connect( m_pDiffTextWindow3, TQ_SIGNAL(selectionEnd()), this, TQ_SLOT(slotSelectionEnd()));
connect( m_pDiffTextWindow3, TQT_SIGNAL(scroll(int,int)), this, TQT_SLOT(scrollDiffTextWindow(int,int))); connect( m_pDiffTextWindow3, TQ_SIGNAL(scroll(int,int)), this, TQ_SLOT(scrollDiffTextWindow(int,int)));
m_pDiffTextWindow3->installEventFilter( this ); m_pDiffTextWindow3->installEventFilter( this );
MergeResultWindow* p = m_pMergeResultWindow; MergeResultWindow* p = m_pMergeResultWindow;
connect( m_pMergeVScrollBar, TQT_SIGNAL(valueChanged(int)), p, TQT_SLOT(setFirstLine(int))); connect( m_pMergeVScrollBar, TQ_SIGNAL(valueChanged(int)), p, TQ_SLOT(setFirstLine(int)));
connect( m_pHScrollBar, TQT_SIGNAL(valueChanged2(int)), p, TQT_SLOT(setFirstColumn(int))); connect( m_pHScrollBar, TQ_SIGNAL(valueChanged2(int)), p, TQ_SLOT(setFirstColumn(int)));
connect( p, TQT_SIGNAL(scroll(int,int)), this, TQT_SLOT(scrollMergeResultWindow(int,int))); connect( p, TQ_SIGNAL(scroll(int,int)), this, TQ_SLOT(scrollMergeResultWindow(int,int)));
connect( p, TQT_SIGNAL(sourceMask(int,int)), this, TQT_SLOT(sourceMask(int,int))); connect( p, TQ_SIGNAL(sourceMask(int,int)), this, TQ_SLOT(sourceMask(int,int)));
connect( p, TQT_SIGNAL( resizeSignal() ),this, TQT_SLOT(resizeMergeResultWindow())); connect( p, TQ_SIGNAL( resizeSignal() ),this, TQ_SLOT(resizeMergeResultWindow()));
connect( p, TQT_SIGNAL( selectionEnd() ), this, TQT_SLOT( slotSelectionEnd() ) ); connect( p, TQ_SIGNAL( selectionEnd() ), this, TQ_SLOT( slotSelectionEnd() ) );
connect( p, TQT_SIGNAL( newSelection() ), this, TQT_SLOT( slotSelectionStart() ) ); connect( p, TQ_SIGNAL( newSelection() ), this, TQ_SLOT( slotSelectionStart() ) );
connect( p, TQT_SIGNAL( modifiedChanged(bool) ), this, TQT_SLOT( slotOutputModified(bool) ) ); connect( p, TQ_SIGNAL( modifiedChanged(bool) ), this, TQ_SLOT( slotOutputModified(bool) ) );
connect( p, TQT_SIGNAL( modifiedChanged(bool) ), m_pMergeResultWindowTitle, TQT_SLOT( slotSetModified(bool) ) ); connect( p, TQ_SIGNAL( modifiedChanged(bool) ), m_pMergeResultWindowTitle, TQ_SLOT( slotSetModified(bool) ) );
connect( p, TQT_SIGNAL( updateAvailabilities() ), this, TQT_SLOT( slotUpdateAvailabilities() ) ); connect( p, TQ_SIGNAL( updateAvailabilities() ), this, TQ_SLOT( slotUpdateAvailabilities() ) );
connect( p, TQT_SIGNAL( showPopupMenu(const TQPoint&) ), this, TQT_SLOT(showPopupMenu(const TQPoint&))); connect( p, TQ_SIGNAL( showPopupMenu(const TQPoint&) ), this, TQ_SLOT(showPopupMenu(const TQPoint&)));
connect( p, TQT_SIGNAL( noRelevantChangesDetected() ), this, TQT_SLOT(slotNoRelevantChangesDetected())); connect( p, TQ_SIGNAL( noRelevantChangesDetected() ), this, TQ_SLOT(slotNoRelevantChangesDetected()));
sourceMask(0,0); sourceMask(0,0);
connect( p, TQT_SIGNAL(setFastSelectorRange(int,int)), m_pDiffTextWindow1, TQT_SLOT(setFastSelectorRange(int,int))); connect( p, TQ_SIGNAL(setFastSelectorRange(int,int)), m_pDiffTextWindow1, TQ_SLOT(setFastSelectorRange(int,int)));
connect( p, TQT_SIGNAL(setFastSelectorRange(int,int)), m_pDiffTextWindow2, TQT_SLOT(setFastSelectorRange(int,int))); connect( p, TQ_SIGNAL(setFastSelectorRange(int,int)), m_pDiffTextWindow2, TQ_SLOT(setFastSelectorRange(int,int)));
connect( p, TQT_SIGNAL(setFastSelectorRange(int,int)), m_pDiffTextWindow3, TQT_SLOT(setFastSelectorRange(int,int))); connect( p, TQ_SIGNAL(setFastSelectorRange(int,int)), m_pDiffTextWindow3, TQ_SLOT(setFastSelectorRange(int,int)));
connect(m_pDiffTextWindow1, TQT_SIGNAL(setFastSelectorLine(int)), p, TQT_SLOT(slotSetFastSelectorLine(int))); connect(m_pDiffTextWindow1, TQ_SIGNAL(setFastSelectorLine(int)), p, TQ_SLOT(slotSetFastSelectorLine(int)));
connect(m_pDiffTextWindow2, TQT_SIGNAL(setFastSelectorLine(int)), p, TQT_SLOT(slotSetFastSelectorLine(int))); connect(m_pDiffTextWindow2, TQ_SIGNAL(setFastSelectorLine(int)), p, TQ_SLOT(slotSetFastSelectorLine(int)));
connect(m_pDiffTextWindow3, TQT_SIGNAL(setFastSelectorLine(int)), p, TQT_SLOT(slotSetFastSelectorLine(int))); connect(m_pDiffTextWindow3, TQ_SIGNAL(setFastSelectorLine(int)), p, TQ_SLOT(slotSetFastSelectorLine(int)));
connect(m_pDiffTextWindow1, TQT_SIGNAL(gotFocus()), p, TQT_SLOT(updateSourceMask())); connect(m_pDiffTextWindow1, TQ_SIGNAL(gotFocus()), p, TQ_SLOT(updateSourceMask()));
connect(m_pDiffTextWindow2, TQT_SIGNAL(gotFocus()), p, TQT_SLOT(updateSourceMask())); connect(m_pDiffTextWindow2, TQ_SIGNAL(gotFocus()), p, TQ_SLOT(updateSourceMask()));
connect(m_pDiffTextWindow3, TQT_SIGNAL(gotFocus()), p, TQT_SLOT(updateSourceMask())); connect(m_pDiffTextWindow3, TQ_SIGNAL(gotFocus()), p, TQ_SLOT(updateSourceMask()));
connect(m_pDirectoryMergeInfo, TQT_SIGNAL(gotFocus()), p, TQT_SLOT(updateSourceMask())); connect(m_pDirectoryMergeInfo, TQ_SIGNAL(gotFocus()), p, TQ_SLOT(updateSourceMask()));
connect( m_pDiffTextWindow1, TQT_SIGNAL( resizeSignal(int,int) ),this, TQT_SLOT(resizeDiffTextWindow(int,int))); connect( m_pDiffTextWindow1, TQ_SIGNAL( resizeSignal(int,int) ),this, TQ_SLOT(resizeDiffTextWindow(int,int)));
// The following two connects cause the wordwrap to be recalced thrice, just to make sure. Better than forgetting one. // The following two connects cause the wordwrap to be recalced thrice, just to make sure. Better than forgetting one.
connect( m_pDiffTextWindow2, TQT_SIGNAL( resizeSignal(int,int) ),this, TQT_SLOT(slotRecalcWordWrap())); connect( m_pDiffTextWindow2, TQ_SIGNAL( resizeSignal(int,int) ),this, TQ_SLOT(slotRecalcWordWrap()));
connect( m_pDiffTextWindow3, TQT_SIGNAL( resizeSignal(int,int) ),this, TQT_SLOT(slotRecalcWordWrap())); connect( m_pDiffTextWindow3, TQ_SIGNAL( resizeSignal(int,int) ),this, TQ_SLOT(slotRecalcWordWrap()));
m_pDiffTextWindow1->setFocus(); m_pDiffTextWindow1->setFocus();
m_pMainWidget->setMinimumSize(50,50); m_pMainWidget->setMinimumSize(50,50);
@ -995,7 +995,7 @@ void KDiff3App::slotFileOpen()
TQDir::convertSeparators( m_bDirCompare ? m_pDirectoryMergeWindow->getDirNameC() : m_sd3.isFromBuffer() ? TQString("") : m_sd3.getAliasName() ), TQDir::convertSeparators( m_bDirCompare ? m_pDirectoryMergeWindow->getDirNameC() : m_sd3.isFromBuffer() ? TQString("") : m_sd3.getAliasName() ),
m_bDirCompare ? ! m_pDirectoryMergeWindow->getDirNameDest().isEmpty() : !m_outputFilename.isEmpty(), m_bDirCompare ? ! m_pDirectoryMergeWindow->getDirNameDest().isEmpty() : !m_outputFilename.isEmpty(),
TQDir::convertSeparators( m_bDirCompare ? m_pDirectoryMergeWindow->getDirNameDest() : m_bDefaultFilename ? TQString("") : m_outputFilename ), TQDir::convertSeparators( m_bDirCompare ? m_pDirectoryMergeWindow->getDirNameDest() : m_bDefaultFilename ? TQString("") : m_outputFilename ),
TQT_SLOT(slotConfigure()), m_pOptionDialog ); TQ_SLOT(slotConfigure()), m_pOptionDialog );
/*OpenDialog d(this, /*OpenDialog d(this,
m_sd1.isFromBuffer() ? TQString("") : m_sd1.getAliasName(), m_sd1.isFromBuffer() ? TQString("") : m_sd1.getAliasName(),
@ -1003,7 +1003,7 @@ void KDiff3App::slotFileOpen()
m_sd3.isFromBuffer() ? TQString("") : m_sd3.getAliasName(), m_sd3.isFromBuffer() ? TQString("") : m_sd3.getAliasName(),
!m_outputFilename.isEmpty(), !m_outputFilename.isEmpty(),
m_bDefaultFilename ? TQString("") : m_outputFilename, m_bDefaultFilename ? TQString("") : m_outputFilename,
TQT_SLOT(slotConfigure()), m_pOptionDialog );*/ TQ_SLOT(slotConfigure()), m_pOptionDialog );*/
int status = d.exec(); int status = d.exec();
if ( status == TQDialog::Accepted ) if ( status == TQDialog::Accepted )
{ {
@ -1296,7 +1296,7 @@ void KDiff3App::choose( int choice )
if ( autoAdvance->isChecked() ) if ( autoAdvance->isChecked() )
{ {
m_bTimerBlock = true; m_bTimerBlock = true;
TQTimer::singleShot( m_pOptionDialog->m_autoAdvanceDelay, this, TQT_SLOT( slotGoNextUnsolvedConflict() ) ); TQTimer::singleShot( m_pOptionDialog->m_autoAdvanceDelay, this, TQ_SLOT( slotGoNextUnsolvedConflict() ) );
} }
} }
} }

60
src/smalldialogs.cpp
Unescape View File

@ -57,10 +57,10 @@ OpenDialog::OpenDialog(
m_pLineA->setEditText( KURL(n1).prettyURL() ); m_pLineA->setEditText( KURL(n1).prettyURL() );
m_pLineA->setMinimumSize( 200, m_pLineA->size().height() ); m_pLineA->setMinimumSize( 200, m_pLineA->size().height() );
TQPushButton * button = new TQPushButton( i18n("File..."), this ); TQPushButton * button = new TQPushButton( i18n("File..."), this );
connect( button, TQT_SIGNAL(clicked()), this, TQT_SLOT( selectFileA() ) ); connect( button, TQ_SIGNAL(clicked()), this, TQ_SLOT( selectFileA() ) );
TQPushButton * button2 = new TQPushButton( i18n("Dir..."), this ); TQPushButton * button2 = new TQPushButton( i18n("Dir..."), this );
connect( button2, TQT_SIGNAL(clicked()), this, TQT_SLOT( selectDirA() ) ); connect( button2, TQ_SIGNAL(clicked()), this, TQ_SLOT( selectDirA() ) );
connect( m_pLineA, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(inputFilenameChanged() ) ); connect( m_pLineA, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(inputFilenameChanged() ) );
h->addWidget( label, 0, 0 ); h->addWidget( label, 0, 0 );
h->addWidget( m_pLineA, 0, 1 ); h->addWidget( m_pLineA, 0, 1 );
@ -73,10 +73,10 @@ OpenDialog::OpenDialog(
m_pLineB->setEditText( KURL(n2).prettyURL() ); m_pLineB->setEditText( KURL(n2).prettyURL() );
m_pLineB->setMinimumSize( 200, m_pLineB->size().height() ); m_pLineB->setMinimumSize( 200, m_pLineB->size().height() );
button = new TQPushButton( i18n("File..."), this ); button = new TQPushButton( i18n("File..."), this );
connect( button, TQT_SIGNAL(clicked()), this, TQT_SLOT( selectFileB() ) ); connect( button, TQ_SIGNAL(clicked()), this, TQ_SLOT( selectFileB() ) );
button2 = new TQPushButton( i18n("Dir..."), this ); button2 = new TQPushButton( i18n("Dir..."), this );
connect( button2, TQT_SIGNAL(clicked()), this, TQT_SLOT( selectDirB() ) ); connect( button2, TQ_SIGNAL(clicked()), this, TQ_SLOT( selectDirB() ) );
connect( m_pLineB, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(inputFilenameChanged() ) ); connect( m_pLineB, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(inputFilenameChanged() ) );
h->addWidget( label, 1, 0 ); h->addWidget( label, 1, 0 );
h->addWidget( m_pLineB, 1, 1 ); h->addWidget( m_pLineB, 1, 1 );
@ -89,10 +89,10 @@ OpenDialog::OpenDialog(
m_pLineC->setEditText( KURL(n3).prettyURL() ); m_pLineC->setEditText( KURL(n3).prettyURL() );
m_pLineC->setMinimumSize( 200, m_pLineC->size().height() ); m_pLineC->setMinimumSize( 200, m_pLineC->size().height() );
button = new TQPushButton( i18n("File..."), this ); button = new TQPushButton( i18n("File..."), this );
connect( button, TQT_SIGNAL(clicked()), this, TQT_SLOT( selectFileC() ) ); connect( button, TQ_SIGNAL(clicked()), this, TQ_SLOT( selectFileC() ) );
button2 = new TQPushButton( i18n("Dir..."), this ); button2 = new TQPushButton( i18n("Dir..."), this );
connect( button2, TQT_SIGNAL(clicked()), this, TQT_SLOT( selectDirC() ) ); connect( button2, TQ_SIGNAL(clicked()), this, TQ_SLOT( selectDirC() ) );
connect( m_pLineC, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(inputFilenameChanged() ) ); connect( m_pLineC, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(inputFilenameChanged() ) );
h->addWidget( label, 2, 0 ); h->addWidget( label, 2, 0 );
h->addWidget( m_pLineC, 2, 1 ); h->addWidget( m_pLineC, 2, 1 );
@ -120,7 +120,7 @@ OpenDialog::OpenDialog(
m->insertItem( i18n("Swap %1<->Output").arg("A"), id++ ); m->insertItem( i18n("Swap %1<->Output").arg("A"), id++ );
m->insertItem( i18n("Swap %1<->Output").arg("B"), id++ ); m->insertItem( i18n("Swap %1<->Output").arg("B"), id++ );
m->insertItem( i18n("Swap %1<->Output").arg("C"), id++ ); m->insertItem( i18n("Swap %1<->Output").arg("C"), id++ );
connect( m, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotSwapCopyNames(int))); connect( m, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotSwapCopyNames(int)));
button->setPopup(m); button->setPopup(m);
@ -132,13 +132,13 @@ OpenDialog::OpenDialog(
m_pLineOut->setEditText( KURL(outputName).prettyURL() ); m_pLineOut->setEditText( KURL(outputName).prettyURL() );
m_pLineOut->setMinimumSize( 200, m_pLineOut->size().height() ); m_pLineOut->setMinimumSize( 200, m_pLineOut->size().height() );
button = new TQPushButton( i18n("File..."), this ); button = new TQPushButton( i18n("File..."), this );
connect( button, TQT_SIGNAL(clicked()), this, TQT_SLOT( selectOutputName() ) ); connect( button, TQ_SIGNAL(clicked()), this, TQ_SLOT( selectOutputName() ) );
button2 = new TQPushButton( i18n("Dir..."), this ); button2 = new TQPushButton( i18n("Dir..."), this );
connect( button2, TQT_SIGNAL(clicked()), this, TQT_SLOT( selectOutputDir() ) ); connect( button2, TQ_SIGNAL(clicked()), this, TQ_SLOT( selectOutputDir() ) );
connect( m_pMerge, TQT_SIGNAL(stateChanged(int)), this, TQT_SLOT(internalSlot(int)) ); connect( m_pMerge, TQ_SIGNAL(stateChanged(int)), this, TQ_SLOT(internalSlot(int)) );
connect( this, TQT_SIGNAL(internalSignal(bool)), m_pLineOut, TQT_SLOT(setEnabled(bool)) ); connect( this, TQ_SIGNAL(internalSignal(bool)), m_pLineOut, TQ_SLOT(setEnabled(bool)) );
connect( this, TQT_SIGNAL(internalSignal(bool)), button, TQT_SLOT(setEnabled(bool)) ); connect( this, TQ_SIGNAL(internalSignal(bool)), button, TQ_SLOT(setEnabled(bool)) );
connect( this, TQT_SIGNAL(internalSignal(bool)), button2, TQT_SLOT(setEnabled(bool)) ); connect( this, TQ_SIGNAL(internalSignal(bool)), button2, TQ_SLOT(setEnabled(bool)) );
m_pMerge->setChecked( !bMerge ); m_pMerge->setChecked( !bMerge );
m_pMerge->setChecked( bMerge ); m_pMerge->setChecked( bMerge );
@ -156,18 +156,18 @@ OpenDialog::OpenDialog(
TQHBoxLayout* l = new TQHBoxLayout( v, 5 ); TQHBoxLayout* l = new TQHBoxLayout( v, 5 );
button = new TQPushButton( i18n("Configure..."), this ); button = new TQPushButton( i18n("Configure..."), this );
connect( button, TQT_SIGNAL(clicked()), pParent, slotConfigure ); connect( button, TQ_SIGNAL(clicked()), pParent, slotConfigure );
l->addWidget( button, 1 ); l->addWidget( button, 1 );
l->addStretch(1); l->addStretch(1);
button = new TQPushButton( i18n("&OK"), this ); button = new TQPushButton( i18n("&OK"), this );
button->setDefault( true ); button->setDefault( true );
connect( button, TQT_SIGNAL(clicked()), this, TQT_SLOT( accept() ) ); connect( button, TQ_SIGNAL(clicked()), this, TQ_SLOT( accept() ) );
l->addWidget( button, 1 ); l->addWidget( button, 1 );
button = new TQPushButton( i18n("&Cancel"), this ); button = new TQPushButton( i18n("&Cancel"), this );
connect( button, TQT_SIGNAL(clicked()), this, TQT_SLOT( reject() ) ); connect( button, TQ_SIGNAL(clicked()), this, TQ_SLOT( reject() ) );
l->addWidget( button,1 ); l->addWidget( button,1 );
TQSize sh = sizeHint(); TQSize sh = sizeHint();
@ -376,11 +376,11 @@ FindDialog::FindDialog(TQWidget* pParent)
TQPushButton* pButton = new TQPushButton( i18n("&Search"), this ); TQPushButton* pButton = new TQPushButton( i18n("&Search"), this );
layout->addWidget( pButton, line, 0 ); layout->addWidget( pButton, line, 0 );
connect( pButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(accept())); connect( pButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(accept()));
pButton = new TQPushButton( i18n("&Cancel"), this ); pButton = new TQPushButton( i18n("&Cancel"), this );
layout->addWidget( pButton, line, 1 ); layout->addWidget( pButton, line, 1 );
connect( pButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(reject())); connect( pButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(reject()));
hide(); hide();
} }
@ -399,7 +399,7 @@ RegExpTester::RegExpTester( TQWidget* pParent, const TQString& autoMergeRegExpTo
TQToolTip::add( l, autoMergeRegExpToolTip ); TQToolTip::add( l, autoMergeRegExpToolTip );
m_pAutoMergeRegExpEdit = new TQLineEdit(this); m_pAutoMergeRegExpEdit = new TQLineEdit(this);
pGrid->addWidget(m_pAutoMergeRegExpEdit,line,1); pGrid->addWidget(m_pAutoMergeRegExpEdit,line,1);
connect( m_pAutoMergeRegExpEdit, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(slotRecalc())); connect( m_pAutoMergeRegExpEdit, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(slotRecalc()));
++line; ++line;
l = new TQLabel(i18n("Example auto merge line:"), this); l = new TQLabel(i18n("Example auto merge line:"), this);
@ -407,7 +407,7 @@ RegExpTester::RegExpTester( TQWidget* pParent, const TQString& autoMergeRegExpTo
TQToolTip::add( l, i18n("For auto merge test copy a line as used in your files.") ); TQToolTip::add( l, i18n("For auto merge test copy a line as used in your files.") );
m_pAutoMergeExampleEdit = new TQLineEdit(this); m_pAutoMergeExampleEdit = new TQLineEdit(this);
pGrid->addWidget(m_pAutoMergeExampleEdit,line,1); pGrid->addWidget(m_pAutoMergeExampleEdit,line,1);
connect( m_pAutoMergeExampleEdit, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(slotRecalc())); connect( m_pAutoMergeExampleEdit, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(slotRecalc()));
++line; ++line;
l = new TQLabel(i18n("Match result:"), this); l = new TQLabel(i18n("Match result:"), this);
@ -426,7 +426,7 @@ RegExpTester::RegExpTester( TQWidget* pParent, const TQString& autoMergeRegExpTo
TQToolTip::add( l, historyStartRegExpToolTip ); TQToolTip::add( l, historyStartRegExpToolTip );
m_pHistoryStartRegExpEdit = new TQLineEdit(this); m_pHistoryStartRegExpEdit = new TQLineEdit(this);
pGrid->addWidget(m_pHistoryStartRegExpEdit,line,1); pGrid->addWidget(m_pHistoryStartRegExpEdit,line,1);
connect( m_pHistoryStartRegExpEdit, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(slotRecalc())); connect( m_pHistoryStartRegExpEdit, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(slotRecalc()));
++line; ++line;
l = new TQLabel(i18n("Example history start line (with leading comment):"), this); l = new TQLabel(i18n("Example history start line (with leading comment):"), this);
@ -436,7 +436,7 @@ RegExpTester::RegExpTester( TQWidget* pParent, const TQString& autoMergeRegExpTo
"including the leading comment.") ); "including the leading comment.") );
m_pHistoryStartExampleEdit = new TQLineEdit(this); m_pHistoryStartExampleEdit = new TQLineEdit(this);
pGrid->addWidget(m_pHistoryStartExampleEdit,line,1); pGrid->addWidget(m_pHistoryStartExampleEdit,line,1);
connect( m_pHistoryStartExampleEdit, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(slotRecalc())); connect( m_pHistoryStartExampleEdit, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(slotRecalc()));
++line; ++line;
l = new TQLabel(i18n("Match result:"), this); l = new TQLabel(i18n("Match result:"), this);
@ -455,7 +455,7 @@ RegExpTester::RegExpTester( TQWidget* pParent, const TQString& autoMergeRegExpTo
TQToolTip::add( l, historyEntryStartRegExpToolTip ); TQToolTip::add( l, historyEntryStartRegExpToolTip );
m_pHistoryEntryStartRegExpEdit = new TQLineEdit(this); m_pHistoryEntryStartRegExpEdit = new TQLineEdit(this);
pGrid->addWidget(m_pHistoryEntryStartRegExpEdit,line,1); pGrid->addWidget(m_pHistoryEntryStartRegExpEdit,line,1);
connect( m_pHistoryEntryStartRegExpEdit, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(slotRecalc())); connect( m_pHistoryEntryStartRegExpEdit, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(slotRecalc()));
++line; ++line;
l = new TQLabel(i18n("History sort key order:"), this); l = new TQLabel(i18n("History sort key order:"), this);
@ -463,7 +463,7 @@ RegExpTester::RegExpTester( TQWidget* pParent, const TQString& autoMergeRegExpTo
TQToolTip::add( l, historySortKeyOrderToolTip ); TQToolTip::add( l, historySortKeyOrderToolTip );
m_pHistorySortKeyOrderEdit = new TQLineEdit(this); m_pHistorySortKeyOrderEdit = new TQLineEdit(this);
pGrid->addWidget(m_pHistorySortKeyOrderEdit,line,1); pGrid->addWidget(m_pHistorySortKeyOrderEdit,line,1);
connect( m_pHistorySortKeyOrderEdit, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(slotRecalc())); connect( m_pHistorySortKeyOrderEdit, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(slotRecalc()));
++line; ++line;
l = new TQLabel(i18n("Example history entry start line (without leading comment):"), this); l = new TQLabel(i18n("Example history entry start line (without leading comment):"), this);
@ -473,7 +473,7 @@ RegExpTester::RegExpTester( TQWidget* pParent, const TQString& autoMergeRegExpTo
++line; ++line;
m_pHistoryEntryStartExampleEdit = new TQLineEdit(this); m_pHistoryEntryStartExampleEdit = new TQLineEdit(this);
pGrid->addWidget(m_pHistoryEntryStartExampleEdit,line,1); pGrid->addWidget(m_pHistoryEntryStartExampleEdit,line,1);
connect( m_pHistoryEntryStartExampleEdit, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(slotRecalc())); connect( m_pHistoryEntryStartExampleEdit, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(slotRecalc()));
++line; ++line;
l = new TQLabel(i18n("Match result:"), this); l = new TQLabel(i18n("Match result:"), this);
@ -492,11 +492,11 @@ RegExpTester::RegExpTester( TQWidget* pParent, const TQString& autoMergeRegExpTo
TQPushButton* pButton = new TQPushButton(i18n("OK"), this); TQPushButton* pButton = new TQPushButton(i18n("OK"), this);
pGrid->addWidget(pButton,line,0); pGrid->addWidget(pButton,line,0);
connect( pButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(accept())); connect( pButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(accept()));
pButton = new TQPushButton(i18n("Cancel"), this); pButton = new TQPushButton(i18n("Cancel"), this);
pGrid->addWidget(pButton,line,1); pGrid->addWidget(pButton,line,1);
connect( pButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(reject())); connect( pButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(reject()));
resize( 800, sizeHint().height() ); resize( 800, sizeHint().height() );
} }

Write Preview
Loading…
Cancel
Save