diff options
Diffstat (limited to 'src/kdiff3.h')
| -rw-r--r-- | src/kdiff3.h | 140 |
1 files changed, 70 insertions, 70 deletions
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; |