Commit 46658e71 authored by Michael Reeves's avatar Michael Reeves
Browse files

*KAction->QAction

parent 612c4dcc
......@@ -22,7 +22,7 @@
#include <kapplication.h>
#include <kstandarddirs.h>
#include <kaction.h>
#include <QAction>
#include <kactionmenu.h>
#include <klocale.h>
#include <kgenericfactory.h>
......@@ -105,32 +105,32 @@ void KDiff3Plugin::setup( KActionCollection* actionCollection, const KonqPopupMe
*/
KActionMenu* pActionMenu = new KActionMenu (i18n ("KDiff3"), actionCollection );
KAction* pAction = 0;
QAction * pAction = 0;
QString s;
if(m_list.count() == 1)
{
int historyCount = s_pHistory ? s_pHistory->count() : 0;
s = i18n("Compare with %1", (historyCount>0 ? s_pHistory->front() : QString()) );
pAction = new KAction ( s, actionCollection );
connect(pAction, &KAction::triggered, this, &KDiff3Plugin::slotCompareWith);
pAction = new QAction ( s, actionCollection );
connect(pAction, &QAction::triggered, this, &KDiff3Plugin::slotCompareWith);
pAction->setEnabled( m_list.count()>0 && historyCount>0 );
pActionMenu->addAction(pAction);
s = i18n("Merge with %1", historyCount>0 ? s_pHistory->front() : QString() );
pAction = new KAction( s, actionCollection);
connect(pAction, &KAction::triggered, this, &KDiff3Plugin::slotMergeWith);
pAction = new QAction( s, actionCollection);
connect(pAction, &QAction::triggered, this, &KDiff3Plugin::slotMergeWith);
pAction->setEnabled( m_list.count()>0 && historyCount>0 );
pActionMenu->addAction (pAction);
s = i18n("Save '%1' for later", ( m_list.front() ) );
pAction = new KAction ( s, actionCollection);
connect(pAction, &KAction::triggered, this, &KDiff3Plugin::slotSaveForLater);
pAction = new QAction ( s, actionCollection);
connect(pAction, &QAction::triggered, this, &KDiff3Plugin::slotSaveForLater);
pAction->setEnabled( m_list.count()>0 );
pActionMenu->addAction(pAction);
pAction = new KAction (i18n("3-way merge with base"), actionCollection);
connect(pAction, &KAction::triggered, this, &KDiff3Plugin::slotMergeThreeWay);
pAction = new QAction (i18n("3-way merge with base"), actionCollection);
connect(pAction, &QAction::triggered, this, &KDiff3Plugin::slotMergeThreeWay);
pAction->setEnabled( m_list.count()>0 && historyCount>=2 );
pActionMenu->addAction (pAction);
......@@ -141,31 +141,31 @@ void KDiff3Plugin::setup( KActionCollection* actionCollection, const KonqPopupMe
pActionMenu->addAction(pHistoryMenu);
for (QStringList::iterator i = s_pHistory->begin(); i!=s_pHistory->end(); ++i)
{
pAction = new KAction( *i, actionCollection);
connect(pAction, &KAction::triggered, this, &KDiff3Plugin::slotCompareWithHistoryItem);
pAction = new QAction( *i, actionCollection);
connect(pAction, &QAction::triggered, this, &KDiff3Plugin::slotCompareWithHistoryItem);
pHistoryMenu->addAction (pAction);
}
pAction = new KAction (i18n("Clear list"), actionCollection);
connect(pAction, &KAction::triggered, this, &KDiff3Plugin::slotClearList);
pAction = new QAction (i18n("Clear list"), actionCollection);
connect(pAction, &QAction::triggered, this, &KDiff3Plugin::slotClearList);
pActionMenu->addAction (pAction);
pAction->setEnabled( historyCount>0 );
}
}
else if(m_list.count() == 2)
{
pAction = new KAction (i18n("Compare"), actionCollection);
connect(pAction, &KAction::triggered, this, &KDiff3Plugin::slotCompareTwoFiles);
pAction = new QAction (i18n("Compare"), actionCollection);
connect(pAction, &QAction::triggered, this, &KDiff3Plugin::slotCompareTwoFiles);
pActionMenu->addAction (pAction);
}
else if ( m_list.count() == 3 )
{
pAction = new KAction (i18n("3 way comparison"), actionCollection);
connect(pAction, &KAction::triggered, this, &KDiff3Plugin::slotCompareThreeFiles);
pAction = new QAction (i18n("3 way comparison"), actionCollection);
connect(pAction, &QAction::triggered, this, &KDiff3Plugin::slotCompareThreeFiles);
pActionMenu->addAction (pAction);
}
pAction = new KAction (i18n("About KDiff3 menu plugin ..."), actionCollection);
connect(pAction, &KAction::triggered, this, &KDiff3Plugin::slotAbout);
pAction = new QAction (i18n("About KDiff3 menu plugin ..."), actionCollection);
connect(pAction, &QAction::triggered, this, &KDiff3Plugin::slotAbout);
pActionMenu->addAction (pAction);
pMenu->addSeparator();
......@@ -190,7 +190,7 @@ void KDiff3Plugin::slotCompareWith()
void KDiff3Plugin::slotCompareWithHistoryItem()
{
const KAction* pAction = dynamic_cast<const KAction*>( sender() );
const QAction * pAction = dynamic_cast<const QAction*>( sender() );
if ( m_list.count() > 0 && pAction )
{
QStringList args;
......
......@@ -39,7 +39,7 @@
#include <algorithm>
#include <kmenu.h>
#include <kaction.h>
#include <QAction>
#include <kmessagebox.h>
#include <kfiledialog.h>
#include <kiconloader.h>
......@@ -430,18 +430,18 @@ public:
void selectItemAndColumn( const QModelIndex& mi, 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;
QAction * m_pDirStartOperation;
QAction * m_pDirRunOperationForCurrentItem;
QAction * m_pDirCompareCurrent;
QAction * m_pDirMergeCurrent;
QAction * m_pDirRescan;
QAction * m_pDirChooseAEverywhere;
QAction * m_pDirChooseBEverywhere;
QAction * m_pDirChooseCEverywhere;
QAction * m_pDirAutoChoiceEverywhere;
QAction * m_pDirDoNothingEverywhere;
QAction * m_pDirFoldAll;
QAction * m_pDirUnfoldAll;
KToggleAction* m_pDirShowIdenticalFiles;
KToggleAction* m_pDirShowDifferentFiles;
......@@ -452,28 +452,28 @@ public:
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;
QAction * m_pDirCompareExplicit;
QAction * m_pDirMergeExplicit;
QAction * m_pDirCurrentDoNothing;
QAction * m_pDirCurrentChooseA;
QAction * m_pDirCurrentChooseB;
QAction * m_pDirCurrentChooseC;
QAction * m_pDirCurrentMerge;
QAction * m_pDirCurrentDelete;
QAction * m_pDirCurrentSyncDoNothing;
QAction * m_pDirCurrentSyncCopyAToB;
QAction * m_pDirCurrentSyncCopyBToA;
QAction * m_pDirCurrentSyncDeleteA;
QAction * m_pDirCurrentSyncDeleteB;
QAction * m_pDirCurrentSyncDeleteAAndB;
QAction * m_pDirCurrentSyncMergeToA;
QAction * m_pDirCurrentSyncMergeToB;
QAction * m_pDirCurrentSyncMergeToAAndB;
QAction * m_pDirSaveMergeState;
QAction * m_pDirLoadMergeState;
bool init( FileAccess& dirA, FileAccess& dirB, FileAccess& dirC, FileAccess& dirDest, bool bDirectoryMerge, bool bReload );
void setOpStatus( const QModelIndex& mi, e_OperationStatus eOpStatus )
......@@ -3378,20 +3378,20 @@ void DirectoryMergeWindow::initDirectoryMergeActions( QObject* pKDiff3App, KActi
#include "xpm/showfilesonlyinc.xpm"
DirectoryMergeWindow* p = this;
d->m_pDirStartOperation = KDiff3::createAction< KAction >(i18n("Start/Continue Directory Merge"), KShortcut( Qt::Key_F7 ), p, SLOT(slotRunOperationForAllItems()), ac, "dir_start_operation");
d->m_pDirRunOperationForCurrentItem = KDiff3::createAction< KAction >(i18n("Run Operation for Current Item"), KShortcut( Qt::Key_F6 ), p, SLOT(slotRunOperationForCurrentItem()), ac, "dir_run_operation_for_current_item");
d->m_pDirCompareCurrent = KDiff3::createAction< KAction >(i18n("Compare Selected File"), p, SLOT(compareCurrentFile()), ac, "dir_compare_current");
d->m_pDirMergeCurrent = KDiff3::createAction< KAction >(i18n("Merge Current File"), QIcon(QPixmap(startmerge)), i18n("Merge\nFile"), pKDiff3App, SLOT(slotMergeCurrentFile()), ac, "merge_current");
d->m_pDirFoldAll = KDiff3::createAction< KAction >(i18n("Fold All Subdirs"), p, SLOT(collapseAll()), ac, "dir_fold_all");
d->m_pDirUnfoldAll = KDiff3::createAction< KAction >(i18n("Unfold All Subdirs"), p, SLOT(expandAll()), ac, "dir_unfold_all");
d->m_pDirRescan = KDiff3::createAction< KAction >(i18n("Rescan"), KShortcut( Qt::SHIFT+Qt::Key_F5 ), p, SLOT(reload()), ac, "dir_rescan");
d->m_pDirSaveMergeState = 0; //KDiff3::createAction< KAction >(i18n("Save Directory Merge State ..."), 0, p, SLOT(slotSaveMergeState()), ac, "dir_save_merge_state");
d->m_pDirLoadMergeState = 0; //KDiff3::createAction< KAction >(i18n("Load Directory Merge State ..."), 0, p, SLOT(slotLoadMergeState()), ac, "dir_load_merge_state");
d->m_pDirChooseAEverywhere = KDiff3::createAction< KAction >(i18n("Choose A for All Items"), p, SLOT(slotChooseAEverywhere()), ac, "dir_choose_a_everywhere");
d->m_pDirChooseBEverywhere = KDiff3::createAction< KAction >(i18n("Choose B for All Items"), p, SLOT(slotChooseBEverywhere()), ac, "dir_choose_b_everywhere");
d->m_pDirChooseCEverywhere = KDiff3::createAction< KAction >(i18n("Choose C for All Items"), p, SLOT(slotChooseCEverywhere()), ac, "dir_choose_c_everywhere");
d->m_pDirAutoChoiceEverywhere = KDiff3::createAction< KAction >(i18n("Auto-Choose Operation for All Items"), p, SLOT(slotAutoChooseEverywhere()), ac, "dir_autochoose_everywhere");
d->m_pDirDoNothingEverywhere = KDiff3::createAction< KAction >(i18n("No Operation for All Items"), p, SLOT(slotNoOpEverywhere()), ac, "dir_nothing_everywhere");
d->m_pDirStartOperation = KDiff3::createAction< QAction >(i18n("Start/Continue Directory Merge"), KShortcut( Qt::Key_F7 ), p, SLOT(slotRunOperationForAllItems()), ac, "dir_start_operation");
d->m_pDirRunOperationForCurrentItem = KDiff3::createAction< QAction >(i18n("Run Operation for Current Item"), KShortcut( Qt::Key_F6 ), p, SLOT(slotRunOperationForCurrentItem()), ac, "dir_run_operation_for_current_item");
d->m_pDirCompareCurrent = KDiff3::createAction< QAction >(i18n("Compare Selected File"), p, SLOT(compareCurrentFile()), ac, "dir_compare_current");
d->m_pDirMergeCurrent = KDiff3::createAction< QAction >(i18n("Merge Current File"), QIcon(QPixmap(startmerge)), i18n("Merge\nFile"), pKDiff3App, SLOT(slotMergeCurrentFile()), ac, "merge_current");
d->m_pDirFoldAll = KDiff3::createAction< QAction >(i18n("Fold All Subdirs"), p, SLOT(collapseAll()), ac, "dir_fold_all");
d->m_pDirUnfoldAll = KDiff3::createAction< QAction >(i18n("Unfold All Subdirs"), p, SLOT(expandAll()), ac, "dir_unfold_all");
d->m_pDirRescan = KDiff3::createAction< QAction >(i18n("Rescan"), KShortcut( Qt::SHIFT+Qt::Key_F5 ), p, SLOT(reload()), ac, "dir_rescan");
d->m_pDirSaveMergeState = 0; //KDiff3::createAction< QAction >(i18n("Save Directory Merge State ..."), 0, p, SLOT(slotSaveMergeState()), ac, "dir_save_merge_state");
d->m_pDirLoadMergeState = 0; //KDiff3::createAction< QAction >(i18n("Load Directory Merge State ..."), 0, p, SLOT(slotLoadMergeState()), ac, "dir_load_merge_state");
d->m_pDirChooseAEverywhere = KDiff3::createAction< QAction >(i18n("Choose A for All Items"), p, SLOT(slotChooseAEverywhere()), ac, "dir_choose_a_everywhere");
d->m_pDirChooseBEverywhere = KDiff3::createAction< QAction >(i18n("Choose B for All Items"), p, SLOT(slotChooseBEverywhere()), ac, "dir_choose_b_everywhere");
d->m_pDirChooseCEverywhere = KDiff3::createAction< QAction >(i18n("Choose C for All Items"), p, SLOT(slotChooseCEverywhere()), ac, "dir_choose_c_everywhere");
d->m_pDirAutoChoiceEverywhere = KDiff3::createAction< QAction >(i18n("Auto-Choose Operation for All Items"), p, SLOT(slotAutoChooseEverywhere()), ac, "dir_autochoose_everywhere");
d->m_pDirDoNothingEverywhere = KDiff3::createAction< QAction >(i18n("No Operation for All Items"), p, SLOT(slotNoOpEverywhere()), ac, "dir_nothing_everywhere");
// d->m_pDirSynchronizeDirectories = KDiff3::createAction< KToggleAction >(i18n("Synchronize Directories"), 0, this, SLOT(slotSynchronizeDirectories()), ac, "dir_synchronize_directories");
// d->m_pDirChooseNewerFiles = KDiff3::createAction< KToggleAction >(i18n("Copy Newer Files Instead of Merging"), 0, this, SLOT(slotChooseNewerFiles()), ac, "dir_choose_newer_files");
......@@ -3404,25 +3404,25 @@ void DirectoryMergeWindow::initDirectoryMergeActions( QObject* pKDiff3App, KActi
d->m_pDirShowIdenticalFiles->setChecked( d->m_pOptions->m_bDmShowIdenticalFiles );
d->m_pDirCompareExplicit = KDiff3::createAction< KAction >(i18n("Compare Explicitly Selected Files"), p, SLOT(slotCompareExplicitlySelectedFiles()), ac, "dir_compare_explicitly_selected_files");
d->m_pDirMergeExplicit = KDiff3::createAction< KAction >(i18n("Merge Explicitly Selected Files"), p, SLOT(slotMergeExplicitlySelectedFiles()), ac, "dir_merge_explicitly_selected_files");
d->m_pDirCurrentDoNothing = KDiff3::createAction< KAction >(i18n("Do Nothing"), p, SLOT(slotCurrentDoNothing()), ac, "dir_current_do_nothing");
d->m_pDirCurrentChooseA = KDiff3::createAction< KAction >(i18n("A"), p, SLOT(slotCurrentChooseA()), ac, "dir_current_choose_a");
d->m_pDirCurrentChooseB = KDiff3::createAction< KAction >(i18n("B"), p, SLOT(slotCurrentChooseB()), ac, "dir_current_choose_b");
d->m_pDirCurrentChooseC = KDiff3::createAction< KAction >(i18n("C"), p, SLOT(slotCurrentChooseC()), ac, "dir_current_choose_c");
d->m_pDirCurrentMerge = KDiff3::createAction< KAction >(i18n("Merge"), p, SLOT(slotCurrentMerge()), ac, "dir_current_merge");
d->m_pDirCurrentDelete = KDiff3::createAction< KAction >(i18n("Delete (if exists)"), p, SLOT(slotCurrentDelete()), ac, "dir_current_delete");
d->m_pDirCurrentSyncDoNothing = KDiff3::createAction< KAction >(i18n("Do Nothing"), p, SLOT(slotCurrentDoNothing()), ac, "dir_current_sync_do_nothing");
d->m_pDirCurrentSyncCopyAToB = KDiff3::createAction< KAction >(i18n("Copy A to B"), p, SLOT(slotCurrentCopyAToB()), ac, "dir_current_sync_copy_a_to_b" );
d->m_pDirCurrentSyncCopyBToA = KDiff3::createAction< KAction >(i18n("Copy B to A"), p, SLOT(slotCurrentCopyBToA()), ac, "dir_current_sync_copy_b_to_a" );
d->m_pDirCurrentSyncDeleteA = KDiff3::createAction< KAction >(i18n("Delete A"), p, SLOT(slotCurrentDeleteA()), ac,"dir_current_sync_delete_a");
d->m_pDirCurrentSyncDeleteB = KDiff3::createAction< KAction >(i18n("Delete B"), p, SLOT(slotCurrentDeleteB()), ac,"dir_current_sync_delete_b");
d->m_pDirCurrentSyncDeleteAAndB = KDiff3::createAction< KAction >(i18n("Delete A && B"), p, SLOT(slotCurrentDeleteAAndB()), ac,"dir_current_sync_delete_a_and_b");
d->m_pDirCurrentSyncMergeToA = KDiff3::createAction< KAction >(i18n("Merge to A"), p, SLOT(slotCurrentMergeToA()), ac,"dir_current_sync_merge_to_a");
d->m_pDirCurrentSyncMergeToB = KDiff3::createAction< KAction >(i18n("Merge to B"), p, SLOT(slotCurrentMergeToB()), ac,"dir_current_sync_merge_to_b");
d->m_pDirCurrentSyncMergeToAAndB = KDiff3::createAction< KAction >(i18n("Merge to A && B"), p, SLOT(slotCurrentMergeToAAndB()), ac,"dir_current_sync_merge_to_a_and_b");
d->m_pDirCompareExplicit = KDiff3::createAction< QAction >(i18n("Compare Explicitly Selected Files"), p, SLOT(slotCompareExplicitlySelectedFiles()), ac, "dir_compare_explicitly_selected_files");
d->m_pDirMergeExplicit = KDiff3::createAction< QAction >(i18n("Merge Explicitly Selected Files"), p, SLOT(slotMergeExplicitlySelectedFiles()), ac, "dir_merge_explicitly_selected_files");
d->m_pDirCurrentDoNothing = KDiff3::createAction< QAction >(i18n("Do Nothing"), p, SLOT(slotCurrentDoNothing()), ac, "dir_current_do_nothing");
d->m_pDirCurrentChooseA = KDiff3::createAction< QAction >(i18n("A"), p, SLOT(slotCurrentChooseA()), ac, "dir_current_choose_a");
d->m_pDirCurrentChooseB = KDiff3::createAction< QAction >(i18n("B"), p, SLOT(slotCurrentChooseB()), ac, "dir_current_choose_b");
d->m_pDirCurrentChooseC = KDiff3::createAction< QAction >(i18n("C"), p, SLOT(slotCurrentChooseC()), ac, "dir_current_choose_c");
d->m_pDirCurrentMerge = KDiff3::createAction< QAction >(i18n("Merge"), p, SLOT(slotCurrentMerge()), ac, "dir_current_merge");
d->m_pDirCurrentDelete = KDiff3::createAction< QAction >(i18n("Delete (if exists)"), p, SLOT(slotCurrentDelete()), ac, "dir_current_delete");
d->m_pDirCurrentSyncDoNothing = KDiff3::createAction< QAction >(i18n("Do Nothing"), p, SLOT(slotCurrentDoNothing()), ac, "dir_current_sync_do_nothing");
d->m_pDirCurrentSyncCopyAToB = KDiff3::createAction< QAction >(i18n("Copy A to B"), p, SLOT(slotCurrentCopyAToB()), ac, "dir_current_sync_copy_a_to_b" );
d->m_pDirCurrentSyncCopyBToA = KDiff3::createAction< QAction >(i18n("Copy B to A"), p, SLOT(slotCurrentCopyBToA()), ac, "dir_current_sync_copy_b_to_a" );
d->m_pDirCurrentSyncDeleteA = KDiff3::createAction< QAction >(i18n("Delete A"), p, SLOT(slotCurrentDeleteA()), ac,"dir_current_sync_delete_a");
d->m_pDirCurrentSyncDeleteB = KDiff3::createAction< QAction >(i18n("Delete B"), p, SLOT(slotCurrentDeleteB()), ac,"dir_current_sync_delete_b");
d->m_pDirCurrentSyncDeleteAAndB = KDiff3::createAction< QAction >(i18n("Delete A && B"), p, SLOT(slotCurrentDeleteAAndB()), ac,"dir_current_sync_delete_a_and_b");
d->m_pDirCurrentSyncMergeToA = KDiff3::createAction< QAction >(i18n("Merge to A"), p, SLOT(slotCurrentMergeToA()), ac,"dir_current_sync_merge_to_a");
d->m_pDirCurrentSyncMergeToB = KDiff3::createAction< QAction >(i18n("Merge to B"), p, SLOT(slotCurrentMergeToB()), ac,"dir_current_sync_merge_to_b");
d->m_pDirCurrentSyncMergeToAAndB = KDiff3::createAction< QAction >(i18n("Merge to A && B"), p, SLOT(slotCurrentMergeToAAndB()), ac,"dir_current_sync_merge_to_a_and_b");
}
......
......@@ -481,7 +481,7 @@ void KDiff3App::initActions( KActionCollection* ac )
fileOpen = KStandardAction::open(this, SLOT(slotFileOpen()), ac);
fileOpen->setStatusTip(i18n("Opens documents for comparison..."));
fileReload = KDiff3::createAction< KAction >( i18n("Reload"), KShortcut( Qt::Key_F5 ), this, SLOT(slotReload()), ac, "file_reload" );
fileReload = KDiff3::createAction< QAction >( i18n("Reload"), KShortcut( Qt::Key_F5 ), this, SLOT(slotReload()), ac, "file_reload" );
fileSave = KStandardAction::save(this, SLOT(slotFileSave()), ac);
fileSave->setStatusTip(i18n("Saves the merge result. All conflicts must be solved!"));
......@@ -511,7 +511,7 @@ void KDiff3App::initActions( KActionCollection* ac )
viewStatusBar = KStandardAction::showStatusbar(this, SLOT(slotViewStatusBar()), ac);
viewStatusBar->setStatusTip(i18n("Enables/disables the statusbar"));
KStandardAction::keyBindings(this, SLOT(slotConfigureKeys()), ac);
KAction* pAction = KStandardAction::preferences(this, SLOT(slotConfigure()), ac );
QAction * pAction = KStandardAction::preferences(this, SLOT(slotConfigure()), ac );
if ( isPart() )
pAction->setText(i18n("Configure KDiff3..."));
......@@ -534,25 +534,25 @@ void KDiff3App::initActions( KActionCollection* ac )
#include "xpm/showlinenumbers.xpm"
//#include "reload.xpm"
goCurrent = KDiff3::createAction< KAction >( i18n("Go to Current Delta"), QIcon(QPixmap(currentpos)), i18n("Current\nDelta"), KShortcut( Qt::CTRL+Qt::Key_Space ), this, SLOT(slotGoCurrent()), ac, "go_current");
goCurrent = KDiff3::createAction< QAction >( i18n("Go to Current Delta"), QIcon(QPixmap(currentpos)), i18n("Current\nDelta"), KShortcut( Qt::CTRL+Qt::Key_Space ), this, SLOT(slotGoCurrent()), ac, "go_current");
goTop = KDiff3::createAction< KAction >(i18n("Go to First Delta"), QIcon(QPixmap(upend)), i18n("First\nDelta"), this, SLOT(slotGoTop()), ac, "go_top");
goTop = KDiff3::createAction< QAction >(i18n("Go to First Delta"), QIcon(QPixmap(upend)), i18n("First\nDelta"), this, SLOT(slotGoTop()), ac, "go_top");
goBottom = KDiff3::createAction< KAction >(i18n("Go to Last Delta"), QIcon(QPixmap(downend)), i18n("Last\nDelta"), this, SLOT(slotGoBottom()), ac, "go_bottom");
goBottom = KDiff3::createAction< QAction >(i18n("Go to Last Delta"), QIcon(QPixmap(downend)), i18n("Last\nDelta"), this, SLOT(slotGoBottom()), ac, "go_bottom");
QString omitsWhitespace = ".\n" + i18n("(Skips white space differences when \"Show White Space\" is disabled.)");
QString includeWhitespace = ".\n" + i18n("(Does not skip white space differences even when \"Show White Space\" is disabled.)");
goPrevDelta = KDiff3::createAction< KAction >(i18n("Go to Previous Delta"), QIcon(QPixmap(up1arrow)), i18n("Prev\nDelta"), KShortcut( Qt::CTRL+Qt::Key_Up), this, SLOT(slotGoPrevDelta()), ac, "go_prev_delta");
goPrevDelta = KDiff3::createAction< QAction >(i18n("Go to Previous Delta"), QIcon(QPixmap(up1arrow)), i18n("Prev\nDelta"), KShortcut( Qt::CTRL+Qt::Key_Up), this, SLOT(slotGoPrevDelta()), ac, "go_prev_delta");
goPrevDelta->setToolTip( goPrevDelta->text() + omitsWhitespace );
goNextDelta = KDiff3::createAction< KAction >(i18n("Go to Next Delta"), QIcon(QPixmap(down1arrow)), i18n("Next\nDelta"), KShortcut( Qt::CTRL+Qt::Key_Down ), this, SLOT(slotGoNextDelta()), ac, "go_next_delta");
goNextDelta = KDiff3::createAction< QAction >(i18n("Go to Next Delta"), QIcon(QPixmap(down1arrow)), i18n("Next\nDelta"), KShortcut( Qt::CTRL+Qt::Key_Down ), this, SLOT(slotGoNextDelta()), ac, "go_next_delta");
goNextDelta->setToolTip( goNextDelta->text() + omitsWhitespace );
goPrevConflict = KDiff3::createAction< KAction >(i18n("Go to Previous Conflict"), QIcon(QPixmap(up2arrow)), i18n("Prev\nConflict"), KShortcut( Qt::CTRL+Qt::Key_PageUp ), this, SLOT(slotGoPrevConflict()), ac, "go_prev_conflict");
goPrevConflict = KDiff3::createAction< QAction >(i18n("Go to Previous Conflict"), QIcon(QPixmap(up2arrow)), i18n("Prev\nConflict"), KShortcut( Qt::CTRL+Qt::Key_PageUp ), this, SLOT(slotGoPrevConflict()), ac, "go_prev_conflict");
goPrevConflict->setToolTip( goPrevConflict->text() + omitsWhitespace );
goNextConflict = KDiff3::createAction< KAction >(i18n("Go to Next Conflict"), QIcon(QPixmap(down2arrow)), i18n("Next\nConflict"), KShortcut( Qt::CTRL+Qt::Key_PageDown ), this, SLOT(slotGoNextConflict()), ac, "go_next_conflict");
goNextConflict = KDiff3::createAction< QAction >(i18n("Go to Next Conflict"), QIcon(QPixmap(down2arrow)), i18n("Next\nConflict"), KShortcut( Qt::CTRL+Qt::Key_PageDown ), this, SLOT(slotGoNextConflict()), ac, "go_next_conflict");
goNextConflict->setToolTip( goNextConflict->text() + omitsWhitespace );
goPrevUnsolvedConflict = KDiff3::createAction< KAction >(i18n("Go to Previous Unsolved Conflict"), QIcon(QPixmap(prevunsolved)), i18n("Prev\nUnsolved"), this, SLOT(slotGoPrevUnsolvedConflict()), ac, "go_prev_unsolved_conflict");
goPrevUnsolvedConflict = KDiff3::createAction< QAction >(i18n("Go to Previous Unsolved Conflict"), QIcon(QPixmap(prevunsolved)), i18n("Prev\nUnsolved"), this, SLOT(slotGoPrevUnsolvedConflict()), ac, "go_prev_unsolved_conflict");
goPrevUnsolvedConflict->setToolTip( goPrevUnsolvedConflict->text() + includeWhitespace );
goNextUnsolvedConflict = KDiff3::createAction< KAction >(i18n("Go to Next Unsolved Conflict"), QIcon(QPixmap(nextunsolved)), i18n("Next\nUnsolved"), this, SLOT(slotGoNextUnsolvedConflict()), ac, "go_next_unsolved_conflict");
goNextUnsolvedConflict = KDiff3::createAction< QAction >(i18n("Go to Next Unsolved Conflict"), QIcon(QPixmap(nextunsolved)), i18n("Next\nUnsolved"), this, SLOT(slotGoNextUnsolvedConflict()), ac, "go_next_unsolved_conflict");
goNextUnsolvedConflict->setToolTip( goNextUnsolvedConflict->text() + includeWhitespace );
chooseA = KDiff3::createAction< KToggleAction >(i18n("Select Line(s) From A"), QIcon(QPixmap(iconA)), i18n("Choose\nA"), KShortcut( Qt::CTRL+Qt::Key_1 ), this, SLOT(slotChooseA()), ac, "merge_choose_a");
chooseB = KDiff3::createAction< KToggleAction >(i18n("Select Line(s) From B"), QIcon(QPixmap(iconB)), i18n("Choose\nB"), KShortcut( Qt::CTRL+Qt::Key_2 ), this, SLOT(slotChooseB()), ac, "merge_choose_b");
......@@ -563,44 +563,44 @@ void KDiff3App::initActions( KActionCollection* ac )
showWhiteSpace = KDiff3::createAction< KToggleAction >(i18n("Show White Space"), QIcon(QPixmap(showwhitespace)), i18n("White\nDeltas"), this, SLOT(slotShowWhiteSpaceToggled()), ac, "diff_show_whitespace");
showLineNumbers = KDiff3::createAction< KToggleAction >(i18n("Show Line Numbers"), QIcon(QPixmap(showlinenumbers)), i18n("Line\nNumbers"), this, SLOT(slotShowLineNumbersToggled()), ac, "diff_showlinenumbers");
chooseAEverywhere = KDiff3::createAction< KAction >(i18n("Choose A Everywhere"), KShortcut( Qt::CTRL+Qt::SHIFT+Qt::Key_1 ), this, SLOT(slotChooseAEverywhere()), ac, "merge_choose_a_everywhere");
chooseBEverywhere = KDiff3::createAction< KAction >(i18n("Choose B Everywhere"), KShortcut( Qt::CTRL+Qt::SHIFT+Qt::Key_2 ), this, SLOT(slotChooseBEverywhere()), ac, "merge_choose_b_everywhere");
chooseCEverywhere = KDiff3::createAction< KAction >(i18n("Choose C Everywhere"), KShortcut( Qt::CTRL+Qt::SHIFT+Qt::Key_3 ), this, SLOT(slotChooseCEverywhere()), ac, "merge_choose_c_everywhere");
chooseAForUnsolvedConflicts = KDiff3::createAction< KAction >(i18n("Choose A for All Unsolved Conflicts"), this, SLOT(slotChooseAForUnsolvedConflicts()), ac, "merge_choose_a_for_unsolved_conflicts");
chooseBForUnsolvedConflicts = KDiff3::createAction< KAction >(i18n("Choose B for All Unsolved Conflicts"), this, SLOT(slotChooseBForUnsolvedConflicts()), ac, "merge_choose_b_for_unsolved_conflicts");
chooseCForUnsolvedConflicts = KDiff3::createAction< KAction >(i18n("Choose C for All Unsolved Conflicts"), this, SLOT(slotChooseCForUnsolvedConflicts()), ac, "merge_choose_c_for_unsolved_conflicts");
chooseAForUnsolvedWhiteSpaceConflicts = KDiff3::createAction< KAction >(i18n("Choose A for All Unsolved Whitespace Conflicts"), this, SLOT(slotChooseAForUnsolvedWhiteSpaceConflicts()), ac, "merge_choose_a_for_unsolved_whitespace_conflicts");
chooseBForUnsolvedWhiteSpaceConflicts = KDiff3::createAction< KAction >(i18n("Choose B for All Unsolved Whitespace Conflicts"), this, SLOT(slotChooseBForUnsolvedWhiteSpaceConflicts()), ac, "merge_choose_b_for_unsolved_whitespace_conflicts");
chooseCForUnsolvedWhiteSpaceConflicts = KDiff3::createAction< KAction >(i18n("Choose C for All Unsolved Whitespace Conflicts"), this, SLOT(slotChooseCForUnsolvedWhiteSpaceConflicts()), ac, "merge_choose_c_for_unsolved_whitespace_conflicts");
autoSolve = KDiff3::createAction< KAction >(i18n("Automatically Solve Simple Conflicts"), this, SLOT(slotAutoSolve()), ac, "merge_autosolve");
unsolve = KDiff3::createAction< KAction >(i18n("Set Deltas to Conflicts"), this, SLOT(slotUnsolve()), ac, "merge_autounsolve");
mergeRegExp = KDiff3::createAction< KAction >(i18n("Run Regular Expression Auto Merge"), this, SLOT(slotRegExpAutoMerge()),ac, "merge_regexp_automerge" );
mergeHistory = KDiff3::createAction< KAction >(i18n("Automatically Solve History Conflicts"), this, SLOT(slotMergeHistory()), ac, "merge_versioncontrol_history" );
splitDiff = KDiff3::createAction< KAction >(i18n("Split Diff At Selection"), this, SLOT(slotSplitDiff()), ac, "merge_splitdiff");
joinDiffs = KDiff3::createAction< KAction >(i18n("Join Selected Diffs"), this, SLOT(slotJoinDiffs()), ac, "merge_joindiffs");
chooseAEverywhere = KDiff3::createAction< QAction >(i18n("Choose A Everywhere"), KShortcut( Qt::CTRL+Qt::SHIFT+Qt::Key_1 ), this, SLOT(slotChooseAEverywhere()), ac, "merge_choose_a_everywhere");
chooseBEverywhere = KDiff3::createAction< QAction >(i18n("Choose B Everywhere"), KShortcut( Qt::CTRL+Qt::SHIFT+Qt::Key_2 ), this, SLOT(slotChooseBEverywhere()), ac, "merge_choose_b_everywhere");
chooseCEverywhere = KDiff3::createAction< QAction >(i18n("Choose C Everywhere"), KShortcut( Qt::CTRL+Qt::SHIFT+Qt::Key_3 ), this, SLOT(slotChooseCEverywhere()), ac, "merge_choose_c_everywhere");
chooseAForUnsolvedConflicts = KDiff3::createAction< QAction >(i18n("Choose A for All Unsolved Conflicts"), this, SLOT(slotChooseAForUnsolvedConflicts()), ac, "merge_choose_a_for_unsolved_conflicts");
chooseBForUnsolvedConflicts = KDiff3::createAction< QAction >(i18n("Choose B for All Unsolved Conflicts"), this, SLOT(slotChooseBForUnsolvedConflicts()), ac, "merge_choose_b_for_unsolved_conflicts");
chooseCForUnsolvedConflicts = KDiff3::createAction< QAction >(i18n("Choose C for All Unsolved Conflicts"), this, SLOT(slotChooseCForUnsolvedConflicts()), ac, "merge_choose_c_for_unsolved_conflicts");
chooseAForUnsolvedWhiteSpaceConflicts = KDiff3::createAction< QAction >(i18n("Choose A for All Unsolved Whitespace Conflicts"), this, SLOT(slotChooseAForUnsolvedWhiteSpaceConflicts()), ac, "merge_choose_a_for_unsolved_whitespace_conflicts");
chooseBForUnsolvedWhiteSpaceConflicts = KDiff3::createAction< QAction >(i18n("Choose B for All Unsolved Whitespace Conflicts"), this, SLOT(slotChooseBForUnsolvedWhiteSpaceConflicts()), ac, "merge_choose_b_for_unsolved_whitespace_conflicts");
chooseCForUnsolvedWhiteSpaceConflicts = KDiff3::createAction< QAction >(i18n("Choose C for All Unsolved Whitespace Conflicts"), this, SLOT(slotChooseCForUnsolvedWhiteSpaceConflicts()), ac, "merge_choose_c_for_unsolved_whitespace_conflicts");
autoSolve = KDiff3::createAction< QAction >(i18n("Automatically Solve Simple Conflicts"), this, SLOT(slotAutoSolve()), ac, "merge_autosolve");
unsolve = KDiff3::createAction< QAction >(i18n("Set Deltas to Conflicts"), this, SLOT(slotUnsolve()), ac, "merge_autounsolve");
mergeRegExp = KDiff3::createAction< QAction >(i18n("Run Regular Expression Auto Merge"), this, SLOT(slotRegExpAutoMerge()),ac, "merge_regexp_automerge" );
mergeHistory = KDiff3::createAction< QAction >(i18n("Automatically Solve History Conflicts"), this, SLOT(slotMergeHistory()), ac, "merge_versioncontrol_history" );
splitDiff = KDiff3::createAction< QAction >(i18n("Split Diff At Selection"), this, SLOT(slotSplitDiff()), ac, "merge_splitdiff");
joinDiffs = KDiff3::createAction< QAction >(i18n("Join Selected Diffs"), this, SLOT(slotJoinDiffs()), ac, "merge_joindiffs");
showWindowA = KDiff3::createAction< KToggleAction >(i18n("Show Window A"), this, SLOT(slotShowWindowAToggled()), ac, "win_show_a");
showWindowB = KDiff3::createAction< KToggleAction >(i18n("Show Window B"), this, SLOT(slotShowWindowBToggled()), ac, "win_show_b");
showWindowC = KDiff3::createAction< KToggleAction >(i18n("Show Window C"), this, SLOT(slotShowWindowCToggled()), ac, "win_show_c");
winFocusNext = KDiff3::createAction< KAction >(i18n("Focus Next Window"), KShortcut( Qt::ALT+Qt::Key_Right ), this, SLOT(slotWinFocusNext()), ac, "win_focus_next");
winFocusNext = KDiff3::createAction< QAction >(i18n("Focus Next Window"), KShortcut( Qt::ALT+Qt::Key_Right ), this, SLOT(slotWinFocusNext()), ac, "win_focus_next");
overviewModeNormal = KDiff3::createAction< KToggleAction >(i18n("Normal Overview"), this, SLOT(slotOverviewNormal()), ac, "diff_overview_normal");
overviewModeAB = KDiff3::createAction< KToggleAction >(i18n("A vs. B Overview"), this, SLOT(slotOverviewAB()), ac, "diff_overview_ab");
overviewModeAC = KDiff3::createAction< KToggleAction >(i18n("A vs. C Overview"), this, SLOT(slotOverviewAC()), ac, "diff_overview_ac");
overviewModeBC = KDiff3::createAction< KToggleAction >(i18n("B vs. C Overview"), this, SLOT(slotOverviewBC()), ac, "diff_overview_bc");
wordWrap = KDiff3::createAction< KToggleAction >(i18n("Word Wrap Diff Windows"), this, SLOT(slotWordWrapToggled()), ac, "diff_wordwrap");
addManualDiffHelp = KDiff3::createAction< KAction >(i18n("Add Manual Diff Alignment"), KShortcut( Qt::CTRL+Qt::Key_Y ), this, SLOT(slotAddManualDiffHelp()), ac, "diff_add_manual_diff_help");
clearManualDiffHelpList = KDiff3::createAction< KAction >(i18n("Clear All Manual Diff Alignments"), KShortcut( Qt::CTRL+Qt::SHIFT+Qt::Key_Y ), this, SLOT(slotClearManualDiffHelpList()), ac, "diff_clear_manual_diff_help_list");
addManualDiffHelp = KDiff3::createAction< QAction >(i18n("Add Manual Diff Alignment"), KShortcut( Qt::CTRL+Qt::Key_Y ), this, SLOT(slotAddManualDiffHelp()), ac, "diff_add_manual_diff_help");
clearManualDiffHelpList = KDiff3::createAction< QAction >(i18n("Clear All Manual Diff Alignments"), KShortcut( Qt::CTRL+Qt::SHIFT+Qt::Key_Y ), this, SLOT(slotClearManualDiffHelpList()), ac, "diff_clear_manual_diff_help_list");
#if defined(_WIN32) || defined(Q_OS_OS2)
KDiff3::createAction< KAction >(i18n("Focus Next Window"), KShortcut(Qt::CTRL+Qt::Key_Tab), this, SLOT(slotWinFocusNext()), ac, "win_focus_next");
KDiff3::createAction< QAction >(i18n("Focus Next Window"), KShortcut(Qt::CTRL+Qt::Key_Tab), this, SLOT(slotWinFocusNext()), ac, "win_focus_next");
#endif
winFocusPrev = KDiff3::createAction< KAction >(i18n("Focus Prev Window"), KShortcut( Qt::ALT+Qt::Key_Left ), this, SLOT(slotWinFocusPrev()), ac, "win_focus_prev");
winToggleSplitOrientation = KDiff3::createAction< KAction >(i18n("Toggle Split Orientation"), this, SLOT(slotWinToggleSplitterOrientation()), ac, "win_toggle_split_orientation");
winFocusPrev = KDiff3::createAction< QAction >(i18n("Focus Prev Window"), KShortcut( Qt::ALT+Qt::Key_Left ), this, SLOT(slotWinFocusPrev()), ac, "win_focus_prev");
winToggleSplitOrientation = KDiff3::createAction< QAction >(i18n("Toggle Split Orientation"), this, SLOT(slotWinToggleSplitterOrientation()), ac, "win_toggle_split_orientation");
dirShowBoth = KDiff3::createAction< KToggleAction >(i18n("Dir && Text Split Screen View"), this, SLOT(slotDirShowBoth()), ac, "win_dir_show_both");
dirShowBoth->setChecked( true );
dirViewToggle = KDiff3::createAction< KAction >(i18n("Toggle Between Dir && Text View"), this, SLOT(slotDirViewToggle()), ac, "win_dir_view_toggle");
dirViewToggle = KDiff3::createAction< QAction >(i18n("Toggle Between Dir && Text View"), this, SLOT(slotDirViewToggle()), ac, "win_dir_view_toggle");
m_pMergeEditorPopupMenu = new QMenu( this );
/* chooseA->plug( m_pMergeEditorPopupMenu );
......
......@@ -20,7 +20,7 @@
#include "kdiff3_part.h"
#include <kcomponentdata.h>
#include <kaction.h>
#include <QAction>
#include <kstandardaction.h>
#include <kfiledialog.h>
......@@ -83,7 +83,7 @@ void KDiff3Part::setModified(bool /*modified*/)
{
/*
// get a handle on our Save action and make sure it is valid
KAction *save = actionCollection()->action(KStandardAction::stdName(KStandardAction::Save));
QAction *save = actionCollection()->action(KStandardAction::stdName(KStandardAction::Save));
if (!save)
return;
......
......@@ -28,7 +28,7 @@
#include <kedittoolbar.h>
#include <kaction.h>
#include <QAction>
#include <kstandardaction.h>
#include <klibloader.h>
......
......@@ -512,18 +512,18 @@ static void initAction( QAction* pAction, QObject* receiver, const char* slot, K
}
}
KAction::KAction(const QString& name, KActionCollection* actionCollection )
QAction::QAction(const QString& name, KActionCollection* actionCollection )
: QAction ( actionCollection->m_pMainWindow )
{
initAction( this, 0,0, actionCollection, name, false, true );
}
KAction::KAction( KActionCollection* actionCollection )
QAction::QAction( KActionCollection* actionCollection )
: QAction ( actionCollection->m_pMainWindow )
{
}
KAction::KAction(const QString& text, const QIcon& icon, int accel,
QAction::QAction(const QString& text, const QIcon& icon, int accel,
QObject* receiver, const char* slot, KActionCollection* actionCollection,
const char* name, bool bToggle, bool bMenu
)
......@@ -538,7 +538,7 @@ KAction::KAction(const QString& text, const QIcon& icon, int accel,
initAction(this, receiver,slot,actionCollection,name,bToggle,bMenu);
}
KAction::KAction(const QString& text, int accel,
QAction::QAction(const QString& text, int accel,
QObject* receiver, const char* slot, KActionCollection* actionCollection,
const char* name, bool bToggle, bool bMenu
)
......@@ -550,16 +550,16 @@ KAction::KAction(const QString& text, int accel,
initAction(this,receiver,slot,actionCollection,name,bToggle,bMenu);
}
void KAction::setStatusText(const QString&)
void QAction::setStatusText(const QString&)
{
}
void KAction::plug(QMenu* menu)
void QAction::plug(QMenu* menu)
{
menu->addAction( this );
}
void KAction::setIcon( const QIcon& icon )
void QAction::setIcon( const QIcon& icon )
{
QAction::setIcon(icon);
if ( !icon.isNull() )
......@@ -571,18 +571,18 @@ void KAction::setIcon( const QIcon& icon )
KToggleAction::KToggleAction( KActionCollection* actionCollection )
: KAction( actionCollection )
: QAction( actionCollection )
{
setCheckable(true);
}
KToggleAction::KToggleAction(const QString& text, int accel, QObject* receiver, const char* slot, KActionCollection* actionCollection, const char* name, bool bMenu)
: KAction( text, accel, receiver, slot, actionCollection, name, true, bMenu)
: QAction( text, accel, receiver, slot, actionCollection, name, true, bMenu)
{
}
KToggleAction::KToggleAction(const QString& text, const QIcon& icon, int accel, KActionCollection* actionCollection, const char* name, bool bMenu)
: KAction( text, icon, accel, 0, 0, actionCollection, name, true, bMenu)
: QAction( text, icon, accel, 0, 0, actionCollection, name, true, bMenu)
{
}
......@@ -595,77 +595,77 @@ void KToggleAction::setChecked(bool bChecked)
//static
KAction* KStandardAction::open( QWidget* parent, const char* slot, KActionCollection* actionCollection)
QAction * KStandardAction::open( QWidget* parent, const char* slot, KActionCollection* actionCollection)
{
#include "../xpm/fileopen.xpm"
KMainWindow* p = actionCollection->m_pMainWindow;
KAction* a = new KAction( i18n("Open"), QIcon(QPixmap(fileopen)), Qt::CTRL+Qt::Key_O, parent, slot, actionCollection, "open", false, false);
QAction * a = new QAction( i18n("Open"), QIcon(QPixmap(fileopen)), Qt::CTRL+Qt::Key_O, parent, slot, actionCollection, "open", false, false);
if(p){ p->fileMenu->addAction( a ); }
return a;
}
KAction* KStandardAction::save( QWidget* parent, const char* slot, KActionCollection* actionCollection )
QAction * KStandardAction::save( QWidget* parent, const char* slot, KActionCollection* actionCollection )
{
#include "../xpm/filesave.xpm"
KMainWindow* p = actionCollection->m_pMainWindow;
KAction* a = new KAction( i18n("Save"), QIcon(QPixmap(filesave)), Qt::CTRL+Qt::Key_S, parent, slot, actionCollection, "save", false, false);
QAction * a = new QAction( i18n("Save"), QIcon(QPixmap(filesave)), Qt::CTRL+Qt::Key_S, parent, slot, actionCollection, "save", false, false);
if(p){ p->fileMenu->addAction( a ); }
return a;
}
KAction* KStandardAction::saveAs( QWidget* parent, const char* slot, KActionCollection* actionCollection)
QAction * KStandardAction::saveAs( QWidget* parent, const char* slot, KActionCollection* actionCollection)
{
KMainWindow* p = actionCollection->m_pMainWindow;
KAction* a = new KAction( i18n("Save As..."), 0, parent, slot, actionCollection, "saveas", false, false);
QAction * a = new QAction( i18n("Save As..."), 0, parent, slot, actionCollection, "saveas", false, false);
if(p) p->fileMenu->addAction( a );
return a;
}
KAction* KStandardAction::print( QWidget* parent, const char* slot, KActionCollection* actionCollection)
QAction * KStandardAction::print( QWidget* parent, const char* slot, KActionCollection* actionCollection)
{
#include "../xpm/fileprint.xpm"
KMainWindow* p = actionCollection->m_pMainWindow;
KAction* a = new KAction( i18n("Print..."), QIcon(QPixmap(fileprint)),Qt::CTRL+Qt::Key_P, parent, slot, actionCollection, "print", false, false);
QAction * a = new QAction( i18n("Print..."), QIcon(QPixmap(fileprint)),Qt::CTRL+Qt::Key_P, parent, slot, actionCollection, "print", false, false);
if(p) p->fileMenu->addAction( a );
return a;
}
KAction* KStandardAction::quit( QWidget* parent, const char* slot, KActionCollection* actionCollection)