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/ChangeLog | 4 +- cervisia/cervisiapart.cpp | 138 ++++++++++++++++++++++---------------------- cervisia/cervisiapart.h | 8 +-- cervisia/cervisiashell.cpp | 2 +- cervisia/cervisiashell.h | 2 +- cervisia/commitdlg.cpp | 2 +- cervisia/commitdlg.h | 4 +- cervisia/historydlg.cpp | 2 +- cervisia/historydlg.h | 4 +- cervisia/logdlg.cpp | 2 +- cervisia/loglist.cpp | 6 +- cervisia/loglist.h | 2 +- cervisia/logmessageedit.cpp | 8 +-- cervisia/repositorydlg.cpp | 10 ++-- cervisia/repositorydlg.h | 4 +- cervisia/settingsdlg.cpp | 2 +- cervisia/updateview.cpp | 2 +- cervisia/updateview.h | 2 +- 18 files changed, 102 insertions(+), 102 deletions(-) (limited to 'cervisia') diff --git a/cervisia/ChangeLog b/cervisia/ChangeLog index fdecfd90..e1af7530 100644 --- a/cervisia/ChangeLog +++ b/cervisia/ChangeLog @@ -577,7 +577,7 @@ 2003-01-16 Christian Loose * Changed main window size handling. The window size is now - handled by KMainWindow. + handled by TDEMainWindow. * Added method openURL() to CervisiaShell. Use this method to open the sandbox which was provided on the command line. TODO: remove restorePseudo() @@ -694,7 +694,7 @@ 2002-12-14 André Wöbbeking - * Removed ListViewItem. Use Q/KListViewItem instead. + * Removed ListViewItem. Use Q/TDEListViewItem instead. 2002-12-14 André Wöbbeking 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(); diff --git a/cervisia/cervisiapart.h b/cervisia/cervisiapart.h index 84f70585..72f468ea 100644 --- a/cervisia/cervisiapart.h +++ b/cervisia/cervisiapart.h @@ -41,8 +41,8 @@ class TQTimer; class UpdateView; class ProtocolView; class TDEAboutData; -class KListView; -class KRecentFilesAction; +class TDEListView; +class TDERecentFilesAction; class CvsService_stub; class CervisiaBrowserExtension; @@ -76,7 +76,7 @@ public slots: void openFile(TQString filename); void openFiles(const TQStringList &filenames); - void popupRequested(KListView*, TQListViewItem*, const TQPoint&); + void popupRequested(TDEListView*, TQListViewItem*, const TQPoint&); void updateActions(); void aboutCervisia(); @@ -181,7 +181,7 @@ private: bool opt_updateRecursive, opt_commitRecursive, opt_doCVSEdit; //for the Open Recent directories - KRecentFilesAction *recent; + TDERecentFilesAction *recent; CvsService_stub* cvsService; KParts::StatusBarExtension* m_statusBar; diff --git a/cervisia/cervisiashell.cpp b/cervisia/cervisiashell.cpp index b3f1539b..fe435fbe 100644 --- a/cervisia/cervisiashell.cpp +++ b/cervisia/cervisiashell.cpp @@ -92,7 +92,7 @@ void CervisiaShell::setupActions() { setStandardToolBarMenuEnabled( true ); - KAction *action = KStdAction::configureToolbars( TQT_TQOBJECT(this), TQT_SLOT(slotConfigureToolBars()), + TDEAction *action = KStdAction::configureToolbars( TQT_TQOBJECT(this), TQT_SLOT(slotConfigureToolBars()), actionCollection() ); TQString hint = i18n("Allows you to configure the toolbar"); action->setToolTip( hint ); diff --git a/cervisia/cervisiashell.h b/cervisia/cervisiashell.h index a8591e24..834c8f58 100644 --- a/cervisia/cervisiashell.h +++ b/cervisia/cervisiashell.h @@ -24,7 +24,7 @@ #include -class KRecentFilesAction; +class TDERecentFilesAction; /** diff --git a/cervisia/commitdlg.cpp b/cervisia/commitdlg.cpp index e1fb43f0..850412e6 100644 --- a/cervisia/commitdlg.cpp +++ b/cervisia/commitdlg.cpp @@ -66,7 +66,7 @@ CommitDialog::CommitDialog(TDEConfig& cfg, CvsService_stub* service, TQLabel *textlabel = new TQLabel( i18n("Commit the following &files:"), mainWidget ); layout->addWidget(textlabel); - m_fileList = new KListView(mainWidget); + m_fileList = new TDEListView(mainWidget); m_fileList->addColumn(""); m_fileList->setFullWidth(true); m_fileList->header()->hide(); diff --git a/cervisia/commitdlg.h b/cervisia/commitdlg.h index 05508163..1b61df1e 100644 --- a/cervisia/commitdlg.h +++ b/cervisia/commitdlg.h @@ -29,7 +29,7 @@ namespace Cervisia { class LogMessageEdit; } class TQComboBox; class TQCheckBox; -class KListView; +class TDEListView; class TDEConfig; class CvsService_stub; @@ -64,7 +64,7 @@ private: void addTemplateText(); void removeTemplateText(); - KListView* m_fileList; + TDEListView* m_fileList; Cervisia::LogMessageEdit* edit; TQComboBox *combo; TQStringList commits; diff --git a/cervisia/historydlg.cpp b/cervisia/historydlg.cpp index 78d0b73b..43d6672e 100644 --- a/cervisia/historydlg.cpp +++ b/cervisia/historydlg.cpp @@ -147,7 +147,7 @@ HistoryDialog::HistoryDialog(TDEConfig& cfg, TQWidget *parent, const char *name) TQBoxLayout *layout = new TQVBoxLayout(mainWidget, 0, spacingHint()); - listview = new KListView(mainWidget); + listview = new TDEListView(mainWidget); listview->setSelectionMode(TQListView::NoSelection); listview->setAllColumnsShowFocus(true); listview->setShowSortIndicator(true); diff --git a/cervisia/historydlg.h b/cervisia/historydlg.h index 8b4345c1..15f98428 100644 --- a/cervisia/historydlg.h +++ b/cervisia/historydlg.h @@ -28,7 +28,7 @@ class TQCheckBox; class TDEConfig; class KLineEdit; -class KListView; +class TDEListView; class CvsService_stub; @@ -48,7 +48,7 @@ private slots: void toggled(bool b); private: - KListView *listview; + TDEListView *listview; TQCheckBox *commit_box, *checkout_box, *tag_box, *other_box; TQCheckBox *onlyuser_box, *onlyfilenames_box, *onlydirnames_box; KLineEdit *user_edit, *filename_edit, *dirname_edit; diff --git a/cervisia/logdlg.cpp b/cervisia/logdlg.cpp index 51ef228b..0389c8af 100644 --- a/cervisia/logdlg.cpp +++ b/cervisia/logdlg.cpp @@ -82,7 +82,7 @@ LogDialog::LogDialog(TDEConfig& cfg, TQWidget *parent, const char *name) list = new LogListView(partConfig, listWidget); listLayout->addWidget(list, 1); - KListViewSearchLine* searchLine = new KListViewSearchLine(listWidget, list); + TDEListViewSearchLine* searchLine = new TDEListViewSearchLine(listWidget, list); TQLabel* searchLabel = new TQLabel(searchLine, i18n("S&earch:"), listWidget); searchLayout->addWidget(searchLabel); searchLayout->addWidget(searchLine, 1); diff --git a/cervisia/loglist.cpp b/cervisia/loglist.cpp index 3b0432fd..68d07d9a 100644 --- a/cervisia/loglist.cpp +++ b/cervisia/loglist.cpp @@ -29,7 +29,7 @@ #include "tooltip.h" -class LogListViewItem : public KListViewItem +class LogListViewItem : public TDEListViewItem { public: @@ -48,7 +48,7 @@ private: LogListViewItem::LogListViewItem(TQListView* list, const Cervisia::LogInfo& logInfo) - : KListViewItem(list), + : TDEListViewItem(list), m_logInfo(logInfo) { setText(Revision, logInfo.m_revision); @@ -107,7 +107,7 @@ int LogListViewItem::compare(TQListViewItem* i, int col, bool ascending) const LogListView::LogListView(TDEConfig& cfg, TQWidget *parent, const char *name) - : KListView(parent, name) + : TDEListView(parent, name) , partConfig(cfg) { setAllColumnsShowFocus(true); diff --git a/cervisia/loglist.h b/cervisia/loglist.h index 49c3ecdc..38b527ec 100644 --- a/cervisia/loglist.h +++ b/cervisia/loglist.h @@ -36,7 +36,7 @@ struct LogInfo; } -class LogListView : public KListView +class LogListView : public TDEListView { Q_OBJECT diff --git a/cervisia/logmessageedit.cpp b/cervisia/logmessageedit.cpp index fb41e57b..302eacd0 100644 --- a/cervisia/logmessageedit.cpp +++ b/cervisia/logmessageedit.cpp @@ -88,9 +88,9 @@ void LogMessageEdit::keyPressEvent(TQKeyEvent* event) KeyBindingMap keys = getKeyBindings(); // handle text completion key - KShortcut shortcut = keys[TextCompletion]; + TDEShortcut shortcut = keys[TextCompletion]; if( shortcut.isNull() ) - shortcut = KStdAccel::shortcut(KStdAccel::TextCompletion); + shortcut = TDEStdAccel::shortcut(TDEStdAccel::TextCompletion); KKey key(event); @@ -112,7 +112,7 @@ void LogMessageEdit::keyPressEvent(TQKeyEvent* event) // handle previous match key shortcut = keys[PrevCompletionMatch]; if( shortcut.isNull() ) - shortcut = KStdAccel::shortcut(KStdAccel::PrevCompletion); + shortcut = TDEStdAccel::shortcut(TDEStdAccel::PrevCompletion); if( shortcut.contains(key) ) { @@ -123,7 +123,7 @@ void LogMessageEdit::keyPressEvent(TQKeyEvent* event) // handle next match key shortcut = keys[NextCompletionMatch]; if( shortcut.isNull() ) - shortcut = KStdAccel::shortcut(KStdAccel::NextCompletion); + shortcut = TDEStdAccel::shortcut(TDEStdAccel::NextCompletion); if( shortcut.contains(key) ) { diff --git a/cervisia/repositorydlg.cpp b/cervisia/repositorydlg.cpp index 0d29cbea..4b73e4b8 100644 --- a/cervisia/repositorydlg.cpp +++ b/cervisia/repositorydlg.cpp @@ -37,10 +37,10 @@ #include "repositories.h" -class RepositoryListItem : public KListViewItem +class RepositoryListItem : public TDEListViewItem { public: - RepositoryListItem(KListView* parent, const TQString& repo, bool loggedin); + RepositoryListItem(TDEListView* parent, const TQString& repo, bool loggedin); void setRsh(const TQString& rsh); void setServer(const TQString& server) { m_server = server; } @@ -85,9 +85,9 @@ static bool LoginNeeded(const TQString& repository) } -RepositoryListItem::RepositoryListItem(KListView* parent, const TQString& repo, +RepositoryListItem::RepositoryListItem(TDEListView* parent, const TQString& repo, bool loggedin) - : KListViewItem(parent) + : TDEListViewItem(parent) , m_isLoggedIn(loggedin) { setText(0, repo); @@ -163,7 +163,7 @@ RepositoryDialog::RepositoryDialog(TDEConfig& cfg, CvsService_stub* cvsService, TQBoxLayout* hbox = new TQHBoxLayout(mainWidget, 0, spacingHint()); - m_repoList = new KListView(mainWidget); + m_repoList = new TDEListView(mainWidget); hbox->addWidget(m_repoList, 10); m_repoList->setMinimumWidth(fontMetrics().width('0') * 60); m_repoList->setAllColumnsShowFocus(true); diff --git a/cervisia/repositorydlg.h b/cervisia/repositorydlg.h index 6d7bffa4..a6dbc8f9 100644 --- a/cervisia/repositorydlg.h +++ b/cervisia/repositorydlg.h @@ -28,7 +28,7 @@ class TQListViewItem; class TQPushButton; class TDEConfig; -class KListView; +class TDEListView; class CvsService_stub; class RepositoryListItem; @@ -65,7 +65,7 @@ private: TDEConfig& m_partConfig; CvsService_stub* m_cvsService; TDEConfig* m_serviceConfig; - KListView* m_repoList; + TDEListView* m_repoList; TQPushButton* m_modifyButton; TQPushButton* m_removeButton; TQPushButton* m_loginButton; diff --git a/cervisia/settingsdlg.cpp b/cervisia/settingsdlg.cpp index dca2730c..e645d553 100644 --- a/cervisia/settingsdlg.cpp +++ b/cervisia/settingsdlg.cpp @@ -69,7 +69,7 @@ void FontButton::chooseFont() { TQFont newFont(font()); - if (KFontDialog::getFont(newFont, false, this) == TQDialog::Rejected) + if (TDEFontDialog::getFont(newFont, false, this) == TQDialog::Rejected) return; setFont(newFont); diff --git a/cervisia/updateview.cpp b/cervisia/updateview.cpp index 19311a0e..4aa5a44e 100644 --- a/cervisia/updateview.cpp +++ b/cervisia/updateview.cpp @@ -39,7 +39,7 @@ using Cervisia::EntryStatus; UpdateView::UpdateView(TDEConfig& partConfig, TQWidget *parent, const char *name) - : KListView(parent, name), + : TDEListView(parent, name), m_partConfig(partConfig), m_unfoldingTree(false) { diff --git a/cervisia/updateview.h b/cervisia/updateview.h index 07894253..257d8c96 100644 --- a/cervisia/updateview.h +++ b/cervisia/updateview.h @@ -32,7 +32,7 @@ class TDEConfig; -class UpdateView : public KListView +class UpdateView : public TDEListView { Q_OBJECT -- cgit v1.2.3