From 35cfeb1230c22ee3bd7d14617ebf4fa62ed93534 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 1 Feb 2013 15:00:05 -0600 Subject: [PATCH] Rename a number of classes to enhance compatibility with KDE4 --- kdiff3plugin/kdiff3plugin.cpp | 26 ++--- src/directorymergewindow.cpp | 92 +++++++-------- src/directorymergewindow.h | 98 ++++++++-------- src/kdiff3.cpp | 116 +++++++++---------- src/kdiff3.h | 140 +++++++++++------------ src/kdiff3_part.cpp | 2 +- src/kdiff3_shell.h | 6 +- src/kreplacements/kreplacements.cpp | 170 ++++++++++++++-------------- src/kreplacements/kreplacements.h | 94 +++++++-------- src/optiondialog.cpp | 10 +- src/optiondialog.h | 2 +- 11 files changed, 378 insertions(+), 378 deletions(-) diff --git a/kdiff3plugin/kdiff3plugin.cpp b/kdiff3plugin/kdiff3plugin.cpp index 92f0639..21f171c 100755 --- a/kdiff3plugin/kdiff3plugin.cpp +++ b/kdiff3plugin/kdiff3plugin.cpp @@ -94,59 +94,59 @@ KDiff3Plugin::KDiff3Plugin( KonqPopupMenu* pPopupmenu, const char *name, const T (3 Files selected): Compare 's1', 's2' and 's3' */ - KActionMenu* pActionMenu = new KActionMenu (i18n ("KDiff3"), "kdiff3", actionCollection (), "kdiff3_menu" ); - KAction* pAction = 0; + TDEActionMenu* pActionMenu = new TDEActionMenu (i18n ("KDiff3"), "kdiff3", actionCollection (), "kdiff3_menu" ); + TDEAction* pAction = 0; TQString s; if(m_list.count() == 1) { int historyCount = s_pHistory ? s_pHistory->count() : 0; s = i18n("Compare with %1").arg( historyCount>0 ? s_pHistory->front() : TQString() ); - pAction = new KAction ( s,0, this, TQT_SLOT(slotCompareWith()), actionCollection()); + pAction = new TDEAction ( s,0, this, TQT_SLOT(slotCompareWith()), actionCollection()); pAction->setEnabled( m_list.count()>0 && historyCount>0 ); pActionMenu->insert (pAction); s = i18n("Merge with %1").arg( historyCount>0 ? s_pHistory->front() : TQString() ); - pAction = new KAction( s, 0, this, TQT_SLOT(slotMergeWith()), actionCollection()); + pAction = new TDEAction( s, 0, this, TQT_SLOT(slotMergeWith()), actionCollection()); pAction->setEnabled( m_list.count()>0 && historyCount>0 ); pActionMenu->insert (pAction); s = i18n("Save '%1' for later").arg( ( m_list.front() ) ); - pAction = new KAction ( s, 0, this, TQT_SLOT(slotSaveForLater()), actionCollection()); + pAction = new TDEAction ( s, 0, this, TQT_SLOT(slotSaveForLater()), actionCollection()); pAction->setEnabled( m_list.count()>0 ); pActionMenu->insert(pAction); - pAction = new KAction (i18n("3-way merge with base"), 0, this, TQT_SLOT(slotMergeThreeWay()), actionCollection()); + pAction = new TDEAction (i18n("3-way merge with base"), 0, this, TQT_SLOT(slotMergeThreeWay()), actionCollection()); pAction->setEnabled( m_list.count()>0 && historyCount>=2 ); pActionMenu->insert (pAction); if ( s_pHistory && !s_pHistory->empty() ) { - KActionMenu* pHistoryMenu = new KActionMenu( i18n("Compare with ..."), "CompareWith", actionCollection (), "kdiff3_history_menu"); + TDEActionMenu* pHistoryMenu = new TDEActionMenu( i18n("Compare with ..."), "CompareWith", actionCollection (), "kdiff3_history_menu"); pHistoryMenu->setEnabled( m_list.count()>0 && historyCount>0 ); pActionMenu->insert(pHistoryMenu); for (TQStringList::iterator i = s_pHistory->begin(); i!=s_pHistory->end(); ++i) { - pAction = new KAction( *i, "History", 0, this, TQT_SLOT(slotCompareWithHistoryItem()), actionCollection()); + pAction = new TDEAction( *i, "History", 0, this, TQT_SLOT(slotCompareWithHistoryItem()), actionCollection()); pHistoryMenu->insert (pAction); } - pAction = new KAction (i18n("Clear list"), 0, this, TQT_SLOT(slotClearList()), actionCollection()); + pAction = new TDEAction (i18n("Clear list"), 0, this, TQT_SLOT(slotClearList()), actionCollection()); pActionMenu->insert (pAction); pAction->setEnabled( historyCount>0 ); } } else if(m_list.count() == 2) { - pAction = new KAction (i18n("Compare"), 0, this, TQT_SLOT(slotCompareTwoFiles()), actionCollection()); + pAction = new TDEAction (i18n("Compare"), 0, this, TQT_SLOT(slotCompareTwoFiles()), actionCollection()); pActionMenu->insert (pAction); } else if ( m_list.count() == 3 ) { - pAction = new KAction (i18n("3 way comparison"), 0, this, TQT_SLOT(slotCompareThreeFiles()), actionCollection()); + pAction = new TDEAction (i18n("3 way comparison"), 0, this, TQT_SLOT(slotCompareThreeFiles()), actionCollection()); pActionMenu->insert (pAction); } - pAction = new KAction (i18n("About KDiff3 menu plugin ..."), 0, this, TQT_SLOT(slotAbout()), actionCollection()); + pAction = new TDEAction (i18n("About KDiff3 menu plugin ..."), 0, this, TQT_SLOT(slotAbout()), actionCollection()); pActionMenu->insert (pAction); addSeparator(); @@ -171,7 +171,7 @@ void KDiff3Plugin::slotCompareWith() void KDiff3Plugin::slotCompareWithHistoryItem() { - const KAction* pAction = dynamic_cast( sender() ); + const TDEAction* pAction = dynamic_cast( sender() ); if ( m_list.count() > 0 && pAction ) { TQStringList args; diff --git a/src/directorymergewindow.cpp b/src/directorymergewindow.cpp index c56f69b..ac8d3ee 100644 --- a/src/directorymergewindow.cpp +++ b/src/directorymergewindow.cpp @@ -1535,7 +1535,7 @@ void DirectoryMergeWindow::onClick( int button, TQListViewItem* lvi, const TQPoi { bool bThreeDirs = m_dirC.isValid(); - KPopupMenu m(this); + TDEPopupMenu m(this); if ( bThreeDirs ) { m_pDirCurrentDoNothing->plug(&m); @@ -1607,7 +1607,7 @@ void DirectoryMergeWindow::slotShowContextMenu(TQListViewItem* lvi,const TQPoint if (!itemPath.isEmpty()) { selectItemAndColumn(pDMI, c, true); - KPopupMenu m(this); + TDEPopupMenu m(this); m_pDirCompareExplicit->plug(&m); m_pDirMergeExplicit->plug(&m); @@ -2912,7 +2912,7 @@ void DirectoryMergeWindow::slotShowFilesOnlyInC() { updateFileVisibilities(); void DirectoryMergeWindow::slotSynchronizeDirectories() { } void DirectoryMergeWindow::slotChooseNewerFiles() { } -void DirectoryMergeWindow::initDirectoryMergeActions( TQObject* pKDiff3App, KActionCollection* ac ) +void DirectoryMergeWindow::initDirectoryMergeActions( TQObject* pKDiff3App, TDEActionCollection* ac ) { #include "xpm/startmerge.xpm" #include "xpm/showequalfiles.xpm" @@ -2921,58 +2921,58 @@ void DirectoryMergeWindow::initDirectoryMergeActions( TQObject* pKDiff3App, KAct #include "xpm/showfilesonlyinc.xpm" DirectoryMergeWindow* p = this; - m_pDirStartOperation = new KAction(i18n("Start/Continue Directory Merge"), TQt::Key_F7, TQT_TQOBJECT(p), TQT_SLOT(slotRunOperationForAllItems()), ac, "dir_start_operation"); - m_pDirRunOperationForCurrentItem = new KAction(i18n("Run Operation for Current Item"), TQt::Key_F6, TQT_TQOBJECT(p), TQT_SLOT(slotRunOperationForCurrentItem()), ac, "dir_run_operation_for_current_item"); - m_pDirCompareCurrent = new KAction(i18n("Compare Selected File"), 0, TQT_TQOBJECT(p), TQT_SLOT(compareCurrentFile()), ac, "dir_compare_current"); - m_pDirMergeCurrent = new KAction(i18n("Merge Current File"), TQIconSet(TQPixmap(startmerge)), 0, TQT_TQOBJECT(pKDiff3App), TQT_SLOT(slotMergeCurrentFile()), ac, "merge_current"); - m_pDirFoldAll = new KAction(i18n("Fold All Subdirs"), 0, TQT_TQOBJECT(p), TQT_SLOT(slotFoldAllSubdirs()), ac, "dir_fold_all"); - m_pDirUnfoldAll = new KAction(i18n("Unfold All Subdirs"), 0, TQT_TQOBJECT(p), TQT_SLOT(slotUnfoldAllSubdirs()), ac, "dir_unfold_all"); - m_pDirRescan = new KAction(i18n("Rescan"), TQt::SHIFT+TQt::Key_F5, TQT_TQOBJECT(p), TQT_SLOT(reload()), ac, "dir_rescan"); - m_pDirSaveMergeState = 0; //new KAction(i18n("Save Directory Merge State ..."), 0, TQT_TQOBJECT(p), TQT_SLOT(slotSaveMergeState()), ac, "dir_save_merge_state"); - m_pDirLoadMergeState = 0; //new KAction(i18n("Load Directory Merge State ..."), 0, TQT_TQOBJECT(p), TQT_SLOT(slotLoadMergeState()), ac, "dir_load_merge_state"); - m_pDirChooseAEverywhere = new KAction(i18n("Choose A for All Items"), 0, TQT_TQOBJECT(p), TQT_SLOT(slotChooseAEverywhere()), ac, "dir_choose_a_everywhere"); - m_pDirChooseBEverywhere = new KAction(i18n("Choose B for All Items"), 0, TQT_TQOBJECT(p), TQT_SLOT(slotChooseBEverywhere()), ac, "dir_choose_b_everywhere"); - m_pDirChooseCEverywhere = new KAction(i18n("Choose C for All Items"), 0, TQT_TQOBJECT(p), TQT_SLOT(slotChooseCEverywhere()), ac, "dir_choose_c_everywhere"); - m_pDirAutoChoiceEverywhere = new KAction(i18n("Auto-Choose Operation for All Items"), 0, TQT_TQOBJECT(p), TQT_SLOT(slotAutoChooseEverywhere()), ac, "dir_autochoose_everywhere"); - m_pDirDoNothingEverywhere = new KAction(i18n("No Operation for All Items"), 0, TQT_TQOBJECT(p), TQT_SLOT(slotNoOpEverywhere()), ac, "dir_nothing_everywhere"); - -// m_pDirSynchronizeDirectories = new KToggleAction(i18n("Synchronize Directories"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotSynchronizeDirectories()), ac, "dir_synchronize_directories"); -// m_pDirChooseNewerFiles = new KToggleAction(i18n("Copy Newer Files Instead of Merging"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotChooseNewerFiles()), ac, "dir_choose_newer_files"); - - m_pDirShowIdenticalFiles = new KToggleAction(i18n("Show Identical Files"), TQIconSet(TQPixmap(showequalfiles)), 0, TQT_TQOBJECT(this), TQT_SLOT(slotShowIdenticalFiles()), ac, "dir_show_identical_files"); - m_pDirShowDifferentFiles = new KToggleAction(i18n("Show Different Files"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotShowDifferentFiles()), ac, "dir_show_different_files"); - m_pDirShowFilesOnlyInA = new KToggleAction(i18n("Show Files only in A"), TQIconSet(TQPixmap(showfilesonlyina)), 0, TQT_TQOBJECT(this), TQT_SLOT(slotShowFilesOnlyInA()), ac, "dir_show_files_only_in_a"); - m_pDirShowFilesOnlyInB = new KToggleAction(i18n("Show Files only in B"), TQIconSet(TQPixmap(showfilesonlyinb)), 0, TQT_TQOBJECT(this), TQT_SLOT(slotShowFilesOnlyInB()), ac, "dir_show_files_only_in_b"); - m_pDirShowFilesOnlyInC = new KToggleAction(i18n("Show Files only in C"), TQIconSet(TQPixmap(showfilesonlyinc)), 0, TQT_TQOBJECT(this), TQT_SLOT(slotShowFilesOnlyInC()), ac, "dir_show_files_only_in_c"); + m_pDirStartOperation = new TDEAction(i18n("Start/Continue Directory Merge"), TQt::Key_F7, TQT_TQOBJECT(p), TQT_SLOT(slotRunOperationForAllItems()), ac, "dir_start_operation"); + m_pDirRunOperationForCurrentItem = new TDEAction(i18n("Run Operation for Current Item"), TQt::Key_F6, TQT_TQOBJECT(p), TQT_SLOT(slotRunOperationForCurrentItem()), ac, "dir_run_operation_for_current_item"); + m_pDirCompareCurrent = new TDEAction(i18n("Compare Selected File"), 0, TQT_TQOBJECT(p), TQT_SLOT(compareCurrentFile()), ac, "dir_compare_current"); + m_pDirMergeCurrent = new TDEAction(i18n("Merge Current File"), TQIconSet(TQPixmap(startmerge)), 0, TQT_TQOBJECT(pKDiff3App), TQT_SLOT(slotMergeCurrentFile()), ac, "merge_current"); + m_pDirFoldAll = new TDEAction(i18n("Fold All Subdirs"), 0, TQT_TQOBJECT(p), TQT_SLOT(slotFoldAllSubdirs()), ac, "dir_fold_all"); + m_pDirUnfoldAll = new TDEAction(i18n("Unfold All Subdirs"), 0, TQT_TQOBJECT(p), TQT_SLOT(slotUnfoldAllSubdirs()), ac, "dir_unfold_all"); + m_pDirRescan = new TDEAction(i18n("Rescan"), TQt::SHIFT+TQt::Key_F5, TQT_TQOBJECT(p), TQT_SLOT(reload()), ac, "dir_rescan"); + m_pDirSaveMergeState = 0; //new TDEAction(i18n("Save Directory Merge State ..."), 0, TQT_TQOBJECT(p), TQT_SLOT(slotSaveMergeState()), ac, "dir_save_merge_state"); + m_pDirLoadMergeState = 0; //new TDEAction(i18n("Load Directory Merge State ..."), 0, TQT_TQOBJECT(p), TQT_SLOT(slotLoadMergeState()), ac, "dir_load_merge_state"); + m_pDirChooseAEverywhere = new TDEAction(i18n("Choose A for All Items"), 0, TQT_TQOBJECT(p), TQT_SLOT(slotChooseAEverywhere()), ac, "dir_choose_a_everywhere"); + m_pDirChooseBEverywhere = new TDEAction(i18n("Choose B for All Items"), 0, TQT_TQOBJECT(p), TQT_SLOT(slotChooseBEverywhere()), ac, "dir_choose_b_everywhere"); + m_pDirChooseCEverywhere = new TDEAction(i18n("Choose C for All Items"), 0, TQT_TQOBJECT(p), TQT_SLOT(slotChooseCEverywhere()), ac, "dir_choose_c_everywhere"); + m_pDirAutoChoiceEverywhere = new TDEAction(i18n("Auto-Choose Operation for All Items"), 0, TQT_TQOBJECT(p), TQT_SLOT(slotAutoChooseEverywhere()), ac, "dir_autochoose_everywhere"); + m_pDirDoNothingEverywhere = new TDEAction(i18n("No Operation for All Items"), 0, TQT_TQOBJECT(p), TQT_SLOT(slotNoOpEverywhere()), ac, "dir_nothing_everywhere"); + +// m_pDirSynchronizeDirectories = new TDEToggleAction(i18n("Synchronize Directories"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotSynchronizeDirectories()), ac, "dir_synchronize_directories"); +// m_pDirChooseNewerFiles = new TDEToggleAction(i18n("Copy Newer Files Instead of Merging"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotChooseNewerFiles()), ac, "dir_choose_newer_files"); + + m_pDirShowIdenticalFiles = new TDEToggleAction(i18n("Show Identical Files"), TQIconSet(TQPixmap(showequalfiles)), 0, TQT_TQOBJECT(this), TQT_SLOT(slotShowIdenticalFiles()), ac, "dir_show_identical_files"); + m_pDirShowDifferentFiles = new TDEToggleAction(i18n("Show Different Files"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotShowDifferentFiles()), ac, "dir_show_different_files"); + m_pDirShowFilesOnlyInA = new TDEToggleAction(i18n("Show Files only in A"), TQIconSet(TQPixmap(showfilesonlyina)), 0, TQT_TQOBJECT(this), TQT_SLOT(slotShowFilesOnlyInA()), ac, "dir_show_files_only_in_a"); + m_pDirShowFilesOnlyInB = new TDEToggleAction(i18n("Show Files only in B"), TQIconSet(TQPixmap(showfilesonlyinb)), 0, TQT_TQOBJECT(this), TQT_SLOT(slotShowFilesOnlyInB()), ac, "dir_show_files_only_in_b"); + m_pDirShowFilesOnlyInC = new TDEToggleAction(i18n("Show Files only in C"), TQIconSet(TQPixmap(showfilesonlyinc)), 0, TQT_TQOBJECT(this), TQT_SLOT(slotShowFilesOnlyInC()), ac, "dir_show_files_only_in_c"); m_pDirShowIdenticalFiles->setChecked( m_pOptions->m_bDmShowIdenticalFiles ); - m_pDirCompareExplicit = new KAction(i18n("Compare Explicitly Selected Files"), 0, TQT_TQOBJECT(p), TQT_SLOT(slotCompareExplicitlySelectedFiles()), ac, "dir_compare_explicitly_selected_files"); - m_pDirMergeExplicit = new KAction(i18n("Merge Explicitly Selected Files"), 0, TQT_TQOBJECT(p), TQT_SLOT(slotMergeExplicitlySelectedFiles()), ac, "dir_merge_explicitly_selected_files"); - - m_pDirCurrentDoNothing = new KAction(i18n("Do Nothing"), 0, TQT_TQOBJECT(p), TQT_SLOT(slotCurrentDoNothing()), ac, "dir_current_do_nothing"); - m_pDirCurrentChooseA = new KAction(i18n("A"), 0, TQT_TQOBJECT(p), TQT_SLOT(slotCurrentChooseA()), ac, "dir_current_choose_a"); - m_pDirCurrentChooseB = new KAction(i18n("B"), 0, TQT_TQOBJECT(p), TQT_SLOT(slotCurrentChooseB()), ac, "dir_current_choose_b"); - m_pDirCurrentChooseC = new KAction(i18n("C"), 0, TQT_TQOBJECT(p), TQT_SLOT(slotCurrentChooseC()), ac, "dir_current_choose_c"); - m_pDirCurrentMerge = new KAction(i18n("Merge"), 0, TQT_TQOBJECT(p), TQT_SLOT(slotCurrentMerge()), ac, "dir_current_merge"); - m_pDirCurrentDelete = new KAction(i18n("Delete (if exists)"), 0, TQT_TQOBJECT(p), TQT_SLOT(slotCurrentDelete()), ac, "dir_current_delete"); - - m_pDirCurrentSyncDoNothing = new KAction(i18n("Do Nothing"), 0, TQT_TQOBJECT(p), TQT_SLOT(slotCurrentDoNothing()), ac, "dir_current_sync_do_nothing"); - m_pDirCurrentSyncCopyAToB = new KAction(i18n("Copy A to B"), 0, TQT_TQOBJECT(p), TQT_SLOT(slotCurrentCopyAToB()), ac, "dir_current_sync_copy_a_to_b" ); - m_pDirCurrentSyncCopyBToA = new KAction(i18n("Copy B to A"), 0, TQT_TQOBJECT(p), TQT_SLOT(slotCurrentCopyBToA()), ac, "dir_current_sync_copy_b_to_a" ); - m_pDirCurrentSyncDeleteA = new KAction(i18n("Delete A"), 0, TQT_TQOBJECT(p), TQT_SLOT(slotCurrentDeleteA()), ac,"dir_current_sync_delete_a"); - m_pDirCurrentSyncDeleteB = new KAction(i18n("Delete B"), 0, TQT_TQOBJECT(p), TQT_SLOT(slotCurrentDeleteB()), ac,"dir_current_sync_delete_b"); - m_pDirCurrentSyncDeleteAAndB = new KAction(i18n("Delete A && B"), 0, TQT_TQOBJECT(p), TQT_SLOT(slotCurrentDeleteAAndB()), ac,"dir_current_sync_delete_a_and_b"); - m_pDirCurrentSyncMergeToA = new KAction(i18n("Merge to A"), 0, TQT_TQOBJECT(p), TQT_SLOT(slotCurrentMergeToA()), ac,"dir_current_sync_merge_to_a"); - m_pDirCurrentSyncMergeToB = new KAction(i18n("Merge to B"), 0, TQT_TQOBJECT(p), TQT_SLOT(slotCurrentMergeToB()), ac,"dir_current_sync_merge_to_b"); - m_pDirCurrentSyncMergeToAAndB = new KAction(i18n("Merge to A && B"), 0, TQT_TQOBJECT(p), TQT_SLOT(slotCurrentMergeToAAndB()), ac,"dir_current_sync_merge_to_a_and_b"); + m_pDirCompareExplicit = new TDEAction(i18n("Compare Explicitly Selected Files"), 0, TQT_TQOBJECT(p), TQT_SLOT(slotCompareExplicitlySelectedFiles()), ac, "dir_compare_explicitly_selected_files"); + m_pDirMergeExplicit = new TDEAction(i18n("Merge Explicitly Selected Files"), 0, TQT_TQOBJECT(p), TQT_SLOT(slotMergeExplicitlySelectedFiles()), ac, "dir_merge_explicitly_selected_files"); + + m_pDirCurrentDoNothing = new TDEAction(i18n("Do Nothing"), 0, TQT_TQOBJECT(p), TQT_SLOT(slotCurrentDoNothing()), ac, "dir_current_do_nothing"); + m_pDirCurrentChooseA = new TDEAction(i18n("A"), 0, TQT_TQOBJECT(p), TQT_SLOT(slotCurrentChooseA()), ac, "dir_current_choose_a"); + m_pDirCurrentChooseB = new TDEAction(i18n("B"), 0, TQT_TQOBJECT(p), TQT_SLOT(slotCurrentChooseB()), ac, "dir_current_choose_b"); + m_pDirCurrentChooseC = new TDEAction(i18n("C"), 0, TQT_TQOBJECT(p), TQT_SLOT(slotCurrentChooseC()), ac, "dir_current_choose_c"); + m_pDirCurrentMerge = new TDEAction(i18n("Merge"), 0, TQT_TQOBJECT(p), TQT_SLOT(slotCurrentMerge()), ac, "dir_current_merge"); + m_pDirCurrentDelete = new TDEAction(i18n("Delete (if exists)"), 0, TQT_TQOBJECT(p), TQT_SLOT(slotCurrentDelete()), ac, "dir_current_delete"); + + m_pDirCurrentSyncDoNothing = new TDEAction(i18n("Do Nothing"), 0, TQT_TQOBJECT(p), TQT_SLOT(slotCurrentDoNothing()), ac, "dir_current_sync_do_nothing"); + m_pDirCurrentSyncCopyAToB = new TDEAction(i18n("Copy A to B"), 0, TQT_TQOBJECT(p), TQT_SLOT(slotCurrentCopyAToB()), ac, "dir_current_sync_copy_a_to_b" ); + m_pDirCurrentSyncCopyBToA = new TDEAction(i18n("Copy B to A"), 0, TQT_TQOBJECT(p), TQT_SLOT(slotCurrentCopyBToA()), ac, "dir_current_sync_copy_b_to_a" ); + m_pDirCurrentSyncDeleteA = new TDEAction(i18n("Delete A"), 0, TQT_TQOBJECT(p), TQT_SLOT(slotCurrentDeleteA()), ac,"dir_current_sync_delete_a"); + m_pDirCurrentSyncDeleteB = new TDEAction(i18n("Delete B"), 0, TQT_TQOBJECT(p), TQT_SLOT(slotCurrentDeleteB()), ac,"dir_current_sync_delete_b"); + m_pDirCurrentSyncDeleteAAndB = new TDEAction(i18n("Delete A && B"), 0, TQT_TQOBJECT(p), TQT_SLOT(slotCurrentDeleteAAndB()), ac,"dir_current_sync_delete_a_and_b"); + m_pDirCurrentSyncMergeToA = new TDEAction(i18n("Merge to A"), 0, TQT_TQOBJECT(p), TQT_SLOT(slotCurrentMergeToA()), ac,"dir_current_sync_merge_to_a"); + m_pDirCurrentSyncMergeToB = new TDEAction(i18n("Merge to B"), 0, TQT_TQOBJECT(p), TQT_SLOT(slotCurrentMergeToB()), ac,"dir_current_sync_merge_to_b"); + m_pDirCurrentSyncMergeToAAndB = new TDEAction(i18n("Merge to A && B"), 0, TQT_TQOBJECT(p), TQT_SLOT(slotCurrentMergeToAAndB()), ac,"dir_current_sync_merge_to_a_and_b"); } void DirectoryMergeWindow::updateAvailabilities( bool bDirCompare, bool bDiffWindowVisible, - KToggleAction* chooseA, KToggleAction* chooseB, KToggleAction* chooseC ) + TDEToggleAction* chooseA, TDEToggleAction* chooseB, TDEToggleAction* chooseC ) { m_pDirStartOperation->setEnabled( bDirCompare ); m_pDirRunOperationForCurrentItem->setEnabled( bDirCompare ); diff --git a/src/directorymergewindow.h b/src/directorymergewindow.h index 855811a..88ee923 100644 --- a/src/directorymergewindow.h +++ b/src/directorymergewindow.h @@ -34,9 +34,9 @@ class StatusInfo; class DirectoryMergeInfo; class OneDirectoryInfo; class TQLabel; -class KAction; -class KToggleAction; -class KActionCollection; +class TDEAction; +class TDEToggleAction; +class TDEActionCollection; class TotalDiffStatus; enum e_MergeOperation @@ -136,9 +136,9 @@ public: int totalColumnWidth(); bool isSyncMode() { return m_bSyncMode; } bool isScanning() { return m_bScanning; } - void initDirectoryMergeActions( TQObject* pKDiff3App, KActionCollection* ac ); + void initDirectoryMergeActions( TQObject* pKDiff3App, TDEActionCollection* ac ); void updateAvailabilities( bool bDirCompare, bool bDiffWindowVisible, - KToggleAction* chooseA, KToggleAction* chooseB, KToggleAction* chooseC ); + TDEToggleAction* chooseA, TDEToggleAction* chooseB, TDEToggleAction* chooseC ); void updateFileVisibilities(); virtual void keyPressEvent( TQKeyEvent* e ); @@ -274,50 +274,50 @@ protected: void selectItemAndColumn(DirMergeItem* pDMI, int c, bool bContextMenu); friend class DirMergeItem; - KAction* m_pDirStartOperation; - KAction* m_pDirRunOperationForCurrentItem; - KAction* m_pDirCompareCurrent; - KAction* m_pDirMergeCurrent; - KAction* m_pDirRescan; - KAction* m_pDirChooseAEverywhere; - KAction* m_pDirChooseBEverywhere; - KAction* m_pDirChooseCEverywhere; - KAction* m_pDirAutoChoiceEverywhere; - KAction* m_pDirDoNothingEverywhere; - KAction* m_pDirFoldAll; - KAction* m_pDirUnfoldAll; - - KToggleAction* m_pDirShowIdenticalFiles; - KToggleAction* m_pDirShowDifferentFiles; - KToggleAction* m_pDirShowFilesOnlyInA; - KToggleAction* m_pDirShowFilesOnlyInB; - KToggleAction* m_pDirShowFilesOnlyInC; - - KToggleAction* m_pDirSynchronizeDirectories; - KToggleAction* m_pDirChooseNewerFiles; - - KAction* m_pDirCompareExplicit; - KAction* m_pDirMergeExplicit; - - KAction* m_pDirCurrentDoNothing; - KAction* m_pDirCurrentChooseA; - KAction* m_pDirCurrentChooseB; - KAction* m_pDirCurrentChooseC; - KAction* m_pDirCurrentMerge; - KAction* m_pDirCurrentDelete; - - KAction* m_pDirCurrentSyncDoNothing; - KAction* m_pDirCurrentSyncCopyAToB; - KAction* m_pDirCurrentSyncCopyBToA; - KAction* m_pDirCurrentSyncDeleteA; - KAction* m_pDirCurrentSyncDeleteB; - KAction* m_pDirCurrentSyncDeleteAAndB; - KAction* m_pDirCurrentSyncMergeToA; - KAction* m_pDirCurrentSyncMergeToB; - KAction* m_pDirCurrentSyncMergeToAAndB; - - KAction* m_pDirSaveMergeState; - KAction* m_pDirLoadMergeState; + TDEAction* m_pDirStartOperation; + TDEAction* m_pDirRunOperationForCurrentItem; + TDEAction* m_pDirCompareCurrent; + TDEAction* m_pDirMergeCurrent; + TDEAction* m_pDirRescan; + TDEAction* m_pDirChooseAEverywhere; + TDEAction* m_pDirChooseBEverywhere; + TDEAction* m_pDirChooseCEverywhere; + TDEAction* m_pDirAutoChoiceEverywhere; + TDEAction* m_pDirDoNothingEverywhere; + TDEAction* m_pDirFoldAll; + TDEAction* m_pDirUnfoldAll; + + TDEToggleAction* m_pDirShowIdenticalFiles; + TDEToggleAction* m_pDirShowDifferentFiles; + TDEToggleAction* m_pDirShowFilesOnlyInA; + TDEToggleAction* m_pDirShowFilesOnlyInB; + TDEToggleAction* m_pDirShowFilesOnlyInC; + + TDEToggleAction* m_pDirSynchronizeDirectories; + TDEToggleAction* m_pDirChooseNewerFiles; + + TDEAction* m_pDirCompareExplicit; + TDEAction* m_pDirMergeExplicit; + + TDEAction* m_pDirCurrentDoNothing; + TDEAction* m_pDirCurrentChooseA; + TDEAction* m_pDirCurrentChooseB; + TDEAction* m_pDirCurrentChooseC; + TDEAction* m_pDirCurrentMerge; + TDEAction* m_pDirCurrentDelete; + + TDEAction* m_pDirCurrentSyncDoNothing; + TDEAction* m_pDirCurrentSyncCopyAToB; + TDEAction* m_pDirCurrentSyncCopyBToA; + TDEAction* m_pDirCurrentSyncDeleteA; + TDEAction* m_pDirCurrentSyncDeleteB; + TDEAction* m_pDirCurrentSyncDeleteAAndB; + TDEAction* m_pDirCurrentSyncMergeToA; + TDEAction* m_pDirCurrentSyncMergeToB; + TDEAction* m_pDirCurrentSyncMergeToAAndB; + + TDEAction* m_pDirSaveMergeState; + TDEAction* m_pDirLoadMergeState; signals: void startDiffMerge(TQString fn1,TQString fn2, TQString fn3, TQString ofn, TQString,TQString,TQString,TotalDiffStatus*); void checkIfCanContinue( bool* pbContinue ); diff --git a/src/kdiff3.cpp b/src/kdiff3.cpp index 8d0839a..d7a3df2 100644 --- a/src/kdiff3.cpp +++ b/src/kdiff3.cpp @@ -57,7 +57,7 @@ #define ID_STATUS_MSG 1 -KActionCollection* KDiff3App::actionCollection() +TDEActionCollection* KDiff3App::actionCollection() { if ( m_pKDiff3Shell==0 ) return m_pKDiff3Part->actionCollection(); @@ -73,7 +73,7 @@ KStatusBar* KDiff3App::statusBar() return m_pKDiff3Shell->statusBar(); } -KToolBar* KDiff3App::toolBar(const char* toolBarId ) +TDEToolBar* KDiff3App::toolBar(const char* toolBarId ) { if ( m_pKDiff3Shell==0 ) return 0; @@ -92,7 +92,7 @@ bool KDiff3App::isFileSaved() } KDiff3App::KDiff3App(TQWidget* pParent, const char* name, KDiff3Part* pKDiff3Part ) - :TQSplitter(pParent, name) //previously KMainWindow + :TQSplitter(pParent, name) //previously TDEMainWindow { m_pKDiff3Part = pKDiff3Part; m_pKDiff3Shell = dynamic_cast(pParent); @@ -258,7 +258,7 @@ KDiff3App::KDiff3App(TQWidget* pParent, const char* name, KDiff3Part* pKDiff3Par slotViewToolBar(); slotViewStatusBar(); if( toolBar("mainToolBar")!=0 ) - toolBar("mainToolBar")->setBarPos( (KToolBar::BarPosition) m_pOptionDialog->m_toolBarPos ); + toolBar("mainToolBar")->setBarPos( (TDEToolBar::BarPosition) m_pOptionDialog->m_toolBarPos ); /* TQSize size = m_pOptionDialog->m_geometry; TQPoint pos = m_pOptionDialog->m_position; if(!size.isEmpty()) @@ -426,14 +426,14 @@ KDiff3App::~KDiff3App() } -void KDiff3App::initActions( KActionCollection* ac ) +void KDiff3App::initActions( TDEActionCollection* ac ) { if (ac==0) KMessageBox::error(0, "actionCollection==0"); fileOpen = KStdAction::open(TQT_TQOBJECT(this), TQT_SLOT(slotFileOpen()), ac); fileOpen->setStatusText(i18n("Opens documents for comparison...")); - fileReload = new KAction(i18n("Reload"), /*TQIconSet(TQPixmap(reloadIcon)),*/ Key_F5, TQT_TQOBJECT(this), TQT_SLOT(slotReload()), ac, "file_reload"); + fileReload = new TDEAction(i18n("Reload"), /*TQIconSet(TQPixmap(reloadIcon)),*/ Key_F5, TQT_TQOBJECT(this), TQT_SLOT(slotReload()), ac, "file_reload"); fileSave = KStdAction::save(TQT_TQOBJECT(this), TQT_SLOT(slotFileSave()), ac); fileSave->setStatusText(i18n("Saves the merge result. All conflicts must be solved!")); @@ -460,7 +460,7 @@ void KDiff3App::initActions( KActionCollection* ac ) viewStatusBar = KStdAction::showStatusbar(TQT_TQOBJECT(this), TQT_SLOT(slotViewStatusBar()), ac); viewStatusBar->setStatusText(i18n("Enables/disables the statusbar")); KStdAction::keyBindings(TQT_TQOBJECT(this), TQT_SLOT(slotConfigureKeys()), ac); - KAction* pAction = KStdAction::preferences(TQT_TQOBJECT(this), TQT_SLOT(slotConfigure()), ac ); + TDEAction* pAction = KStdAction::preferences(TQT_TQOBJECT(this), TQT_SLOT(slotConfigure()), ac ); if ( isPart() ) pAction->setText(i18n("Configure KDiff3...")); @@ -483,70 +483,70 @@ void KDiff3App::initActions( KActionCollection* ac ) #include "xpm/showlinenumbers.xpm" //#include "reload.xpm" - goCurrent = new KAction(i18n("Go to Current Delta"), TQIconSet(TQPixmap(currentpos)), CTRL+Key_Space, TQT_TQOBJECT(this), TQT_SLOT(slotGoCurrent()), ac, "go_current"); - goTop = new KAction(i18n("Go to First Delta"), TQIconSet(TQPixmap(upend)), 0, TQT_TQOBJECT(this), TQT_SLOT(slotGoTop()), ac, "go_top"); - goBottom = new KAction(i18n("Go to Last Delta"), TQIconSet(TQPixmap(downend)), 0, TQT_TQOBJECT(this), TQT_SLOT(slotGoBottom()), ac, "go_bottom"); + goCurrent = new TDEAction(i18n("Go to Current Delta"), TQIconSet(TQPixmap(currentpos)), CTRL+Key_Space, TQT_TQOBJECT(this), TQT_SLOT(slotGoCurrent()), ac, "go_current"); + goTop = new TDEAction(i18n("Go to First Delta"), TQIconSet(TQPixmap(upend)), 0, TQT_TQOBJECT(this), TQT_SLOT(slotGoTop()), ac, "go_top"); + goBottom = new TDEAction(i18n("Go to Last Delta"), TQIconSet(TQPixmap(downend)), 0, TQT_TQOBJECT(this), TQT_SLOT(slotGoBottom()), ac, "go_bottom"); 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.)"); - goPrevDelta = new KAction(i18n("Go to Previous Delta"), TQIconSet(TQPixmap(up1arrow)), CTRL+Key_Up, TQT_TQOBJECT(this), TQT_SLOT(slotGoPrevDelta()), ac, "go_prev_delta"); + goPrevDelta = new TDEAction(i18n("Go to Previous Delta"), TQIconSet(TQPixmap(up1arrow)), CTRL+Key_Up, TQT_TQOBJECT(this), TQT_SLOT(slotGoPrevDelta()), ac, "go_prev_delta"); goPrevDelta->setToolTip( goPrevDelta->text() + omitsWhitespace ); - goNextDelta = new KAction(i18n("Go to Next Delta"), TQIconSet(TQPixmap(down1arrow)), CTRL+Key_Down, TQT_TQOBJECT(this), TQT_SLOT(slotGoNextDelta()), ac, "go_next_delta"); + goNextDelta = new TDEAction(i18n("Go to Next Delta"), TQIconSet(TQPixmap(down1arrow)), CTRL+Key_Down, TQT_TQOBJECT(this), TQT_SLOT(slotGoNextDelta()), ac, "go_next_delta"); goNextDelta->setToolTip( goNextDelta->text() + omitsWhitespace ); - goPrevConflict = new KAction(i18n("Go to Previous Conflict"), TQIconSet(TQPixmap(up2arrow)), CTRL+Key_PageUp, TQT_TQOBJECT(this), TQT_SLOT(slotGoPrevConflict()), ac, "go_prev_conflict"); + goPrevConflict = new TDEAction(i18n("Go to Previous Conflict"), TQIconSet(TQPixmap(up2arrow)), CTRL+Key_PageUp, TQT_TQOBJECT(this), TQT_SLOT(slotGoPrevConflict()), ac, "go_prev_conflict"); goPrevConflict->setToolTip( goPrevConflict->text() + omitsWhitespace ); - goNextConflict = new KAction(i18n("Go to Next Conflict"), TQIconSet(TQPixmap(down2arrow)), CTRL+Key_PageDown, TQT_TQOBJECT(this), TQT_SLOT(slotGoNextConflict()), ac, "go_next_conflict"); + goNextConflict = new TDEAction(i18n("Go to Next Conflict"), TQIconSet(TQPixmap(down2arrow)), CTRL+Key_PageDown, TQT_TQOBJECT(this), TQT_SLOT(slotGoNextConflict()), ac, "go_next_conflict"); goNextConflict->setToolTip( goNextConflict->text() + omitsWhitespace ); - goPrevUnsolvedConflict = new KAction(i18n("Go to Previous Unsolved Conflict"), TQIconSet(TQPixmap(prevunsolved)), 0, TQT_TQOBJECT(this), TQT_SLOT(slotGoPrevUnsolvedConflict()), ac, "go_prev_unsolved_conflict"); + goPrevUnsolvedConflict = new TDEAction(i18n("Go to Previous Unsolved Conflict"), TQIconSet(TQPixmap(prevunsolved)), 0, TQT_TQOBJECT(this), TQT_SLOT(slotGoPrevUnsolvedConflict()), ac, "go_prev_unsolved_conflict"); goPrevUnsolvedConflict->setToolTip( goPrevUnsolvedConflict->text() + includeWhitespace ); - goNextUnsolvedConflict = new KAction(i18n("Go to Next Unsolved Conflict"), TQIconSet(TQPixmap(nextunsolved)), 0, TQT_TQOBJECT(this), TQT_SLOT(slotGoNextUnsolvedConflict()), ac, "go_next_unsolved_conflict"); + goNextUnsolvedConflict = new TDEAction(i18n("Go to Next Unsolved Conflict"), TQIconSet(TQPixmap(nextunsolved)), 0, TQT_TQOBJECT(this), TQT_SLOT(slotGoNextUnsolvedConflict()), ac, "go_next_unsolved_conflict"); goNextUnsolvedConflict->setToolTip( goNextUnsolvedConflict->text() + includeWhitespace ); - chooseA = new KToggleAction(i18n("Select Line(s) From A"), TQIconSet(TQPixmap(iconA)), CTRL+Key_1, TQT_TQOBJECT(this), TQT_SLOT(slotChooseA()), ac, "merge_choose_a"); - chooseB = new KToggleAction(i18n("Select Line(s) From B"), TQIconSet(TQPixmap(iconB)), CTRL+Key_2, TQT_TQOBJECT(this), TQT_SLOT(slotChooseB()), ac, "merge_choose_b"); - chooseC = new KToggleAction(i18n("Select Line(s) From C"), TQIconSet(TQPixmap(iconC)), CTRL+Key_3, TQT_TQOBJECT(this), TQT_SLOT(slotChooseC()), ac, "merge_choose_c"); - autoAdvance = new KToggleAction(i18n("Automatically Go to Next Unsolved Conflict After Source Selection"), TQIconSet(TQPixmap(autoadvance)), 0, TQT_TQOBJECT(this), TQT_SLOT(slotAutoAdvanceToggled()), ac, "merge_autoadvance"); - - showWhiteSpaceCharacters = new KToggleAction(i18n("Show Space && Tabulator Characters for Differences"), TQIconSet(TQPixmap(showwhitespacechars)), 0, TQT_TQOBJECT(this), TQT_SLOT(slotShowWhiteSpaceToggled()), ac, "diff_show_whitespace_characters"); - showWhiteSpace = new KToggleAction(i18n("Show White Space"), TQIconSet(TQPixmap(showwhitespace)), 0, TQT_TQOBJECT(this), TQT_SLOT(slotShowWhiteSpaceToggled()), ac, "diff_show_whitespace"); - - showLineNumbers = new KToggleAction(i18n("Show Line Numbers"), TQIconSet(TQPixmap(showlinenumbers)), 0, TQT_TQOBJECT(this), TQT_SLOT(slotShowLineNumbersToggled()), ac, "diff_showlinenumbers"); - chooseAEverywhere = new KAction(i18n("Choose A Everywhere"), CTRL+SHIFT+Key_1, TQT_TQOBJECT(this), TQT_SLOT(slotChooseAEverywhere()), ac, "merge_choose_a_everywhere"); - chooseBEverywhere = new KAction(i18n("Choose B Everywhere"), CTRL+SHIFT+Key_2, TQT_TQOBJECT(this), TQT_SLOT(slotChooseBEverywhere()), ac, "merge_choose_b_everywhere"); - chooseCEverywhere = new KAction(i18n("Choose C Everywhere"), CTRL+SHIFT+Key_3, TQT_TQOBJECT(this), TQT_SLOT(slotChooseCEverywhere()), ac, "merge_choose_c_everywhere"); - chooseAForUnsolvedConflicts = new KAction(i18n("Choose A for All Unsolved Conflicts"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotChooseAForUnsolvedConflicts()), ac, "merge_choose_a_for_unsolved_conflicts"); - chooseBForUnsolvedConflicts = new KAction(i18n("Choose B for All Unsolved Conflicts"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotChooseBForUnsolvedConflicts()), ac, "merge_choose_b_for_unsolved_conflicts"); - chooseCForUnsolvedConflicts = new KAction(i18n("Choose C for All Unsolved Conflicts"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotChooseCForUnsolvedConflicts()), ac, "merge_choose_c_for_unsolved_conflicts"); - chooseAForUnsolvedWhiteSpaceConflicts = new KAction(i18n("Choose A for All Unsolved Whitespace Conflicts"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotChooseAForUnsolvedWhiteSpaceConflicts()), ac, "merge_choose_a_for_unsolved_whitespace_conflicts"); - chooseBForUnsolvedWhiteSpaceConflicts = new KAction(i18n("Choose B for All Unsolved Whitespace Conflicts"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotChooseBForUnsolvedWhiteSpaceConflicts()), ac, "merge_choose_b_for_unsolved_whitespace_conflicts"); - chooseCForUnsolvedWhiteSpaceConflicts = new KAction(i18n("Choose C for All Unsolved Whitespace Conflicts"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotChooseCForUnsolvedWhiteSpaceConflicts()), ac, "merge_choose_c_for_unsolved_whitespace_conflicts"); - autoSolve = new KAction(i18n("Automatically Solve Simple Conflicts"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotAutoSolve()), ac, "merge_autosolve"); - unsolve = new KAction(i18n("Set Deltas to Conflicts"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotUnsolve()), ac, "merge_autounsolve"); - mergeRegExp = new KAction(i18n("Run Regular Expression Auto Merge"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotRegExpAutoMerge()),ac, "merge_regexp_automerge" ); - mergeHistory = new KAction(i18n("Automatically Solve History Conflicts"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotMergeHistory()), ac, "merge_versioncontrol_history" ); - splitDiff = new KAction(i18n("Split Diff At Selection"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotSplitDiff()), ac, "merge_splitdiff"); - joinDiffs = new KAction(i18n("Join Selected Diffs"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotJoinDiffs()), ac, "merge_joindiffs"); - - showWindowA = new KToggleAction(i18n("Show Window A"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotShowWindowAToggled()), ac, "win_show_a"); - showWindowB = new KToggleAction(i18n("Show Window B"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotShowWindowBToggled()), ac, "win_show_b"); - showWindowC = new KToggleAction(i18n("Show Window C"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotShowWindowCToggled()), ac, "win_show_c"); - winFocusNext = new KAction(i18n("Focus Next Window"), ALT+Key_Right, TQT_TQOBJECT(this), TQT_SLOT(slotWinFocusNext()), ac, "win_focus_next"); - - overviewModeNormal = new KToggleAction(i18n("Normal Overview"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotOverviewNormal()), ac, "diff_overview_normal"); - overviewModeAB = new KToggleAction(i18n("A vs. B Overview"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotOverviewAB()), ac, "diff_overview_ab"); - overviewModeAC = new KToggleAction(i18n("A vs. C Overview"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotOverviewAC()), ac, "diff_overview_ac"); - overviewModeBC = new KToggleAction(i18n("B vs. C Overview"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotOverviewBC()), ac, "diff_overview_bc"); - wordWrap = new KToggleAction(i18n("Word Wrap Diff Windows"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotWordWrapToggled()), ac, "diff_wordwrap"); - addManualDiffHelp = new KAction(i18n("Add Manual Diff Alignment"), TQt::CTRL+TQt::Key_Y, TQT_TQOBJECT(this), TQT_SLOT(slotAddManualDiffHelp()), ac, "diff_add_manual_diff_help"); - clearManualDiffHelpList = new KAction(i18n("Clear All Manual Diff Alignments"), TQt::CTRL+TQt::SHIFT+TQt::Key_Y, TQT_TQOBJECT(this), TQT_SLOT(slotClearManualDiffHelpList()), ac, "diff_clear_manual_diff_help_list"); + chooseA = new TDEToggleAction(i18n("Select Line(s) From A"), TQIconSet(TQPixmap(iconA)), CTRL+Key_1, TQT_TQOBJECT(this), TQT_SLOT(slotChooseA()), ac, "merge_choose_a"); + chooseB = new TDEToggleAction(i18n("Select Line(s) From B"), TQIconSet(TQPixmap(iconB)), CTRL+Key_2, TQT_TQOBJECT(this), TQT_SLOT(slotChooseB()), ac, "merge_choose_b"); + chooseC = new TDEToggleAction(i18n("Select Line(s) From C"), TQIconSet(TQPixmap(iconC)), CTRL+Key_3, TQT_TQOBJECT(this), TQT_SLOT(slotChooseC()), ac, "merge_choose_c"); + autoAdvance = new TDEToggleAction(i18n("Automatically Go to Next Unsolved Conflict After Source Selection"), TQIconSet(TQPixmap(autoadvance)), 0, TQT_TQOBJECT(this), TQT_SLOT(slotAutoAdvanceToggled()), ac, "merge_autoadvance"); + + showWhiteSpaceCharacters = new TDEToggleAction(i18n("Show Space && Tabulator Characters for Differences"), TQIconSet(TQPixmap(showwhitespacechars)), 0, TQT_TQOBJECT(this), TQT_SLOT(slotShowWhiteSpaceToggled()), ac, "diff_show_whitespace_characters"); + showWhiteSpace = new TDEToggleAction(i18n("Show White Space"), TQIconSet(TQPixmap(showwhitespace)), 0, TQT_TQOBJECT(this), TQT_SLOT(slotShowWhiteSpaceToggled()), ac, "diff_show_whitespace"); + + showLineNumbers = new TDEToggleAction(i18n("Show Line Numbers"), TQIconSet(TQPixmap(showlinenumbers)), 0, TQT_TQOBJECT(this), TQT_SLOT(slotShowLineNumbersToggled()), ac, "diff_showlinenumbers"); + chooseAEverywhere = new TDEAction(i18n("Choose A Everywhere"), CTRL+SHIFT+Key_1, TQT_TQOBJECT(this), TQT_SLOT(slotChooseAEverywhere()), ac, "merge_choose_a_everywhere"); + chooseBEverywhere = new TDEAction(i18n("Choose B Everywhere"), CTRL+SHIFT+Key_2, TQT_TQOBJECT(this), TQT_SLOT(slotChooseBEverywhere()), ac, "merge_choose_b_everywhere"); + chooseCEverywhere = new TDEAction(i18n("Choose C Everywhere"), CTRL+SHIFT+Key_3, TQT_TQOBJECT(this), TQT_SLOT(slotChooseCEverywhere()), ac, "merge_choose_c_everywhere"); + chooseAForUnsolvedConflicts = new TDEAction(i18n("Choose A for All Unsolved Conflicts"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotChooseAForUnsolvedConflicts()), ac, "merge_choose_a_for_unsolved_conflicts"); + chooseBForUnsolvedConflicts = new TDEAction(i18n("Choose B for All Unsolved Conflicts"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotChooseBForUnsolvedConflicts()), ac, "merge_choose_b_for_unsolved_conflicts"); + chooseCForUnsolvedConflicts = new TDEAction(i18n("Choose C for All Unsolved Conflicts"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotChooseCForUnsolvedConflicts()), ac, "merge_choose_c_for_unsolved_conflicts"); + chooseAForUnsolvedWhiteSpaceConflicts = new TDEAction(i18n("Choose A for All Unsolved Whitespace Conflicts"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotChooseAForUnsolvedWhiteSpaceConflicts()), ac, "merge_choose_a_for_unsolved_whitespace_conflicts"); + chooseBForUnsolvedWhiteSpaceConflicts = new TDEAction(i18n("Choose B for All Unsolved Whitespace Conflicts"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotChooseBForUnsolvedWhiteSpaceConflicts()), ac, "merge_choose_b_for_unsolved_whitespace_conflicts"); + chooseCForUnsolvedWhiteSpaceConflicts = new TDEAction(i18n("Choose C for All Unsolved Whitespace Conflicts"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotChooseCForUnsolvedWhiteSpaceConflicts()), ac, "merge_choose_c_for_unsolved_whitespace_conflicts"); + autoSolve = new TDEAction(i18n("Automatically Solve Simple Conflicts"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotAutoSolve()), ac, "merge_autosolve"); + unsolve = new TDEAction(i18n("Set Deltas to Conflicts"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotUnsolve()), ac, "merge_autounsolve"); + mergeRegExp = new TDEAction(i18n("Run Regular Expression Auto Merge"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotRegExpAutoMerge()),ac, "merge_regexp_automerge" ); + mergeHistory = new TDEAction(i18n("Automatically Solve History Conflicts"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotMergeHistory()), ac, "merge_versioncontrol_history" ); + splitDiff = new TDEAction(i18n("Split Diff At Selection"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotSplitDiff()), ac, "merge_splitdiff"); + joinDiffs = new TDEAction(i18n("Join Selected Diffs"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotJoinDiffs()), ac, "merge_joindiffs"); + + showWindowA = new TDEToggleAction(i18n("Show Window A"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotShowWindowAToggled()), ac, "win_show_a"); + showWindowB = new TDEToggleAction(i18n("Show Window B"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotShowWindowBToggled()), ac, "win_show_b"); + showWindowC = new TDEToggleAction(i18n("Show Window C"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotShowWindowCToggled()), ac, "win_show_c"); + winFocusNext = new TDEAction(i18n("Focus Next Window"), ALT+Key_Right, TQT_TQOBJECT(this), TQT_SLOT(slotWinFocusNext()), ac, "win_focus_next"); + + overviewModeNormal = new TDEToggleAction(i18n("Normal Overview"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotOverviewNormal()), ac, "diff_overview_normal"); + overviewModeAB = new TDEToggleAction(i18n("A vs. B Overview"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotOverviewAB()), ac, "diff_overview_ab"); + overviewModeAC = new TDEToggleAction(i18n("A vs. C Overview"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotOverviewAC()), ac, "diff_overview_ac"); + overviewModeBC = new TDEToggleAction(i18n("B vs. C Overview"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotOverviewBC()), ac, "diff_overview_bc"); + wordWrap = new TDEToggleAction(i18n("Word Wrap Diff Windows"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotWordWrapToggled()), ac, "diff_wordwrap"); + addManualDiffHelp = new TDEAction(i18n("Add Manual Diff Alignment"), TQt::CTRL+TQt::Key_Y, TQT_TQOBJECT(this), TQT_SLOT(slotAddManualDiffHelp()), ac, "diff_add_manual_diff_help"); + clearManualDiffHelpList = new TDEAction(i18n("Clear All Manual Diff Alignments"), TQt::CTRL+TQt::SHIFT+TQt::Key_Y, TQT_TQOBJECT(this), TQT_SLOT(slotClearManualDiffHelpList()), ac, "diff_clear_manual_diff_help_list"); #ifdef _WIN32 - new KAction(i18n("Focus Next Window"), TQt::CTRL+TQt::Key_Tab, TQT_TQOBJECT(this), TQT_SLOT(slotWinFocusNext()), ac, "win_focus_next", false, false); + new TDEAction(i18n("Focus Next Window"), TQt::CTRL+TQt::Key_Tab, TQT_TQOBJECT(this), TQT_SLOT(slotWinFocusNext()), ac, "win_focus_next", false, false); #endif - winFocusPrev = new KAction(i18n("Focus Prev Window"), TQt::ALT+TQt::Key_Left, TQT_TQOBJECT(this), TQT_SLOT(slotWinFocusPrev()), ac, "win_focus_prev"); - winToggleSplitOrientation = new KAction(i18n("Toggle Split Orientation"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotWinToggleSplitterOrientation()), ac, "win_toggle_split_orientation"); + winFocusPrev = new TDEAction(i18n("Focus Prev Window"), TQt::ALT+TQt::Key_Left, TQT_TQOBJECT(this), TQT_SLOT(slotWinFocusPrev()), ac, "win_focus_prev"); + winToggleSplitOrientation = new TDEAction(i18n("Toggle Split Orientation"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotWinToggleSplitterOrientation()), ac, "win_toggle_split_orientation"); - dirShowBoth = new KToggleAction(i18n("Dir && Text Split Screen View"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotDirShowBoth()), ac, "win_dir_show_both"); + dirShowBoth = new TDEToggleAction(i18n("Dir && Text Split Screen View"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotDirShowBoth()), ac, "win_dir_show_both"); dirShowBoth->setChecked( true ); - dirViewToggle = new KAction(i18n("Toggle Between Dir && Text View"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotDirViewToggle()), actionCollection(), "win_dir_view_toggle"); + dirViewToggle = new TDEAction(i18n("Toggle Between Dir && Text View"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotDirViewToggle()), actionCollection(), "win_dir_view_toggle"); m_pMergeEditorPopupMenu = new TQPopupMenu( this ); chooseA->plug( m_pMergeEditorPopupMenu ); diff --git a/src/kdiff3.h b/src/kdiff3.h index ed95dee..55d0a82 100644 --- a/src/kdiff3.h +++ b/src/kdiff3.h @@ -107,8 +107,8 @@ class KDiff3App : public TQSplitter bool isPart(); - /** initializes the KActions of the application */ - void initActions( KActionCollection* ); + /** initializes the TDEActions of the application */ + void initActions( TDEActionCollection* ); /** save general Options like all bar positions and status as well as the geometry and the recent file list to the configuration file */ @@ -120,11 +120,11 @@ class KDiff3App : public TQSplitter // Finish initialisation (virtual, so that it can be called from the shell too.) virtual void completeInit(const TQString& fn1="", const TQString& fn2="", const TQString& fn3=""); - /** queryClose is called by KMainWindow on each closeEvent of a window. Against the + /** queryClose is called by TDEMainWindow on each closeEvent of a window. Against the * default implementation (only returns true), this calles saveModified() on the document object to ask if the document shall * be saved if Modified; on cancel the closeEvent is rejected. - * @see KMainWindow#queryClose - * @see KMainWindow#closeEvent + * @see TDEMainWindow#queryClose + * @see TDEMainWindow#closeEvent */ virtual bool queryClose(); virtual bool isFileSaved(); @@ -136,7 +136,7 @@ class KDiff3App : public TQSplitter /** sets up the statusbar for the main window by initialzing a statuslabel. */ void initStatusBar(); - /** creates the centerwidget of the KMainWindow instance and sets it as the view */ + /** creates the centerwidget of the TDEMainWindow instance and sets it as the view */ void initView(); public slots: @@ -184,71 +184,71 @@ class KDiff3App : public TQSplitter /** the configuration object of the application */ //TDEConfig *config; - // KAction pointers to enable/disable actions - KAction* fileOpen; - KAction* fileSave; - KAction* fileSaveAs; - KAction* filePrint; - KAction* fileQuit; - KAction* fileReload; - KAction* editCut; - KAction* editCopy; - KAction* editPaste; - KAction* editSelectAll; - KToggleAction* viewToolBar; - KToggleAction* viewStatusBar; + // TDEAction pointers to enable/disable actions + TDEAction* fileOpen; + TDEAction* fileSave; + TDEAction* fileSaveAs; + TDEAction* filePrint; + TDEAction* fileQuit; + TDEAction* fileReload; + TDEAction* editCut; + TDEAction* editCopy; + TDEAction* editPaste; + TDEAction* editSelectAll; + TDEToggleAction* viewToolBar; + TDEToggleAction* viewStatusBar; //////////////////////////////////////////////////////////////////////// // Special KDiff3 specific stuff starts here - KAction *editFind; - KAction *editFindNext; - - KAction *goCurrent; - KAction *goTop; - KAction *goBottom; - KAction *goPrevUnsolvedConflict; - KAction *goNextUnsolvedConflict; - KAction *goPrevConflict; - KAction *goNextConflict; - KAction *goPrevDelta; - KAction *goNextDelta; - KToggleAction *chooseA; - KToggleAction *chooseB; - KToggleAction *chooseC; - KToggleAction *autoAdvance; - KToggleAction *wordWrap; - KAction* splitDiff; - KAction* joinDiffs; - KAction* addManualDiffHelp; - KAction* clearManualDiffHelpList; - KToggleAction *showWhiteSpaceCharacters; - KToggleAction *showWhiteSpace; - KToggleAction *showLineNumbers; - KAction* chooseAEverywhere; - KAction* chooseBEverywhere; - KAction* chooseCEverywhere; - KAction* chooseAForUnsolvedConflicts; - KAction* chooseBForUnsolvedConflicts; - KAction* chooseCForUnsolvedConflicts; - KAction* chooseAForUnsolvedWhiteSpaceConflicts; - KAction* chooseBForUnsolvedWhiteSpaceConflicts; - KAction* chooseCForUnsolvedWhiteSpaceConflicts; - KAction* autoSolve; - KAction* unsolve; - KAction* mergeHistory; - KAction* mergeRegExp; - KToggleAction *showWindowA; - KToggleAction *showWindowB; - KToggleAction *showWindowC; - KAction *winFocusNext; - KAction *winFocusPrev; - KAction* winToggleSplitOrientation; - KToggleAction *dirShowBoth; - KAction *dirViewToggle; - KToggleAction *overviewModeNormal; - KToggleAction *overviewModeAB; - KToggleAction *overviewModeAC; - KToggleAction *overviewModeBC; + TDEAction *editFind; + TDEAction *editFindNext; + + TDEAction *goCurrent; + TDEAction *goTop; + TDEAction *goBottom; + TDEAction *goPrevUnsolvedConflict; + TDEAction *goNextUnsolvedConflict; + TDEAction *goPrevConflict; + TDEAction *goNextConflict; + TDEAction *goPrevDelta; + TDEAction *goNextDelta; + TDEToggleAction *chooseA; + TDEToggleAction *chooseB; + TDEToggleAction *chooseC; + TDEToggleAction *autoAdvance; + TDEToggleAction *wordWrap; + TDEAction* splitDiff; + TDEAction* joinDiffs; + TDEAction* addManualDiffHelp; + TDEAction* clearManualDiffHelpList; + TDEToggleAction *showWhiteSpaceCharacters; + TDEToggleAction *showWhiteSpace; + TDEToggleAction *showLineNumbers; + TDEAction* chooseAEverywhere; + TDEAction* chooseBEverywhere; + TDEAction* chooseCEverywhere; + TDEAction* chooseAForUnsolvedConflicts; + TDEAction* chooseBForUnsolvedConflicts; + TDEAction* chooseCForUnsolvedConflicts; + TDEAction* chooseAForUnsolvedWhiteSpaceConflicts; + TDEAction* chooseBForUnsolvedWhiteSpaceConflicts; + TDEAction* chooseCForUnsolvedWhiteSpaceConflicts; + TDEAction* autoSolve; + TDEAction* unsolve; + TDEAction* mergeHistory; + TDEAction* mergeRegExp; + TDEToggleAction *showWindowA; + TDEToggleAction *showWindowB; + TDEToggleAction *showWindowC; + TDEAction *winFocusNext; + TDEAction *winFocusPrev; + TDEAction* winToggleSplitOrientation; + TDEToggleAction *dirShowBoth; + TDEAction *dirViewToggle; + TDEToggleAction *overviewModeNormal; + TDEToggleAction *overviewModeAB; + TDEToggleAction *overviewModeAC; + TDEToggleAction *overviewModeBC; TQPopupMenu* m_pMergeEditorPopupMenu; @@ -323,9 +323,9 @@ class KDiff3App : public TQSplitter void choose(int choice); - KActionCollection* actionCollection(); + TDEActionCollection* actionCollection(); KStatusBar* statusBar(); - KToolBar* toolBar(const char*); + TDEToolBar* toolBar(const char*); KDiff3Part* m_pKDiff3Part; KParts::MainWindow* m_pKDiff3Shell; bool m_bAutoFlag; diff --git a/src/kdiff3_part.cpp b/src/kdiff3_part.cpp index 6e7ce45..a97dbe8 100644 --- a/src/kdiff3_part.cpp +++ b/src/kdiff3_part.cpp @@ -82,7 +82,7 @@ void KDiff3Part::setModified(bool /*modified*/) { /* // get a handle on our Save action and make sure it is valid - KAction *save = actionCollection()->action(KStdAction::stdName(KStdAction::Save)); + TDEAction *save = actionCollection()->action(KStdAction::stdName(KStdAction::Save)); if (!save) return; diff --git a/src/kdiff3_shell.h b/src/kdiff3_shell.h index 4dcc2aa..d9c5357 100644 --- a/src/kdiff3_shell.h +++ b/src/kdiff3_shell.h @@ -27,7 +27,7 @@ #include #include -class KToggleAction; +class TDEToggleAction; /** * This is the application "Shell". It has a menubar, toolbar, and @@ -67,8 +67,8 @@ private slots: private: KParts::ReadWritePart *m_part; - KToggleAction *m_toolbarAction; - KToggleAction *m_statusbarAction; + TDEToggleAction *m_toolbarAction; + TDEToggleAction *m_statusbarAction; bool m_bUnderConstruction; }; diff --git a/src/kreplacements/kreplacements.cpp b/src/kreplacements/kreplacements.cpp index fae9723..bceee94 100644 --- a/src/kreplacements/kreplacements.cpp +++ b/src/kreplacements/kreplacements.cpp @@ -286,7 +286,7 @@ TQString KFileDialog::getSaveFileName (const TQString &startDir, } -KToolBar::BarPosition KToolBar::barPos() +TDEToolBar::BarPosition TDEToolBar::barPos() { if ( m_pMainWindow->leftDock()->hasDockWindow(this) ) return Left; if ( m_pMainWindow->rightDock()->hasDockWindow(this) ) return Right; @@ -295,7 +295,7 @@ KToolBar::BarPosition KToolBar::barPos() return Top; } -void KToolBar::setBarPos(BarPosition bp) +void TDEToolBar::setBarPos(BarPosition bp) { if ( bp == Left ) m_pMainWindow->moveDockWindow( this, DockLeft ); else if ( bp == Right ) m_pMainWindow->moveDockWindow( this, DockRight ); @@ -303,14 +303,14 @@ void KToolBar::setBarPos(BarPosition bp) else if ( bp == Top ) m_pMainWindow->moveDockWindow( this, DockTop ); } -KToolBar::KToolBar( TQMainWindow* parent ) +TDEToolBar::TDEToolBar( TQMainWindow* parent ) : TQToolBar( parent ) { m_pMainWindow = parent; } -KMainWindow::KMainWindow( TQWidget* parent, const char* name ) +TDEMainWindow::TDEMainWindow( TQWidget* parent, const char* name ) : TQMainWindow( parent, name ), m_actionCollection(this) { fileMenu = new TQPopupMenu(); @@ -334,30 +334,30 @@ KMainWindow::KMainWindow( TQWidget* parent, const char* name ) helpMenu = new TQPopupMenu(); menuBar()->insertItem(i18n("&Help"), helpMenu); - m_pToolBar = new KToolBar(this); + m_pToolBar = new TDEToolBar(this); - memberList = new TQList; + memberList = new TQList; memberList->append(this); } -KToolBar* KMainWindow::toolBar(const TQString&) +TDEToolBar* TDEMainWindow::toolBar(const TQString&) { return m_pToolBar; } -KActionCollection* KMainWindow::actionCollection() +TDEActionCollection* TDEMainWindow::actionCollection() { return &m_actionCollection; } -void KMainWindow::createGUI() +void TDEMainWindow::createGUI() { KStdAction::help(this, TQT_SLOT(slotHelp()), actionCollection()); KStdAction::about(this, TQT_SLOT(slotAbout()), actionCollection()); KStdAction::aboutTQt(actionCollection()); } -void KMainWindow::slotAbout() +void TDEMainWindow::slotAbout() { TQTabDialog d; d.setCaption("About " + s_appName); @@ -417,7 +417,7 @@ void KMainWindow::slotAbout() */ } -void KMainWindow::slotHelp() +void TDEMainWindow::slotHelp() { showHelp(); } @@ -472,11 +472,11 @@ void TDEConfig::setGroup(const TQString&) { } -void KAction::init(TQObject* receiver, const char* slot, KActionCollection* actionCollection, +void TDEAction::init(TQObject* receiver, const char* slot, TDEActionCollection* actionCollection, const char* name, bool bToggle, bool bMenu) { TQString n(name); - KMainWindow* p = actionCollection->m_pMainWindow; + TDEMainWindow* p = actionCollection->m_pMainWindow; if( slot!=0 ) { if (!bToggle) @@ -521,20 +521,20 @@ void KAction::init(TQObject* receiver, const char* slot, KActionCollection* acti } -KAction::KAction(const TQString& text, const TQIconSet& icon, int accel, - TQObject* receiver, const char* slot, KActionCollection* actionCollection, +TDEAction::TDEAction(const TQString& text, const TQIconSet& icon, int accel, + TQObject* receiver, const char* slot, TDEActionCollection* actionCollection, const char* name, bool bToggle, bool bMenu ) : TQAction ( text, icon, text, accel, actionCollection->m_pMainWindow, name, bToggle ) { - KMainWindow* p = actionCollection->m_pMainWindow; + TDEMainWindow* p = actionCollection->m_pMainWindow; if ( !icon.isNull() && p ) this->addTo( p->m_pToolBar ); init(receiver,slot,actionCollection,name,bToggle,bMenu); } -KAction::KAction(const TQString& text, int accel, - TQObject* receiver, const char* slot, KActionCollection* actionCollection, +TDEAction::TDEAction(const TQString& text, int accel, + TQObject* receiver, const char* slot, TDEActionCollection* actionCollection, const char* name, bool bToggle, bool bMenu ) : TQAction ( text, text, accel, actionCollection->m_pMainWindow, name, bToggle ) @@ -542,39 +542,39 @@ KAction::KAction(const TQString& text, int accel, init(receiver,slot,actionCollection,name,bToggle,bMenu); } -void KAction::setStatusText(const TQString&) +void TDEAction::setStatusText(const TQString&) { } -void KAction::plug(TQPopupMenu* menu) +void TDEAction::plug(TQPopupMenu* menu) { addTo(menu); } -KToggleAction::KToggleAction(const TQString& text, const TQIconSet& icon, int accel, TQObject* receiver, const char* slot, KActionCollection* actionCollection, const char* name, bool bMenu) -: KAction( text, icon, accel, receiver, slot, actionCollection, name, true, bMenu) +TDEToggleAction::TDEToggleAction(const TQString& text, const TQIconSet& icon, int accel, TQObject* receiver, const char* slot, TDEActionCollection* actionCollection, const char* name, bool bMenu) +: TDEAction( text, icon, accel, receiver, slot, actionCollection, name, true, bMenu) { } -KToggleAction::KToggleAction(const TQString& text, int accel, TQObject* receiver, const char* slot, KActionCollection* actionCollection, const char* name, bool bMenu) -: KAction( text, accel, receiver, slot, actionCollection, name, true, bMenu) +TDEToggleAction::TDEToggleAction(const TQString& text, int accel, TQObject* receiver, const char* slot, TDEActionCollection* actionCollection, const char* name, bool bMenu) +: TDEAction( text, accel, receiver, slot, actionCollection, name, true, bMenu) { } -KToggleAction::KToggleAction(const TQString& text, const TQIconSet& icon, int accel, KActionCollection* actionCollection, const char* name, bool bMenu) -: KAction( text, icon, accel, 0, 0, actionCollection, name, true, bMenu) +TDEToggleAction::TDEToggleAction(const TQString& text, const TQIconSet& icon, int accel, TDEActionCollection* actionCollection, const char* name, bool bMenu) +: TDEAction( text, icon, accel, 0, 0, actionCollection, name, true, bMenu) { } -void KToggleAction::setChecked(bool bChecked) +void TDEToggleAction::setChecked(bool bChecked) { blockSignals( true ); setOn( bChecked ); blockSignals( false ); } -bool KToggleAction::isChecked() +bool TDEToggleAction::isChecked() { return isOn(); } @@ -582,144 +582,144 @@ bool KToggleAction::isChecked() //static -KAction* KStdAction::open( TQWidget* parent, const char* slot, KActionCollection* actionCollection) +TDEAction* KStdAction::open( TQWidget* parent, const char* slot, TDEActionCollection* actionCollection) { #include "../xpm/fileopen.xpm" - KMainWindow* p = actionCollection->m_pMainWindow; - KAction* a = new KAction( i18n("Open"), TQIconSet(TQPixmap(fileopen)), TQt::CTRL+TQt::Key_O, parent, slot, actionCollection, "open", false, false); + TDEMainWindow* p = actionCollection->m_pMainWindow; + TDEAction* a = new TDEAction( i18n("Open"), TQIconSet(TQPixmap(fileopen)), TQt::CTRL+TQt::Key_O, parent, slot, actionCollection, "open", false, false); if(p){ a->addTo( p->fileMenu ); } return a; } -KAction* KStdAction::save( TQWidget* parent, const char* slot, KActionCollection* actionCollection ) +TDEAction* KStdAction::save( TQWidget* parent, const char* slot, TDEActionCollection* actionCollection ) { #include "../xpm/filesave.xpm" - KMainWindow* p = actionCollection->m_pMainWindow; - KAction* a = new KAction( i18n("Save"), TQIconSet(TQPixmap(filesave)), TQt::CTRL+TQt::Key_S, parent, slot, actionCollection, "save", false, false); + TDEMainWindow* p = actionCollection->m_pMainWindow; + TDEAction* a = new TDEAction( i18n("Save"), TQIconSet(TQPixmap(filesave)), TQt::CTRL+TQt::Key_S, parent, slot, actionCollection, "save", false, false); if(p){ a->addTo( p->fileMenu ); } return a; } -KAction* KStdAction::saveAs( TQWidget* parent, const char* slot, KActionCollection* actionCollection) +TDEAction* KStdAction::saveAs( TQWidget* parent, const char* slot, TDEActionCollection* actionCollection) { - KMainWindow* p = actionCollection->m_pMainWindow; - KAction* a = new KAction( i18n("Save As..."), 0, parent, slot, actionCollection, "saveas", false, false); + TDEMainWindow* p = actionCollection->m_pMainWindow; + TDEAction* a = new TDEAction( i18n("Save As..."), 0, parent, slot, actionCollection, "saveas", false, false); if(p) a->addTo( p->fileMenu ); return a; } -KAction* KStdAction::print( TQWidget* parent, const char* slot, KActionCollection* actionCollection) +TDEAction* KStdAction::print( TQWidget* parent, const char* slot, TDEActionCollection* actionCollection) { #include "../xpm/fileprint.xpm" - KMainWindow* p = actionCollection->m_pMainWindow; - KAction* a = new KAction( i18n("Print..."), TQIconSet(TQPixmap(fileprint)),TQt::CTRL+TQt::Key_P, parent, slot, actionCollection, "print", false, false); + TDEMainWindow* p = actionCollection->m_pMainWindow; + TDEAction* a = new TDEAction( i18n("Print..."), TQIconSet(TQPixmap(fileprint)),TQt::CTRL+TQt::Key_P, parent, slot, actionCollection, "print", false, false); if(p) a->addTo( p->fileMenu ); return a; } -KAction* KStdAction::quit( TQWidget* parent, const char* slot, KActionCollection* actionCollection) +TDEAction* KStdAction::quit( TQWidget* parent, const char* slot, TDEActionCollection* actionCollection) { - KMainWindow* p = actionCollection->m_pMainWindow; - KAction* a = new KAction( i18n("Quit"), TQt::CTRL+TQt::Key_Q, parent, slot, actionCollection, "quit", false, false); + TDEMainWindow* p = actionCollection->m_pMainWindow; + TDEAction* a = new TDEAction( i18n("Quit"), TQt::CTRL+TQt::Key_Q, parent, slot, actionCollection, "quit", false, false); if(p) a->addTo( p->fileMenu ); return a; } -KAction* KStdAction::cut( TQWidget* parent, const char* slot, KActionCollection* actionCollection) +TDEAction* KStdAction::cut( TQWidget* parent, const char* slot, TDEActionCollection* actionCollection) { - KMainWindow* p = actionCollection->m_pMainWindow; - KAction* a = new KAction( i18n("Cut"), TQt::CTRL+TQt::Key_X, parent, slot, actionCollection, "cut", false, false ); + TDEMainWindow* p = actionCollection->m_pMainWindow; + TDEAction* a = new TDEAction( i18n("Cut"), TQt::CTRL+TQt::Key_X, parent, slot, actionCollection, "cut", false, false ); if(p) a->addTo( p->editMenu ); return a; } -KAction* KStdAction::copy( TQWidget* parent, const char* slot, KActionCollection* actionCollection) +TDEAction* KStdAction::copy( TQWidget* parent, const char* slot, TDEActionCollection* actionCollection) { - KMainWindow* p = actionCollection->m_pMainWindow; - KAction* a = new KAction( i18n("Copy"), TQt::CTRL+TQt::Key_C, parent, slot, actionCollection, "copy", false, false ); + TDEMainWindow* p = actionCollection->m_pMainWindow; + TDEAction* a = new TDEAction( i18n("Copy"), TQt::CTRL+TQt::Key_C, parent, slot, actionCollection, "copy", false, false ); if(p) a->addTo( p->editMenu ); return a; } -KAction* KStdAction::paste( TQWidget* parent, const char* slot, KActionCollection* actionCollection) +TDEAction* KStdAction::paste( TQWidget* parent, const char* slot, TDEActionCollection* actionCollection) { - KMainWindow* p = actionCollection->m_pMainWindow; - KAction* a = new KAction( i18n("Paste"), TQt::CTRL+TQt::Key_V, parent, slot, actionCollection, "paste", false, false ); + TDEMainWindow* p = actionCollection->m_pMainWindow; + TDEAction* a = new TDEAction( i18n("Paste"), TQt::CTRL+TQt::Key_V, parent, slot, actionCollection, "paste", false, false ); if(p) a->addTo( p->editMenu ); return a; } -KAction* KStdAction::selectAll( TQWidget* parent, const char* slot, KActionCollection* actionCollection) +TDEAction* KStdAction::selectAll( TQWidget* parent, const char* slot, TDEActionCollection* actionCollection) { - KMainWindow* p = actionCollection->m_pMainWindow; - KAction* a = new KAction( i18n("Select All"), TQt::CTRL+TQt::Key_A, parent, slot, actionCollection, "selectall", false, false ); + TDEMainWindow* p = actionCollection->m_pMainWindow; + TDEAction* a = new TDEAction( i18n("Select All"), TQt::CTRL+TQt::Key_A, parent, slot, actionCollection, "selectall", false, false ); if(p) a->addTo( p->editMenu ); return a; } -KToggleAction* KStdAction::showToolbar( TQWidget* parent, const char* slot, KActionCollection* actionCollection) +TDEToggleAction* KStdAction::showToolbar( TQWidget* parent, const char* slot, TDEActionCollection* actionCollection) { - KMainWindow* p = actionCollection->m_pMainWindow; - KToggleAction* a = new KToggleAction( i18n("Show Toolbar"), 0, parent, slot, actionCollection, "showtoolbar", false ); + TDEMainWindow* p = actionCollection->m_pMainWindow; + TDEToggleAction* a = new TDEToggleAction( i18n("Show Toolbar"), 0, parent, slot, actionCollection, "showtoolbar", false ); if(p) a->addTo( p->settingsMenu ); return a; } -KToggleAction* KStdAction::showStatusbar( TQWidget* parent, const char* slot, KActionCollection* actionCollection) +TDEToggleAction* KStdAction::showStatusbar( TQWidget* parent, const char* slot, TDEActionCollection* actionCollection) { - KMainWindow* p = actionCollection->m_pMainWindow; - KToggleAction* a = new KToggleAction( i18n("Show &Statusbar"), 0, parent, slot, actionCollection, "showstatusbar", false ); + TDEMainWindow* p = actionCollection->m_pMainWindow; + TDEToggleAction* a = new TDEToggleAction( i18n("Show &Statusbar"), 0, parent, slot, actionCollection, "showstatusbar", false ); if(p) a->addTo( p->settingsMenu ); return a; } -KAction* KStdAction::preferences( TQWidget* parent, const char* slot, KActionCollection* actionCollection) +TDEAction* KStdAction::preferences( TQWidget* parent, const char* slot, TDEActionCollection* actionCollection) { - KMainWindow* p = actionCollection->m_pMainWindow; - KAction* a = new KAction( i18n("&Configure %1...").arg("KDiff3"), 0, parent, slot, actionCollection, "settings", false, false ); + TDEMainWindow* p = actionCollection->m_pMainWindow; + TDEAction* a = new TDEAction( i18n("&Configure %1...").arg("KDiff3"), 0, parent, slot, actionCollection, "settings", false, false ); if(p) a->addTo( p->settingsMenu ); return a; } -KAction* KStdAction::keyBindings( TQWidget*, const char*, KActionCollection*) +TDEAction* KStdAction::keyBindings( TQWidget*, const char*, TDEActionCollection*) { return 0; } -KAction* KStdAction::about( TQWidget* parent, const char* slot, KActionCollection* actionCollection) +TDEAction* KStdAction::about( TQWidget* parent, const char* slot, TDEActionCollection* actionCollection) { - KMainWindow* p = actionCollection->m_pMainWindow; - KAction* a = new KAction( i18n("About")+" KDiff3", 0, parent, slot, actionCollection, "about_kdiff3", false, false ); + TDEMainWindow* p = actionCollection->m_pMainWindow; + TDEAction* a = new TDEAction( i18n("About")+" KDiff3", 0, parent, slot, actionCollection, "about_kdiff3", false, false ); if(p) a->addTo( p->helpMenu ); return a; } -KAction* KStdAction::aboutTQt( KActionCollection* actionCollection ) +TDEAction* KStdAction::aboutTQt( TDEActionCollection* actionCollection ) { - KMainWindow* p = actionCollection->m_pMainWindow; - KAction* a = new KAction( i18n("About")+" TQt", 0, tqApp, TQT_SLOT(aboutTQt()), actionCollection, "about_qt", false, false ); + TDEMainWindow* p = actionCollection->m_pMainWindow; + TDEAction* a = new TDEAction( i18n("About")+" TQt", 0, tqApp, TQT_SLOT(aboutTQt()), actionCollection, "about_qt", false, false ); if(p) a->addTo( p->helpMenu ); return a; } -KAction* KStdAction::help( TQWidget* parent, const char* slot, KActionCollection* actionCollection) +TDEAction* KStdAction::help( TQWidget* parent, const char* slot, TDEActionCollection* actionCollection) { - KMainWindow* p = actionCollection->m_pMainWindow; - KAction* a = new KAction( i18n("Help"), TQt::Key_F1, parent, slot, actionCollection, "help", false, false ); + TDEMainWindow* p = actionCollection->m_pMainWindow; + TDEAction* a = new TDEAction( i18n("Help"), TQt::Key_F1, parent, slot, actionCollection, "help", false, false ); if(p) a->addTo( p->helpMenu ); return a; } -KAction* KStdAction::find( TQWidget* parent, const char* slot, KActionCollection* actionCollection) +TDEAction* KStdAction::find( TQWidget* parent, const char* slot, TDEActionCollection* actionCollection) { - KMainWindow* p = actionCollection->m_pMainWindow; - KAction* a = new KAction( i18n("Find"), TQt::CTRL+TQt::Key_F, parent, slot, actionCollection, "find", false, false ); + TDEMainWindow* p = actionCollection->m_pMainWindow; + TDEAction* a = new TDEAction( i18n("Find"), TQt::CTRL+TQt::Key_F, parent, slot, actionCollection, "find", false, false ); if(p) a->addTo( p->editMenu ); return a; } -KAction* KStdAction::findNext( TQWidget* parent, const char* slot, KActionCollection* actionCollection) +TDEAction* KStdAction::findNext( TQWidget* parent, const char* slot, TDEActionCollection* actionCollection) { - KMainWindow* p = actionCollection->m_pMainWindow; - KAction* a = new KAction( i18n("Find Next"), TQt::Key_F3, parent, slot, actionCollection, "findNext", false, false ); + TDEMainWindow* p = actionCollection->m_pMainWindow; + TDEAction* a = new TDEAction( i18n("Find Next"), TQt::Key_F3, parent, slot, actionCollection, "findNext", false, false ); if(p) a->addTo( p->editMenu ); return a; } @@ -727,7 +727,7 @@ KAction* KStdAction::findNext( TQWidget* parent, const char* slot, KActionCollec -KFontChooser::KFontChooser( TQWidget* pParent, const TQString& /*name*/, bool, const TQStringList&, bool, int ) +TDEFontChooser::TDEFontChooser( TQWidget* pParent, const TQString& /*name*/, bool, const TQStringList&, bool, int ) : TQWidget(pParent) { m_pParent = pParent; @@ -745,19 +745,19 @@ KFontChooser::KFontChooser( TQWidget* pParent, const TQString& /*name*/, bool, c pLayout->addWidget(m_pLabel); } -TQFont KFontChooser::font() +TQFont TDEFontChooser::font() { return m_font;//TQFont("courier",10); } -void KFontChooser::setFont( const TQFont& font, bool ) +void TDEFontChooser::setFont( const TQFont& font, bool ) { m_font = font; m_pLabel->setFont( m_font ); //update(); } -void KFontChooser::slotSelectFont() +void TDEFontChooser::slotSelectFont() { for(;;) { @@ -1145,7 +1145,7 @@ namespace TDEIO TransferJob* put( KURL, int, bool, bool, bool ){return (TransferJob*)0;} }; -KActionCollection* KParts::Part::actionCollection() +TDEActionCollection* KParts::Part::actionCollection() { return 0; } diff --git a/src/kreplacements/kreplacements.h b/src/kreplacements/kreplacements.h index b3bcfaf..0275a1b 100644 --- a/src/kreplacements/kreplacements.h +++ b/src/kreplacements/kreplacements.h @@ -40,7 +40,7 @@ TQString getTranslationDir(); -class KMainWindow; +class TDEMainWindow; class KURL { @@ -83,7 +83,7 @@ public: #define RESTORE(x) #define _UNLOAD(x) -typedef TQPopupMenu KPopupMenu; +typedef TQPopupMenu TDEPopupMenu; class KDialogBase : public TQTabDialog { @@ -137,10 +137,10 @@ public: typedef TQStatusBar KStatusBar; -class KToolBar : public TQToolBar +class TDEToolBar : public TQToolBar { public: - KToolBar(TQMainWindow* parent); + TDEToolBar(TQMainWindow* parent); enum BarPosition {Top, Bottom, Left, Right}; BarPosition barPos(); @@ -149,19 +149,19 @@ private: TQMainWindow* m_pMainWindow; }; -class KActionCollection +class TDEActionCollection { public: - KMainWindow* m_pMainWindow; - KActionCollection( KMainWindow* p){ m_pMainWindow=p; } + TDEMainWindow* m_pMainWindow; + TDEActionCollection( TDEMainWindow* p){ m_pMainWindow=p; } }; class KKeyDialog { public: static void configure(void*, TQWidget*){} - static void configureKeys(KActionCollection*, const TQString&){} - static void configure(KActionCollection*, const TQString&){} + static void configureKeys(TDEActionCollection*, const TQString&){} + static void configure(TDEActionCollection*, const TQString&){} }; namespace KParts @@ -169,13 +169,13 @@ namespace KParts class ReadWritePart; } -class KMainWindow : public TQMainWindow +class TDEMainWindow : public TQMainWindow { Q_OBJECT private: KStatusBar m_statusBar; - KActionCollection m_actionCollection; + TDEActionCollection m_actionCollection; protected: virtual bool queryClose() = 0; virtual bool queryExit() = 0; @@ -192,15 +192,15 @@ public: TQPopupMenu* settingsMenu; TQPopupMenu* helpMenu; - KToolBar* m_pToolBar; + TDEToolBar* m_pToolBar; - KMainWindow( TQWidget* parent, const char* name ); - KToolBar* toolBar(const TQString& s = TQString()); - KActionCollection* actionCollection(); + TDEMainWindow( TQWidget* parent, const char* name ); + TDEToolBar* toolBar(const TQString& s = TQString()); + TDEActionCollection* actionCollection(); void createGUI(); void createGUI(KParts::ReadWritePart*){createGUI();} - TQList* memberList; + TQList* memberList; public slots: void slotHelp(); void slotAbout(); @@ -217,25 +217,25 @@ public: void setGroup(const TQString&); }; -class KAction : public TQAction +class TDEAction : public TQAction { Q_OBJECT public: - KAction(const TQString& text, const TQIconSet& icon, int accel, TQObject* receiver, const char* slot, KActionCollection* actionCollection, const char* name, bool bToggle=false, bool bMenu=true); - KAction(const TQString& text, int accel, TQObject* receiver, const char* slot, KActionCollection* actionCollection, const char* name, bool bToggle=false, bool bMenu=true); - void init(TQObject* receiver, const char* slot, KActionCollection* actionCollection, + TDEAction(const TQString& text, const TQIconSet& icon, int accel, TQObject* receiver, const char* slot, TDEActionCollection* actionCollection, const char* name, bool bToggle=false, bool bMenu=true); + TDEAction(const TQString& text, int accel, TQObject* receiver, const char* slot, TDEActionCollection* actionCollection, const char* name, bool bToggle=false, bool bMenu=true); + void init(TQObject* receiver, const char* slot, TDEActionCollection* actionCollection, const char* name, bool bToggle, bool bMenu); void setStatusText(const TQString&); void plug(TQPopupMenu*); }; -class KToggleAction : public KAction +class TDEToggleAction : public TDEAction { public: - KToggleAction(const TQString& text, const TQIconSet& icon, int accel, TQObject* receiver, const char* slot, KActionCollection* actionCollection, const char* name, bool bMenu=true); - KToggleAction(const TQString& text, int accel, TQObject* receiver, const char* slot, KActionCollection* actionCollection, const char* name, bool bMenu=true); - KToggleAction(const TQString& text, const TQIconSet& icon, int accel, KActionCollection* actionCollection, const char* name, bool bMenu=true); + TDEToggleAction(const TQString& text, const TQIconSet& icon, int accel, TQObject* receiver, const char* slot, TDEActionCollection* actionCollection, const char* name, bool bMenu=true); + TDEToggleAction(const TQString& text, int accel, TQObject* receiver, const char* slot, TDEActionCollection* actionCollection, const char* name, bool bMenu=true); + TDEToggleAction(const TQString& text, const TQIconSet& icon, int accel, TDEActionCollection* actionCollection, const char* name, bool bMenu=true); void setChecked(bool); bool isChecked(); }; @@ -244,24 +244,24 @@ public: class KStdAction { public: - static KAction* open( TQWidget* parent, const char* slot, KActionCollection* ); - static KAction* save( TQWidget* parent, const char* slot, KActionCollection* ); - static KAction* saveAs( TQWidget* parent, const char* slot, KActionCollection* ); - static KAction* print( TQWidget* parent, const char* slot, KActionCollection* ); - static KAction* quit( TQWidget* parent, const char* slot, KActionCollection* ); - static KAction* cut( TQWidget* parent, const char* slot, KActionCollection* ); - static KAction* copy( TQWidget* parent, const char* slot, KActionCollection* ); - static KAction* paste( TQWidget* parent, const char* slot, KActionCollection* ); - static KAction* selectAll( TQWidget* parent, const char* slot, KActionCollection* ); - static KToggleAction* showToolbar( TQWidget* parent, const char* slot, KActionCollection* ); - static KToggleAction* showStatusbar( TQWidget* parent, const char* slot, KActionCollection* ); - static KAction* preferences( TQWidget* parent, const char* slot, KActionCollection* ); - static KAction* about( TQWidget* parent, const char* slot, KActionCollection* ); - static KAction* aboutTQt( KActionCollection* ); - static KAction* help( TQWidget* parent, const char* slot, KActionCollection* ); - static KAction* find( TQWidget* parent, const char* slot, KActionCollection* ); - static KAction* findNext( TQWidget* parent, const char* slot, KActionCollection* ); - static KAction* keyBindings( TQWidget* parent, const char* slot, KActionCollection* ); + static TDEAction* open( TQWidget* parent, const char* slot, TDEActionCollection* ); + static TDEAction* save( TQWidget* parent, const char* slot, TDEActionCollection* ); + static TDEAction* saveAs( TQWidget* parent, const char* slot, TDEActionCollection* ); + static TDEAction* print( TQWidget* parent, const char* slot, TDEActionCollection* ); + static TDEAction* quit( TQWidget* parent, const char* slot, TDEActionCollection* ); + static TDEAction* cut( TQWidget* parent, const char* slot, TDEActionCollection* ); + static TDEAction* copy( TQWidget* parent, const char* slot, TDEActionCollection* ); + static TDEAction* paste( TQWidget* parent, const char* slot, TDEActionCollection* ); + static TDEAction* selectAll( TQWidget* parent, const char* slot, TDEActionCollection* ); + static TDEToggleAction* showToolbar( TQWidget* parent, const char* slot, TDEActionCollection* ); + static TDEToggleAction* showStatusbar( TQWidget* parent, const char* slot, TDEActionCollection* ); + static TDEAction* preferences( TQWidget* parent, const char* slot, TDEActionCollection* ); + static TDEAction* about( TQWidget* parent, const char* slot, TDEActionCollection* ); + static TDEAction* aboutTQt( TDEActionCollection* ); + static TDEAction* help( TQWidget* parent, const char* slot, TDEActionCollection* ); + static TDEAction* find( TQWidget* parent, const char* slot, TDEActionCollection* ); + static TDEAction* findNext( TQWidget* parent, const char* slot, TDEActionCollection* ); + static TDEAction* keyBindings( TQWidget* parent, const char* slot, TDEActionCollection* ); }; class KIcon @@ -270,7 +270,7 @@ public: enum {SizeMedium,Small}; }; -class KFontChooser : public TQWidget +class TDEFontChooser : public TQWidget { Q_OBJECT @@ -279,7 +279,7 @@ class KFontChooser : public TQWidget TQLabel* m_pLabel; TQWidget* m_pParent; public: - KFontChooser( TQWidget* pParent, const TQString& name, bool, const TQStringList&, bool, int ); + TDEFontChooser( TQWidget* pParent, const TQString& name, bool, const TQStringList&, bool, int ); TQFont font(); void setFont( const TQFont&, bool ); private slots: @@ -458,10 +458,10 @@ public: namespace KParts { - class MainWindow : public KMainWindow + class MainWindow : public TDEMainWindow { public: - MainWindow( TQWidget* parent, const char* name ) : KMainWindow(parent,name) {} + MainWindow( TQWidget* parent, const char* name ) : TDEMainWindow(parent,name) {} void setXMLFile(const TQString&){} void setAutoSaveSettings(){} void saveMainWindowSettings(TDEConfig*){} @@ -472,7 +472,7 @@ namespace KParts class Part : public TQObject { public: - KActionCollection* actionCollection(); + TDEActionCollection* actionCollection(); TDEApplication* instance(); void setWidget( TQWidget* w ){ m_pWidget=w; } TQWidget* widget(){return m_pWidget;} diff --git a/src/optiondialog.cpp b/src/optiondialog.cpp index be84a9b..f4448fa 100644 --- a/src/optiondialog.cpp +++ b/src/optiondialog.cpp @@ -35,7 +35,7 @@ #include #include -#include // For KFontChooser +#include // For TDEFontChooser #include #include #include @@ -168,11 +168,11 @@ typedef OptionT OptionPoint; typedef OptionT OptionSize; typedef OptionT OptionStringList; -class OptionFontChooser : public KFontChooser, public OptionItem +class OptionFontChooser : public TDEFontChooser, public OptionItem { public: OptionFontChooser( const TQFont& defaultVal, const TQString& saveName, TQFont* pbVar, TQWidget* pParent, OptionDialog* pOD ) - :KFontChooser( pParent,"font",true/*onlyFixed*/,TQStringList(),false,6 ), + :TDEFontChooser( pParent,"font",true/*onlyFixed*/,TQStringList(),false,6 ), OptionItem( pOD, saveName ) { m_pbVar = pbVar; @@ -494,7 +494,7 @@ void OptionDialog::setupOtherOptions() new OptionToggleAction( true, "Show Toolbar", &m_bShowToolBar, this ); new OptionToggleAction( true, "Show Statusbar", &m_bShowStatusBar, this ); - new OptionNum( (int)KToolBar::Top, "ToolBarPos", &m_toolBarPos, this ); + new OptionNum( (int)TDEToolBar::Top, "ToolBarPos", &m_toolBarPos, this ); new OptionSize( TQSize(600,400),"Geometry", &m_geometry, this ); new OptionPoint( TQPoint(0,22), "Position", &m_position, this ); new OptionToggleAction( false, "WindowStateMaximised", &m_bMaximised, this ); @@ -1540,7 +1540,7 @@ void OptionDialog::setupKeysPage( void ) // BarIcon("fonts", KIcon::SizeMedium ) ); //TQVBoxLayout *topLayout = new TQVBoxLayout( page, 0, spacingHint() ); - // new KFontChooser( page,"font",false/*onlyFixed*/,TQStringList(),false,6 ); + // new TDEFontChooser( page,"font",false/*onlyFixed*/,TQStringList(),false,6 ); //m_pKeyDialog=new KKeyDialog( false, 0 ); //topLayout->addWidget( m_pKeyDialog ); } diff --git a/src/optiondialog.h b/src/optiondialog.h index 03803c0..5e2945c 100644 --- a/src/optiondialog.h +++ b/src/optiondialog.h @@ -26,7 +26,7 @@ class TQCheckBox; class TQLabel; class TQLineEdit; class KColorButton; -class KFontChooser; +class TDEFontChooser; class TDEConfig; #include