From 7716a5e605907a009e19f429cec4e6b5f346bd71 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 1 Feb 2013 15:14:36 -0600 Subject: Rename a number of classes to enhance compatibility with KDE4 --- cervisia/cervisiapart.cpp | 138 +++++++++++++++++++++++----------------------- 1 file changed, 69 insertions(+), 69 deletions(-) (limited to 'cervisia/cervisiapart.cpp') diff --git a/cervisia/cervisiapart.cpp b/cervisia/cervisiapart.cpp index 34d4bfc6..68486c7f 100644 --- a/cervisia/cervisiapart.cpp +++ b/cervisia/cervisiapart.cpp @@ -138,8 +138,8 @@ CervisiaPart::CervisiaPart( TQWidget *parentWidget, const char *widgetName, update = new UpdateView(*config(), splitter); update->setFocusPolicy( TQ_StrongFocus ); update->setFocus(); - connect( update, TQT_SIGNAL(contextMenu(KListView*, TQListViewItem*, const TQPoint&)), - this, TQT_SLOT(popupRequested(KListView*, TQListViewItem*, const TQPoint&)) ); + connect( update, TQT_SIGNAL(contextMenu(TDEListView*, TQListViewItem*, const TQPoint&)), + this, TQT_SLOT(popupRequested(TDEListView*, TQListViewItem*, const TQPoint&)) ); connect( update, TQT_SIGNAL(fileOpened(TQString)), this, TQT_SLOT(openFile(TQString)) ); @@ -224,7 +224,7 @@ void CervisiaPart::slotSetupStatusBar() void CervisiaPart::setupActions() { - KAction *action; + TDEAction *action; TQString hint; actionCollection()->setHighlightingEnabled(true); @@ -232,81 +232,81 @@ void CervisiaPart::setupActions() // // File Menu // - action = new KAction( i18n("O&pen Sandbox..."), "fileopen", CTRL+Key_O, + action = new TDEAction( i18n("O&pen Sandbox..."), "fileopen", CTRL+Key_O, this, TQT_SLOT( slotOpenSandbox() ), actionCollection(), "file_open" ); hint = i18n("Opens a CVS working folder in the main window"); action->setToolTip( hint ); action->setWhatsThis( hint ); - recent = new KRecentFilesAction( i18n("Recent Sandboxes"), 0, + recent = new TDERecentFilesAction( i18n("Recent Sandboxes"), 0, this, TQT_SLOT( openURL( const KURL & ) ), actionCollection(), "file_open_recent" ); - action = new KAction( i18n("&Insert ChangeLog Entry..."), 0, + action = new TDEAction( i18n("&Insert ChangeLog Entry..."), 0, this, TQT_SLOT( slotChangeLog() ), actionCollection(), "insert_changelog_entry" ); hint = i18n("Inserts a new intro into the file ChangeLog in the toplevel folder"); action->setToolTip( hint ); action->setWhatsThis( hint ); - action = new KAction( i18n("&Update"), "vcs_update", CTRL+Key_U, + action = new TDEAction( i18n("&Update"), "vcs_update", CTRL+Key_U, this, TQT_SLOT( slotUpdate() ), actionCollection(), "file_update" ); hint = i18n("Updates (cvs update) the selected files and folders"); action->setToolTip( hint ); action->setWhatsThis( hint ); - action = new KAction( i18n("&Status"), "vcs_status", Key_F5, + action = new TDEAction( i18n("&Status"), "vcs_status", Key_F5, this, TQT_SLOT( slotStatus() ), actionCollection(), "file_status" ); hint = i18n("Updates the status (cvs -n update) of the selected files and folders"); action->setToolTip( hint ); action->setWhatsThis( hint ); - action = new KAction( i18n("&Edit"), 0, + action = new TDEAction( i18n("&Edit"), 0, this, TQT_SLOT( slotOpen() ), actionCollection(), "file_edit" ); hint = i18n("Opens the marked file for editing"); action->setToolTip( hint ); action->setWhatsThis( hint ); - action = new KAction( i18n("Reso&lve..."), 0, + action = new TDEAction( i18n("Reso&lve..."), 0, this, TQT_SLOT( slotResolve() ), actionCollection(), "file_resolve" ); hint = i18n("Opens the resolve dialog with the selected file"); action->setToolTip( hint ); action->setWhatsThis( hint ); - action = new KAction( i18n("&Commit..."), "vcs_commit", Key_NumberSign, + action = new TDEAction( i18n("&Commit..."), "vcs_commit", Key_NumberSign, this, TQT_SLOT( slotCommit() ), actionCollection(), "file_commit" ); hint = i18n("Commits the selected files"); action->setToolTip( hint ); action->setWhatsThis( hint ); - action = new KAction( i18n("&Add to Repository..."), "vcs_add", Key_Insert, + action = new TDEAction( i18n("&Add to Repository..."), "vcs_add", Key_Insert, this, TQT_SLOT( slotAdd() ), actionCollection(), "file_add" ); hint = i18n("Adds (cvs add) the selected files to the repository"); action->setToolTip( hint ); action->setWhatsThis( hint ); - action = new KAction( i18n("Add &Binary..."), 0, + action = new TDEAction( i18n("Add &Binary..."), 0, this, TQT_SLOT( slotAddBinary() ), actionCollection(), "file_add_binary" ); hint = i18n("Adds (cvs -kb add) the selected files as binaries to the repository"); action->setToolTip( hint ); action->setWhatsThis( hint ); - action = new KAction( i18n("&Remove From Repository..."), "vcs_remove", Key_Delete, + action = new TDEAction( i18n("&Remove From Repository..."), "vcs_remove", Key_Delete, this, TQT_SLOT( slotRemove() ), actionCollection(), "file_remove" ); hint = i18n("Removes (cvs remove) the selected files from the repository"); action->setToolTip( hint ); action->setWhatsThis( hint ); - action = new KAction( i18n("Rever&t"), 0, + action = new TDEAction( i18n("Rever&t"), 0, this, TQT_SLOT( slotRevert() ), actionCollection(), "file_revert_local_changes" ); hint = i18n("Reverts (cvs update -C) the selected files (only cvs 1.11)"); @@ -314,14 +314,14 @@ void CervisiaPart::setupActions() action->setWhatsThis( hint ); // context menu only - action = new KAction( i18n("&Properties"), 0, + action = new TDEAction( i18n("&Properties"), 0, this, TQT_SLOT( slotFileProperties() ), actionCollection(), "file_properties" ); // // View Menu // - action = new KAction( i18n("Stop"), "stop", Key_Escape, + action = new TDEAction( i18n("Stop"), "stop", Key_Escape, TQT_TQOBJECT(protocol), TQT_SLOT(cancelJob()), actionCollection(), "stop_job" ); action->setEnabled( false ); @@ -330,7 +330,7 @@ void CervisiaPart::setupActions() action->setWhatsThis( hint ); - action = new KAction( i18n("Browse &Log..."), CTRL+Key_L, + action = new TDEAction( i18n("Browse &Log..."), CTRL+Key_L, this, TQT_SLOT(slotBrowseLog()), actionCollection(), "view_log" ); hint = i18n("Shows the revision tree of the selected file"); @@ -338,46 +338,46 @@ void CervisiaPart::setupActions() action->setWhatsThis( hint ); #if 0 - action = new KAction( i18n("Browse Multi-File Log..."), 0, + action = new TDEAction( i18n("Browse Multi-File Log..."), 0, this, TQT_SLOT(slotBrowseMultiLog()), actionCollection() ); #endif - action = new KAction( i18n("&Annotate..."), CTRL+Key_A, + action = new TDEAction( i18n("&Annotate..."), CTRL+Key_A, this, TQT_SLOT(slotAnnotate()), actionCollection(), "view_annotate" ); hint = i18n("Shows a blame-annotated view of the selected file"); action->setToolTip( hint ); action->setWhatsThis( hint ); - action = new KAction( i18n("&Difference to Repository (BASE)..."), "vcs_diff", CTRL+Key_D, + action = new TDEAction( i18n("&Difference to Repository (BASE)..."), "vcs_diff", CTRL+Key_D, this, TQT_SLOT(slotDiffBase()), actionCollection(), "view_diff_base" ); hint = i18n("Shows the differences of the selected file to the checked out version (tag BASE)"); action->setToolTip( hint ); action->setWhatsThis( hint ); - action = new KAction( i18n("Difference to Repository (HEAD)..."), "vcs_diff", CTRL+Key_H, + action = new TDEAction( i18n("Difference to Repository (HEAD)..."), "vcs_diff", CTRL+Key_H, this, TQT_SLOT(slotDiffHead()), actionCollection(), "view_diff_head" ); hint = i18n("Shows the differences of the selected file to the newest version in the repository (tag HEAD)"); action->setToolTip( hint ); action->setWhatsThis( hint ); - action = new KAction( i18n("Last &Change..."), 0, + action = new TDEAction( i18n("Last &Change..."), 0, this, TQT_SLOT(slotLastChange()), actionCollection(), "view_last_change" ); hint = i18n("Shows the differences between the last two revisions of the selected file"); action->setToolTip( hint ); action->setWhatsThis( hint ); - action = new KAction( i18n("&History..."), 0, + action = new TDEAction( i18n("&History..."), 0, this, TQT_SLOT(slotHistory()), actionCollection(), "view_history" ); hint = i18n("Shows the CVS history as reported by the server"); action->setToolTip( hint ); action->setWhatsThis( hint ); - action = new KAction( i18n("&Unfold File Tree"), 0, + action = new TDEAction( i18n("&Unfold File Tree"), 0, this , TQT_SLOT(slotUnfoldTree()), actionCollection(), "view_unfold_tree" ); @@ -385,7 +385,7 @@ void CervisiaPart::setupActions() action->setToolTip( hint ); action->setWhatsThis( hint ); - action = new KAction( i18n("&Fold File Tree"), 0, + action = new TDEAction( i18n("&Fold File Tree"), 0, this, TQT_SLOT(slotFoldTree()), actionCollection(), "view_fold_tree" ); hint = i18n("Closes all branches of the file tree"); @@ -395,98 +395,98 @@ void CervisiaPart::setupActions() // // Advanced Menu // - action = new KAction( i18n("&Tag/Branch..."), 0, + action = new TDEAction( i18n("&Tag/Branch..."), 0, this, TQT_SLOT(slotCreateTag()), actionCollection(), "create_tag" ); hint = i18n("Creates a tag or branch for the selected files"); action->setToolTip( hint ); action->setWhatsThis( hint ); - action = new KAction( i18n("&Delete Tag..."), 0, + action = new TDEAction( i18n("&Delete Tag..."), 0, this, TQT_SLOT(slotDeleteTag()), actionCollection(), "delete_tag" ); hint = i18n("Deletes a tag from the selected files"); action->setToolTip( hint ); action->setWhatsThis( hint ); - action = new KAction( i18n("&Update to Tag/Date..."), 0, + action = new TDEAction( i18n("&Update to Tag/Date..."), 0, this, TQT_SLOT(slotUpdateToTag()), actionCollection(), "update_to_tag" ); hint = i18n("Updates the selected files to a given tag, branch or date"); action->setToolTip( hint ); action->setWhatsThis( hint ); - action = new KAction( i18n("Update to &HEAD"), 0, + action = new TDEAction( i18n("Update to &HEAD"), 0, this, TQT_SLOT(slotUpdateToHead()), actionCollection(), "update_to_head" ); hint = i18n("Updates the selected files to the HEAD revision"); action->setToolTip( hint ); action->setWhatsThis( hint ); - action = new KAction( i18n("&Merge..."), 0, + action = new TDEAction( i18n("&Merge..."), 0, this, TQT_SLOT(slotMerge()), actionCollection(), "merge" ); hint = i18n("Merges a branch or a set of modifications into the selected files"); action->setToolTip( hint ); action->setWhatsThis( hint ); - action = new KAction( i18n("&Add Watch..."), 0, + action = new TDEAction( i18n("&Add Watch..."), 0, this, TQT_SLOT(slotAddWatch()), actionCollection(), "add_watch" ); hint = i18n("Adds a watch for the selected files"); action->setToolTip( hint ); action->setWhatsThis( hint ); - action = new KAction( i18n("&Remove Watch..."), 0, + action = new TDEAction( i18n("&Remove Watch..."), 0, this, TQT_SLOT(slotRemoveWatch()), actionCollection(), "remove_watch" ); hint = i18n("Removes a watch from the selected files"); action->setToolTip( hint ); action->setWhatsThis( hint ); - action = new KAction( i18n("Show &Watchers"), 0, + action = new TDEAction( i18n("Show &Watchers"), 0, this, TQT_SLOT(slotShowWatchers()), actionCollection(), "show_watchers" ); hint = i18n("Shows the watchers of the selected files"); action->setToolTip( hint ); action->setWhatsThis( hint ); - action = new KAction( i18n("Ed&it Files"), 0, + action = new TDEAction( i18n("Ed&it Files"), 0, this, TQT_SLOT(slotEdit()), actionCollection(), "edit_files" ); hint = i18n("Edits (cvs edit) the selected files"); action->setToolTip( hint ); action->setWhatsThis( hint ); - action = new KAction( i18n("U&nedit Files"), 0, + action = new TDEAction( i18n("U&nedit Files"), 0, this, TQT_SLOT(slotUnedit()), actionCollection(), "unedit_files" ); hint = i18n("Unedits (cvs unedit) the selected files"); action->setToolTip( hint ); action->setWhatsThis( hint ); - action = new KAction( i18n("Show &Editors"), 0, + action = new TDEAction( i18n("Show &Editors"), 0, this, TQT_SLOT(slotShowEditors()), actionCollection(), "show_editors" ); hint = i18n("Shows the editors of the selected files"); action->setToolTip( hint ); action->setWhatsThis( hint ); - action = new KAction( i18n("&Lock Files"), 0, + action = new TDEAction( i18n("&Lock Files"), 0, this, TQT_SLOT(slotLock()), actionCollection(), "lock_files" ); hint = i18n("Locks the selected files, so that others cannot modify them"); action->setToolTip( hint ); action->setWhatsThis( hint ); - action = new KAction( i18n("Unl&ock Files"), 0, + action = new TDEAction( i18n("Unl&ock Files"), 0, this, TQT_SLOT(slotUnlock()), actionCollection(), "unlock_files" ); hint = i18n("Unlocks the selected files"); action->setToolTip( hint ); action->setWhatsThis( hint ); - action = new KAction( i18n("Create &Patch Against Repository..."), 0, + action = new TDEAction( i18n("Create &Patch Against Repository..."), 0, this, TQT_SLOT(slotMakePatch()), actionCollection(), "make_patch" ); hint = i18n("Creates a patch from the modifications in your sandbox"); @@ -496,25 +496,25 @@ void CervisiaPart::setupActions() // // Repository Menu // - action = new KAction( i18n("&Create..."), 0, + action = new TDEAction( i18n("&Create..."), 0, this, TQT_SLOT(slotCreateRepository()), actionCollection(), "repository_create" ); - action = new KAction( i18n("&Checkout..."), 0, + action = new TDEAction( i18n("&Checkout..."), 0, this, TQT_SLOT(slotCheckout()), actionCollection(), "repository_checkout" ); hint = i18n("Allows you to checkout a module from a repository"); action->setToolTip( hint ); action->setWhatsThis( hint ); - action = new KAction( i18n("&Import..."), 0, + action = new TDEAction( i18n("&Import..."), 0, this, TQT_SLOT(slotImport()), actionCollection(), "repository_import" ); hint = i18n("Allows you to import a module into a repository"); action->setToolTip( hint ); action->setWhatsThis( hint ); - action = new KAction( i18n("&Repositories..."), 0, + action = new TDEAction( i18n("&Repositories..."), 0, this, TQT_SLOT(slotRepositories()), actionCollection(), "show_repositories" ); hint = i18n("Configures a list of repositories you regularly use"); @@ -524,7 +524,7 @@ void CervisiaPart::setupActions() // // Settings menu // - KToggleAction* toggaction = new KToggleAction( i18n("Hide All &Files"), 0, + TDEToggleAction* toggaction = new TDEToggleAction( i18n("Hide All &Files"), 0, this, TQT_SLOT(slotHideFiles()), actionCollection(), "settings_hide_files" ); toggaction->setCheckedState(i18n("Show All &Files")); @@ -532,7 +532,7 @@ void CervisiaPart::setupActions() toggaction->setToolTip( hint ); toggaction->setWhatsThis( hint ); - toggaction = new KToggleAction( i18n("Hide Unmodified Files"), 0, + toggaction = new TDEToggleAction( i18n("Hide Unmodified Files"), 0, this, TQT_SLOT(slotHideUpToDate()), actionCollection(), "settings_hide_uptodate" ); toggaction->setCheckedState(i18n("Show Unmodified Files")); @@ -541,7 +541,7 @@ void CervisiaPart::setupActions() toggaction->setToolTip( hint ); toggaction->setWhatsThis( hint ); - toggaction = new KToggleAction( i18n("Hide Removed Files"), 0, + toggaction = new TDEToggleAction( i18n("Hide Removed Files"), 0, this, TQT_SLOT(slotHideRemoved()), actionCollection(), "settings_hide_removed" ); toggaction->setCheckedState(i18n("Show Removed Files")); @@ -549,7 +549,7 @@ void CervisiaPart::setupActions() toggaction->setToolTip( hint ); toggaction->setWhatsThis( hint ); - toggaction = new KToggleAction( i18n("Hide Non-CVS Files"), 0, + toggaction = new TDEToggleAction( i18n("Hide Non-CVS Files"), 0, this, TQT_SLOT(slotHideNotInCVS()), actionCollection(), "settings_hide_notincvs" ); toggaction->setCheckedState(i18n("Show Non-CVS Files")); @@ -557,7 +557,7 @@ void CervisiaPart::setupActions() toggaction->setToolTip( hint ); toggaction->setWhatsThis( hint ); - toggaction = new KToggleAction( i18n("Hide Empty Folders"), 0, + toggaction = new TDEToggleAction( i18n("Hide Empty Folders"), 0, this, TQT_SLOT(slotHideEmptyDirectories()), actionCollection(), "settings_hide_empty_directories" ); toggaction->setCheckedState(i18n("Show Empty Folders")); @@ -565,42 +565,42 @@ void CervisiaPart::setupActions() toggaction->setToolTip( hint ); toggaction->setWhatsThis( hint ); - action = new KToggleAction( i18n("Create &Folders on Update"), 0, + action = new TDEToggleAction( i18n("Create &Folders on Update"), 0, this, TQT_SLOT(slotCreateDirs()), actionCollection(), "settings_create_dirs" ); hint = i18n("Determines whether updates create folders"); action->setToolTip( hint ); action->setWhatsThis( hint ); - action = new KToggleAction( i18n("&Prune Empty Folders on Update"), 0, + action = new TDEToggleAction( i18n("&Prune Empty Folders on Update"), 0, this, TQT_SLOT(slotPruneDirs()), actionCollection(), "settings_prune_dirs" ); hint = i18n("Determines whether updates remove empty folders"); action->setToolTip( hint ); action->setWhatsThis( hint ); - action = new KToggleAction( i18n("&Update Recursively"), 0, + action = new TDEToggleAction( i18n("&Update Recursively"), 0, this, TQT_SLOT(slotUpdateRecursive()), actionCollection(), "settings_update_recursively" ); hint = i18n("Determines whether updates are recursive"); action->setToolTip( hint ); action->setWhatsThis( hint ); - action = new KToggleAction( i18n("C&ommit && Remove Recursively"), 0, + action = new TDEToggleAction( i18n("C&ommit && Remove Recursively"), 0, this, TQT_SLOT(slotCommitRecursive()), actionCollection(), "settings_commit_recursively" ); hint = i18n("Determines whether commits and removes are recursive"); action->setToolTip( hint ); action->setWhatsThis( hint ); - action = new KToggleAction( i18n("Do cvs &edit Automatically When Necessary"), 0, + action = new TDEToggleAction( i18n("Do cvs &edit Automatically When Necessary"), 0, this, TQT_SLOT(slotDoCVSEdit()), actionCollection(), "settings_do_cvs_edit" ); hint = i18n("Determines whether automatic cvs editing is active"); action->setToolTip( hint ); action->setWhatsThis( hint ); - action = new KAction( i18n("Configure Cervisia..."), "configure", 0, + action = new TDEAction( i18n("Configure Cervisia..."), "configure", 0, this, TQT_SLOT(slotConfigure()), actionCollection(), "configure_cervisia" ); hint = i18n("Allows you to configure the Cervisia KPart"); @@ -613,7 +613,7 @@ void CervisiaPart::setupActions() action = KStdAction::help( this, TQT_SLOT(slotHelp()), actionCollection() ); - action = new KAction( i18n("CVS &Manual"), 0, + action = new TDEAction( i18n("CVS &Manual"), 0, this, TQT_SLOT(slotCVSInfo()), actionCollection(), "help_cvs_manual" ); hint = i18n("Opens the help browser with the CVS documentation"); @@ -623,7 +623,7 @@ void CervisiaPart::setupActions() // // Folder context menu // - toggaction = new KToggleAction( i18n("Unfold Folder"), 0, + toggaction = new TDEToggleAction( i18n("Unfold Folder"), 0, this, TQT_SLOT( slotUnfoldFolder() ), actionCollection(), "unfold_folder" ); toggaction->setCheckedState(i18n("Fold Folder")); @@ -633,14 +633,14 @@ void CervisiaPart::setupActions() } -void CervisiaPart::popupRequested(KListView*, TQListViewItem* item, const TQPoint& p) +void CervisiaPart::popupRequested(TDEListView*, TQListViewItem* item, const TQPoint& p) { TQString xmlName = "context_popup"; if( isDirItem(item) && update->fileSelection().isEmpty() ) { xmlName = "folder_context_popup"; - KToggleAction* action = static_cast(actionCollection()->action("unfold_folder")); + TDEToggleAction* action = static_cast(actionCollection()->action("unfold_folder")); action->setChecked(item->isOpen()); } @@ -1817,43 +1817,43 @@ void CervisiaPart::readSettings() // with all entries in one group for session management. opt_createDirs = config->readBoolEntry("Create Dirs", true); - (static_cast (actionCollection()->action( "settings_create_dirs" ))) + (static_cast (actionCollection()->action( "settings_create_dirs" ))) ->setChecked( opt_createDirs ); opt_pruneDirs = config->readBoolEntry("Prune Dirs", true); - (static_cast (actionCollection()->action( "settings_prune_dirs" ))) + (static_cast (actionCollection()->action( "settings_prune_dirs" ))) ->setChecked( opt_pruneDirs ); opt_updateRecursive = config->readBoolEntry("Update Recursive", false); - (static_cast (actionCollection()->action( "settings_update_recursively" ))) + (static_cast (actionCollection()->action( "settings_update_recursively" ))) ->setChecked( opt_updateRecursive ); opt_commitRecursive = config->readBoolEntry("Commit Recursive", false); - (static_cast (actionCollection()->action( "settings_commit_recursively" ))) + (static_cast (actionCollection()->action( "settings_commit_recursively" ))) ->setChecked( opt_commitRecursive ); opt_doCVSEdit = config->readBoolEntry("Do cvs edit", false); - (static_cast (actionCollection()->action( "settings_do_cvs_edit" ))) + (static_cast (actionCollection()->action( "settings_do_cvs_edit" ))) ->setChecked( opt_doCVSEdit ); opt_hideFiles = config->readBoolEntry("Hide Files", false); - (static_cast (actionCollection()->action( "settings_hide_files" ))) + (static_cast (actionCollection()->action( "settings_hide_files" ))) ->setChecked( opt_hideFiles ); opt_hideUpToDate = config->readBoolEntry("Hide UpToDate Files", false); - (static_cast (actionCollection()->action( "settings_hide_uptodate" ))) + (static_cast (actionCollection()->action( "settings_hide_uptodate" ))) ->setChecked( opt_hideUpToDate ); opt_hideRemoved = config->readBoolEntry("Hide Removed Files", false); - (static_cast (actionCollection()->action( "settings_hide_removed" ))) + (static_cast (actionCollection()->action( "settings_hide_removed" ))) ->setChecked( opt_hideRemoved ); opt_hideNotInCVS = config->readBoolEntry("Hide Non CVS Files", false); - (static_cast (actionCollection()->action( "settings_hide_notincvs" ))) + (static_cast (actionCollection()->action( "settings_hide_notincvs" ))) ->setChecked( opt_hideNotInCVS ); opt_hideEmptyDirectories = config->readBoolEntry("Hide Empty Directories", false); - (static_cast (actionCollection()->action( "settings_hide_empty_directories" ))) + (static_cast (actionCollection()->action( "settings_hide_empty_directories" ))) ->setChecked( opt_hideEmptyDirectories ); setFilter(); -- cgit v1.2.1