summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-01 15:14:36 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-01 15:14:36 -0600
commit7716a5e605907a009e19f429cec4e6b5f346bd71 (patch)
tree16cf4a5d7a24db774f988022d514adefc75015c0
parent0117fbed932653a04aeef16b2ed7edee858959ac (diff)
downloadtdesdk-7716a5e605907a009e19f429cec4e6b5f346bd71.tar.gz
tdesdk-7716a5e605907a009e19f429cec4e6b5f346bd71.zip
Rename a number of classes to enhance compatibility with KDE4
-rw-r--r--cervisia/ChangeLog4
-rw-r--r--cervisia/cervisiapart.cpp138
-rw-r--r--cervisia/cervisiapart.h8
-rw-r--r--cervisia/cervisiashell.cpp2
-rw-r--r--cervisia/cervisiashell.h2
-rw-r--r--cervisia/commitdlg.cpp2
-rw-r--r--cervisia/commitdlg.h4
-rw-r--r--cervisia/historydlg.cpp2
-rw-r--r--cervisia/historydlg.h4
-rw-r--r--cervisia/logdlg.cpp2
-rw-r--r--cervisia/loglist.cpp6
-rw-r--r--cervisia/loglist.h2
-rw-r--r--cervisia/logmessageedit.cpp8
-rw-r--r--cervisia/repositorydlg.cpp10
-rw-r--r--cervisia/repositorydlg.h4
-rw-r--r--cervisia/settingsdlg.cpp2
-rw-r--r--cervisia/updateview.cpp2
-rw-r--r--cervisia/updateview.h2
-rw-r--r--doc/scripts/man-demangle.1.docbook4
-rw-r--r--kapptemplate/ChangeLog4
-rw-r--r--kapptemplate/kapp/app.cpp6
-rw-r--r--kapptemplate/kapp/app.h2
-rw-r--r--kapptemplate/kpartapp/app_part.cpp2
-rw-r--r--kapptemplate/kpartplugin/plugin_app.cpp2
-rw-r--r--kbabel/catalogmanager/catalogmanager.cpp230
-rw-r--r--kbabel/catalogmanager/catalogmanager.h8
-rw-r--r--kbabel/catalogmanager/main.cpp2
-rw-r--r--kbabel/catalogmanager/validateprogress.cpp2
-rw-r--r--kbabel/catalogmanager/validateprogress.h4
-rw-r--r--kbabel/commonui/context.h2
-rw-r--r--kbabel/commonui/kactionselector.cpp90
-rw-r--r--kbabel/commonui/kactionselector.h12
-rw-r--r--kbabel/commonui/klisteditor.ui18
-rw-r--r--kbabel/commonui/klisteditor.ui.h20
-rw-r--r--kbabel/commonui/projectprefwidgets.cpp2
-rw-r--r--kbabel/commonui/projectprefwidgets.h6
-rw-r--r--kbabel/commonui/toolaction.cpp8
-rw-r--r--kbabel/commonui/toolaction.h12
-rw-r--r--kbabel/commonui/toolselectionwidget.cpp2
-rw-r--r--kbabel/commonui/toolselectionwidget.h2
-rw-r--r--kbabel/kbabel/fontpreferences.ui2
-rw-r--r--kbabel/kbabel/kbabel.cpp178
-rw-r--r--kbabel/kbabel/kbabel.h22
-rw-r--r--kbabel/kbabel/kbabelview.cpp4
-rw-r--r--kbabel/kbabel/kbabelview.h2
-rw-r--r--kbabel/kbabel/kbcataloglistview.cpp2
-rw-r--r--kbabel/kbabel/kbcataloglistview.h4
-rw-r--r--kbabel/kbabel/kbcataloglistviewitem.cpp2
-rw-r--r--kbabel/kbabel/kbcataloglistviewitem.h6
-rw-r--r--kbabel/kbabel/main.cpp20
-rw-r--r--kbabel/kbabel/taglistview.cpp2
-rw-r--r--kbabel/kbabel/taglistview.h4
-rw-r--r--kbabel/kbabeldict/dictchooser.cpp4
-rw-r--r--kbabel/kbabeldict/dictchooser.h6
-rw-r--r--kbabel/kbabeldict/dictionarymenu.cpp8
-rw-r--r--kbabel/kbabeldict/dictionarymenu.h10
-rw-r--r--kbabel/kbabeldict/kbabeldictbox.cpp8
-rw-r--r--kbabel/kbabeldict/kbabeldictbox.h6
-rw-r--r--kbugbuster/gui/buglvi.cpp6
-rw-r--r--kbugbuster/gui/buglvi.h4
-rw-r--r--kbugbuster/gui/cwbuglistcontainer.cpp4
-rw-r--r--kbugbuster/gui/cwbuglistcontainer.h4
-rw-r--r--kbugbuster/gui/kbbmainwindow.cpp60
-rw-r--r--kbugbuster/gui/kbbmainwindow.h32
-rw-r--r--kbugbuster/gui/msginputdialog.cpp2
-rw-r--r--kbugbuster/gui/msginputdialog.h4
-rw-r--r--kompare/ChangeLog2
-rw-r--r--kompare/kompare_shell.cpp8
-rw-r--r--kompare/kompare_shell.h4
-rw-r--r--kompare/komparenavtreepart/komparenavtreepart.cpp22
-rw-r--r--kompare/komparenavtreepart/komparenavtreepart.h32
-rw-r--r--kompare/komparepart/kompare_part.cpp8
-rw-r--r--kompare/komparepart/kompare_part.h10
-rw-r--r--kompare/komparepart/komparelistview.cpp4
-rw-r--r--kompare/komparepart/komparelistview.h2
-rw-r--r--kompare/libdialogpages/viewpage.cpp2
-rw-r--r--kompare/libdialogpages/viewpage.h4
-rw-r--r--kompare/libdiff2/komparemodellist.cpp16
-rw-r--r--kompare/libdiff2/komparemodellist.h20
-rw-r--r--kspy/classinfoview.cpp4
-rw-r--r--kspy/classinfoview.h2
-rw-r--r--kspy/navview.cpp2
-rw-r--r--kspy/navview.h2
-rw-r--r--kspy/navviewitem.cpp4
-rw-r--r--kspy/navviewitem.h2
-rw-r--r--kspy/propsview.cpp8
-rw-r--r--kspy/propsview.h2
-rw-r--r--kspy/receiversview.cpp6
-rw-r--r--kspy/receiversview.h2
-rw-r--r--kspy/sigslotview.cpp10
-rw-r--r--kspy/sigslotview.h2
-rw-r--r--kspy/spy.cpp2
-rw-r--r--kuiviewer/kuiviewer.h8
-rw-r--r--kuiviewer/kuiviewer_part.cpp2
-rw-r--r--kuiviewer/kuiviewer_part.h8
-rw-r--r--scheck/scheck.cpp4
-rw-r--r--scripts/fixheaders6
-rw-r--r--scripts/kde-devel-vim.vim2
-rw-r--r--tdecachegrind/TODO2
-rw-r--r--tdecachegrind/tdecachegrind/main.cpp2
-rw-r--r--tdecachegrind/tdecachegrind/toplevel.cpp94
-rw-r--r--tdecachegrind/tdecachegrind/toplevel.h24
-rw-r--r--umbrello/umbrello/aligntoolbar.cpp2
-rw-r--r--umbrello/umbrello/aligntoolbar.h2
-rw-r--r--umbrello/umbrello/associationwidget.cpp4
-rw-r--r--umbrello/umbrello/dialogs/activitydialog.cpp2
-rw-r--r--umbrello/umbrello/dialogs/activitydialog.h2
-rw-r--r--umbrello/umbrello/dialogs/assocpropdlg.cpp2
-rw-r--r--umbrello/umbrello/dialogs/assocpropdlg.h2
-rw-r--r--umbrello/umbrello/dialogs/classpropdlg.cpp2
-rw-r--r--umbrello/umbrello/dialogs/classpropdlg.h2
-rw-r--r--umbrello/umbrello/dialogs/codevieweroptionsbase.ui4
-rw-r--r--umbrello/umbrello/dialogs/settingsdlg.cpp2
-rw-r--r--umbrello/umbrello/dialogs/settingsdlg.h2
-rw-r--r--umbrello/umbrello/dialogs/statedialog.cpp2
-rw-r--r--umbrello/umbrello/dialogs/statedialog.h4
-rw-r--r--umbrello/umbrello/dialogs/umlviewdialog.cpp2
-rw-r--r--umbrello/umbrello/dialogs/umlviewdialog.h4
-rw-r--r--umbrello/umbrello/floatingtextwidget.cpp2
-rw-r--r--umbrello/umbrello/kplayerslideraction.cpp48
-rw-r--r--umbrello/umbrello/kplayerslideraction.h12
-rw-r--r--umbrello/umbrello/listpopupmenu.cpp74
-rw-r--r--umbrello/umbrello/listpopupmenu.h4
-rw-r--r--umbrello/umbrello/refactoring/refactoringassistant.cpp30
-rw-r--r--umbrello/umbrello/refactoring/refactoringassistant.h4
-rw-r--r--umbrello/umbrello/uml.cpp70
-rw-r--r--umbrello/umbrello/uml.h146
-rw-r--r--umbrello/umbrello/umldoc.cpp2
-rw-r--r--umbrello/umbrello/umldoc.h4
-rw-r--r--umbrello/umbrello/umllistview.cpp14
-rw-r--r--umbrello/umbrello/umllistview.h2
-rw-r--r--umbrello/umbrello/umlwidget.cpp4
-rw-r--r--umbrello/umbrello/worktoolbar.cpp6
-rw-r--r--umbrello/umbrello/worktoolbar.h2
134 files changed, 924 insertions, 924 deletions
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 <christian.loose@hamburg.de>
* 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 <Woebbeking@kde.org>
- * Removed ListViewItem. Use Q/KListViewItem instead.
+ * Removed ListViewItem. Use Q/TDEListViewItem instead.
2002-12-14 André Wöbbeking <Woebbeking@kde.org>
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<KToggleAction*>(actionCollection()->action("unfold_folder"));
+ TDEToggleAction* action = static_cast<TDEToggleAction*>(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<KToggleAction *> (actionCollection()->action( "settings_create_dirs" )))
+ (static_cast<TDEToggleAction *> (actionCollection()->action( "settings_create_dirs" )))
->setChecked( opt_createDirs );
opt_pruneDirs = config->readBoolEntry("Prune Dirs", true);
- (static_cast<KToggleAction *> (actionCollection()->action( "settings_prune_dirs" )))
+ (static_cast<TDEToggleAction *> (actionCollection()->action( "settings_prune_dirs" )))
->setChecked( opt_pruneDirs );
opt_updateRecursive = config->readBoolEntry("Update Recursive", false);
- (static_cast<KToggleAction *> (actionCollection()->action( "settings_update_recursively" )))
+ (static_cast<TDEToggleAction *> (actionCollection()->action( "settings_update_recursively" )))
->setChecked( opt_updateRecursive );
opt_commitRecursive = config->readBoolEntry("Commit Recursive", false);
- (static_cast<KToggleAction *> (actionCollection()->action( "settings_commit_recursively" )))
+ (static_cast<TDEToggleAction *> (actionCollection()->action( "settings_commit_recursively" )))
->setChecked( opt_commitRecursive );
opt_doCVSEdit = config->readBoolEntry("Do cvs edit", false);
- (static_cast<KToggleAction *> (actionCollection()->action( "settings_do_cvs_edit" )))
+ (static_cast<TDEToggleAction *> (actionCollection()->action( "settings_do_cvs_edit" )))
->setChecked( opt_doCVSEdit );
opt_hideFiles = config->readBoolEntry("Hide Files", false);
- (static_cast<KToggleAction *> (actionCollection()->action( "settings_hide_files" )))
+ (static_cast<TDEToggleAction *> (actionCollection()->action( "settings_hide_files" )))
->setChecked( opt_hideFiles );
opt_hideUpToDate = config->readBoolEntry("Hide UpToDate Files", false);
- (static_cast<KToggleAction *> (actionCollection()->action( "settings_hide_uptodate" )))
+ (static_cast<TDEToggleAction *> (actionCollection()->action( "settings_hide_uptodate" )))
->setChecked( opt_hideUpToDate );
opt_hideRemoved = config->readBoolEntry("Hide Removed Files", false);
- (static_cast<KToggleAction *> (actionCollection()->action( "settings_hide_removed" )))
+ (static_cast<TDEToggleAction *> (actionCollection()->action( "settings_hide_removed" )))
->setChecked( opt_hideRemoved );
opt_hideNotInCVS = config->readBoolEntry("Hide Non CVS Files", false);
- (static_cast<KToggleAction *> (actionCollection()->action( "settings_hide_notincvs" )))
+ (static_cast<TDEToggleAction *> (actionCollection()->action( "settings_hide_notincvs" )))
->setChecked( opt_hideNotInCVS );
opt_hideEmptyDirectories = config->readBoolEntry("Hide Empty Directories", false);
- (static_cast<KToggleAction *> (actionCollection()->action( "settings_hide_empty_directories" )))
+ (static_cast<TDEToggleAction *> (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 <tdeparts/mainwindow.h>
-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
diff --git a/doc/scripts/man-demangle.1.docbook b/doc/scripts/man-demangle.1.docbook
index 40043252..dd0137f3 100644
--- a/doc/scripts/man-demangle.1.docbook
+++ b/doc/scripts/man-demangle.1.docbook
@@ -42,14 +42,14 @@
<programlisting>_ZNK6Object10metaObjectEv
_ZN8QPtrListI5ArrowE5clearEv
-_ZTC4Kolf0_11KMainWindow</programlisting>
+_ZTC4Kolf0_11TDEMainWindow</programlisting>
<para>These names can then be demangled as follows:</para>
<screen><prompt>example$</prompt> <userinput><command>demangle</command> &lt; <filename>names</filename></userinput>
<computeroutput>Object::metaObject() const
QPtrList&lt;Arrow&gt;::clear()
-construction vtable for KMainWindow-in-Kolf</computeroutput></screen>
+construction vtable for TDEMainWindow-in-Kolf</computeroutput></screen>
</refsect1>
diff --git a/kapptemplate/ChangeLog b/kapptemplate/ChangeLog
index 0e9e42f8..e3563d37 100644
--- a/kapptemplate/ChangeLog
+++ b/kapptemplate/ChangeLog
@@ -111,7 +111,7 @@ Jun-09-2000 - Kurt Granroth (v0.6.3)
compile with the newly ambiguous KDialogBase::addPage methods
May-30-2000 - Kurt Granroth (v0.6.2)
- o Removed KAccel stuff... KKeyDialog can handle action collections
+ o Removed TDEAccel stuff... KKeyDialog can handle action collections
o Use KURLRequesterDlg instead of homemade job
Mar-14-2000 - Kurt Granroth (v0.6.1)
@@ -144,7 +144,7 @@ Nov-29-1999 - Kurt Granroth (v0.4.4)
Nov-26-1999 - Kurt Granroth (v0.4.3)
o Beefed up the print function with more boilerplate stuff
- o KAccel keys should now work
+ o TDEAccel keys should now work
Nov-20-1999 - Kurt Granroth (v0.4.2)
o Use mkinstalldirs instead of mkdir
diff --git a/kapptemplate/kapp/app.cpp b/kapptemplate/kapp/app.cpp
index df8cc8ed..62f1a261 100644
--- a/kapptemplate/kapp/app.cpp
+++ b/kapptemplate/kapp/app.cpp
@@ -34,14 +34,14 @@ cat << EOF > $LOCATION_ROOT/${APP_NAME_LC}/${APP_NAME_LC}.cpp
#include <kstdaction.h>
${APP_NAME}::${APP_NAME}()
- : KMainWindow( 0, "${APP_NAME}" ),
+ : TDEMainWindow( 0, "${APP_NAME}" ),
m_view(new ${APP_NAME}View(this)),
m_printer(0)
{
// accept dnd
setAcceptDrops(true);
- // tell the KMainWindow that this is indeed the main widget
+ // tell the TDEMainWindow that this is indeed the main widget
setCentralWidget(m_view);
// then, setup our actions
@@ -102,7 +102,7 @@ void ${APP_NAME}::setupActions()
// this doesn't do anything useful. it's just here to illustrate
// how to insert a custom menu and menu item
- KAction *custom = new KAction(i18n("Cus&tom Menuitem"), 0,
+ TDEAction *custom = new TDEAction(i18n("Cus&tom Menuitem"), 0,
this, TQT_SLOT(optionsPreferences()),
actionCollection(), "custom_action");
}
diff --git a/kapptemplate/kapp/app.h b/kapptemplate/kapp/app.h
index 7c80c0f2..bc96132f 100644
--- a/kapptemplate/kapp/app.h
+++ b/kapptemplate/kapp/app.h
@@ -23,7 +23,7 @@ class KURL;
* @author $AUTHOR <$EMAIL>
* @version $APP_VERSION
*/
-class ${APP_NAME} : public KMainWindow
+class ${APP_NAME} : public TDEMainWindow
{
Q_OBJECT
diff --git a/kapptemplate/kpartapp/app_part.cpp b/kapptemplate/kpartapp/app_part.cpp
index 7ef6e964..c87f6be5 100644
--- a/kapptemplate/kpartapp/app_part.cpp
+++ b/kapptemplate/kpartapp/app_part.cpp
@@ -68,7 +68,7 @@ void ${APP_NAME}Part::setReadWrite(bool rw)
void ${APP_NAME}Part::setModified(bool modified)
{
// get a handle on our Save action and make sure it is valid
- KAction *save = actionCollection()->action(KStdAction::stdName(KStdAction::Save));
+ TDEAction *save = actionCollection()->action(KStdAction::stdName(KStdAction::Save));
if (!save)
return;
diff --git a/kapptemplate/kpartplugin/plugin_app.cpp b/kapptemplate/kpartplugin/plugin_app.cpp
index 29388b46..74de46f5 100644
--- a/kapptemplate/kpartplugin/plugin_app.cpp
+++ b/kapptemplate/kpartplugin/plugin_app.cpp
@@ -19,7 +19,7 @@ Plugin${APP_NAME}::Plugin${APP_NAME}( TQObject* parent, const char* name,
{
// Instantiate all of your actions here. These will appear in
// Konqueror's menu and toolbars.
- (void) new KAction( i18n("&Plugin Action"), "${APP_NAME_LC}", 0,
+ (void) new TDEAction( i18n("&Plugin Action"), "${APP_NAME_LC}", 0,
this, TQT_SLOT(slotAction()),
actionCollection(), "plugin_action" );
}
diff --git a/kbabel/catalogmanager/catalogmanager.cpp b/kbabel/catalogmanager/catalogmanager.cpp
index 41c18005..d18f59d2 100644
--- a/kbabel/catalogmanager/catalogmanager.cpp
+++ b/kbabel/catalogmanager/catalogmanager.cpp
@@ -90,7 +90,7 @@ TQStringList CatalogManager::_foundFilesList;
TQStringList CatalogManager::_toBeSearched;
CatalogManager::CatalogManager(TQString configFile )
- :KMainWindow(0,0)
+ :TDEMainWindow(0,0)
{
if ( configFile.isEmpty() )
configFile = KBabel::ProjectManager::defaultProjectName();
@@ -216,16 +216,16 @@ void CatalogManager::setupActions()
{
TDEGlobal::iconLoader()->addAppDir("kbabel");
- KAction *action;
+ TDEAction *action;
// the file menu
- action = new KAction( i18n("&Open"), CTRL+Key_O, TQT_TQOBJECT(_catalogManager),
+ action = new TDEAction( i18n("&Open"), CTRL+Key_O, TQT_TQOBJECT(_catalogManager),
TQT_SLOT(slotOpenFile()),actionCollection(), "open");
action->setEnabled(false);
- action = new KAction(i18n("&Open Template"),Key_Space,TQT_TQOBJECT(_catalogManager),
+ action = new TDEAction(i18n("&Open Template"),Key_Space,TQT_TQOBJECT(_catalogManager),
TQT_SLOT(slotOpenTemplate()),actionCollection(), "open_template");
action->setEnabled(false);
- action = new KAction(i18n("Open in &New Window"),CTRL+SHIFT+Key_O,TQT_TQOBJECT(_catalogManager),
+ action = new TDEAction(i18n("Open in &New Window"),CTRL+SHIFT+Key_O,TQT_TQOBJECT(_catalogManager),
TQT_SLOT(slotOpenFileInNewWindow()),actionCollection(), "open_new_window");
action->setEnabled(false);
@@ -234,45 +234,45 @@ void CatalogManager::setupActions()
actionMap["open_template"] = NEEDS_POT;
// the edit menu
- action = new KAction( i18n("Fi&nd in Files..."), CTRL+Key_F, TQT_TQOBJECT(this),
+ action = new TDEAction( i18n("Fi&nd in Files..."), CTRL+Key_F, TQT_TQOBJECT(this),
TQT_SLOT(find()), actionCollection(), "find_in_files");
action->setEnabled(false);
- action = new KAction( i18n("Re&place in Files..."), CTRL+Key_R, TQT_TQOBJECT(this),
+ action = new TDEAction( i18n("Re&place in Files..."), CTRL+Key_R, TQT_TQOBJECT(this),
TQT_SLOT(replace()), actionCollection(), "replace_in_files");
action->setEnabled(false);
- action = new KAction( i18n("&Stop Searching"), "stop", Key_Escape, TQT_TQOBJECT(this),
+ action = new TDEAction( i18n("&Stop Searching"), "stop", Key_Escape, TQT_TQOBJECT(this),
TQT_SLOT(stopSearching()), actionCollection(), "stop_search");
action->setEnabled(false);
- action = new KAction( i18n("&Reload"), "reload", KStdAccel::reload(), TQT_TQOBJECT(_catalogManager),
+ action = new TDEAction( i18n("&Reload"), "reload", TDEStdAccel::reload(), TQT_TQOBJECT(_catalogManager),
TQT_SLOT(updateCurrent()), actionCollection(), "reload");
action->setEnabled(false);
// the marking menu
- action = new KAction( i18n("&Toggle Marking"), CTRL+Key_M, TQT_TQOBJECT(_catalogManager),
+ action = new TDEAction( i18n("&Toggle Marking"), CTRL+Key_M, TQT_TQOBJECT(_catalogManager),
TQT_SLOT(toggleMark()), actionCollection(), "toggle_marking");
action->setEnabled(false);
- action = new KAction( i18n("Remove Marking"), 0, TQT_TQOBJECT(_catalogManager),
+ action = new TDEAction( i18n("Remove Marking"), 0, TQT_TQOBJECT(_catalogManager),
TQT_SLOT(slotClearMarksInDir()), actionCollection(), "remove_marking");
action->setEnabled(false);
- action = new KAction( i18n("Toggle All Markings"), 0, TQT_TQOBJECT(_catalogManager),
+ action = new TDEAction( i18n("Toggle All Markings"), 0, TQT_TQOBJECT(_catalogManager),
TQT_SLOT(toggleAllMarks()), actionCollection(), "toggle_all_marking");
action->setEnabled(false);
- action = new KAction( i18n("Remove All Markings"), 0, TQT_TQOBJECT(_catalogManager),
+ action = new TDEAction( i18n("Remove All Markings"), 0, TQT_TQOBJECT(_catalogManager),
TQT_SLOT(clearAllMarks()), actionCollection(), "remove_all_marking");
action->setEnabled(false);
- action = new KAction( i18n("Mark Modified Files"), 0, TQT_TQOBJECT(_catalogManager),
+ action = new TDEAction( i18n("Mark Modified Files"), 0, TQT_TQOBJECT(_catalogManager),
TQT_SLOT(markModifiedFiles()), actionCollection(), "mark_modified_files");
// fixme to enabling this when loading is done using updateFinished() signal
action->setEnabled(true);
- action = new KAction( i18n("&Load Markings..."), 0, TQT_TQOBJECT(_catalogManager),
+ action = new TDEAction( i18n("&Load Markings..."), 0, TQT_TQOBJECT(_catalogManager),
TQT_SLOT(loadMarks()), actionCollection(), "load_marking");
action->setEnabled(false);
- action = new KAction( i18n("&Save Markings..."), 0, TQT_TQOBJECT(_catalogManager),
+ action = new TDEAction( i18n("&Save Markings..."), 0, TQT_TQOBJECT(_catalogManager),
TQT_SLOT(saveMarks()), actionCollection(), "save_marking");
action->setEnabled(false);
- (void)new KAction(i18n("&Mark Files..."), 0, TQT_TQOBJECT(_catalogManager),
+ (void)new TDEAction(i18n("&Mark Files..."), 0, TQT_TQOBJECT(_catalogManager),
TQT_SLOT(slotMarkPattern()), actionCollection(), "mark_pattern");
- (void)new KAction(i18n("&Unmark Files..."), 0, TQT_TQOBJECT(_catalogManager),
+ (void)new TDEAction(i18n("&Unmark Files..."), 0, TQT_TQOBJECT(_catalogManager),
TQT_SLOT(slotUnmarkPattern()), actionCollection(), "unmark_pattern");
actionMap["remove_marking"] = NEEDS_MARK;
@@ -281,103 +281,103 @@ void CatalogManager::setupActions()
actionMap["unmark_pattern"] = NEEDS_DIR | NEEDS_MARK;
// go menu
- action = new KAction(i18n("Nex&t Untranslated"), "nextuntranslated", ALT+Key_Next,
+ action = new TDEAction(i18n("Nex&t Untranslated"), "nextuntranslated", ALT+Key_Next,
TQT_TQOBJECT(_catalogManager), TQT_SLOT(gotoNextUntranslated()),actionCollection(), "go_next_untrans");
action->setEnabled(false);
- action = new KAction(i18n("Prev&ious Untranslated"), "prevuntranslated", ALT+Key_Prior,
+ action = new TDEAction(i18n("Prev&ious Untranslated"), "prevuntranslated", ALT+Key_Prior,
TQT_TQOBJECT(_catalogManager), TQT_SLOT(gotoPreviousUntranslated()),actionCollection(), "go_prev_untrans");
action->setEnabled(false);
- action = new KAction(i18n("Ne&xt Fuzzy"), "nextfuzzy", CTRL+Key_Next,
+ action = new TDEAction(i18n("Ne&xt Fuzzy"), "nextfuzzy", CTRL+Key_Next,
TQT_TQOBJECT(_catalogManager), TQT_SLOT(gotoNextFuzzy()),actionCollection(), "go_next_fuzzy");
action->setEnabled(false);
- action = new KAction(i18n("Pre&vious Fuzzy"), "prevfuzzy", CTRL+Key_Prior,
+ action = new TDEAction(i18n("Pre&vious Fuzzy"), "prevfuzzy", CTRL+Key_Prior,
TQT_TQOBJECT(_catalogManager), TQT_SLOT(gotoPreviousFuzzy()),actionCollection(), "go_prev_fuzzy");
action->setEnabled(false);
- action = new KAction(i18n("N&ext Fuzzy or Untranslated"), "nextfuzzyuntrans", CTRL+SHIFT+Key_Next,
+ action = new TDEAction(i18n("N&ext Fuzzy or Untranslated"), "nextfuzzyuntrans", CTRL+SHIFT+Key_Next,
TQT_TQOBJECT(_catalogManager), TQT_SLOT(gotoNextFuzzyOrUntranslated()),actionCollection(), "go_next_fuzzyUntr");
action->setEnabled(false);
- action = new KAction(i18n("P&revious Fuzzy or Untranslated"), "prevfuzzyuntrans", CTRL+SHIFT+Key_Prior,
+ action = new TDEAction(i18n("P&revious Fuzzy or Untranslated"), "prevfuzzyuntrans", CTRL+SHIFT+Key_Prior,
TQT_TQOBJECT(_catalogManager), TQT_SLOT(gotoPreviousFuzzyOrUntranslated()),actionCollection(), "go_prev_fuzzyUntr");
action->setEnabled(false);
- action = new KAction(i18n("Next Err&or"), "nexterror", ALT+SHIFT+Key_Next,
+ action = new TDEAction(i18n("Next Err&or"), "nexterror", ALT+SHIFT+Key_Next,
TQT_TQOBJECT(_catalogManager), TQT_SLOT(gotoNextError()),actionCollection(), "go_next_error");
action->setEnabled(false);
- action = new KAction(i18n("Previo&us Error"), "preverror", ALT+SHIFT+Key_Prior,
+ action = new TDEAction(i18n("Previo&us Error"), "preverror", ALT+SHIFT+Key_Prior,
TQT_TQOBJECT(_catalogManager), TQT_SLOT(gotoPreviousError()),actionCollection(), "go_prev_error");
action->setEnabled(false);
- action = new KAction(i18n("Next Te&mplate Only"), "nexttemplate", CTRL+Key_Down,
+ action = new TDEAction(i18n("Next Te&mplate Only"), "nexttemplate", CTRL+Key_Down,
TQT_TQOBJECT(_catalogManager), TQT_SLOT(gotoNextTemplate()),actionCollection(), "go_next_template");
action->setEnabled(false);
- action = new KAction(i18n("Previous Temp&late Only"), "prevtemplate", CTRL+Key_Up,
+ action = new TDEAction(i18n("Previous Temp&late Only"), "prevtemplate", CTRL+Key_Up,
TQT_TQOBJECT(_catalogManager), TQT_SLOT(gotoPreviousTemplate()),actionCollection(), "go_prev_template");
action->setEnabled(false);
- action = new KAction(i18n("Next Tran&slation Exists"), "nextpo", ALT+Key_Down,
+ action = new TDEAction(i18n("Next Tran&slation Exists"), "nextpo", ALT+Key_Down,
TQT_TQOBJECT(_catalogManager), TQT_SLOT(gotoNextPo()),actionCollection(), "go_next_po");
action->setEnabled(false);
- action = new KAction(i18n("Previous Transl&ation Exists"), "prevpo", ALT+Key_Up,
+ action = new TDEAction(i18n("Previous Transl&ation Exists"), "prevpo", ALT+Key_Up,
TQT_TQOBJECT(_catalogManager), TQT_SLOT(gotoPreviousPo()),actionCollection(), "go_prev_po");
action->setEnabled(false);
- action = new KAction(i18n("Previous Marke&d"), "prevmarked", SHIFT+Key_Up,
+ action = new TDEAction(i18n("Previous Marke&d"), "prevmarked", SHIFT+Key_Up,
TQT_TQOBJECT(_catalogManager), TQT_SLOT(gotoPreviousMarked()),actionCollection(), "go_prev_marked");
action->setEnabled(false);
- action = new KAction(i18n("Next &Marked"), "nextmarked", SHIFT+Key_Down,
+ action = new TDEAction(i18n("Next &Marked"), "nextmarked", SHIFT+Key_Down,
TQT_TQOBJECT(_catalogManager), TQT_SLOT(gotoNextMarked()),actionCollection(), "go_next_marked");
action->setEnabled(false);
// project menu
// the project menu
- action = new KAction(i18n("&New..."), "filenew"
+ action = new TDEAction(i18n("&New..."), "filenew"
, TQT_TQOBJECT(this), TQT_SLOT(projectNew()),actionCollection()
,"project_new");
- action = new KAction(i18n("&Open..."), "fileopen"
+ action = new TDEAction(i18n("&Open..."), "fileopen"
, TQT_TQOBJECT(this), TQT_SLOT(projectOpen()),actionCollection()
,"project_open");
- action = new KAction(i18n("C&lose"), "fileclose"
+ action = new TDEAction(i18n("C&lose"), "fileclose"
, TQT_TQOBJECT(this), TQT_SLOT(projectClose()),actionCollection()
,"project_close");
action->setEnabled (_project->filename() != KBabel::ProjectManager::defaultProjectName() );
- action = new KAction(i18n("&Configure..."), "configure"
+ action = new TDEAction(i18n("&Configure..."), "configure"
, TQT_TQOBJECT(this), TQT_SLOT(projectConfigure()),actionCollection()
,"project_settings");
// tools menu
- action = new KAction( i18n("&Statistics"), "statistics", CTRL+Key_S,
+ action = new TDEAction( i18n("&Statistics"), "statistics", CTRL+Key_S,
TQT_TQOBJECT(_catalogManager), TQT_SLOT(statistics()), actionCollection(), "statistics");
action->setEnabled(false);
- action = new KAction( i18n("S&tatistics in Marked"), "statistics", CTRL+ALT+Key_S,
+ action = new TDEAction( i18n("S&tatistics in Marked"), "statistics", CTRL+ALT+Key_S,
TQT_TQOBJECT(_catalogManager), TQT_SLOT(markedStatistics()), actionCollection(), "statistics_marked");
action->setEnabled(false);
- action = new KAction( i18n("Check S&yntax"), "syntax", CTRL+Key_Y,
+ action = new TDEAction( i18n("Check S&yntax"), "syntax", CTRL+Key_Y,
TQT_TQOBJECT(_catalogManager), TQT_SLOT(checkSyntax()), actionCollection(), "syntax");
action->setEnabled(false);
- action = new KAction( i18n("S&pell Check"), "spellcheck", CTRL+Key_I,
+ action = new TDEAction( i18n("S&pell Check"), "spellcheck", CTRL+Key_I,
TQT_TQOBJECT(this), TQT_SLOT(spellcheck()), actionCollection(), "spellcheck");
action->setEnabled(false);
- action = new KAction( i18n("Spell Check in &Marked"), "spellcheck", CTRL+ALT+Key_I,
+ action = new TDEAction( i18n("Spell Check in &Marked"), "spellcheck", CTRL+ALT+Key_I,
TQT_TQOBJECT(this), TQT_SLOT(markedSpellcheck()), actionCollection(), "spellcheck_marked");
action->setEnabled(false);
- action = new KAction( i18n("&Rough Translation"), CTRL+Key_T,
+ action = new TDEAction( i18n("&Rough Translation"), CTRL+Key_T,
TQT_TQOBJECT(_catalogManager), TQT_SLOT(roughTranslation()), actionCollection(), "rough_translation");
action->setEnabled(false);
- action = new KAction( i18n("Rough Translation in M&arked"), CTRL+ALT+Key_T,
+ action = new TDEAction( i18n("Rough Translation in M&arked"), CTRL+ALT+Key_T,
TQT_TQOBJECT(_catalogManager), TQT_SLOT(markedRoughTranslation()), actionCollection(), "rough_translation_marked");
action->setEnabled(false);
- action = new KAction( i18n("Mai&l"), "mail_send", CTRL+Key_A,
+ action = new TDEAction( i18n("Mai&l"), "mail_send", CTRL+Key_A,
TQT_TQOBJECT(_catalogManager), TQT_SLOT(mailFiles()), actionCollection(), "mail_file");
action->setEnabled(false);
- action = new KAction( i18n("Mail Mar&ked"), "mail_send", CTRL+ALT+Key_A,
+ action = new TDEAction( i18n("Mail Mar&ked"), "mail_send", CTRL+ALT+Key_A,
TQT_TQOBJECT(_catalogManager), TQT_SLOT(mailMarkedFiles()), actionCollection(), "mail_file_marked");
action->setEnabled(false);
- action = new KAction( i18n("&Pack"), "tar", CTRL+Key_B,
+ action = new TDEAction( i18n("&Pack"), "tar", CTRL+Key_B,
TQT_TQOBJECT(_catalogManager), TQT_SLOT(packageFiles()), actionCollection(), "package_file");
- action = new KAction( i18n("Pack &Marked"), "tar", CTRL+ALT+Key_B, TQT_TQOBJECT(_catalogManager), TQT_SLOT(packageMarkedFiles()), actionCollection(), "package_file_marked");
+ action = new TDEAction( i18n("Pack &Marked"), "tar", CTRL+ALT+Key_B, TQT_TQOBJECT(_catalogManager), TQT_SLOT(packageMarkedFiles()), actionCollection(), "package_file_marked");
action->setEnabled(false);
actionMap["statistics_marked"] = NEEDS_DIR | NEEDS_MARK;
@@ -392,14 +392,14 @@ void CatalogManager::setupActions()
// dynamic tools
TQValueList<KDataToolInfo> tools = ToolAction::validationTools();
- TQPtrList<KAction> actions = ToolAction::dataToolActionList(
+ TQPtrList<TDEAction> actions = ToolAction::dataToolActionList(
tools, TQT_TQOBJECT(_catalogManager), TQT_SLOT(validateUsingTool( const KDataToolInfo &, const TQString& ))
,"validate", false, actionCollection() );
- KActionMenu* m_menu = new KActionMenu(i18n("&Validation"), actionCollection(),
+ TDEActionMenu* m_menu = new TDEActionMenu(i18n("&Validation"), actionCollection(),
"dynamic_validation");
- KAction*ac;
+ TDEAction*ac;
for(ac = actions.first(); ac ; ac = actions.next() )
{
@@ -409,7 +409,7 @@ void CatalogManager::setupActions()
actions = ToolAction::dataToolActionList(
tools, TQT_TQOBJECT(_catalogManager), TQT_SLOT(validateMarkedUsingTool( const KDataToolInfo &, const TQString& ))
,"validate", false, actionCollection(), "marked_" );
- m_menu = new KActionMenu(i18n("V&alidation Marked"), actionCollection(),
+ m_menu = new TDEActionMenu(i18n("V&alidation Marked"), actionCollection(),
"dynamic_validation_marked");
for( ac = actions.first(); ac ; ac = actions.next() )
@@ -422,19 +422,19 @@ void CatalogManager::setupActions()
// CVS submenu
// Actions for PO files
- (void)new KAction( i18n( "Update" ), "down", 0, TQT_TQOBJECT(_catalogManager),
+ (void)new TDEAction( i18n( "Update" ), "down", 0, TQT_TQOBJECT(_catalogManager),
TQT_SLOT( cvsUpdate( ) ), actionCollection( ), "cvs_update" );
- (void)new KAction( i18n( "Update Marked" ), 0, TQT_TQOBJECT(_catalogManager),
+ (void)new TDEAction( i18n( "Update Marked" ), 0, TQT_TQOBJECT(_catalogManager),
TQT_SLOT( cvsUpdateMarked( ) ), actionCollection( ), "cvs_update_marked" );
- (void)new KAction( i18n( "Commit" ), "up", 0, TQT_TQOBJECT(_catalogManager),
+ (void)new TDEAction( i18n( "Commit" ), "up", 0, TQT_TQOBJECT(_catalogManager),
TQT_SLOT( cvsCommit( ) ), actionCollection( ), "cvs_commit" );
- (void)new KAction( i18n( "Commit Marked" ), 0, TQT_TQOBJECT(_catalogManager),
+ (void)new TDEAction( i18n( "Commit Marked" ), 0, TQT_TQOBJECT(_catalogManager),
TQT_SLOT( cvsCommitMarked( ) ), actionCollection( ), "cvs_commit_marked" );
- (void)new KAction( i18n( "Status" ), 0, TQT_TQOBJECT(_catalogManager),
+ (void)new TDEAction( i18n( "Status" ), 0, TQT_TQOBJECT(_catalogManager),
TQT_SLOT( cvsStatus( ) ), actionCollection( ), "cvs_status" );
- (void)new KAction( i18n( "Status for Marked" ), 0, TQT_TQOBJECT(_catalogManager),
+ (void)new TDEAction( i18n( "Status for Marked" ), 0, TQT_TQOBJECT(_catalogManager),
TQT_SLOT( cvsStatusMarked( ) ), actionCollection( ), "cvs_status_marked" );
- (void)new KAction( i18n( "Show Diff" ), 0, TQT_TQOBJECT(_catalogManager),
+ (void)new TDEAction( i18n( "Show Diff" ), 0, TQT_TQOBJECT(_catalogManager),
TQT_SLOT( cvsDiff( ) ), actionCollection( ), "cvs_diff" );
// CVS
@@ -448,27 +448,27 @@ void CatalogManager::setupActions()
// SVN submenu
// Actions for PO files
- (void)new KAction( i18n( "Update" ), "down", 0, TQT_TQOBJECT(_catalogManager),
+ (void)new TDEAction( i18n( "Update" ), "down", 0, TQT_TQOBJECT(_catalogManager),
TQT_SLOT( svnUpdate( ) ), actionCollection( ), "svn_update" );
- (void)new KAction( i18n( "Update Marked" ), 0, TQT_TQOBJECT(_catalogManager),
+ (void)new TDEAction( i18n( "Update Marked" ), 0, TQT_TQOBJECT(_catalogManager),
TQT_SLOT( svnUpdateMarked( ) ), actionCollection( ), "svn_update_marked" );
- (void)new KAction( i18n( "Commit" ), "up", 0, TQT_TQOBJECT(_catalogManager),
+ (void)new TDEAction( i18n( "Commit" ), "up", 0, TQT_TQOBJECT(_catalogManager),
TQT_SLOT( svnCommit( ) ), actionCollection( ), "svn_commit" );
- (void)new KAction( i18n( "Commit Marked" ), 0, TQT_TQOBJECT(_catalogManager),
+ (void)new TDEAction( i18n( "Commit Marked" ), 0, TQT_TQOBJECT(_catalogManager),
TQT_SLOT( svnCommitMarked( ) ), actionCollection( ), "svn_commit_marked" );
- (void)new KAction( i18n( "Status (Local)" ), 0, TQT_TQOBJECT(_catalogManager),
+ (void)new TDEAction( i18n( "Status (Local)" ), 0, TQT_TQOBJECT(_catalogManager),
TQT_SLOT( svnStatusLocal() ), actionCollection( ), "svn_status_local" );
- (void)new KAction( i18n( "Status (Local) for Marked" ), 0, TQT_TQOBJECT(_catalogManager),
+ (void)new TDEAction( i18n( "Status (Local) for Marked" ), 0, TQT_TQOBJECT(_catalogManager),
TQT_SLOT( svnStatusLocalMarked() ), actionCollection( ), "svn_status_local_marked" );
- (void)new KAction( i18n( "Status (Remote)" ), 0, TQT_TQOBJECT(_catalogManager),
+ (void)new TDEAction( i18n( "Status (Remote)" ), 0, TQT_TQOBJECT(_catalogManager),
TQT_SLOT( svnStatusRemote() ), actionCollection( ), "svn_status_remote" );
- (void)new KAction( i18n( "Status (Remote) for Marked" ), 0, TQT_TQOBJECT(_catalogManager),
+ (void)new TDEAction( i18n( "Status (Remote) for Marked" ), 0, TQT_TQOBJECT(_catalogManager),
TQT_SLOT( svnStatusRemoteMarked() ), actionCollection( ), "svn_status_remote_marked" );
- (void)new KAction( i18n( "Show Diff" ), 0, TQT_TQOBJECT(_catalogManager),
+ (void)new TDEAction( i18n( "Show Diff" ), 0, TQT_TQOBJECT(_catalogManager),
TQT_SLOT( svnDiff( ) ), actionCollection( ), "svn_diff" );
- (void)new KAction( i18n( "Show Information" ), 0, TQT_TQOBJECT(_catalogManager),
+ (void)new TDEAction( i18n( "Show Information" ), 0, TQT_TQOBJECT(_catalogManager),
TQT_SLOT( svnInfo() ), actionCollection( ), "svn_info" );
- (void)new KAction( i18n( "Show Information for Marked" ), 0, TQT_TQOBJECT(_catalogManager),
+ (void)new TDEAction( i18n( "Show Information for Marked" ), 0, TQT_TQOBJECT(_catalogManager),
TQT_SLOT( svnInfoMarked() ), actionCollection( ), "svn_info_marked" );
// SVN
@@ -485,13 +485,13 @@ void CatalogManager::setupActions()
actionMap["svn_info_marked"] = NEEDS_PO | NEEDS_PO_SVN | NEEDS_MARK;
// CVS Actions for POT files
- (void)new KAction( i18n( "Update Templates" ), 0, TQT_TQOBJECT(_catalogManager),
+ (void)new TDEAction( i18n( "Update Templates" ), 0, TQT_TQOBJECT(_catalogManager),
TQT_SLOT( cvsUpdateTemplate( ) ), actionCollection( ), "cvs_update_template" );
- (void)new KAction( i18n( "Update Marked Templates" ), 0, TQT_TQOBJECT(_catalogManager),
+ (void)new TDEAction( i18n( "Update Marked Templates" ), 0, TQT_TQOBJECT(_catalogManager),
TQT_SLOT( cvsUpdateMarkedTemplate( ) ), actionCollection( ), "cvs_update_marked_template" );
- (void)new KAction( i18n( "Commit Templates" ), 0, TQT_TQOBJECT(_catalogManager),
+ (void)new TDEAction( i18n( "Commit Templates" ), 0, TQT_TQOBJECT(_catalogManager),
TQT_SLOT( cvsCommitTemplate( ) ), actionCollection( ), "cvs_commit_template" );
- (void)new KAction( i18n( "Commit Marked Templates" ), 0, TQT_TQOBJECT(_catalogManager),
+ (void)new TDEAction( i18n( "Commit Marked Templates" ), 0, TQT_TQOBJECT(_catalogManager),
TQT_SLOT( cvsCommitMarkedTemplate( ) ), actionCollection( ), "cvs_commit_marked_template" );
actionMap["cvs_update_template"] = NEEDS_POT | NEEDS_POT_CVS;
@@ -500,13 +500,13 @@ void CatalogManager::setupActions()
actionMap["cvs_commit_marked_template"] = NEEDS_POT | NEEDS_POT_CVS | NEEDS_MARK;
// SVN Actions for POT files
- (void)new KAction( i18n( "Update Templates" ), 0, TQT_TQOBJECT(_catalogManager),
+ (void)new TDEAction( i18n( "Update Templates" ), 0, TQT_TQOBJECT(_catalogManager),
TQT_SLOT( svnUpdateTemplate( ) ), actionCollection( ), "svn_update_template" );
- (void)new KAction( i18n( "Update Marked Templates" ), 0, TQT_TQOBJECT(_catalogManager),
+ (void)new TDEAction( i18n( "Update Marked Templates" ), 0, TQT_TQOBJECT(_catalogManager),
TQT_SLOT( svnUpdateMarkedTemplate( ) ), actionCollection( ), "svn_update_marked_template" );
- (void)new KAction( i18n( "Commit Templates" ), 0, TQT_TQOBJECT(_catalogManager),
+ (void)new TDEAction( i18n( "Commit Templates" ), 0, TQT_TQOBJECT(_catalogManager),
TQT_SLOT( svnCommitTemplate( ) ), actionCollection( ), "svn_commit_template" );
- (void)new KAction( i18n( "Commit Marked Templates" ), 0, TQT_TQOBJECT(_catalogManager),
+ (void)new TDEAction( i18n( "Commit Marked Templates" ), 0, TQT_TQOBJECT(_catalogManager),
TQT_SLOT( svnCommitMarkedTemplate( ) ), actionCollection( ), "svn_commit_marked_template" );
actionMap["svn_update_template"] = NEEDS_POT | NEEDS_POT_SVN;
@@ -522,15 +522,15 @@ void CatalogManager::setupActions()
setStandardToolBarMenuEnabled ( true );
// commands menus
- KActionMenu* actionMenu=new KActionMenu(i18n("Commands"), 0,
+ TDEActionMenu* actionMenu=new TDEActionMenu(i18n("Commands"), 0,
actionCollection(), "dir_commands");
_catalogManager->setDirCommandsMenu( actionMenu->popupMenu());
- actionMenu=new KActionMenu(i18n("Commands"), 0,
+ actionMenu=new TDEActionMenu(i18n("Commands"), 0,
actionCollection(), "file_commands");
_catalogManager->setFileCommandsMenu( actionMenu->popupMenu());
- action = new KAction(i18n("&Delete"),Key_Delete,TQT_TQOBJECT(_catalogManager),TQT_SLOT(slotDeleteFile()),actionCollection(), "delete");
+ action = new TDEAction(i18n("&Delete"),Key_Delete,TQT_TQOBJECT(_catalogManager),TQT_SLOT(slotDeleteFile()),actionCollection(), "delete");
action->setEnabled(false);
#if KDE_IS_VERSION( 3, 2, 90 )
@@ -572,7 +572,7 @@ void CatalogManager::selectedChanged(uint actionValue)
{
TQMap<TQString,uint>::Iterator it;
for (it = actionMap.begin( ); it != actionMap.end( ); ++it) {
- KAction * action = actionCollection()->action(it.key( ).latin1( ));
+ TDEAction * action = actionCollection()->action(it.key( ).latin1( ));
if (action) action->setEnabled((actionValue & it.data( )) == it.data( ));
}
}
@@ -855,7 +855,7 @@ bool CatalogManager::startKBabel()
TQString url = "";
if( kapp->startServiceByDesktopName(app,url, &result, &service))
{
- KMessageBox::error( this, i18n("Unable to use KLauncher to start KBabel.\n"
+ KMessageBox::error( this, i18n("Unable to use TDELauncher to start KBabel.\n"
"You should check the installation of TDE.\n"
"Please start KBabel manually."));
return false;
@@ -940,7 +940,7 @@ void CatalogManager::find()
prepareStatusProgressBar(i18n("Searching"),1); // just show the progress bar
// enable stop action to stop searching
- KAction *action = (KAction*)actionCollection()->action("stop_search");
+ TDEAction *action = (TDEAction*)actionCollection()->action("stop_search");
action->setEnabled(true);
_findOptions = _findDialog->findOpts();
@@ -1024,7 +1024,7 @@ void CatalogManager::replace()
prepareStatusProgressBar(i18n("Searching"),1); // just show the progress bar
// enable stop action to stop searching
- KAction *action = (KAction*)actionCollection()->action("stop_search");
+ TDEAction *action = (TDEAction*)actionCollection()->action("stop_search");
action->setEnabled(true);
ReplaceOptions options = _replaceDialog->replaceOpts();
@@ -1131,7 +1131,7 @@ void CatalogManager::stopSearching()
// fake that we are over (fake, because findNextFile can still be running for the last file
clearStatusProgressBar(); // clear the status bar, we are finished
// disable stop action as well
- KAction *action = (KAction*)actionCollection()->action("stop_search");
+ TDEAction *action = (TDEAction*)actionCollection()->action("stop_search");
action->setEnabled(false);
}
@@ -1177,7 +1177,7 @@ void CatalogManager::restoreView()
{
applyMainWindowSettings( TDEGlobal::config(), "View");
- KToggleAction * toggle = (KToggleAction*)actionCollection()->
+ TDEToggleAction * toggle = (TDEToggleAction*)actionCollection()->
action(KStdAction::stdName(KStdAction::ShowStatusbar));
toggle->setChecked(!statusBar()->isHidden() );
}
@@ -1254,7 +1254,7 @@ void CatalogManager::changeProjectActions(const TQString& project)
{
bool def = ( project == KBabel::ProjectManager::defaultProjectName() ) ;
- KAction* saveAction=(KAction*)actionCollection()->action( "project_close" );
+ TDEAction* saveAction=(TDEAction*)actionCollection()->action( "project_close" );
saveAction->setEnabled( ! def );
}
@@ -1283,88 +1283,88 @@ void CatalogManager::disableActions()
void CatalogManager::enableActions(bool enable)
{
- KAction* action;
+ TDEAction* action;
// the file menu
- action = (KAction*)actionCollection()->action( "open" );
+ action = (TDEAction*)actionCollection()->action( "open" );
action->setEnabled(enable);
- action = (KAction*)actionCollection()->action( "open_new_window" );
+ action = (TDEAction*)actionCollection()->action( "open_new_window" );
action->setEnabled(enable);
- action = (KAction*)actionCollection()->action( "find_in_files" );
+ action = (TDEAction*)actionCollection()->action( "find_in_files" );
action->setEnabled(enable);
- action = (KAction*)actionCollection()->action( "replace_in_files" );
+ action = (TDEAction*)actionCollection()->action( "replace_in_files" );
action->setEnabled(enable);
- action = (KAction*)actionCollection()->action( "reload" );
+ action = (TDEAction*)actionCollection()->action( "reload" );
action->setEnabled(enable);
- action = (KAction*)actionCollection()->action( "toggle_marking" );
+ action = (TDEAction*)actionCollection()->action( "toggle_marking" );
action->setEnabled(enable);
- action = (KAction*)actionCollection()->action( "toggle_all_marking" );
+ action = (TDEAction*)actionCollection()->action( "toggle_all_marking" );
action->setEnabled(enable);
- action = (KAction*)actionCollection()->action( "mark_modified_files" );
+ action = (TDEAction*)actionCollection()->action( "mark_modified_files" );
action->setEnabled(enable);
- action = (KAction*)actionCollection()->action( "load_marking" );
+ action = (TDEAction*)actionCollection()->action( "load_marking" );
action->setEnabled(enable);
- action = (KAction*)actionCollection()->action( "save_marking" );
+ action = (TDEAction*)actionCollection()->action( "save_marking" );
action->setEnabled(enable);
- action = (KAction*)actionCollection()->action( "go_next_untrans" );
+ action = (TDEAction*)actionCollection()->action( "go_next_untrans" );
action->setEnabled(enable);
- action = (KAction*)actionCollection()->action( "go_prev_untrans" );
+ action = (TDEAction*)actionCollection()->action( "go_prev_untrans" );
action->setEnabled(enable);
- action = (KAction*)actionCollection()->action( "go_next_fuzzy" );
+ action = (TDEAction*)actionCollection()->action( "go_next_fuzzy" );
action->setEnabled(enable);
- action = (KAction*)actionCollection()->action( "go_prev_fuzzy" );
+ action = (TDEAction*)actionCollection()->action( "go_prev_fuzzy" );
action->setEnabled(enable);
- action = (KAction*)actionCollection()->action( "go_next_fuzzyUntr" );
+ action = (TDEAction*)actionCollection()->action( "go_next_fuzzyUntr" );
action->setEnabled(enable);
- action = (KAction*)actionCollection()->action( "go_prev_fuzzyUntr" );
+ action = (TDEAction*)actionCollection()->action( "go_prev_fuzzyUntr" );
action->setEnabled(enable);
- action = (KAction*)actionCollection()->action( "go_next_error" );
+ action = (TDEAction*)actionCollection()->action( "go_next_error" );
action->setEnabled(enable);
- action = (KAction*)actionCollection()->action( "go_prev_error" );
+ action = (TDEAction*)actionCollection()->action( "go_prev_error" );
action->setEnabled(enable);
- action = (KAction*)actionCollection()->action( "go_next_template" );
+ action = (TDEAction*)actionCollection()->action( "go_next_template" );
action->setEnabled(enable);
- action = (KAction*)actionCollection()->action( "go_prev_template" );
+ action = (TDEAction*)actionCollection()->action( "go_prev_template" );
action->setEnabled(enable);
- action = (KAction*)actionCollection()->action( "go_next_po" );
+ action = (TDEAction*)actionCollection()->action( "go_next_po" );
action->setEnabled(enable);
- action = (KAction*)actionCollection()->action( "go_prev_po" );
+ action = (TDEAction*)actionCollection()->action( "go_prev_po" );
action->setEnabled(enable);
- action = (KAction*)actionCollection()->action( "go_next_marked" );
+ action = (TDEAction*)actionCollection()->action( "go_next_marked" );
action->setEnabled(enable);
- action = (KAction*)actionCollection()->action( "go_prev_marked" );
+ action = (TDEAction*)actionCollection()->action( "go_prev_marked" );
action->setEnabled(enable);
- action = (KAction*)actionCollection()->action( "statistics" );
+ action = (TDEAction*)actionCollection()->action( "statistics" );
action->setEnabled(enable);
- action = (KAction*)actionCollection()->action( "package_file" );
+ action = (TDEAction*)actionCollection()->action( "package_file" );
action->setEnabled(enable);
- action = (KAction*)actionCollection()->action( "rough_translation" );
+ action = (TDEAction*)actionCollection()->action( "rough_translation" );
action->setEnabled(enable);
}
diff --git a/kbabel/catalogmanager/catalogmanager.h b/kbabel/catalogmanager/catalogmanager.h
index d7cd467e..8a0fe6fd 100644
--- a/kbabel/catalogmanager/catalogmanager.h
+++ b/kbabel/catalogmanager/catalogmanager.h
@@ -57,7 +57,7 @@ class TQPixmap;
class TQPopupMenu;
class TQTimer;
class KProgress;
-class KAction;
+class TDEAction;
class TDEConfig;
class FindInFilesDialog;
@@ -67,7 +67,7 @@ namespace KBabel
class ProjectDialog;
}
-class CatalogManager : public KMainWindow
+class CatalogManager : public TDEMainWindow
{
Q_OBJECT
@@ -149,7 +149,7 @@ private slots:
/**
* calls @ref KBabel::open where as preferred windos _preferredWindow
* is used. If this is deleted meanwhile, the first window in
- * @ref KMainWindow::memberList is used.
+ * @ref TDEMainWindow::memberList is used.
*/
void openFile(TQString filename,TQString package);
void openFile(TQString filename,TQString package, int msgid);
@@ -157,7 +157,7 @@ private slots:
/**
* calls @ref KBabel::openTemplate where as preferred windos _preferredWindow
* is used. If this is deleted meanwhile, the first window in
- * @ref KMainWindow::memberList is used.
+ * @ref TDEMainWindow::memberList is used.
*/
void openTemplate(TQString openFilename,TQString saveFileName,TQString package);
void openTemplateInNewWindow(TQString openFilename,TQString saveFileName,TQString package);
diff --git a/kbabel/catalogmanager/main.cpp b/kbabel/catalogmanager/main.cpp
index d28425a6..9c321b71 100644
--- a/kbabel/catalogmanager/main.cpp
+++ b/kbabel/catalogmanager/main.cpp
@@ -114,7 +114,7 @@ int CatalogManagerApp::newInstance()
if( isRestored() )
{
int n = 1;
- while (KMainWindow::canBeRestored(n)){
+ while (TDEMainWindow::canBeRestored(n)){
CatalogManager* cm = new CatalogManager();
cm->restore(n);
n++;
diff --git a/kbabel/catalogmanager/validateprogress.cpp b/kbabel/catalogmanager/validateprogress.cpp
index 8ac02c0d..e01585f3 100644
--- a/kbabel/catalogmanager/validateprogress.cpp
+++ b/kbabel/catalogmanager/validateprogress.cpp
@@ -68,7 +68,7 @@ ValidateProgressDialog::ValidateProgressDialog(const TQString& ignoreURL, TQWidg
readIgnores();
- _errorMenu = new KPopupMenu(this);
+ _errorMenu = new TDEPopupMenu(this);
_errorMenu->insertItem(i18n("&Open"),ID_ERROR_OPEN);
_errorMenu->insertItem(i18n("&Ignore"),ID_ERROR_IGNORE);
diff --git a/kbabel/catalogmanager/validateprogress.h b/kbabel/catalogmanager/validateprogress.h
index 6910723d..06cd1175 100644
--- a/kbabel/catalogmanager/validateprogress.h
+++ b/kbabel/catalogmanager/validateprogress.h
@@ -42,7 +42,7 @@ class CatManListItem;
class ValidateProgressWidget;
class KDataToolInfo;
class KDataTool;
-class KPopupMenu;
+class TDEPopupMenu;
struct IgnoreItem
{
@@ -98,7 +98,7 @@ private:
TQString _toolID;
TQPtrList<CatManListItem> _files;
bool _stopped;
- KPopupMenu* _errorMenu;
+ TDEPopupMenu* _errorMenu;
bool _ignoreFuzzy;
bool _setAsFuzzy;
diff --git a/kbabel/commonui/context.h b/kbabel/commonui/context.h
index 512bd741..9cddcd67 100644
--- a/kbabel/commonui/context.h
+++ b/kbabel/commonui/context.h
@@ -44,7 +44,7 @@
class TQComboBox;
class TQVBoxLayout;
class TQLineEdit;
-class KListEditor;
+class TDEListEditor;
class TDEConfig;
class KURL;
diff --git a/kbabel/commonui/kactionselector.cpp b/kbabel/commonui/kactionselector.cpp
index 9e5d3e79..c2638ff5 100644
--- a/kbabel/commonui/kactionselector.cpp
+++ b/kbabel/commonui/kactionselector.cpp
@@ -1,5 +1,5 @@
/***************************************************************************
- KActionSelector.cpp
+ TDEActionSelector.cpp
A widget for selecting and arranging actions/objects
-------------------
begin : Mon June 3 2002
@@ -43,24 +43,24 @@
#include <tqwhatsthis.h>
#include <tqapplication.h>
-class KActionSelectorPrivate {
+class TDEActionSelectorPrivate {
public:
TQListBox *availableListBox, *selectedListBox;
TQToolButton *btnAdd, *btnRemove, *btnUp, *btnDown;
TQLabel *lAvailable, *lSelected;
bool moveOnDoubleClick, keyboardEnabled;
- KActionSelector::ButtonIconSize iconSize;
+ TDEActionSelector::ButtonIconSize iconSize;
TQString addIcon, removeIcon, upIcon, downIcon;
- KActionSelector::InsertionPolicy availableInsertionPolicy, selectedInsertionPolicy;
+ TDEActionSelector::InsertionPolicy availableInsertionPolicy, selectedInsertionPolicy;
bool showUpDownButtons;
};
//BEGIN Constructor/destructor
-KActionSelector::KActionSelector( TQWidget *parent, const char *name )
+TDEActionSelector::TDEActionSelector( TQWidget *parent, const char *name )
: TQWidget( parent, name )
{
- d = new KActionSelectorPrivate();
+ d = new TDEActionSelectorPrivate();
d->moveOnDoubleClick = true;
d->keyboardEnabled = true;
d->iconSize = SmallIcon;
@@ -126,7 +126,7 @@ KActionSelector::KActionSelector( TQWidget *parent, const char *name )
d->selectedListBox->installEventFilter( this );
}
-KActionSelector::~KActionSelector()
+TDEActionSelector::~TDEActionSelector()
{
delete d;
}
@@ -135,17 +135,17 @@ KActionSelector::~KActionSelector()
//BEGIN Public Methods
-TQListBox *KActionSelector::availableListBox()
+TQListBox *TDEActionSelector::availableListBox()
{
return d->availableListBox;
}
-TQListBox *KActionSelector::selectedListBox()
+TQListBox *TDEActionSelector::selectedListBox()
{
return d->selectedListBox;
}
-void KActionSelector::setButtonIcon( const TQString &icon, MoveButton button )
+void TDEActionSelector::setButtonIcon( const TQString &icon, MoveButton button )
{
int isz;
if ( d->iconSize == SmallIcon ) isz = IconSize( KIcon::Small );
@@ -173,11 +173,11 @@ void KActionSelector::setButtonIcon( const TQString &icon, MoveButton button )
d->btnDown->setIconSet( SmallIconSet( icon, isz ) );
break;
default:
- kdDebug(KBABEL)<<"KActionSelector::setButtonIcon: DAINBREAD!"<<endl;
+ kdDebug(KBABEL)<<"TDEActionSelector::setButtonIcon: DAINBREAD!"<<endl;
}
}
-void KActionSelector::setButtonIconSet( const TQIconSet &iconset, MoveButton button )
+void TDEActionSelector::setButtonIconSet( const TQIconSet &iconset, MoveButton button )
{
switch ( button )
{
@@ -194,11 +194,11 @@ void KActionSelector::setButtonIconSet( const TQIconSet &iconset, MoveButton but
d->btnDown->setIconSet( iconset );
break;
default:
- kdDebug(KBABEL)<<"KActionSelector::setButtonIconSet: DAINBREAD!"<<endl;
+ kdDebug(KBABEL)<<"TDEActionSelector::setButtonIconSet: DAINBREAD!"<<endl;
}
}
-void KActionSelector::setButtonTooltip( const TQString &tip, MoveButton button )
+void TDEActionSelector::setButtonTooltip( const TQString &tip, MoveButton button )
{
switch ( button )
{
@@ -215,11 +215,11 @@ void KActionSelector::setButtonTooltip( const TQString &tip, MoveButton button )
d->btnDown->setTextLabel( tip );
break;
default:
- kdDebug(KBABEL)<<"KActionSelector::setButtonToolTip: DAINBREAD!"<<endl;
+ kdDebug(KBABEL)<<"TDEActionSelector::setButtonToolTip: DAINBREAD!"<<endl;
}
}
-void KActionSelector::setButtonWhatsThis( const TQString &text, MoveButton button )
+void TDEActionSelector::setButtonWhatsThis( const TQString &text, MoveButton button )
{
switch ( button )
{
@@ -236,11 +236,11 @@ void KActionSelector::setButtonWhatsThis( const TQString &text, MoveButton butto
TQWhatsThis::add( d->btnDown, text );
break;
default:
- kdDebug(KBABEL)<<"KActionSelector::setButtonWhatsThis: DAINBREAD!"<<endl;
+ kdDebug(KBABEL)<<"TDEActionSelector::setButtonWhatsThis: DAINBREAD!"<<endl;
}
}
-void KActionSelector::setButtonsEnabled()
+void TDEActionSelector::setButtonsEnabled()
{
d->btnAdd->setEnabled( d->availableListBox->currentItem() > -1 );
d->btnRemove->setEnabled( d->selectedListBox->currentItem() > -1 );
@@ -253,84 +253,84 @@ void KActionSelector::setButtonsEnabled()
//BEGIN Properties
-bool KActionSelector::moveOnDoubleClick() const
+bool TDEActionSelector::moveOnDoubleClick() const
{
return d->moveOnDoubleClick;
}
-void KActionSelector::setMoveOnDoubleClick( bool b )
+void TDEActionSelector::setMoveOnDoubleClick( bool b )
{
d->moveOnDoubleClick = b;
}
-bool KActionSelector::keyboardEnabled() const
+bool TDEActionSelector::keyboardEnabled() const
{
return d->keyboardEnabled;
}
-void KActionSelector::setKeyboardEnabled( bool b )
+void TDEActionSelector::setKeyboardEnabled( bool b )
{
d->keyboardEnabled = b;
}
-TQString KActionSelector::availableLabel() const
+TQString TDEActionSelector::availableLabel() const
{
return d->lAvailable->text();
}
-void KActionSelector::setAvailableLabel( const TQString &text )
+void TDEActionSelector::setAvailableLabel( const TQString &text )
{
d->lAvailable->setText( text );
}
-TQString KActionSelector::selectedLabel() const
+TQString TDEActionSelector::selectedLabel() const
{
return d->lSelected->text();
}
-void KActionSelector::setSelectedLabel( const TQString &text )
+void TDEActionSelector::setSelectedLabel( const TQString &text )
{
d->lSelected->setText( text );
}
-KActionSelector::ButtonIconSize KActionSelector::buttonIconSize() const
+TDEActionSelector::ButtonIconSize TDEActionSelector::buttonIconSize() const
{
return d->iconSize;
}
-void KActionSelector::setButtonIconSize( ButtonIconSize size )
+void TDEActionSelector::setButtonIconSize( ButtonIconSize size )
{
d->iconSize = size;
// reload icons
loadIcons();
}
-KActionSelector::InsertionPolicy KActionSelector::availableInsertionPolicy()
+TDEActionSelector::InsertionPolicy TDEActionSelector::availableInsertionPolicy()
{
return d->availableInsertionPolicy;
}
-void KActionSelector::setAvailableInsertionPolicy( InsertionPolicy p )
+void TDEActionSelector::setAvailableInsertionPolicy( InsertionPolicy p )
{
d->availableInsertionPolicy = p;
}
-KActionSelector::InsertionPolicy KActionSelector::selectedInsertionPolicy()
+TDEActionSelector::InsertionPolicy TDEActionSelector::selectedInsertionPolicy()
{
return d->selectedInsertionPolicy;
}
-void KActionSelector::setSelectedInsertionPolicy( InsertionPolicy p )
+void TDEActionSelector::setSelectedInsertionPolicy( InsertionPolicy p )
{
d->selectedInsertionPolicy = p;
}
-bool KActionSelector::showUpDownButtons()
+bool TDEActionSelector::showUpDownButtons()
{
return d->showUpDownButtons;
}
-void KActionSelector::setShowUpDownButtons( bool show )
+void TDEActionSelector::setShowUpDownButtons( bool show )
{
d->showUpDownButtons = show;
if ( show )
@@ -349,7 +349,7 @@ void KActionSelector::setShowUpDownButtons( bool show )
//BEGIN Public Slots
-void KActionSelector::polish()
+void TDEActionSelector::polish()
{
setButtonsEnabled();
}
@@ -357,7 +357,7 @@ void KActionSelector::polish()
//END Public Slots
//BEGIN Protected
-void KActionSelector::keyPressEvent( TQKeyEvent *e )
+void TDEActionSelector::keyPressEvent( TQKeyEvent *e )
{
if ( ! d->keyboardEnabled ) return;
if ( (e->state() & TQt::ControlButton) )
@@ -383,7 +383,7 @@ void KActionSelector::keyPressEvent( TQKeyEvent *e )
}
}
-bool KActionSelector::eventFilter( TQObject *o, TQEvent *e )
+bool TDEActionSelector::eventFilter( TQObject *o, TQEvent *e )
{
if ( d->keyboardEnabled && e->type() == TQEvent::KeyPress )
{
@@ -430,7 +430,7 @@ bool KActionSelector::eventFilter( TQObject *o, TQEvent *e )
//BEGIN Private Slots
-void KActionSelector::buttonAddClicked()
+void TDEActionSelector::buttonAddClicked()
{
// move all selected items from available to selected listbox
TQListBoxItem *item = d->availableListBox->firstItem();
@@ -448,7 +448,7 @@ void KActionSelector::buttonAddClicked()
d->selectedListBox->setFocus();
}
-void KActionSelector::buttonRemoveClicked()
+void TDEActionSelector::buttonRemoveClicked()
{
// move all selected items from selected to available listbox
TQListBoxItem *item = d->selectedListBox->firstItem();
@@ -466,7 +466,7 @@ void KActionSelector::buttonRemoveClicked()
d->availableListBox->setFocus();
}
-void KActionSelector::buttonUpClicked()
+void TDEActionSelector::buttonUpClicked()
{
int c = d->selectedListBox->currentItem();
if ( c < 0 ) return;
@@ -477,7 +477,7 @@ void KActionSelector::buttonUpClicked()
emit movedUp( item );
}
-void KActionSelector::buttonDownClicked()
+void TDEActionSelector::buttonDownClicked()
{
int c = d->selectedListBox->currentItem();
if ( c < 0 ) return;
@@ -488,7 +488,7 @@ void KActionSelector::buttonDownClicked()
emit movedDown( item );
}
-void KActionSelector::itemDoubleClicked( TQListBoxItem *item )
+void TDEActionSelector::itemDoubleClicked( TQListBoxItem *item )
{
if ( d->moveOnDoubleClick )
moveItem( item );
@@ -498,7 +498,7 @@ void KActionSelector::itemDoubleClicked( TQListBoxItem *item )
//BEGIN Private Methods
-void KActionSelector::loadIcons()
+void TDEActionSelector::loadIcons()
{
int isz;
if ( d->iconSize == SmallIcon ) isz = IconSize( KIcon::Small );
@@ -513,7 +513,7 @@ void KActionSelector::loadIcons()
d->btnDown->setIconSet( SmallIconSet( d->downIcon, isz ) );
}
-void KActionSelector::moveItem( TQListBoxItem *item )
+void TDEActionSelector::moveItem( TQListBoxItem *item )
{
TQListBox *lbFrom = item->listBox();
TQListBox *lbTo;
@@ -540,7 +540,7 @@ void KActionSelector::moveItem( TQListBoxItem *item )
emit removed( item );
}
-int KActionSelector::insertionIndex( TQListBox *lb, InsertionPolicy policy )
+int TDEActionSelector::insertionIndex( TQListBox *lb, InsertionPolicy policy )
{
int index;
switch ( policy )
diff --git a/kbabel/commonui/kactionselector.h b/kbabel/commonui/kactionselector.h
index 3a13303b..eaa1ab72 100644
--- a/kbabel/commonui/kactionselector.h
+++ b/kbabel/commonui/kactionselector.h
@@ -1,5 +1,5 @@
/***************************************************************************
- KActionSelector.h
+ TDEActionSelector.h
A widget for selecting and arranging actions/objects
-------------------
begin : Mon June 3 2002
@@ -38,7 +38,7 @@ class TQKeyEvent;
class TQEvent;
class TQIconSet;
-class KActionSelectorPrivate;
+class TDEActionSelectorPrivate;
/**
@short A widget for selecting and arranging actions/objects
@@ -84,7 +84,7 @@ class KActionSelectorPrivate;
@author Anders Lund <anders@alweb.dk>
*/
-class KActionSelector : public TQWidget {
+class TDEActionSelector : public TQWidget {
Q_OBJECT
TQ_ENUMS( ButtonIconSize InsertionPolicy )
@@ -98,8 +98,8 @@ class KActionSelector : public TQWidget {
TQ_PROPERTY( bool showUpDownButtons READ showUpDownButtons WRITE setShowUpDownButtons )
public:
- KActionSelector( TQWidget *parent=0, const char *name=0 );
- ~KActionSelector();
+ TDEActionSelector( TQWidget *parent=0, const char *name=0 );
+ ~TDEActionSelector();
/**
@return The TQListBox holding the available actions
@@ -405,7 +405,7 @@ private:
/** @private
Private data storage
*/
- KActionSelectorPrivate *d;
+ TDEActionSelectorPrivate *d;
};
#endif // _KACTION_SELECTOR_H_
diff --git a/kbabel/commonui/klisteditor.ui b/kbabel/commonui/klisteditor.ui
index 4b7eeb0d..5f0f8ce1 100644
--- a/kbabel/commonui/klisteditor.ui
+++ b/kbabel/commonui/klisteditor.ui
@@ -1,8 +1,8 @@
<!DOCTYPE UI><UI version="3.3" stdsetdef="1">
-<class>KListEditor</class>
+<class>TDEListEditor</class>
<widget class="TQWidget">
<property name="name">
- <cstring>KListEditor</cstring>
+ <cstring>TDEListEditor</cstring>
</property>
<property name="geometry">
<rect>
@@ -193,43 +193,43 @@
<connection>
<sender>_addButton</sender>
<signal>pressed()</signal>
- <receiver>KListEditor</receiver>
+ <receiver>TDEListEditor</receiver>
<slot>addToList()</slot>
</connection>
<connection>
<sender>_removeButton</sender>
<signal>pressed()</signal>
- <receiver>KListEditor</receiver>
+ <receiver>TDEListEditor</receiver>
<slot>removeFromList()</slot>
</connection>
<connection>
<sender>_upButton</sender>
<signal>pressed()</signal>
- <receiver>KListEditor</receiver>
+ <receiver>TDEListEditor</receiver>
<slot>upInList()</slot>
</connection>
<connection>
<sender>_downButton</sender>
<signal>pressed()</signal>
- <receiver>KListEditor</receiver>
+ <receiver>TDEListEditor</receiver>
<slot>downInList()</slot>
</connection>
<connection>
<sender>_edit</sender>
<signal>returnPressed()</signal>
- <receiver>KListEditor</receiver>
+ <receiver>TDEListEditor</receiver>
<slot>updateList()</slot>
</connection>
<connection>
<sender>_edit</sender>
<signal>textChanged(const TQString&amp;)</signal>
- <receiver>KListEditor</receiver>
+ <receiver>TDEListEditor</receiver>
<slot>editChanged(const TQString&amp;)</slot>
</connection>
<connection>
<sender>_list</sender>
<signal>highlighted(int)</signal>
- <receiver>KListEditor</receiver>
+ <receiver>TDEListEditor</receiver>
<slot>updateButtons(int)</slot>
</connection>
<connection>
diff --git a/kbabel/commonui/klisteditor.ui.h b/kbabel/commonui/klisteditor.ui.h
index 1845943c..30978506 100644
--- a/kbabel/commonui/klisteditor.ui.h
+++ b/kbabel/commonui/klisteditor.ui.h
@@ -38,7 +38,7 @@
*****************************************************************************/
-void KListEditor::addToList()
+void TDEListEditor::addToList()
{
_list->insertItem(_edit->text());
_edit->clear();
@@ -46,7 +46,7 @@ void KListEditor::addToList()
emit itemsChanged();
}
-void KListEditor::downInList()
+void TDEListEditor::downInList()
{
int i=_list->currentItem();
if( i< (int)_list->count()-1 ) {
@@ -58,7 +58,7 @@ void KListEditor::downInList()
emit itemsChanged();
}
-void KListEditor::removeFromList()
+void TDEListEditor::removeFromList()
{
_list->removeItem(_list->currentItem());
if( _list->count()==0 ) _edit->clear();
@@ -66,7 +66,7 @@ void KListEditor::removeFromList()
emit itemsChanged();
}
-void KListEditor::upInList()
+void TDEListEditor::upInList()
{
int i=_list->currentItem();
if( i>0 ) {
@@ -78,21 +78,21 @@ void KListEditor::upInList()
emit itemsChanged();
}
-void KListEditor::updateButtons( int newIndex )
+void TDEListEditor::updateButtons( int newIndex )
{
_upButton->setEnabled(newIndex>0);
_downButton->setEnabled(newIndex+1 != (int)_list->count());
_removeButton->setEnabled(true);
}
-void KListEditor::updateList()
+void TDEListEditor::updateList()
{
int i=_list->currentItem();
if( i==-1 ) addToList();
else _list->changeItem(_edit->text(), i );
}
-void KListEditor::setList( TQStringList contents )
+void TDEListEditor::setList( TQStringList contents )
{
_list->clear();
_list->insertStringList(contents);
@@ -101,19 +101,19 @@ void KListEditor::setList( TQStringList contents )
}
-void KListEditor::editChanged( const TQString &s )
+void TDEListEditor::editChanged( const TQString &s )
{
_addButton->setEnabled(!s.isEmpty());
}
-void KListEditor::setTitle( const TQString &s )
+void TDEListEditor::setTitle( const TQString &s )
{
_frame->setTitle(s);
}
-TQStringList KListEditor::list()
+TQStringList TDEListEditor::list()
{
TQStringList result;
for( uint i=0; i<_list->count() ; i++ )
diff --git a/kbabel/commonui/projectprefwidgets.cpp b/kbabel/commonui/projectprefwidgets.cpp
index 530d8a95..04c845c9 100644
--- a/kbabel/commonui/projectprefwidgets.cpp
+++ b/kbabel/commonui/projectprefwidgets.cpp
@@ -1164,7 +1164,7 @@ SourceContextPreferences::SourceContextPreferences(TQWidget* parent): TQWidget(p
layout->addWidget(box);
// FIXME: use TDEConfigXT
- _pathsEditor = new KListEditor(page);
+ _pathsEditor = new TDEListEditor(page);
_pathsEditor->setTitle(i18n("Path Patterns"));
layout->addWidget(_pathsEditor);
diff --git a/kbabel/commonui/projectprefwidgets.h b/kbabel/commonui/projectprefwidgets.h
index f3a29a58..4d93326a 100644
--- a/kbabel/commonui/projectprefwidgets.h
+++ b/kbabel/commonui/projectprefwidgets.h
@@ -48,14 +48,14 @@ class TQListBox;
class TQRadioButton;
class TQSpinBox;
class CmdEdit;
-class KFontChooser;
+class TDEFontChooser;
class KColorButton;
class KComboBox;
class KSpellConfig;
class KURLRequester;
class TQPushButton;
class TQGroupBox;
-class KListEditor;
+class TDEListEditor;
class ToolSelectionWidget;
class KIntNumInput;
class KURLRequester;
@@ -288,7 +288,7 @@ signals:
private:
KURLRequester* _coderootEdit;
- KListEditor* _pathsEditor;
+ TDEListEditor* _pathsEditor;
};
#endif // PROJECTPREFWIDGETS_H
diff --git a/kbabel/commonui/toolaction.cpp b/kbabel/commonui/toolaction.cpp
index 48650231..6e594834 100644
--- a/kbabel/commonui/toolaction.cpp
+++ b/kbabel/commonui/toolaction.cpp
@@ -33,9 +33,9 @@
#include <kdebug.h>
-ToolAction::ToolAction( const TQString & text, const KShortcut& cut, const KDataToolInfo & info, const TQString & command,
+ToolAction::ToolAction( const TQString & text, const TDEShortcut& cut, const KDataToolInfo & info, const TQString & command,
TQObject * parent, const char * name )
- : KAction( text, info.iconName() == "unknown" ? TQString() : info.iconName(), cut, parent, name ),
+ : TDEAction( text, info.iconName() == "unknown" ? TQString() : info.iconName(), cut, parent, name ),
m_command( command ),
m_info( info )
{
@@ -46,9 +46,9 @@ void ToolAction::slotActivated()
emit toolActivated( m_info, m_command );
}
-TQPtrList<KAction> ToolAction::dataToolActionList( const TQValueList<KDataToolInfo> & tools, const TQObject *receiver, const char* slot, const TQStringList& command, bool excludeCommand, KActionCollection* parent, const TQString& namePrefix )
+TQPtrList<TDEAction> ToolAction::dataToolActionList( const TQValueList<KDataToolInfo> & tools, const TQObject *receiver, const char* slot, const TQStringList& command, bool excludeCommand, TDEActionCollection* parent, const TQString& namePrefix )
{
- TQPtrList<KAction> actionList;
+ TQPtrList<TDEAction> actionList;
if ( tools.isEmpty() )
return actionList;
diff --git a/kbabel/commonui/toolaction.h b/kbabel/commonui/toolaction.h
index 764b9493..1d785309 100644
--- a/kbabel/commonui/toolaction.h
+++ b/kbabel/commonui/toolaction.h
@@ -36,22 +36,22 @@
#include <kaction.h>
#include <kdatatool.h>
-class KShortcut;
-class KActionCollection;
+class TDEShortcut;
+class TDEActionCollection;
-class KDE_EXPORT ToolAction : public KAction
+class KDE_EXPORT ToolAction : public TDEAction
{
Q_OBJECT
public:
- ToolAction( const TQString & text, const KShortcut& cut, const KDataToolInfo & info, const TQString & command, TQObject * parent = 0, const char * name = 0);
+ ToolAction( const TQString & text, const TDEShortcut& cut, const KDataToolInfo & info, const TQString & command, TQObject * parent = 0, const char * name = 0);
/**
- * return the list of KActions created for a list of tools. @ref command
+ * return the list of TDEActions created for a list of tools. @ref command
* allows to specify rescriction of commands, for which the list should
* or shouldn't be created according to the @ref excludeCommand flag.
*/
- static TQPtrList<KAction> dataToolActionList( const TQValueList<KDataToolInfo> & tools, const TQObject *receiver, const char* slot, const TQStringList& command, bool excludeCommand, KActionCollection* parent=0, const TQString& namePrefix=TQString() );
+ static TQPtrList<TDEAction> dataToolActionList( const TQValueList<KDataToolInfo> & tools, const TQObject *receiver, const char* slot, const TQStringList& command, bool excludeCommand, TDEActionCollection* parent=0, const TQString& namePrefix=TQString() );
/**
* returns information about all available validation tools (KDataTools with support for CatalogItem
diff --git a/kbabel/commonui/toolselectionwidget.cpp b/kbabel/commonui/toolselectionwidget.cpp
index 55a46f93..2e47ae2d 100644
--- a/kbabel/commonui/toolselectionwidget.cpp
+++ b/kbabel/commonui/toolselectionwidget.cpp
@@ -37,7 +37,7 @@
#include <tqlistbox.h>
ToolSelectionWidget::ToolSelectionWidget( TQWidget * parent, const char * name )
- : KActionSelector( parent, name )
+ : TDEActionSelector( parent, name )
{
}
diff --git a/kbabel/commonui/toolselectionwidget.h b/kbabel/commonui/toolselectionwidget.h
index 622717f8..d0c8ee3a 100644
--- a/kbabel/commonui/toolselectionwidget.h
+++ b/kbabel/commonui/toolselectionwidget.h
@@ -37,7 +37,7 @@
class KDataToolInfo;
-class KDE_EXPORT ToolSelectionWidget : public KActionSelector
+class KDE_EXPORT ToolSelectionWidget : public TDEActionSelector
{
Q_OBJECT
diff --git a/kbabel/kbabel/fontpreferences.ui b/kbabel/kbabel/fontpreferences.ui
index 22b49455..4befa080 100644
--- a/kbabel/kbabel/fontpreferences.ui
+++ b/kbabel/kbabel/fontpreferences.ui
@@ -36,7 +36,7 @@
<string>&amp;Show only fixed font</string>
</property>
</widget>
- <widget class="KFontChooser">
+ <widget class="TDEFontChooser">
<property name="name">
<cstring>kcfg_MsgFont</cstring>
</property>
diff --git a/kbabel/kbabel/kbabel.cpp b/kbabel/kbabel/kbabel.cpp
index 262e47ab..eea5f60b 100644
--- a/kbabel/kbabel/kbabel.cpp
+++ b/kbabel/kbabel/kbabel.cpp
@@ -293,8 +293,8 @@ void KBabelMW::init(KBCatalog* catalog)
mailer = new KBabelMailer( this, _project );
bmHandler = new KBabelBookmarkHandler((TQPopupMenu*)factory()->container("bookmark", this));
- // the earlier created KAction for "clear_bookmarks" is now reconnected
- KAction* action = actionCollection()->action("clear_bookmarks");
+ // the earlier created TDEAction for "clear_bookmarks" is now reconnected
+ TDEAction* action = actionCollection()->action("clear_bookmarks");
if (action) {
action->disconnect(TQT_SIGNAL(activated()));
connect(action, TQT_SIGNAL(activated()),
@@ -401,7 +401,7 @@ void KBabelMW::updateSettings()
void KBabelMW::setupActions()
{
- KAction* action;
+ TDEAction* action;
// the file menu
action = KStdAction::open(TQT_TQOBJECT(this), TQT_SLOT(fileOpen()), actionCollection());
@@ -412,19 +412,19 @@ void KBabelMW::setupActions()
action = KStdAction::revert(TQT_TQOBJECT(m_view),TQT_SLOT(revertToSaved()),actionCollection());
action=KStdAction::save(TQT_TQOBJECT(this), TQT_SLOT(fileSave()), actionCollection());
action = KStdAction::saveAs(TQT_TQOBJECT(this), TQT_SLOT(fileSaveAs()), actionCollection());
- action = new KAction(i18n("Save Sp&ecial..."), 0, TQT_TQOBJECT(this), TQT_SLOT(fileSaveSpecial()),
+ action = new TDEAction(i18n("Save Sp&ecial..."), 0, TQT_TQOBJECT(this), TQT_SLOT(fileSaveSpecial()),
actionCollection(), "save_special" );
- action = new KAction(i18n("Set &Package..."), 0, TQT_TQOBJECT(m_view), TQT_SLOT(setFilePackage()),
+ action = new TDEAction(i18n("Set &Package..."), 0, TQT_TQOBJECT(m_view), TQT_SLOT(setFilePackage()),
actionCollection(), "set_package" );
action = KStdAction::mail(TQT_TQOBJECT(this), TQT_SLOT(fileMail()), actionCollection());
- action = new KAction(i18n("&New View"), 0, TQT_TQOBJECT(this), TQT_SLOT(fileNewView()),
+ action = new TDEAction(i18n("&New View"), 0, TQT_TQOBJECT(this), TQT_SLOT(fileNewView()),
actionCollection(), "file_new_view");
- action = new KAction(i18n("New &Window"), 0, TQT_TQOBJECT(this), TQT_SLOT(fileNewWindow()),
+ action = new TDEAction(i18n("New &Window"), 0, TQT_TQOBJECT(this), TQT_SLOT(fileNewWindow()),
actionCollection(), "file_new_window");
- action->setShortcut( KStdAccel::openNew() );
+ action->setShortcut( TDEStdAccel::openNew() );
action = KStdAction::quit(TQT_TQOBJECT(this), TQT_SLOT(quit()), actionCollection());
@@ -444,66 +444,66 @@ void KBabelMW::setupActions()
action = KStdAction::clear( TQT_TQOBJECT(m_view), TQT_SLOT(clear()), actionCollection(), "clear" );
- action = new KAction(i18n("Cop&y Msgid to Msgstr"), "msgid2msgstr", CTRL+Key_Space, TQT_TQOBJECT(m_view)
+ action = new TDEAction(i18n("Cop&y Msgid to Msgstr"), "msgid2msgstr", CTRL+Key_Space, TQT_TQOBJECT(m_view)
,TQT_SLOT(msgid2msgstr()), actionCollection(), "msgid2msgstr");
- action = new KAction(i18n("Copy Searc&h Result to Msgstr"), "search2msgstr",
+ action = new TDEAction(i18n("Copy Searc&h Result to Msgstr"), "search2msgstr",
CTRL+ALT+Key_Space, TQT_TQOBJECT(m_view), TQT_SLOT(search2msgstr()),
actionCollection(), "search2msgstr");
- action = new KAction(i18n("Copy Msgstr to Other &Plurals"), Key_F11, TQT_TQOBJECT(m_view)
+ action = new TDEAction(i18n("Copy Msgstr to Other &Plurals"), Key_F11, TQT_TQOBJECT(m_view)
,TQT_SLOT(plural2msgstr()), actionCollection(), "plural2msgstr");
- action = new KAction(i18n("Copy Selected Character to Msgstr"), Key_F10, TQT_TQOBJECT(m_charselectorview)
+ action = new TDEAction(i18n("Copy Selected Character to Msgstr"), Key_F10, TQT_TQOBJECT(m_charselectorview)
,TQT_SLOT(emitChar()), actionCollection(), "char2msgstr");
- a_unsetFuzzy = new KAction(i18n("To&ggle Fuzzy Status"), "togglefuzzy", CTRL+Key_U, TQT_TQOBJECT(m_view)
+ a_unsetFuzzy = new TDEAction(i18n("To&ggle Fuzzy Status"), "togglefuzzy", CTRL+Key_U, TQT_TQOBJECT(m_view)
, TQT_SLOT(removeFuzzyStatus()), actionCollection(), "edit_toggle_fuzzy");
- action = new KAction(i18n("&Edit Header..."), 0, TQT_TQOBJECT(m_view), TQT_SLOT(editHeader()),
+ action = new TDEAction(i18n("&Edit Header..."), 0, TQT_TQOBJECT(m_view), TQT_SLOT(editHeader()),
actionCollection(), "edit_edit_header");
- action = new KAction(i18n("&Insert Next Tag"), "insert_tag", CTRL+ALT+Key_N
+ action = new TDEAction(i18n("&Insert Next Tag"), "insert_tag", CTRL+ALT+Key_N
, TQT_TQOBJECT(m_view), TQT_SLOT(insertNextTag())
, actionCollection(),"insert_next_tag");
connect(m_view,TQT_SIGNAL(signalNextTagAvailable(bool)),action
,TQT_SLOT(setEnabled(bool)));
- action = new KAction(i18n("Insert Next Tag From Msgid P&osition"), "insert_tag", CTRL+Key_M
+ action = new TDEAction(i18n("Insert Next Tag From Msgid P&osition"), "insert_tag", CTRL+Key_M
, TQT_TQOBJECT(m_view), TQT_SLOT(insertNextTagMsgid())
, actionCollection(),"insert_next_tag_msgid");
connect(m_view,TQT_SIGNAL(signalNextTagAvailable(bool)),action
,TQT_SLOT(setEnabled(bool)));
- KActionMenu *actionMenu= new KActionMenu(i18n("Inser&t Tag"), "insert_tag"
+ TDEActionMenu *actionMenu= new TDEActionMenu(i18n("Inser&t Tag"), "insert_tag"
, actionCollection(),"insert_tag");
m_view->setTagsMenu(actionMenu->popupMenu());
connect(m_view,TQT_SIGNAL(signalTagsAvailable(bool)),actionMenu
,TQT_SLOT(setEnabled(bool)));
connect(actionMenu,TQT_SIGNAL(activated()),m_view,TQT_SLOT(insertNextTag()));
- action = new KAction(i18n("Show Tags Menu"),CTRL+Key_Less
+ action = new TDEAction(i18n("Show Tags Menu"),CTRL+Key_Less
, TQT_TQOBJECT(m_view), TQT_SLOT(showTagsMenu()), actionCollection(),"show_tags_menu");
action->setEnabled(false);
connect(m_view,TQT_SIGNAL(signalTagsAvailable(bool)),action
,TQT_SLOT(setEnabled(bool)));
- action = new KAction(i18n("Move to Next Tag"), 0, CTRL+ALT+Key_M
+ action = new TDEAction(i18n("Move to Next Tag"), 0, CTRL+ALT+Key_M
, TQT_TQOBJECT(m_view), TQT_SLOT(skipToNextTag())
, actionCollection(),"move_to_next_tag");
- action = new KAction(i18n("Move to Previous Tag"), 0, CTRL+ALT+Key_B
+ action = new TDEAction(i18n("Move to Previous Tag"), 0, CTRL+ALT+Key_B
, TQT_TQOBJECT(m_view), TQT_SLOT(skipToPreviousTag())
, actionCollection(),"move_to_prev_tag");
- action = new KAction(i18n("Insert Next Argument"), "insert_arg", CTRL+ALT+Key_G
+ action = new TDEAction(i18n("Insert Next Argument"), "insert_arg", CTRL+ALT+Key_G
, TQT_TQOBJECT(m_view), TQT_SLOT(insertNextArg())
, actionCollection(),"insert_next_arg");
connect(m_view,TQT_SIGNAL(signalNextArgAvailable(bool)),action
,TQT_SLOT(setEnabled(bool)));
- actionMenu= new KActionMenu(i18n("Inser&t Argument"), "insert_arg"
+ actionMenu= new TDEActionMenu(i18n("Inser&t Argument"), "insert_arg"
, actionCollection(),"insert_arg");
m_view->setArgsMenu(actionMenu->popupMenu());
connect(m_view,TQT_SIGNAL(signalArgsAvailable(bool)),actionMenu
,TQT_SLOT(setEnabled(bool)));
connect(actionMenu,TQT_SIGNAL(activated()),m_view,TQT_SLOT(insertNextArg()));
- action = new KAction(i18n("Show Arguments Menu"),CTRL+Key_Percent
+ action = new TDEAction(i18n("Show Arguments Menu"),CTRL+Key_Percent
, TQT_TQOBJECT(m_view), TQT_SLOT(showArgsMenu()), actionCollection(),"show_args_menu");
action->setEnabled(false);
@@ -511,78 +511,78 @@ void KBabelMW::setupActions()
,TQT_SLOT(setEnabled(bool)));
// next, the go-menu
- action = new KAction(i18n("&Previous"), "previous",
- KStdAccel::shortcut(KStdAccel::Prior), TQT_TQOBJECT(m_view) , TQT_SLOT(gotoPrev()),
+ action = new TDEAction(i18n("&Previous"), "previous",
+ TDEStdAccel::shortcut(TDEStdAccel::Prior), TQT_TQOBJECT(m_view) , TQT_SLOT(gotoPrev()),
actionCollection(),"go_prev_entry");
- action = new KAction(i18n("&Next"), "next",
- KStdAccel::shortcut(KStdAccel::Next), TQT_TQOBJECT(m_view) , TQT_SLOT(gotoNext()),
+ action = new TDEAction(i18n("&Next"), "next",
+ TDEStdAccel::shortcut(TDEStdAccel::Next), TQT_TQOBJECT(m_view) , TQT_SLOT(gotoNext()),
actionCollection(),"go_next_entry");
action = KStdAction::goTo(TQT_TQOBJECT(m_view), TQT_SLOT(gotoEntry()), actionCollection());
- action->setShortcut( KStdAccel::gotoLine());
+ action->setShortcut( TDEStdAccel::gotoLine());
action = KStdAction::firstPage(TQT_TQOBJECT(m_view), TQT_SLOT(gotoFirst()),actionCollection());
action->setText(i18n("&First Entry"));
action->setShortcut(CTRL+ALT+Key_Home);
action = KStdAction::lastPage(TQT_TQOBJECT(m_view), TQT_SLOT(gotoLast()),actionCollection());
action->setText(i18n("&Last Entry"));
action->setShortcut(CTRL+ALT+Key_End);
- a_prevFoU = new KAction(i18n("P&revious Fuzzy or Untranslated"),"prevfuzzyuntrans",
+ a_prevFoU = new TDEAction(i18n("P&revious Fuzzy or Untranslated"),"prevfuzzyuntrans",
CTRL+SHIFT+Key_Prior, TQT_TQOBJECT(m_view),
TQT_SLOT(gotoPrevFuzzyOrUntrans()),actionCollection(), "go_prev_fuzzyUntr");
- a_nextFoU = new KAction(i18n("N&ext Fuzzy or Untranslated"),"nextfuzzyuntrans",
+ a_nextFoU = new TDEAction(i18n("N&ext Fuzzy or Untranslated"),"nextfuzzyuntrans",
CTRL+SHIFT+Key_Next, TQT_TQOBJECT(m_view),
TQT_SLOT(gotoNextFuzzyOrUntrans()),actionCollection(), "go_next_fuzzyUntr");
- a_prevFuzzy = new KAction(i18n("Pre&vious Fuzzy"),"prevfuzzy",
+ a_prevFuzzy = new TDEAction(i18n("Pre&vious Fuzzy"),"prevfuzzy",
CTRL+Key_Prior, TQT_TQOBJECT(m_view),
TQT_SLOT(gotoPrevFuzzy()),actionCollection(), "go_prev_fuzzy");
- a_nextFuzzy = new KAction(i18n("Ne&xt Fuzzy"), "nextfuzzy",
+ a_nextFuzzy = new TDEAction(i18n("Ne&xt Fuzzy"), "nextfuzzy",
CTRL+Key_Next, TQT_TQOBJECT(m_view),
TQT_SLOT(gotoNextFuzzy()),actionCollection(), "go_next_fuzzy");
- a_prevUntrans = new KAction(i18n("Prev&ious Untranslated"), "prevuntranslated",
+ a_prevUntrans = new TDEAction(i18n("Prev&ious Untranslated"), "prevuntranslated",
ALT+Key_Prior, TQT_TQOBJECT(m_view),
TQT_SLOT(gotoPrevUntranslated()),actionCollection(), "go_prev_untrans");
- a_nextUntrans = new KAction(i18n("Nex&t Untranslated"), "nextuntranslated",
+ a_nextUntrans = new TDEAction(i18n("Nex&t Untranslated"), "nextuntranslated",
ALT+Key_Next, TQT_TQOBJECT(m_view),
TQT_SLOT(gotoNextUntranslated()),actionCollection(), "go_next_untrans");
- action = new KAction(i18n("Previo&us Error"), "preverror",
+ action = new TDEAction(i18n("Previo&us Error"), "preverror",
SHIFT+Key_Prior, TQT_TQOBJECT(m_view),
TQT_SLOT(gotoPrevError()),actionCollection(), "go_prev_error");
- action = new KAction(i18n("Next Err&or"), "nexterror",
+ action = new TDEAction(i18n("Next Err&or"), "nexterror",
SHIFT+Key_Next, TQT_TQOBJECT(m_view),
TQT_SLOT(gotoNextError()),actionCollection(), "go_next_error");
- action = new KAction(i18n("&Back in History"), "back", ALT+Key_Left, TQT_TQOBJECT(m_view),
+ action = new TDEAction(i18n("&Back in History"), "back", ALT+Key_Left, TQT_TQOBJECT(m_view),
TQT_SLOT(backHistory()),actionCollection(), "go_back_history");
- action = new KAction(i18n("For&ward in History"), "forward", ALT+Key_Right, TQT_TQOBJECT(m_view),
+ action = new TDEAction(i18n("For&ward in History"), "forward", ALT+Key_Right, TQT_TQOBJECT(m_view),
TQT_SLOT(forwardHistory()),actionCollection(), "go_forward_history");
// the search menu
- actionMenu=new KActionMenu(i18n("&Find Text"),
+ actionMenu=new TDEActionMenu(i18n("&Find Text"),
"transsearch",actionCollection(),"dict_search_all");
connect(actionMenu,TQT_SIGNAL(activated()),m_view,TQT_SLOT(startSearch()));
dictMenu = new DictionaryMenu(actionMenu->popupMenu(),actionCollection(),TQT_TQOBJECT(this));
connect(dictMenu,TQT_SIGNAL(activated(const TQString)), TQT_TQOBJECT(m_view)
, TQT_SLOT(startSearch(const TQString)));
- actionMenu=new KActionMenu(i18n("F&ind Selected Text"),
+ actionMenu=new TDEActionMenu(i18n("F&ind Selected Text"),
"transsearch",actionCollection(),"dict_search_selected");
connect(actionMenu,TQT_SIGNAL(activated()),m_view,TQT_SLOT(startSelectionSearch()));
selectionDictMenu = new DictionaryMenu(actionMenu->popupMenu(),actionCollection(),TQT_TQOBJECT(this));
connect(selectionDictMenu,TQT_SIGNAL(activated(const TQString)), TQT_TQOBJECT(m_view)
, TQT_SLOT(startSelectionSearch(const TQString)));
- actionMenu=new KActionMenu(i18n("&Edit Dictionary"),
+ actionMenu=new TDEActionMenu(i18n("&Edit Dictionary"),
"transsearch",actionCollection(),"dict_edit");
editDictMenu = new DictionaryMenu(actionMenu->popupMenu(),actionCollection(),TQT_TQOBJECT(this));
connect(editDictMenu,TQT_SIGNAL(activated(const TQString)), TQT_TQOBJECT(m_view)
, TQT_SLOT(editDictionary(const TQString)));
- actionMenu=new KActionMenu(i18n("Con&figure Dictionary"),
+ actionMenu=new TDEActionMenu(i18n("Con&figure Dictionary"),
"transsearch",actionCollection(),"dict_configure");
configDictMenu = new DictionaryMenu(actionMenu->popupMenu(),actionCollection(),TQT_TQOBJECT(this));
connect(configDictMenu,TQT_SIGNAL(activated(const TQString)), TQT_TQOBJECT(m_view)
, TQT_SLOT(configureDictionary(const TQString)));
- actionMenu=new KActionMenu(i18n("About Dictionary"), "transsearch",
+ actionMenu=new TDEActionMenu(i18n("About Dictionary"), "transsearch",
actionCollection(), "dict_about");
aboutDictMenu = new DictionaryMenu(actionMenu->popupMenu(),actionCollection(),TQT_TQOBJECT(this));
connect(aboutDictMenu,TQT_SIGNAL(activated(const TQString)), TQT_TQOBJECT(m_view)
@@ -591,75 +591,75 @@ void KBabelMW::setupActions()
buildDictMenus();
// the project menu
- action = new KAction(i18n("&New..."), "filenew"
+ action = new TDEAction(i18n("&New..."), "filenew"
, TQT_TQOBJECT(this), TQT_SLOT(projectNew()),actionCollection()
,"project_new");
- action = new KAction(i18n("&Open..."), "fileopen"
+ action = new TDEAction(i18n("&Open..."), "fileopen"
, TQT_TQOBJECT(this), TQT_SLOT(projectOpen()),actionCollection()
,"project_open");
- action = new KAction(i18n("C&lose"), "fileclose"
+ action = new TDEAction(i18n("C&lose"), "fileclose"
, TQT_TQOBJECT(this), TQT_SLOT(projectClose()),actionCollection()
,"project_close");
action->setEnabled (_project->filename() != KBabel::ProjectManager::defaultProjectName() );
- action = new KAction(i18n("&Configure..."), "configure"
+ action = new TDEAction(i18n("&Configure..."), "configure"
, TQT_TQOBJECT(this), TQT_SLOT(projectConfigure()),actionCollection()
,"project_settings");
- a_recentprojects = new KRecentFilesAction(i18n("Open &Recent"), 0, TQT_TQOBJECT(this), TQT_SLOT(projectOpenRecent(const KURL&)), actionCollection(), "recent_projects");
+ a_recentprojects = new TDERecentFilesAction(i18n("Open &Recent"), 0, TQT_TQOBJECT(this), TQT_SLOT(projectOpenRecent(const KURL&)), actionCollection(), "recent_projects");
// the tools menu
- action = new KAction(i18n("&Spell Check..."), "spellcheck", CTRL+Key_I
+ action = new TDEAction(i18n("&Spell Check..."), "spellcheck", CTRL+Key_I
, TQT_TQOBJECT(m_view), TQT_SLOT(spellcheckCommon()),actionCollection()
,"spellcheck_common");
- action = new KAction(i18n("&Check All..."), "spellcheck_all", 0
+ action = new TDEAction(i18n("&Check All..."), "spellcheck_all", 0
, TQT_TQOBJECT(m_view), TQT_SLOT(spellcheckAll()),actionCollection()
,"spellcheck_all");
- action = new KAction(i18n("C&heck From Cursor Position..."), "spellcheck_from_cursor", 0
+ action = new TDEAction(i18n("C&heck From Cursor Position..."), "spellcheck_from_cursor", 0
, TQT_TQOBJECT(m_view), TQT_SLOT(spellcheckFromCursor()),actionCollection()
,"spellcheck_from_cursor");
- action = new KAction(i18n("Ch&eck Current..."), "spellcheck_actual", 0
+ action = new TDEAction(i18n("Ch&eck Current..."), "spellcheck_actual", 0
, TQT_TQOBJECT(m_view), TQT_SLOT(spellcheckCurrent()),actionCollection()
,"spellcheck_current");
- action = new KAction(i18n("Check Fro&m Current to End of File..."), 0
+ action = new TDEAction(i18n("Check Fro&m Current to End of File..."), 0
, TQT_TQOBJECT(m_view), TQT_SLOT(spellcheckFromCurrent()),actionCollection()
,"spellcheck_from_current");
- action = new KAction(i18n("Chec&k Selected Text..."), "spellcheck_selected", 0
+ action = new TDEAction(i18n("Chec&k Selected Text..."), "spellcheck_selected", 0
, TQT_TQOBJECT(m_view), TQT_SLOT(spellcheckMarked()),actionCollection()
,"spellcheck_marked");
- KToggleAction *toggleAction;
+ TDEToggleAction *toggleAction;
- toggleAction = new KToggleAction(i18n("&Diffmode"), "autodiff", 0
+ toggleAction = new TDEToggleAction(i18n("&Diffmode"), "autodiff", 0
,actionCollection(), "diff_toggleDiff");
connect(toggleAction,TQT_SIGNAL(toggled(bool)), TQT_TQOBJECT(m_view), TQT_SLOT(toggleAutoDiff(bool)));
connect(m_view,TQT_SIGNAL(signalDiffEnabled(bool)), toggleAction
, TQT_SLOT(setChecked(bool)));
toggleAction->setChecked(m_view->autoDiffEnabled());
- action = new KAction(i18n("&Show Diff"), "diff", Key_F5
+ action = new TDEAction(i18n("&Show Diff"), "diff", Key_F5
, TQT_TQOBJECT(m_view), TQT_SLOT(diff()),actionCollection()
,"diff_diff");
- action = new KAction(i18n("S&how Original Text"), "contents", Key_F6
+ action = new TDEAction(i18n("S&how Original Text"), "contents", Key_F6
, TQT_TQOBJECT(m_view), TQT_SLOT(diffShowOrig()),actionCollection()
,"diff_showOrig");
- action = new KAction(i18n("&Open File for Diff"), "fileopen" ,0
+ action = new TDEAction(i18n("&Open File for Diff"), "fileopen" ,0
, TQT_TQOBJECT(m_view), TQT_SLOT(openDiffFile()),actionCollection()
,"diff_openFile");
- action = new KAction(i18n("&Rough Translation..."), 0
+ action = new TDEAction(i18n("&Rough Translation..."), 0
, TQT_TQOBJECT(m_view), TQT_SLOT(roughTranslation()),actionCollection()
,"rough_translation");
- action = new KAction(i18n("&Catalog Manager..."),"catalogmanager", 0 , TQT_TQOBJECT(this),
+ action = new TDEAction(i18n("&Catalog Manager..."),"catalogmanager", 0 , TQT_TQOBJECT(this),
TQT_SLOT(openCatalogManager()),actionCollection(), "open_catalog_manager");
- new KAction( i18n("Toggle Edit Mode"), 0, Key_Insert,TQT_TQOBJECT(this),TQT_SLOT(toggleEditMode()), actionCollection(), "toggle_insert_mode");
+ new TDEAction( i18n("Toggle Edit Mode"), 0, Key_Insert,TQT_TQOBJECT(this),TQT_SLOT(toggleEditMode()), actionCollection(), "toggle_insert_mode");
- new KAction( i18n("&Word Count"), 0, TQT_TQOBJECT(m_view), TQT_SLOT(wordCount()), actionCollection(), "word_count");
+ new TDEAction( i18n("&Word Count"), 0, TQT_TQOBJECT(m_view), TQT_SLOT(wordCount()), actionCollection(), "word_count");
// next, the settings menu
createStandardStatusBarAction();
@@ -671,11 +671,11 @@ void KBabelMW::setupActions()
setStandardToolBarMenuEnabled ( true );
- action = new KAction(i18n("&Stop Searching"), "stop",Key_Escape, TQT_TQOBJECT(m_view),
+ action = new TDEAction(i18n("&Stop Searching"), "stop",Key_Escape, TQT_TQOBJECT(m_view),
TQT_SLOT(stopSearch()),actionCollection(), "stop_search");
action->setEnabled(false);
- new KAction(i18n("&Gettext Info"), 0, TQT_TQOBJECT(this),
+ new TDEAction(i18n("&Gettext Info"), 0, TQT_TQOBJECT(this),
TQT_SLOT(gettextHelp()), actionCollection(), "help_gettext");
@@ -686,7 +686,7 @@ void KBabelMW::setupActions()
action->setEnabled(false);
// this action is now connected to dummySlot(), and later reconnected
// to bmHandler after that object actually is created
- new KAction(i18n("Clear Bookmarks"), 0, TQT_TQOBJECT(this), TQT_SLOT(dummySlot()),
+ new TDEAction(i18n("Clear Bookmarks"), 0, TQT_TQOBJECT(this), TQT_SLOT(dummySlot()),
actionCollection(), "clear_bookmarks");
setupDynamicActions();
@@ -758,20 +758,20 @@ void KBabelMW::setupDynamicActions()
// dynamic validation tools
TQValueList<KDataToolInfo> tools = ToolAction::validationTools();
- TQPtrList<KAction> actions = ToolAction::dataToolActionList(
+ TQPtrList<TDEAction> actions = ToolAction::dataToolActionList(
tools, TQT_TQOBJECT(m_view), TQT_SLOT(validateUsingTool( const KDataToolInfo &, const TQString & )),
"validate", false, actionCollection() );
- KActionMenu* m_menu = new KActionMenu(i18n("&Validation"), actionCollection(), "dynamic_validation_tools");
+ TDEActionMenu* m_menu = new TDEActionMenu(i18n("&Validation"), actionCollection(), "dynamic_validation_tools");
- KAction* ac = new KAction(i18n("Perform &All Checks"), CTRL+Key_E , TQT_TQOBJECT(m_view),
+ TDEAction* ac = new TDEAction(i18n("Perform &All Checks"), CTRL+Key_E , TQT_TQOBJECT(m_view),
TQT_SLOT(checkAll()),actionCollection(), "check_all");
ac->setEnabled(false);
m_menu->insert(ac);
- m_menu->insert( new KActionSeparator() );
+ m_menu->insert( new TDEActionSeparator() );
- ac = new KAction(i18n("C&heck Syntax"), CTRL+Key_T , TQT_TQOBJECT(m_view),
+ ac = new TDEAction(i18n("C&heck Syntax"), CTRL+Key_T , TQT_TQOBJECT(m_view),
TQT_SLOT(checkSyntax()),actionCollection(), "check_syntax");
ac->setEnabled(false);
m_menu->insert(ac);
@@ -811,7 +811,7 @@ void KBabelMW::setupDynamicActions()
}
// insert tools
- m_menu = new KActionMenu(i18n("&Modify"), actionCollection(), "dynamic_modify_tools");
+ m_menu = new TDEActionMenu(i18n("&Modify"), actionCollection(), "dynamic_modify_tools");
for( ac = actions.first(); ac ; ac = actions.next() )
{
m_menu->insert(ac);
@@ -848,7 +848,7 @@ void KBabelMW::setupDynamicActions()
"validate", true, actionCollection() );
// insert tools
- m_menu = new KActionMenu(i18n("&Modify"), actionCollection(), "dynamic_modify_tools");
+ m_menu = new TDEActionMenu(i18n("&Modify"), actionCollection(), "dynamic_modify_tools");
for( ac = actions.first(); ac ; ac = actions.next() )
{
m_menu->insert(ac);
@@ -1083,7 +1083,7 @@ void KBabelMW::fileSave_internal()
else
{
// disable save
- KAction* saveAction=(KAction*)actionCollection()->action( KStdAction::name( KStdAction::Save) );
+ TDEAction* saveAction=(TDEAction*)actionCollection()->action( KStdAction::name( KStdAction::Save) );
saveAction->setEnabled(false);
m_view->saveFile();
@@ -1263,7 +1263,7 @@ void KBabelMW::openCatalogManager()
TQString url = "";
if( kapp->startServiceByDesktopName(prog,url, &result,&service))
{
- KMessageBox::error(this, i18n("Unable to use KLauncher to start "
+ KMessageBox::error(this, i18n("Unable to use TDELauncher to start "
"Catalog Manager. You should check the installation of TDE.\n"
"Please start Catalog Manager manually."));
return;
@@ -1281,8 +1281,8 @@ void KBabelMW::openCatalogManager()
void KBabelMW::firstEntryDisplayed(bool firstEntry, bool firstForm)
{
- KAction* firstAction=(KAction*)actionCollection()->action(KStdAction::stdName(KStdAction::FirstPage));
- KAction* prevAction=(KAction*)actionCollection()->action("go_prev_entry");
+ TDEAction* firstAction=(TDEAction*)actionCollection()->action(KStdAction::stdName(KStdAction::FirstPage));
+ TDEAction* prevAction=(TDEAction*)actionCollection()->action("go_prev_entry");
firstAction->setEnabled(!firstEntry);
prevAction->setEnabled(!(firstEntry && firstForm));
@@ -1291,8 +1291,8 @@ void KBabelMW::firstEntryDisplayed(bool firstEntry, bool firstForm)
void KBabelMW::lastEntryDisplayed(bool lastEntry, bool lastForm)
{
- KAction* lastAction=(KAction*)actionCollection()->action(KStdAction::stdName(KStdAction::LastPage));
- KAction* nextAction=(KAction*)actionCollection()->action("go_next_entry");
+ TDEAction* lastAction=(TDEAction*)actionCollection()->action(KStdAction::stdName(KStdAction::LastPage));
+ TDEAction* nextAction=(TDEAction*)actionCollection()->action("go_next_entry");
lastAction->setEnabled(!lastEntry);
nextAction->setEnabled(!(lastEntry && lastForm));
@@ -1323,7 +1323,7 @@ void KBabelMW::untranslatedDisplayed(bool flag)
return;
// do not allow fuzzy toggle for untranslated
- KAction *action=actionCollection()->action("edit_toggle_fuzzy");
+ TDEAction *action=actionCollection()->action("edit_toggle_fuzzy");
if(action)
action->setEnabled(!flag);
@@ -1445,26 +1445,26 @@ void KBabelMW::hasUntranslatedInFront(bool flag)
void KBabelMW::hasErrorAfterwards(bool flag)
{
- KAction* action=actionCollection()->action("go_next_error");
+ TDEAction* action=actionCollection()->action("go_next_error");
action->setEnabled(flag);
}
void KBabelMW::hasErrorInFront(bool flag)
{
- KAction* action=actionCollection()->action("go_prev_error");
+ TDEAction* action=actionCollection()->action("go_prev_error");
action->setEnabled(flag);
}
void KBabelMW::enableBackHistory(bool on)
{
- KAction* action=actionCollection()->action("go_back_history");
+ TDEAction* action=actionCollection()->action("go_back_history");
action->setEnabled(on);
}
void KBabelMW::enableForwardHistory(bool on)
{
- KAction* action=actionCollection()->action("go_forward_history");
+ TDEAction* action=actionCollection()->action("go_forward_history");
action->setEnabled(on);
}
@@ -1519,7 +1519,7 @@ void KBabelMW::showModified(bool on)
// display the text on the caption
setCaption(m_view->catalog()->package(),on);
- KAction *action=actionCollection()->action(
+ TDEAction *action=actionCollection()->action(
KStdAction::stdName(KStdAction::Save));
action->setEnabled(on);
@@ -1541,19 +1541,19 @@ void KBabelMW::enableDefaults(bool readOnly)
void KBabelMW::enableUndo(bool on)
{
- KAction* action=actionCollection()->action(KStdAction::stdName(KStdAction::Undo));
+ TDEAction* action=actionCollection()->action(KStdAction::stdName(KStdAction::Undo));
action->setEnabled(on);
}
void KBabelMW::enableRedo(bool on)
{
- KAction* action=actionCollection()->action(KStdAction::stdName(KStdAction::Redo));
+ TDEAction* action=actionCollection()->action(KStdAction::stdName(KStdAction::Redo));
action->setEnabled(on);
}
void KBabelMW::enableStop(bool flag)
{
- KAction* action=(KAction*)actionCollection()->action("stop_search");
+ TDEAction* action=(TDEAction*)actionCollection()->action("stop_search");
action->setEnabled(flag);
}
@@ -1771,7 +1771,7 @@ void KBabelMW::changeProjectActions(const TQString& project)
{
bool def = (project == KBabel::ProjectManager::defaultProjectName());
- KAction* saveAction=(KAction*)actionCollection()->action( "project_close" );
+ TDEAction* saveAction=(TDEAction*)actionCollection()->action( "project_close" );
saveAction->setEnabled( ! def );
if (!def)
diff --git a/kbabel/kbabel/kbabel.h b/kbabel/kbabel/kbabel.h
index 7e6b4913..9d6b6bd4 100644
--- a/kbabel/kbabel/kbabel.h
+++ b/kbabel/kbabel/kbabel.h
@@ -49,8 +49,8 @@
#include "kbabelview.h"
#include "kbproject.h"
-class KAction;
-class KRecentFilesAction;
+class TDEAction;
+class TDERecentFilesAction;
class KLed;
class KProgress;
class TQHBox;
@@ -293,16 +293,16 @@ private:
// frequently used actions
- KAction* a_unsetFuzzy;
- KAction* a_prevFoU;
- KAction* a_nextFoU;
- KAction* a_prevFuzzy;
- KAction* a_nextFuzzy;
- KAction* a_prevUntrans;
- KAction* a_nextUntrans;
+ TDEAction* a_unsetFuzzy;
+ TDEAction* a_prevFoU;
+ TDEAction* a_nextFoU;
+ TDEAction* a_prevFuzzy;
+ TDEAction* a_nextFuzzy;
+ TDEAction* a_prevUntrans;
+ TDEAction* a_nextUntrans;
- KRecentFilesAction* a_recent;
- KRecentFilesAction* a_recentprojects;
+ TDERecentFilesAction* a_recent;
+ TDERecentFilesAction* a_recentprojects;
DictionaryMenu *dictMenu;
DictionaryMenu *selectionDictMenu;
diff --git a/kbabel/kbabel/kbabelview.cpp b/kbabel/kbabel/kbabelview.cpp
index 8cf98335..5755a3e3 100644
--- a/kbabel/kbabel/kbabelview.cpp
+++ b/kbabel/kbabel/kbabelview.cpp
@@ -3460,12 +3460,12 @@ bool KBabelView::eventFilter( TQObject* object, TQEvent* event)
gotoLast();
return true;
}
- else if( KShortcut(KKey(ke)) == KStdAccel::undo() )
+ else if( TDEShortcut(KKey(ke)) == TDEStdAccel::undo() )
{
undo();
return true;
}
- else if( KShortcut(KKey(ke)) == KStdAccel::redo() )
+ else if( TDEShortcut(KKey(ke)) == TDEStdAccel::redo() )
{
redo();
return true;
diff --git a/kbabel/kbabel/kbabelview.h b/kbabel/kbabel/kbabelview.h
index 28766458..b9b286ea 100644
--- a/kbabel/kbabel/kbabelview.h
+++ b/kbabel/kbabel/kbabelview.h
@@ -54,7 +54,7 @@ namespace KBabel
class TQListBoxItem;
class TQTextView;
class TQTabWidget;
-class KListBox;
+class TDEListBox;
class KSpell;
class KSpellConfig;
class KBabelDictBox;
diff --git a/kbabel/kbabel/kbcataloglistview.cpp b/kbabel/kbabel/kbcataloglistview.cpp
index aace2c10..d05f135c 100644
--- a/kbabel/kbabel/kbcataloglistview.cpp
+++ b/kbabel/kbabel/kbcataloglistview.cpp
@@ -40,7 +40,7 @@ KBCatalogListView::KBCatalogListView(KBCatalog* catalog, TQWidget *parent, KBabe
m_catalog= catalog;
TQVBoxLayout* layout=new TQVBoxLayout(this);
- m_listview = new KListView(this, "catalogListView");
+ m_listview = new TDEListView(this, "catalogListView");
m_listview->addColumn(i18n("Id"));
m_listview->addColumn(i18n("Original String"));
m_listview->addColumn(i18n("Translated String"));
diff --git a/kbabel/kbabel/kbcataloglistview.h b/kbabel/kbabel/kbcataloglistview.h
index c1fcd005..92f08603 100644
--- a/kbabel/kbabel/kbcataloglistview.h
+++ b/kbabel/kbabel/kbcataloglistview.h
@@ -41,7 +41,7 @@ namespace KBabel{
class KBabelMW;
class KBCatalog;
-class KListView;
+class TDEListView;
/**
@@ -72,7 +72,7 @@ public slots:
void msgstrChanged(const TQString&);
private:
- KListView * m_listview;
+ TDEListView * m_listview;
KBCatalog* m_catalog;
TQPtrVector<KBCatalogListViewItem>* m_items;
diff --git a/kbabel/kbabel/kbcataloglistviewitem.cpp b/kbabel/kbabel/kbcataloglistviewitem.cpp
index 4bbc3049..92eb158b 100644
--- a/kbabel/kbabel/kbcataloglistviewitem.cpp
+++ b/kbabel/kbabel/kbcataloglistviewitem.cpp
@@ -23,7 +23,7 @@
#include "kbcataloglistviewitem.h"
#include <assert.h>
-KBCatalogListViewItem::KBCatalogListViewItem(KListView* lv, KListViewItem* parent, uint id, TQString msgid, TQString msgstr)
+KBCatalogListViewItem::KBCatalogListViewItem(TDEListView* lv, TDEListViewItem* parent, uint id, TQString msgid, TQString msgstr)
: Super(lv, parent, "","",""), m_id(id), m_msgid(msgid), m_msgstr(msgstr)
{
setText(0,TQString::number(id));
diff --git a/kbabel/kbabel/kbcataloglistviewitem.h b/kbabel/kbabel/kbcataloglistviewitem.h
index 4a24c159..89c0e859 100644
--- a/kbabel/kbabel/kbcataloglistviewitem.h
+++ b/kbabel/kbabel/kbcataloglistviewitem.h
@@ -30,11 +30,11 @@
/**
@author
*/
-class KBCatalogListViewItem : public KListViewItem
+class KBCatalogListViewItem : public TDEListViewItem
{
- typedef KListViewItem Super;
+ typedef TDEListViewItem Super;
public:
- KBCatalogListViewItem(KListView* lv, KListViewItem* parent, uint id, TQString msgid, TQString msgstr);
+ KBCatalogListViewItem(TDEListView* lv, TDEListViewItem* parent, uint id, TQString msgid, TQString msgstr);
~KBCatalogListViewItem();
diff --git a/kbabel/kbabel/main.cpp b/kbabel/kbabel/main.cpp
index 1ecea9ed..2ed2cba1 100644
--- a/kbabel/kbabel/main.cpp
+++ b/kbabel/kbabel/main.cpp
@@ -246,9 +246,9 @@ void KBabelInterface::openURL(TQCString url, TQCString package, WId window, int
}
else
{
- KMainWindow *mw = 0;
- if(KMainWindow::memberList && !KMainWindow::memberList->isEmpty())
- mw=KMainWindow::memberList->first();
+ TDEMainWindow *mw = 0;
+ if(TDEMainWindow::memberList && !TDEMainWindow::memberList->isEmpty())
+ mw=TDEMainWindow::memberList->first();
// first, try to lookup correct winid
while( mw ) {
@@ -263,7 +263,7 @@ void KBabelInterface::openURL(TQCString url, TQCString package, WId window, int
return ;
}
- mw = KMainWindow::memberList->next();
+ mw = TDEMainWindow::memberList->next();
}
// now, the empty window
@@ -282,8 +282,8 @@ void KBabelInterface::openURL(TQCString url, TQCString package, WId window, int
return;
}
- if(KMainWindow::memberList && !KMainWindow::memberList->isEmpty())
- mw=KMainWindow::memberList->first();
+ if(TDEMainWindow::memberList && !TDEMainWindow::memberList->isEmpty())
+ mw=TDEMainWindow::memberList->first();
while( mw ) {
if( mw->inherits("KBabelMW") && static_cast<KBabelMW*>(mw)->project()==project)
@@ -297,7 +297,7 @@ void KBabelInterface::openURL(TQCString url, TQCString package, WId window, int
return ;
}
- mw = KMainWindow::memberList->next();
+ mw = TDEMainWindow::memberList->next();
}
if( !mw )
@@ -335,9 +335,9 @@ void KBabelInterface::openTemplate(TQCString openFilename, TQCString saveFilenam
}
else
{
- KMainWindow *mw = 0;
- if(KMainWindow::memberList && !KMainWindow::memberList->isEmpty())
- mw=KMainWindow::memberList->first();
+ TDEMainWindow *mw = 0;
+ if(TDEMainWindow::memberList && !TDEMainWindow::memberList->isEmpty())
+ mw=TDEMainWindow::memberList->first();
if(mw && mw->inherits("KBabelMW") && static_cast<KBabelMW*>(mw)->project()==project)
{
diff --git a/kbabel/kbabel/taglistview.cpp b/kbabel/kbabel/taglistview.cpp
index 11d0905e..0fdd8183 100644
--- a/kbabel/kbabel/taglistview.cpp
+++ b/kbabel/kbabel/taglistview.cpp
@@ -50,7 +50,7 @@ TagListView::TagListView(KBCatalog* catalog,TQWidget *parent, Project::Ptr proje
TQVBoxLayout* layout = new TQVBoxLayout( this );
layout->setResizeMode( TQLayout::Minimum );
- _tagBox = new KListBox (this, "taglist textview");
+ _tagBox = new TDEListBox (this, "taglist textview");
layout->addWidget (_tagBox);
diff --git a/kbabel/kbabel/taglistview.h b/kbabel/kbabel/taglistview.h
index d8c8dd11..c936435d 100644
--- a/kbabel/kbabel/taglistview.h
+++ b/kbabel/kbabel/taglistview.h
@@ -35,7 +35,7 @@
#include "kbcatalogview.h"
-class KListBox;
+class TDEListBox;
class TagListView : public KBCatalogView
{
@@ -56,7 +56,7 @@ signals:
void signalTagSelected (const TQString& tag);
private:
- KListBox* _tagBox;
+ TDEListBox* _tagBox;
};
#endif // TAGLISTVIEW_H
diff --git a/kbabel/kbabeldict/dictchooser.cpp b/kbabel/kbabeldict/dictchooser.cpp
index a7803320..3ac386e5 100644
--- a/kbabel/kbabeldict/dictchooser.cpp
+++ b/kbabel/kbabeldict/dictchooser.cpp
@@ -62,7 +62,7 @@ DictChooser::DictChooser(KBabelDictBox*b, TQStringList selected
label = new TQLabel(i18n("dictionary to use","Use:"),this);
layout->addWidget(label,0,2);
- unselectedBox = new KListBox(this,"unselectedBox");
+ unselectedBox = new TDEListBox(this,"unselectedBox");
layout->addWidget(unselectedBox,1,0);
@@ -76,7 +76,7 @@ DictChooser::DictChooser(KBabelDictBox*b, TQStringList selected
bLayout->addStretch();
layout->addLayout(bLayout,1,1);
- selectedBox = new KListBox(this,"selectedBox");
+ selectedBox = new TDEListBox(this,"selectedBox");
layout->addWidget(selectedBox,1,2);
diff --git a/kbabel/kbabeldict/dictchooser.h b/kbabel/kbabeldict/dictchooser.h
index b2f80240..37cc0e28 100644
--- a/kbabel/kbabeldict/dictchooser.h
+++ b/kbabel/kbabeldict/dictchooser.h
@@ -40,7 +40,7 @@
#include <tqwidget.h>
#include <kbabeldictbox.h>
-class KListBox;
+class TDEListBox;
class KTempFile;
class TQPushButton;
@@ -80,8 +80,8 @@ private:
KBabelDictBox* box;
TQPtrList<ModuleInfo> dictList;
- KListBox *selectedBox;
- KListBox *unselectedBox;
+ TDEListBox *selectedBox;
+ TDEListBox *unselectedBox;
TQPushButton *selectBtn;
TQPushButton *unselectBtn;
diff --git a/kbabel/kbabeldict/dictionarymenu.cpp b/kbabel/kbabeldict/dictionarymenu.cpp
index 759468c9..57b7d9d7 100644
--- a/kbabel/kbabeldict/dictionarymenu.cpp
+++ b/kbabel/kbabeldict/dictionarymenu.cpp
@@ -38,7 +38,7 @@
#include <tqsignalmapper.h>
-DictionaryMenu::DictionaryMenu(KPopupMenu *popupMenu, KActionCollection *collection
+DictionaryMenu::DictionaryMenu(TDEPopupMenu *popupMenu, TDEActionCollection *collection
, TQObject *parent)
: TQObject(parent, "dictionarymenu")
, popup(popupMenu)
@@ -89,7 +89,7 @@ void DictionaryMenu::add(const TQString& name, const TQString& moduleId)
{
if(popup)
{
- KAction* dictionaryAction = new KAction( name, 0, dictionaryMapper, TQT_SLOT(map()), actionCollection, moduleId.utf8() );
+ TDEAction* dictionaryAction = new TDEAction( name, 0, dictionaryMapper, TQT_SLOT(map()), actionCollection, moduleId.utf8() );
uint id = maxId++;
dictionaryAction->plug(popup, id);
@@ -114,9 +114,9 @@ void DictionaryMenu::add(const TQString& n, const TQString& moduleId
{
keyString=key.arg(accel2id.count()+1);
}
- KShortcut k(keyString);
+ TDEShortcut k(keyString);
- KAction* dictionaryAction = new KAction( name, k, dictionaryMapper, TQT_SLOT(map()), actionCollection, key.arg(moduleId).utf8() );
+ TDEAction* dictionaryAction = new TDEAction( name, k, dictionaryMapper, TQT_SLOT(map()), actionCollection, key.arg(moduleId).utf8() );
uint id = maxId++;
dictionaryAction->plug(popup,id);
diff --git a/kbabel/kbabeldict/dictionarymenu.h b/kbabel/kbabeldict/dictionarymenu.h
index 913ef79a..26729c7e 100644
--- a/kbabel/kbabeldict/dictionarymenu.h
+++ b/kbabel/kbabeldict/dictionarymenu.h
@@ -40,8 +40,8 @@
#include <kdemacros.h>
class TQSignalMapper;
-class KPopupMenu;
-class KActionCollection;
+class TDEPopupMenu;
+class TDEActionCollection;
class KDE_EXPORT DictionaryMenu : public TQObject
{
@@ -49,7 +49,7 @@ class KDE_EXPORT DictionaryMenu : public TQObject
public:
- DictionaryMenu(KPopupMenu *menu, KActionCollection *collection, TQObject *parent=0);
+ DictionaryMenu(TDEPopupMenu *menu, TDEActionCollection *collection, TQObject *parent=0);
~DictionaryMenu();
void add(const TQString& name,const TQString& id);
@@ -69,8 +69,8 @@ private slots:
void activated(int);
private:
- TQGuardedPtr<KPopupMenu> popup;
- TQGuardedPtr<KActionCollection> actionCollection;
+ TQGuardedPtr<TDEPopupMenu> popup;
+ TQGuardedPtr<TDEActionCollection> actionCollection;
TQIntDict<TQString> num2id;
TQIntDict<TQString> accel2id;
TQSignalMapper* dictionaryMapper;
diff --git a/kbabel/kbabeldict/kbabeldictbox.cpp b/kbabel/kbabeldict/kbabeldictbox.cpp
index b56f38e3..d62cb176 100644
--- a/kbabel/kbabeldict/kbabeldictbox.cpp
+++ b/kbabel/kbabeldict/kbabeldictbox.cpp
@@ -282,7 +282,7 @@ KBabelDictBox::KBabelDictBox( TQWidget* parent, const char* name, WFlags fl )
vbox->addWidget(translationView);
viewContainer->setMinimumSize(1,1);
- resultListView = new KListView( resultSplitter, "resultListView" );
+ resultListView = new TDEListView( resultSplitter, "resultListView" );
resultListView->setMinimumSize(1,1);
resultListView->addColumn( i18n( "Score" ) );
resultListView->addColumn( i18n( "Original" ) );
@@ -296,9 +296,9 @@ KBabelDictBox::KBabelDictBox( TQWidget* parent, const char* name, WFlags fl )
connect(resultListView, TQT_SIGNAL(returnPressed(TQListViewItem *))
, this, TQT_SLOT(editFile()));
connect(resultListView
- , TQT_SIGNAL(contextMenu(KListView *,TQListViewItem *,const TQPoint&))
+ , TQT_SIGNAL(contextMenu(TDEListView *,TQListViewItem *,const TQPoint&))
, this
- , TQT_SLOT(showContextMenu(KListView *,TQListViewItem *,const TQPoint&)));
+ , TQT_SLOT(showContextMenu(TDEListView *,TQListViewItem *,const TQPoint&)));
resultSplitter->setResizeMode(viewContainer,TQSplitter::KeepSize);
TQValueList<int> sizes;
@@ -1717,7 +1717,7 @@ void KBabelDictBox::editFile()
}
}
-void KBabelDictBox::showContextMenu(KListView *,TQListViewItem *,const TQPoint& p)
+void KBabelDictBox::showContextMenu(TDEListView *,TQListViewItem *,const TQPoint& p)
{
if(rmbPopup)
{
diff --git a/kbabel/kbabeldict/kbabeldictbox.h b/kbabel/kbabeldict/kbabeldictbox.h
index 5f6fc885..7a71eb06 100644
--- a/kbabel/kbabeldict/kbabeldictbox.h
+++ b/kbabel/kbabeldict/kbabeldictbox.h
@@ -42,7 +42,7 @@
#include <tqptrlist.h>
#include <tqstringlist.h>
-class KListView;
+class TDEListView;
class TQLabel;
class TQListViewItem;
class TQPopupMenu;
@@ -223,7 +223,7 @@ protected slots:
void showListOnly();
void clearModuleResults();
void editFile();
- void showContextMenu(KListView *, TQListViewItem *, const TQPoint&);
+ void showContextMenu(TDEListView *, TQListViewItem *, const TQPoint&);
/**
* This slots gets connected to a SearchEngine's searchStopped() signal,
@@ -270,7 +270,7 @@ private:
TQTextView *origView;
TQTextView *translationView;
TQSplitter *viewContainer;
- KListView *resultListView;
+ TDEListView *resultListView;
TQSplitter *resultSplitter;
TQToolButton *listButton;
diff --git a/kbugbuster/gui/buglvi.cpp b/kbugbuster/gui/buglvi.cpp
index 18d7c064..7026bd29 100644
--- a/kbugbuster/gui/buglvi.cpp
+++ b/kbugbuster/gui/buglvi.cpp
@@ -27,8 +27,8 @@
using namespace KBugBusterMainWindow;
-BugLVI::BugLVI( KListView *parent , const Bug &bug )
-: KListViewItem( parent, bug.number() + " ",
+BugLVI::BugLVI( TDEListView *parent , const Bug &bug )
+: TDEListViewItem( parent, bug.number() + " ",
i18n( "1 day", "%n days", bug.age() ),
bug.title(), //KStringHandler::csqueeze( bug.title(), 70 ),
Bug::statusLabel( bug.status() ),
@@ -97,7 +97,7 @@ void BugLVI::paintCell(TQPainter* p, const TQColorGroup& cg,
newCg.setColor( TQColorGroup::Text, cg.color( TQColorGroup::Dark ) );
}
- KListViewItem::paintCell( p, newCg, column, width, align );
+ TDEListViewItem::paintCell( p, newCg, column, width, align );
}
void BugLVI::setCommandState( BugCommand::State state)
diff --git a/kbugbuster/gui/buglvi.h b/kbugbuster/gui/buglvi.h
index 5f66f398..d1bd7558 100644
--- a/kbugbuster/gui/buglvi.h
+++ b/kbugbuster/gui/buglvi.h
@@ -28,10 +28,10 @@ namespace KBugBusterMainWindow
/**
* @author Martijn Klingens
*/
-class BugLVI : public KListViewItem
+class BugLVI : public TDEListViewItem
{
public:
- BugLVI( KListView *parent , const Bug &bug );
+ BugLVI( TDEListView *parent , const Bug &bug );
~BugLVI();
Bug& bug() { return m_bug; }
diff --git a/kbugbuster/gui/cwbuglistcontainer.cpp b/kbugbuster/gui/cwbuglistcontainer.cpp
index 14a601be..d7a39cad 100644
--- a/kbugbuster/gui/cwbuglistcontainer.cpp
+++ b/kbugbuster/gui/cwbuglistcontainer.cpp
@@ -59,9 +59,9 @@ CWBugListContainer::CWBugListContainer( TQWidget *parent , const char * name )
m_listStack = new TQWidgetStack( this );
// Create Outstanding Bugs listview
- m_listBugs = new KListView( m_listStack );
+ m_listBugs = new TDEListView( m_listStack );
- topLayout->addWidget( new KListViewSearchLineWidget( m_listBugs, this ) );
+ topLayout->addWidget( new TDEListViewSearchLineWidget( m_listBugs, this ) );
topLayout->addWidget( m_listStack );
topLayout->setStretchFactor( m_listStack, 1 );
diff --git a/kbugbuster/gui/cwbuglistcontainer.h b/kbugbuster/gui/cwbuglistcontainer.h
index d6ebda07..bb4b1f7a 100644
--- a/kbugbuster/gui/cwbuglistcontainer.h
+++ b/kbugbuster/gui/cwbuglistcontainer.h
@@ -22,7 +22,7 @@
#include <tqwidget.h>
-class KListView;
+class TDEListView;
class KFind;
class BugCommand;
class BugLVI;
@@ -85,7 +85,7 @@ private:
TQLabel *m_listLabel;
TQWidgetStack *m_listStack;
- KListView *m_listBugs;
+ TDEListView *m_listBugs;
KFind *m_find;
BugLVI *m_findItem;
diff --git a/kbugbuster/gui/kbbmainwindow.cpp b/kbugbuster/gui/kbbmainwindow.cpp
index 34d4b0f2..df133bce 100644
--- a/kbugbuster/gui/kbbmainwindow.cpp
+++ b/kbugbuster/gui/kbbmainwindow.cpp
@@ -92,7 +92,7 @@ KBBMainWindow::KBBMainWindow( const TQCString &initialPackage,
const TQCString &initialComponent,
const TQCString &initialBug,
TQWidget * , const char * name )
- : KMainWindow( 0, name ), mPreferencesDialog( 0 ), mResponseViewer( 0 ),
+ : TDEMainWindow( 0, name ), mPreferencesDialog( 0 ), mResponseViewer( 0 ),
mBugSourceViewer( 0 ), mPackageSelectDialog( 0 )
{
BugSystem::self()->setCurrentServer( KBBPrefs::instance()->mCurrentServer );
@@ -148,54 +148,54 @@ void KBBMainWindow::initActions()
TQT_SLOT( close() ), actionCollection() );
fileQuit->setToolTip( i18n( "Quit KBugBuster" ) );
- new KAction( i18n("See &Pending Changes"), "contents", 0, TQT_TQOBJECT(this), TQT_SLOT( slotListChanges() ),
+ new TDEAction( i18n("See &Pending Changes"), "contents", 0, TQT_TQOBJECT(this), TQT_SLOT( slotListChanges() ),
actionCollection(), "file_seechanges" );
- new KAction( i18n("&Submit Changes"), "mail_send", 0, TQT_TQOBJECT(this), TQT_SLOT( slotSubmit() ),
+ new TDEAction( i18n("&Submit Changes"), "mail_send", 0, TQT_TQOBJECT(this), TQT_SLOT( slotSubmit() ),
actionCollection(), "file_submit" );
- reloadpacklist = new KAction( i18n("Reload &Product List"), "reload", CTRL+TQt::Key_F5, TQT_TQOBJECT(m_mainWidget), TQT_SLOT( slotReloadPackageList() ),
+ reloadpacklist = new TDEAction( i18n("Reload &Product List"), "reload", CTRL+TQt::Key_F5, TQT_TQOBJECT(m_mainWidget), TQT_SLOT( slotReloadPackageList() ),
actionCollection(), "reload_packagelist" );
- reloadpack= new KAction( i18n("Reload Bug &List (for current product)"), "reload", TQt::Key_F5, TQT_TQOBJECT(m_mainWidget), TQT_SLOT( slotReloadPackage() ),
+ reloadpack= new TDEAction( i18n("Reload Bug &List (for current product)"), "reload", TQt::Key_F5, TQT_TQOBJECT(m_mainWidget), TQT_SLOT( slotReloadPackage() ),
actionCollection(), "reload_package" );
- reloadbug = new KAction( i18n("Reload Bug &Details (for current bug)"), "reload", SHIFT+TQt::Key_F5, TQT_TQOBJECT(m_mainWidget), TQT_SLOT( slotReloadBug() ),
+ reloadbug = new TDEAction( i18n("Reload Bug &Details (for current bug)"), "reload", SHIFT+TQt::Key_F5, TQT_TQOBJECT(m_mainWidget), TQT_SLOT( slotReloadBug() ),
actionCollection(), "reload_bug" );
- loadMyBugs = new KAction( i18n( "Load &My Bugs List" ), 0, TQT_TQOBJECT(m_mainWidget), TQT_SLOT( slotLoadMyBugs() ),
+ loadMyBugs = new TDEAction( i18n( "Load &My Bugs List" ), 0, TQT_TQOBJECT(m_mainWidget), TQT_SLOT( slotLoadMyBugs() ),
actionCollection(), "load_my_bugs" );
- reloadall = new KAction( i18n("Load All Bug Details (for current product)"), TQt::Key_F6, TQT_TQOBJECT(m_mainWidget), TQT_SLOT( slotRetrieveAllBugDetails() ), actionCollection(), "load_allbugs" );
- new KAction( i18n("Extract &Attachments"), "filesave", TQt::Key_F4, TQT_TQOBJECT(m_mainWidget), TQT_SLOT( slotExtractAttachments() ),
+ reloadall = new TDEAction( i18n("Load All Bug Details (for current product)"), TQt::Key_F6, TQT_TQOBJECT(m_mainWidget), TQT_SLOT( slotRetrieveAllBugDetails() ), actionCollection(), "load_allbugs" );
+ new TDEAction( i18n("Extract &Attachments"), "filesave", TQt::Key_F4, TQT_TQOBJECT(m_mainWidget), TQT_SLOT( slotExtractAttachments() ),
actionCollection(), "extract_attachments" );
- new KAction( i18n("Clear Cache"), 0, TQT_TQOBJECT(this), TQT_SLOT( clearCache() ),
+ new TDEAction( i18n("Clear Cache"), 0, TQT_TQOBJECT(this), TQT_SLOT( clearCache() ),
actionCollection(), "clear_cache" );
- new KAction( i18n("&Search by Product..."), "goto", CTRL+TQt::Key_P, TQT_TQOBJECT(this),
+ new TDEAction( i18n("&Search by Product..."), "goto", CTRL+TQt::Key_P, TQT_TQOBJECT(this),
TQT_SLOT( searchPackage() ), actionCollection(), "search_package" );
- new KAction( i18n("Search by Bug &Number..."), "filefind", CTRL+TQt::Key_N, TQT_TQOBJECT(this),
+ new TDEAction( i18n("Search by Bug &Number..."), "filefind", CTRL+TQt::Key_N, TQT_TQOBJECT(this),
TQT_SLOT( searchBugNumber() ), actionCollection(), "search_bugnumber" );
// For now "Description" searches by title. Maybe later we can have a
// full-text search interfacing bugs.trinitydesktop.org and rename the current one to "By Title".
- new KAction( i18n("Search by &Description...") ,"find", CTRL+TQt::Key_D, TQT_TQOBJECT(this),
+ new TDEAction( i18n("Search by &Description...") ,"find", CTRL+TQt::Key_D, TQT_TQOBJECT(this),
TQT_SLOT( searchDescription() ), actionCollection(), "search_description" );
-// new KAction( i18n("&Merge"), "view_remove", CTRL+TQt::Key_M, TQT_TQOBJECT(m_mainWidget),
+// new TDEAction( i18n("&Merge"), "view_remove", CTRL+TQt::Key_M, TQT_TQOBJECT(m_mainWidget),
// TQT_SLOT( mergeBugs() ), actionCollection(), "cmd_merge" );
-// new KAction( i18n("&Unmerge"), "view_top_bottom", CTRL+SHIFT+TQt::Key_M, TQT_TQOBJECT(m_mainWidget),
+// new TDEAction( i18n("&Unmerge"), "view_top_bottom", CTRL+SHIFT+TQt::Key_M, TQT_TQOBJECT(m_mainWidget),
// TQT_SLOT( unmergeBugs() ), actionCollection(), "cmd_unmerge" );
- new KAction( i18n("C&lose..."), "edittrash", CTRL+TQt::Key_L, TQT_TQOBJECT(m_mainWidget),
+ new TDEAction( i18n("C&lose..."), "edittrash", CTRL+TQt::Key_L, TQT_TQOBJECT(m_mainWidget),
TQT_SLOT( closeBug() ), actionCollection(), "cmd_close" );
-// new KAction( i18n("Clos&e Silently"), "edittrash", CTRL+TQt::Key_E, TQT_TQOBJECT(m_mainWidget),
+// new TDEAction( i18n("Clos&e Silently"), "edittrash", CTRL+TQt::Key_E, TQT_TQOBJECT(m_mainWidget),
// TQT_SLOT( closeBugSilently() ), actionCollection(), "cmd_close_silently" );
- new KAction( i18n("Re&open"), "idea", CTRL+TQt::Key_O, TQT_TQOBJECT(m_mainWidget),
+ new TDEAction( i18n("Re&open"), "idea", CTRL+TQt::Key_O, TQT_TQOBJECT(m_mainWidget),
TQT_SLOT( reopenBug() ), actionCollection(), "cmd_reopen" );
-// new KAction( i18n("Re&assign..."), "folder_new", CTRL+TQt::Key_A, TQT_TQOBJECT(m_mainWidget),
+// new TDEAction( i18n("Re&assign..."), "folder_new", CTRL+TQt::Key_A, TQT_TQOBJECT(m_mainWidget),
// TQT_SLOT( reassignBug() ), actionCollection(), "cmd_reassign" );
-// new KAction( i18n("Change &Title..."), "text_under", CTRL+TQt::Key_T, TQT_TQOBJECT(m_mainWidget),
+// new TDEAction( i18n("Change &Title..."), "text_under", CTRL+TQt::Key_T, TQT_TQOBJECT(m_mainWidget),
// TQT_SLOT( titleBug() ), actionCollection(), "cmd_title" );
-// new KAction( i18n("Change &Severity..."), "edit", CTRL+TQt::Key_S, TQT_TQOBJECT(m_mainWidget),
+// new TDEAction( i18n("Change &Severity..."), "edit", CTRL+TQt::Key_S, TQT_TQOBJECT(m_mainWidget),
// TQT_SLOT( severityBug() ), actionCollection(), "cmd_severity" );
- new KAction( i18n("&Reply..."), "mail_replyall",CTRL+TQt::Key_R , TQT_TQOBJECT(m_mainWidget),
+ new TDEAction( i18n("&Reply..."), "mail_replyall",CTRL+TQt::Key_R , TQT_TQOBJECT(m_mainWidget),
TQT_SLOT( replyBug() ), actionCollection(), "cmd_reply" );
- new KAction( i18n("Reply &Privately..."), "mail_reply", CTRL+TQt::Key_I, TQT_TQOBJECT(m_mainWidget),
+ new TDEAction( i18n("Reply &Privately..."), "mail_reply", CTRL+TQt::Key_I, TQT_TQOBJECT(m_mainWidget),
TQT_SLOT( replyPrivateBug() ), actionCollection(), "cmd_replyprivate" );
KStdAction::showMenubar(TQT_TQOBJECT(this), TQT_SLOT( slotToggleMenubar() ), actionCollection() );
@@ -204,7 +204,7 @@ void KBBMainWindow::initActions()
setStandardToolBarMenuEnabled(true);
#endif
- m_disconnectedAction = new KToggleAction( i18n("&Disconnected Mode"), 0,
+ m_disconnectedAction = new TDEToggleAction( i18n("&Disconnected Mode"), 0,
TQT_TQOBJECT(this),
TQT_SLOT( slotDisconnectedAction() ),
actionCollection(),
@@ -212,26 +212,26 @@ void KBBMainWindow::initActions()
m_disconnectedAction->setChecked( BugSystem::self()->disconnected() );
// Bookmarks menu
- m_pamBookmarks = new KActionMenu( i18n( "&Bookmarks" ), "bookmark", actionCollection(), "bookmarks" );
+ m_pamBookmarks = new TDEActionMenu( i18n( "&Bookmarks" ), "bookmark", actionCollection(), "bookmarks" );
m_pBookmarkMenu = new KBookmarkMenu( KBBBookmarkManager::self(), this, m_pamBookmarks->popupMenu(), actionCollection(), true );
KStdAction::preferences( TQT_TQOBJECT(this), TQT_SLOT(preferences()), actionCollection() );
- KToggleAction *toggleTmp = new KToggleAction( i18n("Show Closed Bugs"), "recycled", 0, TQT_TQOBJECT(this), TQT_SLOT( slotToggleDone() ),
+ TDEToggleAction *toggleTmp = new TDEToggleAction( i18n("Show Closed Bugs"), "recycled", 0, TQT_TQOBJECT(this), TQT_SLOT( slotToggleDone() ),
actionCollection(), "cmd_toggle_done" );
#if KDE_IS_VERSION( 3, 2, 90 )
toggleTmp->setCheckedState(i18n("Hide Closed Bugs"));
#endif
toggleTmp->setChecked( KBBPrefs::instance()->mShowClosedBugs );
- toggleTmp =new KToggleAction( i18n("Show Wishes"), "bookmark", 0, TQT_TQOBJECT(this), TQT_SLOT( slotToggleWishes() ),
+ toggleTmp =new TDEToggleAction( i18n("Show Wishes"), "bookmark", 0, TQT_TQOBJECT(this), TQT_SLOT( slotToggleWishes() ),
actionCollection(), "cmd_toggle_wishes" );
#if KDE_IS_VERSION( 3, 2, 90 )
toggleTmp->setCheckedState(i18n("Hide Wishes"));
#endif
toggleTmp->setChecked(KBBPrefs::instance()->mShowWishes);
- mSelectServerAction = new KSelectAction( i18n( "Select Server" ), 0, 0,
+ mSelectServerAction = new TDESelectAction( i18n( "Select Server" ), 0, 0,
TQT_TQOBJECT(this),
TQT_SLOT( slotSelectServer() ),
actionCollection(),
@@ -240,10 +240,10 @@ void KBBMainWindow::initActions()
setupSelectServerAction();
if ( KBBPrefs::instance()->mDebugMode ) {
- new KAction( i18n("Show Last Server Response..."), 0 , TQT_TQOBJECT(this),
+ new TDEAction( i18n("Show Last Server Response..."), 0 , TQT_TQOBJECT(this),
TQT_SLOT( showLastResponse() ), actionCollection(),
"debug_lastresponse" );
- new KAction( i18n("Show Bug HTML Source..."), 0 , TQT_TQOBJECT(this),
+ new TDEAction( i18n("Show Bug HTML Source..."), 0 , TQT_TQOBJECT(this),
TQT_SLOT( showBugSource() ), actionCollection(),
"debug_showbugsource" );
}
diff --git a/kbugbuster/gui/kbbmainwindow.h b/kbugbuster/gui/kbbmainwindow.h
index 4b82934a..9ced8512 100644
--- a/kbugbuster/gui/kbbmainwindow.h
+++ b/kbugbuster/gui/kbbmainwindow.h
@@ -25,11 +25,11 @@
#include "bug.h"
#include "bugdetails.h"
-class KAction;
-class KActionMenu;
+class TDEAction;
+class TDEActionMenu;
class KBookmarkMenu;
-class KToggleAction;
-class KSelectAction;
+class TDEToggleAction;
+class TDESelectAction;
class TQLabel;
class TQListViewItem;
class TQProgressBar;
@@ -45,7 +45,7 @@ namespace KBugBusterMainWindow
/**
* @author Martijn Klingens
*/
-class KBBMainWindow : public KMainWindow, virtual public KBookmarkOwner
+class KBBMainWindow : public TDEMainWindow, virtual public KBookmarkOwner
{
Q_OBJECT
@@ -66,7 +66,7 @@ class KBBMainWindow : public KMainWindow, virtual public KBookmarkOwner
public slots:
/**
- * Event handlers for our KActions
+ * Event handlers for our TDEActions
*/
void slotStatusMsg( const TQString &text );
void slotDisconnectedAction();
@@ -109,15 +109,15 @@ class KBBMainWindow : public KMainWindow, virtual public KBookmarkOwner
KBugBusterMainWindow::CentralWidget *m_mainWidget;
/**
- * Used KActions
+ * Used TDEActions
*/
- KAction *fileQuit;
- KAction *reloadpacklist;
- KAction *reloadpack;
- KAction *reloadbug;
- KAction *reloadall;
- KAction *loadMyBugs;
- KToggleAction *m_disconnectedAction;
+ TDEAction *fileQuit;
+ TDEAction *reloadpacklist;
+ TDEAction *reloadpack;
+ TDEAction *reloadbug;
+ TDEAction *reloadall;
+ TDEAction *loadMyBugs;
+ TDEToggleAction *m_disconnectedAction;
/**
* Status bar label. We need this, because the default TQt version doesn't
@@ -128,10 +128,10 @@ class KBBMainWindow : public KMainWindow, virtual public KBookmarkOwner
PreferencesDialog *mPreferencesDialog;
- KActionMenu *m_pamBookmarks;
+ TDEActionMenu *m_pamBookmarks;
KBookmarkMenu* m_pBookmarkMenu;
- KSelectAction *mSelectServerAction;
+ TDESelectAction *mSelectServerAction;
TextViewer *mResponseViewer;
TextViewer *mBugSourceViewer;
diff --git a/kbugbuster/gui/msginputdialog.cpp b/kbugbuster/gui/msginputdialog.cpp
index c34a18be..4bd8437a 100644
--- a/kbugbuster/gui/msginputdialog.cpp
+++ b/kbugbuster/gui/msginputdialog.cpp
@@ -90,7 +90,7 @@ MsgInputDialog::MsgInputDialog(MsgInputDialog::MessageType type, const Bug &bug,
l = new TQLabel( i18n( "&Preset Messages" ), w );
l->setFont( f );
- mPresets = new KListBox( w );
+ mPresets = new TDEListBox( w );
updatePresets();
l->setBuddy( mPresets );
diff --git a/kbugbuster/gui/msginputdialog.h b/kbugbuster/gui/msginputdialog.h
index 539a3589..ed7576e0 100644
--- a/kbugbuster/gui/msginputdialog.h
+++ b/kbugbuster/gui/msginputdialog.h
@@ -8,7 +8,7 @@
class KTextEdit;
class TQSplitter;
-class KListBox;
+class TDEListBox;
class MsgInputDialog : public KDialogBase
{
@@ -46,7 +46,7 @@ class MsgInputDialog : public KDialogBase
TQComboBox *mRecipient;
KTextEdit *mMessageEdit;
TQSplitter *mSplitter;
- KListBox *mPresets;
+ TDEListBox *mPresets;
Bug mBug;
Package mPackage;
diff --git a/kompare/ChangeLog b/kompare/ChangeLog
index 2781e875..52cfd307 100644
--- a/kompare/ChangeLog
+++ b/kompare/ChangeLog
@@ -129,7 +129,7 @@ Sep 27, 2003 : Otto Bruggeman
Sep 27, 2003 : Otto Bruggeman
* Moved the apply and navigation actions into the komparemodellist
- * Fixed Ingo's problem with the next and prev difference KActions
+ * Fixed Ingo's problem with the next and prev difference TDEActions
Sep 26, 2003 : Otto Bruggeman
* Added a struct Info in the Kompare namespace. This one contains all the info about what kompare is doing
diff --git a/kompare/kompare_shell.cpp b/kompare/kompare_shell.cpp
index dd4fda2a..6ec2a171 100644
--- a/kompare/kompare_shell.cpp
+++ b/kompare/kompare_shell.cpp
@@ -228,12 +228,12 @@ void KompareShell::blend( const KURL& url1, const KURL& diff )
void KompareShell::setupActions()
{
- KAction* open = KStdAction::open(TQT_TQOBJECT(this), TQT_SLOT(slotFileOpen()), actionCollection());
+ TDEAction* open = KStdAction::open(TQT_TQOBJECT(this), TQT_SLOT(slotFileOpen()), actionCollection());
open->setText( i18n( "&Open Diff..." ) );
- new KAction( i18n("&Compare Files..."), "fileopen", TQt::CTRL + TQt::Key_C,
+ new TDEAction( i18n("&Compare Files..."), "fileopen", TQt::CTRL + TQt::Key_C,
TQT_TQOBJECT(this), TQT_SLOT(slotFileCompareFiles()),
actionCollection(), "file_compare_files" );
- new KAction( i18n("&Blend URL with Diff..."), "fileblend", TQt::CTRL + TQt::Key_B,
+ new TDEAction( i18n("&Blend URL with Diff..."), "fileblend", TQt::CTRL + TQt::Key_B,
TQT_TQOBJECT(this), TQT_SLOT(slotFileBlendURLAndDiff()),
actionCollection(), "file_blend_url" );
KStdAction::quit( TQT_TQOBJECT(this), TQT_SLOT( slotFileClose() ), actionCollection() );
@@ -242,7 +242,7 @@ void KompareShell::setupActions()
createStandardStatusBarAction();
#endif
setStandardToolBarMenuEnabled(true);
- m_showTextView = new KToggleAction( i18n("Show T&ext View"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotShowTextView()),
+ m_showTextView = new TDEToggleAction( i18n("Show T&ext View"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotShowTextView()),
actionCollection(), "options_show_text_view" );
m_showTextView->setCheckedState(i18n("Hide T&ext View"));
diff --git a/kompare/kompare_shell.h b/kompare/kompare_shell.h
index 5b7a5abe..84f8887f 100644
--- a/kompare/kompare_shell.h
+++ b/kompare/kompare_shell.h
@@ -25,7 +25,7 @@
#include "kompare.h"
-class KToggleAction;
+class TDEToggleAction;
class KSqueezedTextLabel;
class KomparePart;
@@ -140,7 +140,7 @@ private:
KDockWidget* m_mainViewDock;
KDockWidget* m_navTreeDock;
- KToggleAction* m_showTextView;
+ TDEToggleAction* m_showTextView;
enum Kompare::Mode m_mode;
// This is the statusbarwidget for displaying the general stuff
diff --git a/kompare/komparenavtreepart/komparenavtreepart.cpp b/kompare/komparenavtreepart/komparenavtreepart.cpp
index fe231bb2..31146762 100644
--- a/kompare/komparenavtreepart/komparenavtreepart.cpp
+++ b/kompare/komparenavtreepart/komparenavtreepart.cpp
@@ -57,24 +57,24 @@ KompareNavTreePart::KompareNavTreePart( TQWidget* parent, const char* name )
setWidget( m_splitter );
- m_srcDirTree = new KListView( m_splitter );
+ m_srcDirTree = new TDEListView( m_splitter );
m_srcDirTree->addColumn( i18n("Source Folder") );
m_srcDirTree->setRootIsDecorated( false );
m_srcDirTree->setSorting( 0, true );
- m_destDirTree = new KListView( m_splitter );
+ m_destDirTree = new TDEListView( m_splitter );
m_destDirTree->addColumn( i18n("Destination Folder") );
m_destDirTree->setRootIsDecorated( false );
m_destDirTree->setSorting( 0, true );
- m_fileList = new KListView( m_splitter );
+ m_fileList = new TDEListView( m_splitter );
m_fileList->addColumn( i18n("Source File") );
m_fileList->addColumn( i18n("Destination File") );
m_fileList->setAllColumnsShowFocus( true );
m_fileList->setRootIsDecorated( false );
m_fileList->setSorting( 0, true );
- m_changesList = new KListView( m_splitter );
+ m_changesList = new TDEListView( m_splitter );
m_changesList->addColumn( i18n("Source Line") );
m_changesList->addColumn( i18n("Destination Line") );
m_changesList->addColumn( i18n("Difference") );
@@ -453,7 +453,7 @@ void KChangeLVI::setDifferenceText()
setText( 2, text );
}
-KChangeLVI::KChangeLVI( KListView* parent, Difference* diff ) : KListViewItem( parent )
+KChangeLVI::KChangeLVI( TDEListView* parent, Difference* diff ) : TDEListViewItem( parent )
{
m_difference = diff;
@@ -487,7 +487,7 @@ KChangeLVI::~KChangeLVI()
{
}
-KFileLVI::KFileLVI( KListView* parent, DiffModel* model ) : KListViewItem( parent )
+KFileLVI::KFileLVI( TDEListView* parent, DiffModel* model ) : TDEListViewItem( parent )
{
m_model = model;
@@ -498,7 +498,7 @@ KFileLVI::KFileLVI( KListView* parent, DiffModel* model ) : KListViewItem( paren
setSelectable( true );
}
-void KFileLVI::fillChangesList( KListView* changesList, TQPtrDict<KChangeLVI>* diffToChangeItemDict )
+void KFileLVI::fillChangesList( TDEListView* changesList, TQPtrDict<KChangeLVI>* diffToChangeItemDict )
{
changesList->clear();
diffToChangeItemDict->clear();
@@ -519,9 +519,9 @@ KFileLVI::~KFileLVI()
{
}
-KDirLVI::KDirLVI( KListView* parent, TQString& dir ) : KListViewItem( parent )
+KDirLVI::KDirLVI( TDEListView* parent, TQString& dir ) : TDEListViewItem( parent )
{
-// kdDebug(8105) << "KDirLVI (KListView) constructor called with dir = " << dir << endl;
+// kdDebug(8105) << "KDirLVI (TDEListView) constructor called with dir = " << dir << endl;
m_rootItem = true;
m_dirName = dir;
setPixmap( 0, SmallIcon( "folder" ) );
@@ -533,7 +533,7 @@ KDirLVI::KDirLVI( KListView* parent, TQString& dir ) : KListViewItem( parent )
setText( 0, m_dirName );
}
-KDirLVI::KDirLVI( KDirLVI* parent, TQString& dir ) : KListViewItem( parent )
+KDirLVI::KDirLVI( KDirLVI* parent, TQString& dir ) : TDEListViewItem( parent )
{
// kdDebug(8105) << "KDirLVI (KDirLVI) constructor called with dir = " << dir << endl;
m_rootItem = false;
@@ -592,7 +592,7 @@ KDirLVI* KDirLVI::findChild( TQString dir )
return 0L;
}
-void KDirLVI::fillFileList( KListView* fileList, TQPtrDict<KFileLVI>* modelToFileItemDict )
+void KDirLVI::fillFileList( TDEListView* fileList, TQPtrDict<KFileLVI>* modelToFileItemDict )
{
fileList->clear();
diff --git a/kompare/komparenavtreepart/komparenavtreepart.h b/kompare/komparenavtreepart/komparenavtreepart.h
index f535f676..b7df27b4 100644
--- a/kompare/komparenavtreepart/komparenavtreepart.h
+++ b/kompare/komparenavtreepart/komparenavtreepart.h
@@ -33,7 +33,7 @@
class KompareModelList;
class KomparePart;
-class KListView;
+class TDEListView;
namespace Diff2 {
class DiffModel;
@@ -88,10 +88,10 @@ private:
TQString compareFromEndAndReturnSame( const TQString& string1, const TQString& string2 );
void addDirToTreeView( enum Kompare::Target, const TQString& filename );
- KListViewItem* findDirInDirTree( const KListViewItem* parent, const TQString& dir );
+ TDEListViewItem* findDirInDirTree( const TDEListViewItem* parent, const TQString& dir );
-// KListViewItem* firstItem();
-// KListViewItem* lastItem();
+// TDEListViewItem* firstItem();
+// TDEListViewItem* lastItem();
private:
TQSplitter* m_splitter;
@@ -102,10 +102,10 @@ private:
TQPtrDict<KDirLVI> m_modelToSrcDirItemDict;
TQPtrDict<KDirLVI> m_modelToDestDirItemDict;
- KListView* m_srcDirTree;
- KListView* m_destDirTree;
- KListView* m_fileList;
- KListView* m_changesList;
+ TDEListView* m_srcDirTree;
+ TDEListView* m_destDirTree;
+ TDEListView* m_fileList;
+ TDEListView* m_changesList;
KDirLVI* m_srcRootItem;
KDirLVI* m_destRootItem;
@@ -122,10 +122,10 @@ private:
// These 3 classes are need to store the models into a tree so it is easier
// to extract the info we need for the navigation widgets
-class KChangeLVI : public KListViewItem
+class KChangeLVI : public TDEListViewItem
{
public:
- KChangeLVI( KListView* parent, Diff2::Difference* diff );
+ KChangeLVI( TDEListView* parent, Diff2::Difference* diff );
~KChangeLVI();
public:
Diff2::Difference* difference() { return m_difference; };
@@ -136,30 +136,30 @@ private:
Diff2::Difference* m_difference;
};
-class KFileLVI : public KListViewItem
+class KFileLVI : public TDEListViewItem
{
public:
- KFileLVI( KListView* parent, Diff2::DiffModel* model );
+ KFileLVI( TDEListView* parent, Diff2::DiffModel* model );
~KFileLVI();
public:
Diff2::DiffModel* model() { return m_model; };
- void fillChangesList( KListView* changesList, TQPtrDict<KChangeLVI>* diffToChangeItemDict );
+ void fillChangesList( TDEListView* changesList, TQPtrDict<KChangeLVI>* diffToChangeItemDict );
private:
Diff2::DiffModel* m_model;
};
-class KDirLVI : public KListViewItem
+class KDirLVI : public TDEListViewItem
{
public:
KDirLVI( KDirLVI* parent, TQString& dir );
- KDirLVI( KListView* parent, TQString& dir );
+ KDirLVI( TDEListView* parent, TQString& dir );
~KDirLVI();
public:
void addModel( TQString& dir, Diff2::DiffModel* model, TQPtrDict<KDirLVI>* modelToDirItemDict );
TQString& dirName() { return m_dirName; };
TQString fullPath( TQString& path );
KDirLVI* setSelected( TQString dir );
- void fillFileList( KListView* fileList, TQPtrDict<KFileLVI>* modelToFileItemDict );
+ void fillFileList( TDEListView* fileList, TQPtrDict<KFileLVI>* modelToFileItemDict );
bool isRootItem() { return m_rootItem; };
private:
KDirLVI* findChild( TQString dir );
diff --git a/kompare/komparepart/kompare_part.cpp b/kompare/komparepart/kompare_part.cpp
index 097eb5db..e2e2956c 100644
--- a/kompare/komparepart/kompare_part.cpp
+++ b/kompare/komparepart/kompare_part.cpp
@@ -162,16 +162,16 @@ void KomparePart::setupActions()
{
// create our actions
- m_saveAll = new KAction( i18n("Save &All"), "save_all", 0,
+ m_saveAll = new TDEAction( i18n("Save &All"), "save_all", 0,
this, TQT_SLOT(saveAll()),
actionCollection(), "file_save_all" );
- m_saveDiff = new KAction( i18n("Save .&diff..."), 0,
+ m_saveDiff = new TDEAction( i18n("Save .&diff..."), 0,
this, TQT_SLOT(saveDiff()),
actionCollection(), "file_save_diff" );
- m_swap = new KAction( i18n( "Swap Source with Destination" ), 0,
+ m_swap = new TDEAction( i18n( "Swap Source with Destination" ), 0,
this, TQT_SLOT(slotSwap()),
actionCollection(), "file_swap" );
- m_diffStats = new KAction( i18n( "Show Statistics" ), 0,
+ m_diffStats = new TDEAction( i18n( "Show Statistics" ), 0,
this, TQT_SLOT(slotShowDiffstats()),
actionCollection(), "file_diffstats" );
diff --git a/kompare/komparepart/kompare_part.h b/kompare/komparepart/kompare_part.h
index f853fa36..e0cb7d61 100644
--- a/kompare/komparepart/kompare_part.h
+++ b/kompare/komparepart/kompare_part.h
@@ -32,7 +32,7 @@
class TQWidget;
class KTempFile;
-class KToggleAction;
+class TDEToggleAction;
class KURL;
namespace Diff2 {
@@ -211,10 +211,10 @@ private:
KompareSplitter* m_splitter;
- KAction* m_saveAll;
- KAction* m_saveDiff;
- KAction* m_swap;
- KAction* m_diffStats;
+ TDEAction* m_saveAll;
+ TDEAction* m_saveDiff;
+ TDEAction* m_swap;
+ TDEAction* m_diffStats;
KTempFile* m_tempDiff;
diff --git a/kompare/komparepart/komparelistview.cpp b/kompare/komparepart/komparelistview.cpp
index 30e65d87..77158e9f 100644
--- a/kompare/komparepart/komparelistview.cpp
+++ b/kompare/komparepart/komparelistview.cpp
@@ -99,7 +99,7 @@ void KompareListViewFrame::slotSetModel( const DiffModel* model )
KompareListView::KompareListView( bool isSource,
ViewSettings* settings,
TQWidget* parent, const char* name ) :
- KListView( parent, name ),
+ TDEListView( parent, name ),
m_isSource( isSource ),
m_settings( settings ),
m_scrollId( -1 ),
@@ -415,7 +415,7 @@ void KompareListView::wheelEvent( TQWheelEvent* e )
void KompareListView::resizeEvent( TQResizeEvent* e )
{
- KListView::resizeEvent(e);
+ TDEListView::resizeEvent(e);
emit resized();
kdDebug() << "resizeEvent " << endl;
}
diff --git a/kompare/komparepart/komparelistview.h b/kompare/komparepart/komparelistview.h
index cf557c19..6124d184 100644
--- a/kompare/komparepart/komparelistview.h
+++ b/kompare/komparepart/komparelistview.h
@@ -43,7 +43,7 @@ class KompareListViewItem;
class KompareListViewDiffItem;
class KompareListViewLineContainerItem;
-class KompareListView : public KListView
+class KompareListView : public TDEListView
{
Q_OBJECT
diff --git a/kompare/libdialogpages/viewpage.cpp b/kompare/libdialogpages/viewpage.cpp
index 19f5b057..9150b392 100644
--- a/kompare/libdialogpages/viewpage.cpp
+++ b/kompare/libdialogpages/viewpage.cpp
@@ -106,7 +106,7 @@ ViewPage::ViewPage( TQWidget* parent ) : PageBase( parent )
gb->setMargin( KDialog::marginHint() );
label = new TQLabel( i18n( "Font:" ), gb );
- m_fontCombo = new KFontCombo( gb, "fontcombo" );
+ m_fontCombo = new TDEFontCombo( gb, "fontcombo" );
label->setBuddy( m_fontCombo );
label = new TQLabel( i18n( "Size:" ), gb );
diff --git a/kompare/libdialogpages/viewpage.h b/kompare/libdialogpages/viewpage.h
index 774b9c45..0630d321 100644
--- a/kompare/libdialogpages/viewpage.h
+++ b/kompare/libdialogpages/viewpage.h
@@ -26,7 +26,7 @@ class TQCheckBox;
class TQSpinBox;
class KColorButton;
-class KFontCombo;
+class TDEFontCombo;
class ViewSettings;
@@ -58,7 +58,7 @@ public:
// snol == scroll number of lines
TQSpinBox* m_snolSpinBox;
TQSpinBox* m_tabSpinBox;
- KFontCombo* m_fontCombo;
+ TDEFontCombo* m_fontCombo;
TQSpinBox* m_fontSizeSpinBox;
};
diff --git a/kompare/libdiff2/komparemodellist.cpp b/kompare/libdiff2/komparemodellist.cpp
index c6cf587c..8e667800 100644
--- a/kompare/libdiff2/komparemodellist.cpp
+++ b/kompare/libdiff2/komparemodellist.cpp
@@ -58,28 +58,28 @@ KompareModelList::KompareModelList( DiffSettings* diffSettings, struct Kompare::
m_info( info ),
m_textCodec( 0 )
{
- m_applyDifference = new KAction( i18n("&Apply Difference"), "1rightarrow", TQt::Key_Space,
+ m_applyDifference = new TDEAction( i18n("&Apply Difference"), "1rightarrow", TQt::Key_Space,
this, TQT_SLOT(slotActionApplyDifference()),
(( KomparePart* )parent)->actionCollection(), "difference_apply" );
- m_unApplyDifference = new KAction( i18n("Un&apply Difference"), "1leftarrow", TQt::Key_BackSpace,
+ m_unApplyDifference = new TDEAction( i18n("Un&apply Difference"), "1leftarrow", TQt::Key_BackSpace,
this, TQT_SLOT(slotActionUnApplyDifference()),
(( KomparePart* )parent)->actionCollection(), "difference_unapply" );
- m_applyAll = new KAction( i18n("App&ly All"), "2rightarrow", TQt::CTRL + TQt::Key_A,
+ m_applyAll = new TDEAction( i18n("App&ly All"), "2rightarrow", TQt::CTRL + TQt::Key_A,
this, TQT_SLOT(slotActionApplyAllDifferences()),
(( KomparePart* )parent)->actionCollection(), "difference_applyall" );
- m_unapplyAll = new KAction( i18n("&Unapply All"), "2leftarrow", TQt::CTRL + TQt::Key_U,
+ m_unapplyAll = new TDEAction( i18n("&Unapply All"), "2leftarrow", TQt::CTRL + TQt::Key_U,
this, TQT_SLOT(slotActionUnapplyAllDifferences()),
(( KomparePart* )parent)->actionCollection(), "difference_unapplyall" );
- m_previousFile = new KAction( i18n("P&revious File"), "2uparrow", TQt::CTRL + TQt::Key_PageUp,
+ m_previousFile = new TDEAction( i18n("P&revious File"), "2uparrow", TQt::CTRL + TQt::Key_PageUp,
this, TQT_SLOT(slotPreviousModel()),
(( KomparePart* )parent)->actionCollection(), "difference_previousfile" );
- m_nextFile = new KAction( i18n("N&ext File"), "2downarrow", TQt::CTRL + TQt::Key_PageDown,
+ m_nextFile = new TDEAction( i18n("N&ext File"), "2downarrow", TQt::CTRL + TQt::Key_PageDown,
this, TQT_SLOT(slotNextModel()),
(( KomparePart* )parent)->actionCollection(), "difference_nextfile" );
- m_previousDifference = new KAction( i18n("&Previous Difference"), "1uparrow", TQt::CTRL + TQt::Key_Up,
+ m_previousDifference = new TDEAction( i18n("&Previous Difference"), "1uparrow", TQt::CTRL + TQt::Key_Up,
this, TQT_SLOT(slotPreviousDifference()),
(( KomparePart* )parent)->actionCollection(), "difference_previous" );
- m_nextDifference = new KAction( i18n("&Next Difference"), "1downarrow", TQt::CTRL + TQt::Key_Down,
+ m_nextDifference = new TDEAction( i18n("&Next Difference"), "1downarrow", TQt::CTRL + TQt::Key_Down,
this, TQT_SLOT(slotNextDifference()),
(( KomparePart* )parent)->actionCollection(), "difference_next" );
m_previousDifference->setEnabled( false );
diff --git a/kompare/libdiff2/komparemodellist.h b/kompare/libdiff2/komparemodellist.h
index 3d5a83ff..ce70c4d6 100644
--- a/kompare/libdiff2/komparemodellist.h
+++ b/kompare/libdiff2/komparemodellist.h
@@ -28,7 +28,7 @@
class TQFile;
-class KAction;
+class TDEAction;
class KDirWatch;
class KTempFile;
@@ -194,16 +194,16 @@ private:
struct Kompare::Info& m_info;
- KAction* m_applyDifference;
- KAction* m_unApplyDifference;
- KAction* m_applyAll;
- KAction* m_unapplyAll;
- KAction* m_previousFile;
- KAction* m_nextFile;
- KAction* m_previousDifference;
- KAction* m_nextDifference;
+ TDEAction* m_applyDifference;
+ TDEAction* m_unApplyDifference;
+ TDEAction* m_applyAll;
+ TDEAction* m_unapplyAll;
+ TDEAction* m_previousFile;
+ TDEAction* m_nextFile;
+ TDEAction* m_previousDifference;
+ TDEAction* m_nextDifference;
- KAction* m_save;
+ TDEAction* m_save;
TQString m_encoding;
TQTextCodec* m_textCodec;
diff --git a/kspy/classinfoview.cpp b/kspy/classinfoview.cpp
index 87f018bb..5326aeae 100644
--- a/kspy/classinfoview.cpp
+++ b/kspy/classinfoview.cpp
@@ -25,7 +25,7 @@
#include "classinfoview.h"
-ClassInfoView::ClassInfoView(TQWidget *parent, const char *name ) : KListView(parent,name)
+ClassInfoView::ClassInfoView(TQWidget *parent, const char *name ) : TDEListView(parent,name)
{
addColumn( i18n( "Name" ) );
addColumn( i18n( "Value" ) );
@@ -45,7 +45,7 @@ void ClassInfoView::buildList( TQObject *o )
for (int index = 0; index < mo->numClassInfo(true); index++) {
const TQClassInfo * classInfo = mo->classInfo(index, true);
- new KListViewItem( this, classInfo->tqt_mo_ci_name, classInfo->tqt_mo_ci_value );
+ new TDEListViewItem( this, classInfo->tqt_mo_ci_name, classInfo->tqt_mo_ci_value );
}
}
diff --git a/kspy/classinfoview.h b/kspy/classinfoview.h
index 80ff0f0c..121a276c 100644
--- a/kspy/classinfoview.h
+++ b/kspy/classinfoview.h
@@ -25,7 +25,7 @@
*@author Richard Dale
*/
-class ClassInfoView : public KListView {
+class ClassInfoView : public TDEListView {
Q_OBJECT
public:
diff --git a/kspy/navview.cpp b/kspy/navview.cpp
index 2cdbec90..871792e4 100644
--- a/kspy/navview.cpp
+++ b/kspy/navview.cpp
@@ -23,7 +23,7 @@
#include "navview.h"
#include "navviewitem.h"
-NavView::NavView(TQWidget *parent, const char *name ) : KListView(parent,name)
+NavView::NavView(TQWidget *parent, const char *name ) : TDEListView(parent,name)
{
addColumn( i18n( "Name" ) );
addColumn( i18n( "Type" ) );
diff --git a/kspy/navview.h b/kspy/navview.h
index f90f709f..f0ab3ee1 100644
--- a/kspy/navview.h
+++ b/kspy/navview.h
@@ -26,7 +26,7 @@ class NavViewItem;
/**
* @author Richard Moore
*/
-class NavView : public KListView
+class NavView : public TDEListView
{
Q_OBJECT
diff --git a/kspy/navviewitem.cpp b/kspy/navviewitem.cpp
index 641332ac..a3e04599 100644
--- a/kspy/navviewitem.cpp
+++ b/kspy/navviewitem.cpp
@@ -21,14 +21,14 @@
#include "navviewitem.h"
NavViewItem::NavViewItem(NavView *parent, TQObject *obj )
- : KListViewItem(parent, obj->name(), obj->className() )
+ : TDEListViewItem(parent, obj->name(), obj->className() )
{
data = obj;
setExpandable( true );
}
NavViewItem::NavViewItem(NavViewItem *parent, TQObject *obj )
- : KListViewItem(parent, obj->name(), obj->className() )
+ : TDEListViewItem(parent, obj->name(), obj->className() )
{
data = obj;
setExpandable( true );
diff --git a/kspy/navviewitem.h b/kspy/navviewitem.h
index d9b7ba23..b1bd3885 100644
--- a/kspy/navviewitem.h
+++ b/kspy/navviewitem.h
@@ -26,7 +26,7 @@ class NavView;
*@author Richard Moore
*/
-class NavViewItem : public KListViewItem {
+class NavViewItem : public TDEListViewItem {
public:
NavViewItem(NavView *parent, TQObject *item );
NavViewItem(NavViewItem *parent, TQObject *item );
diff --git a/kspy/propsview.cpp b/kspy/propsview.cpp
index 8d099a94..1ac94759 100644
--- a/kspy/propsview.cpp
+++ b/kspy/propsview.cpp
@@ -26,11 +26,11 @@
#include "propsview.h"
-class KSpyItem : KListViewItem
+class KSpyItem : TDEListViewItem
{
public:
KSpyItem( TQListView * parent, TQString label1, TQString label2 = TQString(), TQString label3 = TQString(), TQString label4 = TQString(), TQString label5 = TQString(), TQString label6 = TQString() )
- : KListViewItem(parent, label1, label2, label3, label4, label5, label6)
+ : TDEListViewItem(parent, label1, label2, label3, label4, label5, label6)
{
}
protected:
@@ -43,12 +43,12 @@ protected:
TQColor(text(1)), TQColor(text(1)) );
TQListViewItem::paintCell(p, color_cg, column, width, alignment);
} else {
- KListViewItem::paintCell(p, cg, column, width, alignment);
+ TDEListViewItem::paintCell(p, cg, column, width, alignment);
}
}
};
-PropsView::PropsView(TQWidget *parent, const char *name ) : KListView(parent,name)
+PropsView::PropsView(TQWidget *parent, const char *name ) : TDEListView(parent,name)
{
addColumn( i18n( "Name" ) );
addColumn( i18n( "Value" ) );
diff --git a/kspy/propsview.h b/kspy/propsview.h
index 3242069c..f98f068b 100644
--- a/kspy/propsview.h
+++ b/kspy/propsview.h
@@ -25,7 +25,7 @@
*@author Richard Moore
*/
-class PropsView : public KListView {
+class PropsView : public TDEListView {
Q_OBJECT
public:
diff --git a/kspy/receiversview.cpp b/kspy/receiversview.cpp
index b9ff68b1..98132b52 100644
--- a/kspy/receiversview.cpp
+++ b/kspy/receiversview.cpp
@@ -31,7 +31,7 @@ public:
TQConnectionList *public_receivers(int signal) const { return receivers(signal); }
};
-ReceiversView::ReceiversView(TQWidget *parent, const char *name ) : KListView(parent,name)
+ReceiversView::ReceiversView(TQWidget *parent, const char *name ) : TDEListView(parent,name)
{
addColumn( i18n( "Object" ) );
addColumn( i18n( "Type" ) );
@@ -56,13 +56,13 @@ void ReceiversView::buildList( TQObject *o )
for (int sig = 0; sig < mo->numSignals(true); sig++) {
TQConnectionList * clist = qobject->public_receivers(sig);
if (clist != 0) {
- KListViewItem *conn = new KListViewItem( this, signalNames.at(sig) );
+ TDEListViewItem *conn = new TDEListViewItem( this, signalNames.at(sig) );
for ( TQConnection * connection = clist->first();
connection != 0;
connection = clist->next() )
{
- new KListViewItem( conn,
+ new TDEListViewItem( conn,
connection->object()->name(),
connection->memberType() == 1 ? "SLOT" : "SIGNAL",
connection->memberName() );
diff --git a/kspy/receiversview.h b/kspy/receiversview.h
index cb60ff90..965ee65a 100644
--- a/kspy/receiversview.h
+++ b/kspy/receiversview.h
@@ -25,7 +25,7 @@
*@author Richard Dale
*/
-class ReceiversView : public KListView {
+class ReceiversView : public TDEListView {
Q_OBJECT
public:
diff --git a/kspy/sigslotview.cpp b/kspy/sigslotview.cpp
index d6fdba24..a381a2fd 100644
--- a/kspy/sigslotview.cpp
+++ b/kspy/sigslotview.cpp
@@ -25,7 +25,7 @@
#include "sigslotview.h"
-SigSlotView::SigSlotView(TQWidget *parent, const char *name ) : KListView(parent,name)
+SigSlotView::SigSlotView(TQWidget *parent, const char *name ) : TDEListView(parent,name)
{
addColumn( i18n( "Signals/Slots" ) );
@@ -42,22 +42,22 @@ void SigSlotView::buildList( TQObject *o )
{
TQMetaObject *mo = o->metaObject();
- KListViewItem *sigs = new KListViewItem( this, "Signals" );
+ TDEListViewItem *sigs = new TDEListViewItem( this, "Signals" );
TQStrList sigList = mo->signalNames( true );
TQStrListIterator sigIt( sigList );
char *si;
while ( (si=sigIt.current()) != 0 ) {
++sigIt;
- new KListViewItem( sigs, si /*, "someSignal()"*/ );
+ new TDEListViewItem( sigs, si /*, "someSignal()"*/ );
}
- KListViewItem *slts = new KListViewItem( this, "Slots" );
+ TDEListViewItem *slts = new TDEListViewItem( this, "Slots" );
TQStrList sltList = mo->slotNames( true );
TQStrListIterator sltIt( sltList );
char *sl;
while ( (sl=sltIt.current()) != 0 ) {
++sltIt;
- new KListViewItem( slts, sl/*, "someSlot()"*/ );
+ new TDEListViewItem( slts, sl/*, "someSlot()"*/ );
}
setOpen( sigs, false );
diff --git a/kspy/sigslotview.h b/kspy/sigslotview.h
index c0f15da7..7a478cc5 100644
--- a/kspy/sigslotview.h
+++ b/kspy/sigslotview.h
@@ -25,7 +25,7 @@
*@author Richard Moore
*/
-class SigSlotView : public KListView {
+class SigSlotView : public TDEListView {
Q_OBJECT
public:
diff --git a/kspy/spy.cpp b/kspy/spy.cpp
index 4c1f73ce..2067add6 100644
--- a/kspy/spy.cpp
+++ b/kspy/spy.cpp
@@ -54,7 +54,7 @@ Spy::Spy( TQWidget *parent, const char *name )
TQVBox *leftPane = new TQVBox( div );
- KListViewSearchLine *searchLine = new KListViewSearchLine( leftPane, "search line" );
+ TDEListViewSearchLine *searchLine = new TDEListViewSearchLine( leftPane, "search line" );
mNavView = new NavView( leftPane, "navigation view" );
searchLine->setListView( mNavView );
diff --git a/kuiviewer/kuiviewer.h b/kuiviewer/kuiviewer.h
index e404b66a..bc0f362a 100644
--- a/kuiviewer/kuiviewer.h
+++ b/kuiviewer/kuiviewer.h
@@ -30,8 +30,8 @@
#include <kapplication.h>
#include <tdeparts/mainwindow.h>
-class KToggleAction;
-class KListView;
+class TDEToggleAction;
+class TDEListView;
namespace KParts {
class ReadOnlyPart;
@@ -96,8 +96,8 @@ private:
private:
KParts::ReadOnlyPart *m_part;
- KToggleAction *m_toolbarAction;
- KToggleAction *m_statusbarAction;
+ TDEToggleAction *m_toolbarAction;
+ TDEToggleAction *m_statusbarAction;
};
#endif // KUIVIEWER_H
diff --git a/kuiviewer/kuiviewer_part.cpp b/kuiviewer/kuiviewer_part.cpp
index 617823f9..a79c9816 100644
--- a/kuiviewer/kuiviewer_part.cpp
+++ b/kuiviewer/kuiviewer_part.cpp
@@ -70,7 +70,7 @@ KUIViewerPart::KUIViewerPart( TQWidget *parentWidget, const char *widgetName,
// set our XML-UI resource file
setXMLFile("kuiviewer_part.rc");
- m_style = new KListAction( i18n("Style"),
+ m_style = new TDEListAction( i18n("Style"),
CTRL + Key_S,
TQT_TQOBJECT(this),
TQT_SLOT(slotStyle(int)),
diff --git a/kuiviewer/kuiviewer_part.h b/kuiviewer/kuiviewer_part.h
index a0dd6d8b..960da999 100644
--- a/kuiviewer/kuiviewer_part.h
+++ b/kuiviewer/kuiviewer_part.h
@@ -29,8 +29,8 @@ class TQWidget;
class KURL;
class TQVBox;
class TDEAboutData;
-class KListAction;
-class KListView;
+class TDEListAction;
+class TDEListView;
/**
* This is a "Part". It that does all the real work in a KPart
@@ -73,8 +73,8 @@ protected:
private:
TQVBox *m_widget;
TQGuardedPtr<TQWidget> m_view;
- KListAction *m_style;
- KAction *m_copy;
+ TDEListAction *m_style;
+ TDEAction *m_copy;
};
#endif // KUIVIEWERPART_H
diff --git a/scheck/scheck.cpp b/scheck/scheck.cpp
index 6b09b093..9ff5abd0 100644
--- a/scheck/scheck.cpp
+++ b/scheck/scheck.cpp
@@ -891,12 +891,12 @@ StyleCheckStyle::~StyleCheckStyle()
delete watcher;
}
-//We walk down the widget tree until we find something we render, and sic KAccelManager in programmer's mode on those
+//We walk down the widget tree until we find something we render, and sic TDEAccelManager in programmer's mode on those
void StyleCheckStyle::accelManageRecursive(TQWidget* widget)
{
if (&widget->style() == this)
{
- KAcceleratorManager::manage(widget, true);
+ TDEAcceleratorManager::manage(widget, true);
return;
}
diff --git a/scripts/fixheaders b/scripts/fixheaders
index 91358097..2e1dc579 100644
--- a/scripts/fixheaders
+++ b/scripts/fixheaders
@@ -57,7 +57,7 @@ $lastdir = '.';
'`QUriDrag\' undeclared \(first use this function\)' => "qdragobject",
'`kdDebug\' undeclared \(first use this function\)' => "kdebug",
'`kdWarning\' undeclared \(first use this function\)' => "kdebug",
- 'no matching function for call to `KMenuBar::insertItem\(QString, KPopupMenu' => "kpopupmenu",
+ 'no matching function for call to `KMenuBar::insertItem\(QString, TDEPopupMenu' => "kpopupmenu",
'no matching function for call to `KMenuBar::' => "kmenubar",
'invalid use of undefined type `class QPointArray' => "qpointarray",
'variable `QPainter \S*\' has initializer but incomplete type' => "qpainter",
@@ -84,9 +84,9 @@ $lastdir = '.';
'invalid use of undefined type `class QLineEdit\'' => "qlineedit",
'invalid use of undefined type `class QComboBox\'' => "qcombobox",
'invalid use of undefined type `class QStyle\'' => "qstyle",
- 'invalid use of undefined type `class KPopupMenu\'' => "kpopupmenu",
+ 'invalid use of undefined type `class TDEPopupMenu\'' => "kpopupmenu",
'invalid use of undefined type `class QPopupMenu\'' => "qpopupmenu",
- 'cannot convert `KPopupMenu \*\' to `QPopupMenu \*' => "kpopupmenu",
+ 'cannot convert `TDEPopupMenu \*\' to `QPopupMenu \*' => "kpopupmenu",
'aggregate `QPopupMenu \S*\' has incomplete type' => "qpopupmenu",
'invalid use of undefined type `class KURL' => "kurl",
'no method `QApplication::' => "qapplication",
diff --git a/scripts/kde-devel-vim.vim b/scripts/kde-devel-vim.vim
index c57122b6..8e64e399 100644
--- a/scripts/kde-devel-vim.vim
+++ b/scripts/kde-devel-vim.vim
@@ -236,7 +236,7 @@ function! MapIdentHeader( ident )
return '<knuminput.h>'
elseif a:ident == 'TDEConfigGroup'
return '<tdeconfigbase.h>'
- elseif a:ident == 'KListViewItem'
+ elseif a:ident == 'TDEListViewItem'
return '<klistview.h>'
elseif a:ident =~ 'kd\(Debug\|Warning\|Error\|Fatal\|Backtrace\)'
return '<kdebug.h>'
diff --git a/tdecachegrind/TODO b/tdecachegrind/TODO
index 1eca67ed..b9ee78c2 100644
--- a/tdecachegrind/TODO
+++ b/tdecachegrind/TODO
@@ -83,7 +83,7 @@ WISHS:
- every xxx BBs (DONE)
- dump around
- function invocation
- - KAction event
+ - TDEAction event
- DCOP event
- data accesses from (instr address/count)
diff --git a/tdecachegrind/tdecachegrind/main.cpp b/tdecachegrind/tdecachegrind/main.cpp
index 81d05ee6..edf04f16 100644
--- a/tdecachegrind/tdecachegrind/main.cpp
+++ b/tdecachegrind/tdecachegrind/main.cpp
@@ -62,7 +62,7 @@ int main( int argc, char ** argv )
if (a.isRestored()){
int n = 1;
- while (KMainWindow::canBeRestored(n)){
+ while (TDEMainWindow::canBeRestored(n)){
(new TopLevel())->restore(n);
n++;
}
diff --git a/tdecachegrind/tdecachegrind/toplevel.cpp b/tdecachegrind/tdecachegrind/toplevel.cpp
index 9efd6400..c8ac689b 100644
--- a/tdecachegrind/tdecachegrind/toplevel.cpp
+++ b/tdecachegrind/tdecachegrind/toplevel.cpp
@@ -67,7 +67,7 @@
TopLevel::TopLevel(const char *name)
- : KMainWindow(0, name), DCOPObject("KCachegrindIface")
+ : TDEMainWindow(0, name), DCOPObject("KCachegrindIface")
{
init();
@@ -197,7 +197,7 @@ void TopLevel::setupPartSelection(PartSelection* ps)
* sub widgets.
*
* No positions are saved. These is done automatically for
- * KToolbar, and manually in queryExit() for QT docks.
+ * TDEToolbar, and manually in queryExit() for QT docks.
*/
void TopLevel::saveCurrentState(TQString postfix)
{
@@ -249,7 +249,7 @@ void TopLevel::saveTraceSettings()
* sub widgets.
*
* This does NOT restore any positions. This is done automatically for
- * KToolbar, and manually in the createDocks() for QT docks..
+ * TDEToolbar, and manually in the createDocks() for QT docks..
*/
void TopLevel::restoreCurrentState(TQString postfix)
{
@@ -445,44 +445,44 @@ void TopLevel::readProperties(TDEConfig* c)
void TopLevel::createLayoutActions()
{
TQString hint;
- KAction* action;
+ TDEAction* action;
- action = new KAction( i18n( "&Duplicate" ),
- KShortcut(KKey("Ctrl+Plus")),
+ action = new TDEAction( i18n( "&Duplicate" ),
+ TDEShortcut(KKey("Ctrl+Plus")),
TQT_TQOBJECT(this), TQT_SLOT(layoutDuplicate()),
actionCollection(), "layout_duplicate" );
hint = i18n("<b>Duplicate Current Layout</b>"
"<p>Make a copy of the current layout.</p>");
action->setWhatsThis( hint );
- action = new KAction( i18n( "&Remove" ), KShortcut(),
+ action = new TDEAction( i18n( "&Remove" ), TDEShortcut(),
TQT_TQOBJECT(this), TQT_SLOT(layoutRemove()),
actionCollection(), "layout_remove" );
hint = i18n("<b>Remove Current Layout</b>"
"<p>Delete current layout and make the previous active.</p>");
action->setWhatsThis( hint );
- action = new KAction( i18n( "&Go to Next" ),
- KShortcut(KKey("Ctrl+Right")),
+ action = new TDEAction( i18n( "&Go to Next" ),
+ TDEShortcut(KKey("Ctrl+Right")),
TQT_TQOBJECT(this), TQT_SLOT(layoutNext()),
actionCollection(), "layout_next" );
hint = i18n("Go to Next Layout");
action->setWhatsThis( hint );
- action = new KAction( i18n( "&Go to Previous" ),
- KShortcut(KKey("Ctrl+Left")),
+ action = new TDEAction( i18n( "&Go to Previous" ),
+ TDEShortcut(KKey("Ctrl+Left")),
TQT_TQOBJECT(this), TQT_SLOT(layoutPrevious()),
actionCollection(), "layout_previous" );
hint = i18n("Go to Previous Layout");
action->setWhatsThis( hint );
- action = new KAction( i18n( "&Restore to Default" ), KShortcut(),
+ action = new TDEAction( i18n( "&Restore to Default" ), TDEShortcut(),
TQT_TQOBJECT(this), TQT_SLOT(layoutRestore()),
actionCollection(), "layout_restore" );
hint = i18n("Restore Layouts to Default");
action->setWhatsThis( hint );
- action = new KAction( i18n( "&Save as Default" ), KShortcut(),
+ action = new TDEAction( i18n( "&Save as Default" ), TDEShortcut(),
TQT_TQOBJECT(this), TQT_SLOT(layoutSave()),
actionCollection(), "layout_save" );
hint = i18n("Save Layouts as Default");
@@ -493,32 +493,32 @@ void TopLevel::createLayoutActions()
void TopLevel::createMiscActions()
{
TQString hint;
- KAction* action;
+ TDEAction* action;
action = KStdAction::openNew(TQT_TQOBJECT(this), TQT_SLOT(newWindow()), actionCollection());
hint = i18n("<b>New</b><p>Open new empty KCachegrind window.</p>");
action->setWhatsThis( hint );
- action = new KAction( i18n( "&Add..." ), KShortcut(),
+ action = new TDEAction( i18n( "&Add..." ), TDEShortcut(),
TQT_TQOBJECT(this), TQT_SLOT(addTrace()),
actionCollection(), "file_add" );
hint = i18n("<b>Add Profile Data</b>"
"<p>This opens an additional profile data file in the current window.</p>");
action->setWhatsThis( hint );
- action = new KAction( i18n( "&Reload" ), "reload",
+ action = new TDEAction( i18n( "&Reload" ), "reload",
#if TDE_VERSION > 0x030190
- // for KDE 3.2: KStdAccel::key is deprecated
- KStdAccel::shortcut(KStdAccel::Reload),
+ // for KDE 3.2: TDEStdAccel::key is deprecated
+ TDEStdAccel::shortcut(TDEStdAccel::Reload),
#else
- KStdAccel::key(KStdAccel::Reload),
+ TDEStdAccel::key(TDEStdAccel::Reload),
#endif
TQT_TQOBJECT(this), TQT_SLOT( reload() ), actionCollection(), "reload" );
hint = i18n("<b>Reload Profile Data</b>"
"<p>This loads any new created parts, too.</p>");
action->setWhatsThis( hint );
- action = new KAction( i18n( "&Export Graph" ), KShortcut(),
+ action = new TDEAction( i18n( "&Export Graph" ), TDEShortcut(),
TQT_TQOBJECT(this), TQT_SLOT(exportGraph()),
actionCollection(), "export" );
@@ -528,12 +528,12 @@ void TopLevel::createMiscActions()
action->setWhatsThis( hint );
- _taDump = new KToggleAction( i18n( "&Force Dump" ), "redo",
+ _taDump = new TDEToggleAction( i18n( "&Force Dump" ), "redo",
#if TDE_VERSION > 0x030190
- // for KDE 3.2: KStdAccel::key is deprecated
- KStdAccel::shortcut(KStdAccel::Redo),
+ // for KDE 3.2: TDEStdAccel::key is deprecated
+ TDEStdAccel::shortcut(TDEStdAccel::Redo),
#else
- KStdAccel::key(KStdAccel::Redo),
+ TDEStdAccel::key(TDEStdAccel::Redo),
#endif
TQT_TQOBJECT(this), TQT_SLOT( forceTrace() ),
actionCollection(), "dump" );
@@ -573,7 +573,7 @@ void TopLevel::createMiscActions()
KStdAction::showStatusbar(TQT_TQOBJECT(this),
TQT_SLOT(toggleStatusBar()), actionCollection());
- _partDockShown = new KToggleAction(i18n("Parts Overview"), KShortcut(),
+ _partDockShown = new TDEToggleAction(i18n("Parts Overview"), TDEShortcut(),
TQT_TQOBJECT(this), TQT_SLOT(togglePartDock()),
actionCollection(),
"settings_show_partdock");
@@ -582,7 +582,7 @@ void TopLevel::createMiscActions()
_partDockShown->setToolTip( hint );
_partDockShown->setWhatsThis( hint );
- _stackDockShown = new KToggleAction(i18n("Call Stack"), KShortcut(),
+ _stackDockShown = new TDEToggleAction(i18n("Call Stack"), TDEShortcut(),
TQT_TQOBJECT(this), TQT_SLOT(toggleStackDock()),
actionCollection(),
"settings_show_stackdock");
@@ -591,7 +591,7 @@ void TopLevel::createMiscActions()
_stackDockShown->setToolTip( hint );
_stackDockShown->setWhatsThis( hint );
- _functionDockShown = new KToggleAction(i18n("Function Profile"), KShortcut(),
+ _functionDockShown = new TDEToggleAction(i18n("Function Profile"), TDEShortcut(),
TQT_TQOBJECT(this), TQT_SLOT(toggleFunctionDock()),
actionCollection(),
"settings_show_profiledock");
@@ -601,7 +601,7 @@ void TopLevel::createMiscActions()
_functionDockShown->setWhatsThis( hint );
#if ENABLE_DUMPDOCK
- _dumpDockShown = new KToggleAction(i18n("Profile Dumps"), KShortcut(),
+ _dumpDockShown = new TDEToggleAction(i18n("Profile Dumps"), TDEShortcut(),
TQT_TQOBJECT(this), TQT_SLOT(toggleDumpDock()),
actionCollection(),
"settings_show_dumpdock");
@@ -611,8 +611,8 @@ void TopLevel::createMiscActions()
_dumpDockShown->setWhatsThis( hint );
#endif
- _taPercentage = new KToggleAction(i18n("Show Relative Costs"), "percent",
- KShortcut(),
+ _taPercentage = new TDEToggleAction(i18n("Show Relative Costs"), "percent",
+ TDEShortcut(),
TQT_TQOBJECT(this), TQT_SLOT(togglePercentage()),
actionCollection(),
"view_percentage");
@@ -625,8 +625,8 @@ void TopLevel::createMiscActions()
_taPercentage->setToolTip( hint );
_taPercentage->setWhatsThis( hint );
- _taExpanded = new KToggleAction(i18n("Percentage Relative to Parent"), "move",
- KShortcut(),
+ _taExpanded = new TDEToggleAction(i18n("Percentage Relative to Parent"), "move",
+ TDEShortcut(),
TQT_TQOBJECT(this), TQT_SLOT(toggleExpanded()),
actionCollection(),
"view_expanded");
@@ -650,8 +650,8 @@ void TopLevel::createMiscActions()
"<p>(*) Only if function grouping is switched on (e.g. ELF object grouping).");
_taExpanded->setWhatsThis( hint );
- _taCycles = new KToggleAction( i18n( "Do Cycle Detection" ), "undo",
- KShortcut(),
+ _taCycles = new TDEToggleAction( i18n( "Do Cycle Detection" ), "undo",
+ TDEShortcut(),
TQT_TQOBJECT(this), TQT_SLOT( toggleCycles() ), actionCollection(),
"view_cycles" );
#if TDE_VERSION >= 0x030290
@@ -699,7 +699,7 @@ void TopLevel::createMiscActions()
action->setToolTip( hint );
action->setWhatsThis( hint );
#else
- _paUp = new KToolBarPopupAction( i18n( "&Up" ), "up",
+ _paUp = new TDEToolBarPopupAction( i18n( "&Up" ), "up",
ALT+Key_Up,
TQT_TQOBJECT(_stackSelection), TQT_SLOT( browserUp() ),
actionCollection(), "go_up" );
@@ -714,7 +714,7 @@ void TopLevel::createMiscActions()
_paUp->setWhatsThis( hint );
TQPair< KGuiItem, KGuiItem > backForward = KStdGuiItem::backAndForward();
- _paBack = new KToolBarPopupAction( backForward.first, ALT+Key_Left,
+ _paBack = new TDEToolBarPopupAction( backForward.first, ALT+Key_Left,
TQT_TQOBJECT(_stackSelection), TQT_SLOT(browserBack()),
actionCollection(), "go_back" );
connect( _paBack->popupMenu(), TQT_SIGNAL( aboutToShow() ),
@@ -725,7 +725,7 @@ void TopLevel::createMiscActions()
_paBack->setToolTip( hint );
_paBack->setWhatsThis( hint );
- _paForward = new KToolBarPopupAction( backForward.second, ALT+Key_Right,
+ _paForward = new TDEToolBarPopupAction( backForward.second, ALT+Key_Right,
TQT_TQOBJECT(_stackSelection),
TQT_SLOT(browserForward()),
actionCollection(), "go_forward" );
@@ -738,19 +738,19 @@ void TopLevel::createMiscActions()
_paForward->setWhatsThis( hint );
#endif
- _saCost = new KSelectAction( i18n("Primary Event Type"), KShortcut(),
+ _saCost = new TDESelectAction( i18n("Primary Event Type"), TDEShortcut(),
actionCollection(), "view_cost_type");
hint = i18n("Select primary event type of costs");
_saCost->setComboWidth(300);
_saCost->setToolTip( hint );
_saCost->setWhatsThis( hint );
- // cost types are dependent on loaded data, thus KSelectAction
+ // cost types are dependent on loaded data, thus TDESelectAction
// is filled in setData()
connect( _saCost, TQT_SIGNAL(activated(const TQString&)),
TQT_TQOBJECT(this), TQT_SLOT(costTypeSelected(const TQString&)));
- _saCost2 = new KSelectAction( i18n("Secondary Event Type"), KShortcut(),
+ _saCost2 = new TDESelectAction( i18n("Secondary Event Type"), TDEShortcut(),
actionCollection(), "view_cost_type2");
hint = i18n("Select secondary event type for cost e.g. shown in annotations");
_saCost2->setComboWidth(300);
@@ -760,7 +760,7 @@ void TopLevel::createMiscActions()
connect( _saCost2, TQT_SIGNAL(activated(const TQString&)),
TQT_TQOBJECT(this), TQT_SLOT(costType2Selected(const TQString&)));
- saGroup = new KSelectAction( i18n("Grouping"), KShortcut(),
+ saGroup = new TDESelectAction( i18n("Grouping"), TDEShortcut(),
actionCollection(), "view_group_type");
hint = i18n("Select how functions are grouped into higher level cost items");
@@ -779,7 +779,7 @@ void TopLevel::createMiscActions()
connect( saGroup, TQT_SIGNAL(activated(int)),
TQT_TQOBJECT(this), TQT_SLOT(groupTypeSelected(int)));
- _taSplit = new KToggleAction(i18n("Split"), "view_left_right", KShortcut(),
+ _taSplit = new TDEToggleAction(i18n("Split"), "view_left_right", TDEShortcut(),
TQT_TQOBJECT(this), TQT_SLOT(splitSlot()),
actionCollection(), "view_split");
@@ -787,8 +787,8 @@ void TopLevel::createMiscActions()
_taSplit->setToolTip( hint );
_taSplit->setWhatsThis( hint );
- _taSplitDir = new KToggleAction(i18n("SplitQt::Horizontal"),
- "view_left_right", KShortcut(),
+ _taSplitDir = new TDEToggleAction(i18n("SplitQt::Horizontal"),
+ "view_left_right", TDEShortcut(),
TQT_TQOBJECT(this), TQT_SLOT(splitDirSlot()),
actionCollection(), "view_split_dir");
@@ -800,7 +800,7 @@ void TopLevel::createMiscActions()
#if TDE_VERSION >= 308 // KDE 3.1
KStdAction::tipOfDay( TQT_TQOBJECT(this), TQT_SLOT( slotShowTip() ), actionCollection() );
#else
- (void) new KAction( KGuiItem( i18n("Tip of the &Day..."), "idea",
+ (void) new TDEAction( KGuiItem( i18n("Tip of the &Day..."), "idea",
i18n("Show \"Tip of the Day\"") ),
0, TQT_TQOBJECT(this), TQT_SLOT(slotShowTip()),
actionCollection(), "help_show_tip" );
@@ -1907,7 +1907,7 @@ void TopLevel::layoutRestore()
void TopLevel::updateLayoutActions()
{
- KAction* ka;
+ TDEAction* ka;
ka = actionCollection()->action("layout_next");
if (ka) ka->setEnabled(_layoutCount>1);
@@ -1990,7 +1990,7 @@ bool TopLevel::queryExit()
// save QT dock positions...
- // We don't want to save the KToolbar position here.
+ // We don't want to save the TDEToolbar position here.
// Its already stored.
delete toolBar();
diff --git a/tdecachegrind/tdecachegrind/toplevel.h b/tdecachegrind/tdecachegrind/toplevel.h
index 7ac4f2de..69b3079b 100644
--- a/tdecachegrind/tdecachegrind/toplevel.h
+++ b/tdecachegrind/tdecachegrind/toplevel.h
@@ -39,12 +39,12 @@ class TQProgressBar;
class TQPopupMenu;
class KURL;
-class KSelectAction;
-class KToggleAction;
-class KToolBarPopupAction;
+class TDESelectAction;
+class TDEToggleAction;
+class TDEToolBarPopupAction;
class TraceData;
-class KRecentFilesAction;
+class TDERecentFilesAction;
class MainWidget;
class PartSelection;
class FunctionSelection;
@@ -52,7 +52,7 @@ class DumpSelection;
class StackSelection;
class TraceFunction;
-class TopLevel : public KMainWindow, public DCOPObject
+class TopLevel : public TDEMainWindow, public DCOPObject
{
Q_OBJECT
@@ -214,7 +214,7 @@ private:
KStatusBar* _statusbar;
TQLabel* _statusLabel;
- KRecentFilesAction* _openRecent;
+ TDERecentFilesAction* _openRecent;
bool _twoMainWidgets;
Qt::Orientation _spOrientation;
@@ -228,12 +228,12 @@ private:
TQDockWindow *_partDock, *_stackDock, *_functionDock, *_dumpDock;
bool _forcePartDock;
- KSelectAction *_saCost, *_saCost2, *saGroup;
- KToggleAction *_partDockShown, *_stackDockShown;
- KToggleAction *_functionDockShown, *_dumpDockShown;
- KToggleAction *_taPercentage, *_taExpanded, *_taCycles;
- KToggleAction *_taDump, *_taSplit, *_taSplitDir;
- KToolBarPopupAction *_paForward, *_paBack, *_paUp;
+ TDESelectAction *_saCost, *_saCost2, *saGroup;
+ TDEToggleAction *_partDockShown, *_stackDockShown;
+ TDEToggleAction *_functionDockShown, *_dumpDockShown;
+ TDEToggleAction *_taPercentage, *_taExpanded, *_taCycles;
+ TDEToggleAction *_taDump, *_taSplit, *_taSplitDir;
+ TDEToolBarPopupAction *_paForward, *_paBack, *_paUp;
TraceFunction* _function;
const TQObject* _lastSender;
diff --git a/umbrello/umbrello/aligntoolbar.cpp b/umbrello/umbrello/aligntoolbar.cpp
index cf2a15cc..21748d48 100644
--- a/umbrello/umbrello/aligntoolbar.cpp
+++ b/umbrello/umbrello/aligntoolbar.cpp
@@ -32,7 +32,7 @@
#include "umlwidgetlist.h"
AlignToolBar::AlignToolBar(TQMainWindow* parentWindow, const char* )
- : KToolBar(parentWindow,TQt::DockRight,false) {
+ : TDEToolBar(parentWindow,TQt::DockRight,false) {
// load images for the buttons
loadPixmaps();
diff --git a/umbrello/umbrello/aligntoolbar.h b/umbrello/umbrello/aligntoolbar.h
index 0567bee4..581a023c 100644
--- a/umbrello/umbrello/aligntoolbar.h
+++ b/umbrello/umbrello/aligntoolbar.h
@@ -28,7 +28,7 @@ class UMLWidget;
* @author Sebastian Stein <seb.kde@hpfsc.de>
* Bugs and comments to uml-devel@lists.sf.net or http://bugs.kde.org
*/
-class AlignToolBar : public KToolBar {
+class AlignToolBar : public TDEToolBar {
Q_OBJECT
public:
diff --git a/umbrello/umbrello/associationwidget.cpp b/umbrello/umbrello/associationwidget.cpp
index 81a1bb57..e0c6a982 100644
--- a/umbrello/umbrello/associationwidget.cpp
+++ b/umbrello/umbrello/associationwidget.cpp
@@ -2378,13 +2378,13 @@ void AssociationWidget::slotMenuSelection(int sel) {
case ListPopupMenu::mt_Change_Font:
font = getFont();
- if( KFontDialog::getFont( font, false, m_pView ) )
+ if( TDEFontDialog::getFont( font, false, m_pView ) )
lwSetFont(font);
break;
case ListPopupMenu::mt_Change_Font_Selection:
font = getFont();
- if( KFontDialog::getFont( font, false, m_pView ) ) {
+ if( TDEFontDialog::getFont( font, false, m_pView ) ) {
m_pView -> selectionSetFont( font );
m_umldoc->setModified(true);
}
diff --git a/umbrello/umbrello/dialogs/activitydialog.cpp b/umbrello/umbrello/dialogs/activitydialog.cpp
index ed7f779e..c128e027 100644
--- a/umbrello/umbrello/dialogs/activitydialog.cpp
+++ b/umbrello/umbrello/dialogs/activitydialog.cpp
@@ -106,7 +106,7 @@ void ActivityDialog::setupGeneralPage() {
void ActivityDialog::setupFontPage() {
TQVBox * page = addVBoxPage( i18n("Font"), i18n("Font Settings"), DesktopIcon( "fonts") );
- m_pChooser = new KFontChooser( (TQWidget*)page, "font", false, TQStringList(), false);
+ m_pChooser = new TDEFontChooser( (TQWidget*)page, "font", false, TQStringList(), false);
m_pChooser -> setFont( m_pActivityWidget -> getFont() );
}
diff --git a/umbrello/umbrello/dialogs/activitydialog.h b/umbrello/umbrello/dialogs/activitydialog.h
index 99af61e0..27b49b40 100644
--- a/umbrello/umbrello/dialogs/activitydialog.h
+++ b/umbrello/umbrello/dialogs/activitydialog.h
@@ -102,7 +102,7 @@ protected:
/**
* Font chooser widget for font page.
*/
- KFontChooser * m_pChooser;
+ TDEFontChooser * m_pChooser;
/**
* Color page
diff --git a/umbrello/umbrello/dialogs/assocpropdlg.cpp b/umbrello/umbrello/dialogs/assocpropdlg.cpp
index 1d5b9c77..331e3e45 100644
--- a/umbrello/umbrello/dialogs/assocpropdlg.cpp
+++ b/umbrello/umbrello/dialogs/assocpropdlg.cpp
@@ -107,7 +107,7 @@ void AssocPropDlg::setupFontPage()
return;
TQVBox *page = addVBoxPage( i18n("Font"), i18n("Font Settings"), DesktopIcon( "fonts"));
- m_pChooser = new KFontChooser( (TQWidget*)page, "font", false, TQStringList(), false);
+ m_pChooser = new TDEFontChooser( (TQWidget*)page, "font", false, TQStringList(), false);
m_pChooser->setFont( m_pAssoc->getFont());
m_pChooser->setSampleText(i18n("Association font"));
}
diff --git a/umbrello/umbrello/dialogs/assocpropdlg.h b/umbrello/umbrello/dialogs/assocpropdlg.h
index 1970e59b..7f20c427 100644
--- a/umbrello/umbrello/dialogs/assocpropdlg.h
+++ b/umbrello/umbrello/dialogs/assocpropdlg.h
@@ -62,7 +62,7 @@ protected slots:
private:
AssocGenPage *m_pGenPage;
AssocRolePage *m_pRolePage;
- KFontChooser * m_pChooser;
+ TDEFontChooser * m_pChooser;
AssociationWidget *m_pAssoc;
UMLDoc *m_pDoc; // is this needed??
diff --git a/umbrello/umbrello/dialogs/classpropdlg.cpp b/umbrello/umbrello/dialogs/classpropdlg.cpp
index 169de20e..ccd09bba 100644
--- a/umbrello/umbrello/dialogs/classpropdlg.cpp
+++ b/umbrello/umbrello/dialogs/classpropdlg.cpp
@@ -241,7 +241,7 @@ void ClassPropDlg::setupFontPage() {
if( !m_pWidget )
return;
TQVBox * page = addVBoxPage( i18n("Font"), i18n("Font Settings"), DesktopIcon( "fonts") );
- m_pChooser = new KFontChooser( (TQWidget*)page, "font", false, TQStringList(), false);
+ m_pChooser = new TDEFontChooser( (TQWidget*)page, "font", false, TQStringList(), false);
m_pChooser -> setFont( m_pWidget -> getFont() );
}
diff --git a/umbrello/umbrello/dialogs/classpropdlg.h b/umbrello/umbrello/dialogs/classpropdlg.h
index e8bcb2c6..d11e0d25 100644
--- a/umbrello/umbrello/dialogs/classpropdlg.h
+++ b/umbrello/umbrello/dialogs/classpropdlg.h
@@ -104,7 +104,7 @@ protected:
*/
void setupFontPage();
private:
- KFontChooser * m_pChooser;
+ TDEFontChooser * m_pChooser;
ClassGenPage * m_pGenPage;
ClassifierListPage* m_pAttPage;
ClassifierListPage* m_pOpsPage;
diff --git a/umbrello/umbrello/dialogs/codevieweroptionsbase.ui b/umbrello/umbrello/dialogs/codevieweroptionsbase.ui
index 346dc44d..4de2f313 100644
--- a/umbrello/umbrello/dialogs/codevieweroptionsbase.ui
+++ b/umbrello/umbrello/dialogs/codevieweroptionsbase.ui
@@ -16,7 +16,7 @@
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="KFontChooser" row="0" column="0">
+ <widget class="TDEFontChooser" row="0" column="0">
<property name="name">
<cstring>fontChooser</cstring>
</property>
@@ -341,7 +341,7 @@
</widget>
<customwidgets>
<customwidget>
- <class>KFontChooser</class>
+ <class>TDEFontChooser</class>
<header location="global">kfontdialog.h</header>
<sizehint>
<width>-1</width>
diff --git a/umbrello/umbrello/dialogs/settingsdlg.cpp b/umbrello/umbrello/dialogs/settingsdlg.cpp
index 145b0519..234f67bc 100644
--- a/umbrello/umbrello/dialogs/settingsdlg.cpp
+++ b/umbrello/umbrello/dialogs/settingsdlg.cpp
@@ -304,7 +304,7 @@ void SettingsDlg::setupCodeViewerPage(Settings::CodeViewerState options) {
void SettingsDlg::setupFontPage() {
TQVBox * page = addVBoxPage( i18n("Font"), i18n("Font Settings"), DesktopIcon( "fonts") );
- m_FontWidgets.chooser = new KFontChooser( page, "font", false, TQStringList(), false);
+ m_FontWidgets.chooser = new TDEFontChooser( page, "font", false, TQStringList(), false);
m_FontWidgets.chooser->setFont( m_pOptionState->uiState.font );
}
diff --git a/umbrello/umbrello/dialogs/settingsdlg.h b/umbrello/umbrello/dialogs/settingsdlg.h
index 78f8b064..98fb4549 100644
--- a/umbrello/umbrello/dialogs/settingsdlg.h
+++ b/umbrello/umbrello/dialogs/settingsdlg.h
@@ -142,7 +142,7 @@ private:
;//end struct ClassWidgets
struct FontWidgets {
- KFontChooser * chooser;
+ TDEFontChooser * chooser;
};
//private methods
diff --git a/umbrello/umbrello/dialogs/statedialog.cpp b/umbrello/umbrello/dialogs/statedialog.cpp
index 564146ec..e49d1633 100644
--- a/umbrello/umbrello/dialogs/statedialog.cpp
+++ b/umbrello/umbrello/dialogs/statedialog.cpp
@@ -122,7 +122,7 @@ void StateDialog::setupFontPage() {
if ( !m_pStateWidget )
return;
TQVBox * page = addVBoxPage( i18n("Font"), i18n("Font Settings"), DesktopIcon( "fonts") );
- m_pChooser = new KFontChooser( (TQWidget*)page, "font", false, TQStringList(), false);
+ m_pChooser = new TDEFontChooser( (TQWidget*)page, "font", false, TQStringList(), false);
m_pChooser -> setFont( m_pStateWidget -> getFont() );
}
diff --git a/umbrello/umbrello/dialogs/statedialog.h b/umbrello/umbrello/dialogs/statedialog.h
index 873ad067..86f4eb62 100644
--- a/umbrello/umbrello/dialogs/statedialog.h
+++ b/umbrello/umbrello/dialogs/statedialog.h
@@ -26,7 +26,7 @@ class TQLabel;
class TQLineEdit;
class TQMultiLineEdit;
class TQGroupBox;
-class KFontChooser;
+class TDEFontChooser;
/**
* Displays the properties for a @ref StateWidget
@@ -107,7 +107,7 @@ protected:
/**
* Font chooser widget for font page.
*/
- KFontChooser * m_pChooser;
+ TDEFontChooser * m_pChooser;
/**
* Color page
diff --git a/umbrello/umbrello/dialogs/umlviewdialog.cpp b/umbrello/umbrello/dialogs/umlviewdialog.cpp
index 33a6a21f..804100c4 100644
--- a/umbrello/umbrello/dialogs/umlviewdialog.cpp
+++ b/umbrello/umbrello/dialogs/umlviewdialog.cpp
@@ -105,7 +105,7 @@ void UMLViewDialog::setupColorPage() {
void UMLViewDialog::setupFontPage() {
TQVBox * page = addVBoxPage( i18n("Font"), i18n("Font Settings"), DesktopIcon( "fonts") );
- m_pChooser = new KFontChooser( (TQWidget*)page, "font", false, TQStringList(), false);
+ m_pChooser = new TDEFontChooser( (TQWidget*)page, "font", false, TQStringList(), false);
m_pChooser -> setFont( m_pView -> getOptionState().uiState.font );
}
diff --git a/umbrello/umbrello/dialogs/umlviewdialog.h b/umbrello/umbrello/dialogs/umlviewdialog.h
index 8effb99c..5d466d50 100644
--- a/umbrello/umbrello/dialogs/umlviewdialog.h
+++ b/umbrello/umbrello/dialogs/umlviewdialog.h
@@ -31,7 +31,7 @@ class TQLineEdit;
class TQGroupBox;
class TQTextEdit;
class TQSpinBox;
-class KFontChooser;
+class TDEFontChooser;
class DiagramPropertiesPage;
@@ -99,7 +99,7 @@ protected:
Settings::OptionState m_options;
- KFontChooser * m_pChooser;
+ TDEFontChooser * m_pChooser;
DiagramPropertiesPage *m_diagramProperties;
ClassOptionsPage * m_pOptionsPage;
UMLWidgetColorPage * m_pColorPage;
diff --git a/umbrello/umbrello/floatingtextwidget.cpp b/umbrello/umbrello/floatingtextwidget.cpp
index 94c5ec21..f9e25f3d 100644
--- a/umbrello/umbrello/floatingtextwidget.cpp
+++ b/umbrello/umbrello/floatingtextwidget.cpp
@@ -134,7 +134,7 @@ void FloatingTextWidget::slotMenuSelection(int sel) {
case ListPopupMenu::mt_Change_Font:
{
TQFont font = getFont();
- if( KFontDialog::getFont( font, false, m_pView ) ) {
+ if( TDEFontDialog::getFont( font, false, m_pView ) ) {
if( m_Role == Uml::tr_Floating || m_Role == Uml::tr_Seq_Message ) {
setFont( font );
} else if (m_pLink) {
diff --git a/umbrello/umbrello/kplayerslideraction.cpp b/umbrello/umbrello/kplayerslideraction.cpp
index 95007d73..791c8ad8 100644
--- a/umbrello/umbrello/kplayerslideraction.cpp
+++ b/umbrello/umbrello/kplayerslideraction.cpp
@@ -66,9 +66,9 @@ void KPlayerPopupFrame::mouseReleaseEvent (TQMouseEvent* ev)
}*/
KPlayerPopupSliderAction::KPlayerPopupSliderAction (const TQString& text,
- const TQString& pix, const KShortcut& shortcut, const TQObject* receiver,
+ const TQString& pix, const TDEShortcut& shortcut, const TQObject* receiver,
const char* slot, TQObject* parent, const char* name)
- : KAction (text, pix, shortcut, parent, name)
+ : TDEAction (text, pix, shortcut, parent, name)
{
m_frame = new KPlayerPopupFrame;
m_frame -> setFrameStyle (TQFrame::PopupPanel | TQFrame::Raised);
@@ -93,10 +93,10 @@ KPlayerPopupSliderAction::~KPlayerPopupSliderAction()
Q_ASSERT (! isPlugged());
if ( ! m_slider || ! widget || isPlugged() )
return -1;
- Q_ASSERT (widget -> inherits ("KToolBar"));
- if ( ! widget -> inherits ("KToolBar") )
+ Q_ASSERT (widget -> inherits ("TDEToolBar"));
+ if ( ! widget -> inherits ("TDEToolBar") )
return -1;
- int retval = KAction::plug (widget, index);
+ int retval = TDEAction::plug (widget, index);
// if ( retval >= 0 )
// m_slider -> reparent (widget, TQPoint());
return retval;
@@ -107,25 +107,25 @@ void KPlayerPopupSliderAction::unplug (TQWidget* widget)
Q_ASSERT (m_slider);
Q_ASSERT (widget);
Q_ASSERT (isPlugged());
- Q_ASSERT (widget -> inherits ("KToolBar"));
- if ( ! m_slider || ! widget || ! isPlugged() || ! widget -> inherits ("KToolBar") )
+ Q_ASSERT (widget -> inherits ("TDEToolBar"));
+ if ( ! m_slider || ! widget || ! isPlugged() || ! widget -> inherits ("TDEToolBar") )
return;
//m_slider -> reparent (0, TQPoint());
- KAction::unplug (widget);
+ TDEAction::unplug (widget);
}*/
void KPlayerPopupSliderAction::slotActivated (void)
{
- KAction::slotActivated();
+ TDEAction::slotActivated();
TQWidget* button = 0;
if ( sender() )
{
//CHANGED kdDebug() << "Sender class name: " << sender() -> className() << "\n";
- if ( sender() -> inherits ("KToolBarButton") )
+ if ( sender() -> inherits ("TDEToolBarButton") )
button = (TQWidget*) sender();
- else if ( sender() -> inherits ("KToolBar") )
+ else if ( sender() -> inherits ("TDEToolBar") )
{
- KToolBar* toolbar = (KToolBar*) sender();
+ TDEToolBar* toolbar = (TDEToolBar*) sender();
int index = findContainer (toolbar);
if ( index >= 0 )
button = toolbar -> getButton (itemId (index));
@@ -157,10 +157,10 @@ void KPlayerPopupSliderAction::slotActivated (void)
m_slider -> setFocus();
}
-KPlayerSliderAction::KPlayerSliderAction (const TQString& text, const KShortcut& cut,
- const TQObject* receiver, const char* slot, KActionCollection* parent, const char* name)
+KPlayerSliderAction::KPlayerSliderAction (const TQString& text, const TDEShortcut& cut,
+ const TQObject* receiver, const char* slot, TDEActionCollection* parent, const char* name)
: KWidgetAction (new KPlayerSlider (Qt::Horizontal, 0, name), text, cut, receiver, slot, parent, name)
- //: KAction (text, 0, parent, name)
+ //: TDEAction (text, 0, parent, name)
{
setAutoSized (true);
connect (slider(), TQT_SIGNAL (changed (int)), receiver, slot);
@@ -177,15 +177,15 @@ int KPlayerSliderAction::plug (TQWidget* widget, int index)
//Q_ASSERT (slider());
//if ( ! slider() || ! widget || isPlugged() )
// return -1;
- //Q_ASSERT (widget -> inherits ("KToolBar"));
- //if ( ! widget -> inherits ("KToolBar") )
+ //Q_ASSERT (widget -> inherits ("TDEToolBar"));
+ //if ( ! widget -> inherits ("TDEToolBar") )
// return -1;
- //if ( kapp && ! kapp -> authorizeKAction (name()) )
+ //if ( kapp && ! kapp -> authorizeTDEAction (name()) )
// return -1;
int result = KWidgetAction::plug (widget, index);
if ( result < 0 )
return result;
- KToolBar* toolbar = (KToolBar*) widget;
+ TDEToolBar* toolbar = (TDEToolBar*) widget;
//int id = getToolButtonID();
//kdDebug() << "Qt::Orientation: " << toolbar -> orientation() << "\n";
//m_slider -> reparent (toolbar, TQPoint());
@@ -211,11 +211,11 @@ void KPlayerSliderAction::unplug (TQWidget* widget)
{
//Q_ASSERT (m_slider);
//Q_ASSERT (isPlugged());
- //Q_ASSERT (widget -> inherits ("KToolBar"));
+ //Q_ASSERT (widget -> inherits ("TDEToolBar"));
KWidgetAction::unplug (widget);
if ( ! slider() || ! isPlugged() || TQT_BASE_OBJECT(widget) != TQT_BASE_OBJECT(slider() -> parent()) )
return;
- //KToolBar* toolbar = (KToolBar*) widget;
+ //TDEToolBar* toolbar = (TDEToolBar*) widget;
disconnect (widget, TQT_SIGNAL (orientationChanged (Qt::Orientation)), this, TQT_SLOT (orientationChanged (Qt::Orientation)));
//disconnect (toolbar, TQT_SIGNAL (destroyed()), this, TQT_SLOT (toolbarDestroyed()));
//m_slider -> reparent (0, TQPoint());
@@ -226,7 +226,7 @@ void KPlayerSliderAction::unplug (TQWidget* widget)
removeContainer (index);*/
}
-/*void KPlayerSliderAction::setupToolbar (Qt::Orientation orientation, KToolBar* toolbar)
+/*void KPlayerSliderAction::setupToolbar (Qt::Orientation orientation, TDEToolBar* toolbar)
{
if ( orientation == Qt::Horizontal )
{
@@ -250,8 +250,8 @@ void KPlayerSliderAction::unplug (TQWidget* widget)
void KPlayerSliderAction::orientationChanged (Qt::Orientation orientation)
{
- //if ( sender() && sender() -> inherits ("KToolBar") )
- // setupToolbar (orientation, (KToolBar*) sender());
+ //if ( sender() && sender() -> inherits ("TDEToolBar") )
+ // setupToolbar (orientation, (TDEToolBar*) sender());
//Q_ASSERT (m_slider);
//Q_ASSERT (isPlugged());
if ( slider() )
diff --git a/umbrello/umbrello/kplayerslideraction.h b/umbrello/umbrello/kplayerslideraction.h
index 5965a8dd..665cc621 100644
--- a/umbrello/umbrello/kplayerslideraction.h
+++ b/umbrello/umbrello/kplayerslideraction.h
@@ -125,15 +125,15 @@ protected:
/**Action representing a popup slider activated by a toolbar button.
*@author kiriuja
*/
-class KPlayerPopupSliderAction : public KAction
+class KPlayerPopupSliderAction : public TDEAction
{
Q_OBJECT
public:
- /** The KPlayerPopupSliderAction constructor. Parameters are passed on to KAction.
+ /** The KPlayerPopupSliderAction constructor. Parameters are passed on to TDEAction.
*/
- KPlayerPopupSliderAction (const TQString& text, const TQString& pix, const KShortcut& shortcut,
+ KPlayerPopupSliderAction (const TQString& text, const TQString& pix, const TDEShortcut& shortcut,
const TQObject* receiver, const char* slot, TQObject* parent = 0, const char* name = 0);
/** The KPlayerPopupSliderAction destructor. Deletes the KPlayerPopupFrame.
*/
@@ -172,10 +172,10 @@ class KPlayerSliderAction : public KWidgetAction
public:
- /** The KPlayerSliderAction constructor. Parameters are passed on to KAction.
+ /** The KPlayerSliderAction constructor. Parameters are passed on to TDEAction.
*/
- KPlayerSliderAction (const TQString& text, const KShortcut&, const TQObject* receiver,
- const char* slot, KActionCollection* parent = 0, const char* name = 0);
+ KPlayerSliderAction (const TQString& text, const TDEShortcut&, const TQObject* receiver,
+ const char* slot, TDEActionCollection* parent = 0, const char* name = 0);
/** The KPlayerSliderAction destructor. Does nothing.
*/
virtual ~KPlayerSliderAction();
diff --git a/umbrello/umbrello/listpopupmenu.cpp b/umbrello/umbrello/listpopupmenu.cpp
index 96679522..6e8f3d9a 100644
--- a/umbrello/umbrello/listpopupmenu.cpp
+++ b/umbrello/umbrello/listpopupmenu.cpp
@@ -38,14 +38,14 @@
//ListPopupMenu for a UMLView (diagram)
ListPopupMenu::ListPopupMenu(TQWidget *parent, Menu_Type type, UMLView * view)
- : KPopupMenu(parent) {
+ : TDEPopupMenu(parent) {
init();
setupMenu(type, view);
}
//ListPopupMenu for the tree list view
ListPopupMenu::ListPopupMenu(TQWidget *parent, Uml::ListView_Type type)
- : KPopupMenu(parent) {
+ : TDEPopupMenu(parent) {
init();
Menu_Type mt = mt_Undefined;
switch(type)
@@ -207,7 +207,7 @@ ListPopupMenu::ListPopupMenu(TQWidget *parent, Uml::ListView_Type type)
//ListPopupMenu for a canvas widget
ListPopupMenu::ListPopupMenu(TQWidget * parent, UMLWidget * object,
bool multi, bool unique)
- : KPopupMenu(parent)
+ : TDEPopupMenu(parent)
{
init();
//make the right menu for the type
@@ -277,7 +277,7 @@ ListPopupMenu::ListPopupMenu(TQWidget * parent, UMLWidget * object,
break;
case Uml::wt_Enum:
- m_pInsert = new KPopupMenu(this);
+ m_pInsert = new TDEPopupMenu(this);
m_pInsert->insertItem(SmallIcon("source"), i18n("Enum Literal..."), mt_EnumLiteral);
insertFileNew();
setupColor(object->getUseFillColour());
@@ -288,7 +288,7 @@ ListPopupMenu::ListPopupMenu(TQWidget * parent, UMLWidget * object,
break;
case Uml::wt_Entity:
- m_pInsert = new KPopupMenu(this);
+ m_pInsert = new TDEPopupMenu(this);
m_pInsert->insertItem(SmallIcon("source"), i18n("Entity Attribute..."), mt_EntityAttribute);
insertFileNew();
setupColor(object->getUseFillColour());
@@ -356,7 +356,7 @@ ListPopupMenu::ListPopupMenu(TQWidget * parent, UMLWidget * object,
case Uml::wt_State:
pState = static_cast< StateWidget *>( object );
if( pState -> getStateType() == StateWidget::Normal ) {
- m_pInsert = new KPopupMenu(this);
+ m_pInsert = new TDEPopupMenu(this);
m_pInsert -> insertItem(SmallIcon( "filenew"), i18n("Activity..."), mt_New_Activity);
insertFileNew();
}
@@ -663,7 +663,7 @@ void ListPopupMenu::makeMultiClassifierPopup(ClassifierWidget *c)
Uml::Widget_Type type = c->getBaseType();
ClassifierWidget *cls = NULL;
- m_pShow = new KPopupMenu(this);
+ m_pShow = new TDEPopupMenu(this);
m_pShow->setCheckable(true);
if (type == Uml::wt_Class) {
cls = static_cast<ClassifierWidget*>(c);
@@ -702,7 +702,7 @@ void ListPopupMenu::makeMultiClassifierPopup(ClassifierWidget *c)
void ListPopupMenu::makeClassifierPopup(ClassifierWidget *c)
{
Uml::Widget_Type type = c->getBaseType();
- m_pInsert = new KPopupMenu(this);
+ m_pInsert = new TDEPopupMenu(this);
if (type == Uml::wt_Class)
m_pInsert->insertItem(SmallIcon( "CVpublic_var" ), i18n("Attribute..."), mt_Attribute);
m_pInsert->insertItem( SmallIcon( "CVpublic_meth"), i18n("Operation..."), mt_Operation);
@@ -730,7 +730,7 @@ void ListPopupMenu::makeClassifierPopup(ClassifierWidget *c)
void ListPopupMenu::setupColor(bool fc)
{
- m_pColor = new KPopupMenu(this);
+ m_pColor = new TDEPopupMenu(this);
m_pColor -> insertItem(SmallIcon( "color_line"), i18n("Line Color..."), mt_Line_Color);
m_pColor -> insertItem(SmallIcon( "color_fill"), i18n("Fill Color..."), mt_Fill_Color);
m_pColor -> insertItem( i18n("Use Fill Color"), mt_Use_Fill_Color);
@@ -741,7 +741,7 @@ void ListPopupMenu::setupColor(bool fc)
void ListPopupMenu::setupColorSelection(bool fc)
{
- m_pColor = new KPopupMenu(this);
+ m_pColor = new TDEPopupMenu(this);
m_pColor -> insertItem(SmallIcon( "color_line"), i18n("Line Color..."), mt_Line_Color_Selection);
m_pColor -> insertItem(SmallIcon( "color_fill"), i18n("Fill Color..."), mt_Fill_Color_Selection);
m_pColor -> insertItem( i18n("Use Fill Color"), mt_Use_Fill_Color);
@@ -849,7 +849,7 @@ void ListPopupMenu::setupMenu(Menu_Type type, UMLView* view) {
switch(type) {
case mt_Logical_View:
- m_pInsert = new KPopupMenu(this);
+ m_pInsert = new TDEPopupMenu(this);
insertContainerItems(true);
insertSeparator();
insertStdItem(mt_Paste);
@@ -861,7 +861,7 @@ void ListPopupMenu::setupMenu(Menu_Type type, UMLView* view) {
break;
case mt_Component_View:
- m_pInsert = new KPopupMenu(this);
+ m_pInsert = new TDEPopupMenu(this);
insertStdItem(mt_Component_Folder);
insertStdItem(mt_Subsystem);
insertStdItem(mt_Component);
@@ -876,7 +876,7 @@ void ListPopupMenu::setupMenu(Menu_Type type, UMLView* view) {
break;
case mt_Deployment_View:
- m_pInsert = new KPopupMenu(this);
+ m_pInsert = new TDEPopupMenu(this);
insertStdItem(mt_Deployment_Folder);
insertStdItem(mt_Node);
insertStdItem(mt_Deployment_Diagram);
@@ -889,7 +889,7 @@ void ListPopupMenu::setupMenu(Menu_Type type, UMLView* view) {
break;
case mt_EntityRelationship_Model:
- m_pInsert = new KPopupMenu(this);
+ m_pInsert = new TDEPopupMenu(this);
insertStdItem(mt_EntityRelationship_Folder);
insertStdItem(mt_Entity);
insertStdItem(mt_EntityRelationship_Diagram);
@@ -902,7 +902,7 @@ void ListPopupMenu::setupMenu(Menu_Type type, UMLView* view) {
break;
case mt_UseCase_View:
- m_pInsert = new KPopupMenu(this);
+ m_pInsert = new TDEPopupMenu(this);
insertStdItem(mt_UseCase_Folder);
insertStdItem(mt_Actor);
insertStdItem(mt_UseCase);
@@ -918,7 +918,7 @@ void ListPopupMenu::setupMenu(Menu_Type type, UMLView* view) {
break;
case mt_Logical_Folder:
- m_pInsert = new KPopupMenu(this);
+ m_pInsert = new TDEPopupMenu(this);
insertContainerItems(true);
insertStdItems();
insertStdItem(mt_Import_Classes);
@@ -929,7 +929,7 @@ void ListPopupMenu::setupMenu(Menu_Type type, UMLView* view) {
break;
case mt_Component_Folder:
- m_pInsert = new KPopupMenu(this);
+ m_pInsert = new TDEPopupMenu(this);
insertStdItem(mt_Component_Folder);
insertStdItem(mt_Subsystem);
insertStdItem(mt_Component);
@@ -944,7 +944,7 @@ void ListPopupMenu::setupMenu(Menu_Type type, UMLView* view) {
break;
case mt_Deployment_Folder:
- m_pInsert = new KPopupMenu(this);
+ m_pInsert = new TDEPopupMenu(this);
insertStdItem(mt_Deployment_Folder);
insertStdItem(mt_Node);
insertStdItem(mt_Deployment_Diagram);
@@ -957,7 +957,7 @@ void ListPopupMenu::setupMenu(Menu_Type type, UMLView* view) {
break;
case mt_UseCase_Folder:
- m_pInsert = new KPopupMenu(this);
+ m_pInsert = new TDEPopupMenu(this);
insertStdItem(mt_UseCase_Folder);
insertStdItem(mt_Actor);
insertStdItem(mt_UseCase);
@@ -971,7 +971,7 @@ void ListPopupMenu::setupMenu(Menu_Type type, UMLView* view) {
break;
case mt_EntityRelationship_Folder:
- m_pInsert = new KPopupMenu(this);
+ m_pInsert = new TDEPopupMenu(this);
insertStdItem(mt_EntityRelationship_Folder);
insertStdItem(mt_Entity);
insertStdItem(mt_EntityRelationship_Diagram);
@@ -1003,7 +1003,7 @@ void ListPopupMenu::setupMenu(Menu_Type type, UMLView* view) {
//FIXME a lot of these insertItem()s could be insertStandardItem()s
case mt_On_UseCase_Diagram:
- m_pInsert = new KPopupMenu( this );
+ m_pInsert = new TDEPopupMenu( this );
m_pInsert -> insertItem(m_pixmap[pm_Actor], i18n( "Actor..." ), mt_Actor );
m_pInsert -> insertItem(m_pixmap[pm_Usecase], i18n( "Use Case..."), mt_UseCase );
insertStdItem(mt_FloatText );
@@ -1013,7 +1013,7 @@ void ListPopupMenu::setupMenu(Menu_Type type, UMLView* view) {
break;
case mt_On_Class_Diagram:
- m_pInsert = new KPopupMenu( this );
+ m_pInsert = new TDEPopupMenu( this );
m_pInsert -> insertItem(m_pixmap[pm_Class], i18n("Class..."), mt_Class);
m_pInsert->insertItem(m_pixmap[pm_Interface], i18n("Interface..."), mt_Interface);
m_pInsert->insertItem(m_pixmap[pm_Datatype], i18n("Datatype..."), mt_Datatype);
@@ -1026,7 +1026,7 @@ void ListPopupMenu::setupMenu(Menu_Type type, UMLView* view) {
break;
case mt_On_State_Diagram:
- m_pInsert = new KPopupMenu( this );
+ m_pInsert = new TDEPopupMenu( this );
m_pInsert -> insertItem(m_pixmap[pm_InitialState], i18n("Initial State"), mt_Initial_State );
m_pInsert -> insertItem(m_pixmap[pm_EndState], i18n("End State"), mt_End_State );
m_pInsert -> insertItem(m_pixmap[pm_Usecase], i18n("State..."), mt_State );
@@ -1037,7 +1037,7 @@ void ListPopupMenu::setupMenu(Menu_Type type, UMLView* view) {
break;
case mt_On_Activity_Diagram:
- m_pInsert = new KPopupMenu( this );
+ m_pInsert = new TDEPopupMenu( this );
m_pInsert -> insertItem(m_pixmap[pm_InitialState], i18n("Initial Activity"), mt_Initial_Activity );
m_pInsert -> insertItem(m_pixmap[pm_EndState], i18n("End Activity"), mt_End_Activity );
m_pInsert -> insertItem(m_pixmap[pm_Usecase], i18n("Activity..."), mt_Activity );
@@ -1049,7 +1049,7 @@ void ListPopupMenu::setupMenu(Menu_Type type, UMLView* view) {
break;
case mt_On_Component_Diagram:
- m_pInsert = new KPopupMenu(this);
+ m_pInsert = new TDEPopupMenu(this);
m_pInsert->insertItem(m_pixmap[pm_Subsystem], i18n("Subsystem..."), mt_Subsystem);
m_pInsert->insertItem(m_pixmap[pm_Component], i18n("Component..."), mt_Component);
m_pInsert->insertItem(m_pixmap[pm_Artifact], i18n("Artifact..."), mt_Artifact);
@@ -1059,7 +1059,7 @@ void ListPopupMenu::setupMenu(Menu_Type type, UMLView* view) {
break;
case mt_On_Deployment_Diagram:
- m_pInsert = new KPopupMenu(this);
+ m_pInsert = new TDEPopupMenu(this);
m_pInsert->insertItem(m_pixmap[pm_Node], i18n("Node..."), mt_Node);
insertFileNew();
insertSeparator();
@@ -1067,7 +1067,7 @@ void ListPopupMenu::setupMenu(Menu_Type type, UMLView* view) {
break;
case mt_On_EntityRelationship_Diagram:
- m_pInsert = new KPopupMenu(this);
+ m_pInsert = new TDEPopupMenu(this);
m_pInsert->insertItem(m_pixmap[pm_Entity], i18n("Entity..."), mt_Entity);
insertFileNew();
insertSeparator();
@@ -1076,7 +1076,7 @@ void ListPopupMenu::setupMenu(Menu_Type type, UMLView* view) {
case mt_On_Sequence_Diagram:
case mt_On_Collaboration_Diagram:
- m_pInsert = new KPopupMenu( this );
+ m_pInsert = new TDEPopupMenu( this );
m_pInsert -> insertItem(m_pixmap[pm_Object], i18n("Object..."), mt_Object);
insertStdItem(mt_FloatText);
insertFileNew();
@@ -1085,7 +1085,7 @@ void ListPopupMenu::setupMenu(Menu_Type type, UMLView* view) {
break;
case mt_Class:
- m_pInsert = new KPopupMenu(this);
+ m_pInsert = new TDEPopupMenu(this);
m_pInsert -> insertItem(SmallIcon( "CVpublic_var"), i18n("Attribute"), mt_Attribute);
m_pInsert -> insertItem(SmallIcon( "CVpublic_meth"), i18n("Operation"), mt_Operation);
m_pInsert -> insertItem(SmallIcon("source"), i18n("Template"), mt_Template);
@@ -1095,7 +1095,7 @@ void ListPopupMenu::setupMenu(Menu_Type type, UMLView* view) {
break;
case mt_Interface:
- m_pInsert = new KPopupMenu(this);
+ m_pInsert = new TDEPopupMenu(this);
m_pInsert->insertItem(SmallIcon("CVpublic_meth"), i18n("Operation"), mt_Operation);
m_pInsert -> insertItem(SmallIcon("source"), i18n("Template"), mt_Template);
insertFileNew();
@@ -1104,7 +1104,7 @@ void ListPopupMenu::setupMenu(Menu_Type type, UMLView* view) {
break;
case mt_Package:
- m_pInsert = new KPopupMenu(this);
+ m_pInsert = new TDEPopupMenu(this);
insertContainerItems(false);
insertStdItems();
insertStdItem(mt_Properties);
@@ -1114,7 +1114,7 @@ void ListPopupMenu::setupMenu(Menu_Type type, UMLView* view) {
break;
case mt_Subsystem:
- m_pInsert = new KPopupMenu(this);
+ m_pInsert = new TDEPopupMenu(this);
insertStdItem(mt_Subsystem);
insertStdItem(mt_Component);
insertStdItem(mt_Artifact);
@@ -1127,7 +1127,7 @@ void ListPopupMenu::setupMenu(Menu_Type type, UMLView* view) {
break;
case mt_Component:
- m_pInsert = new KPopupMenu(this);
+ m_pInsert = new TDEPopupMenu(this);
insertStdItem(mt_Component);
insertStdItem(mt_Artifact);
insertFileNew();
@@ -1139,7 +1139,7 @@ void ListPopupMenu::setupMenu(Menu_Type type, UMLView* view) {
break;
case mt_Entity:
- m_pInsert = new KPopupMenu(this);
+ m_pInsert = new TDEPopupMenu(this);
m_pInsert->insertItem(SmallIcon("source"), i18n("Entity Attribute..."), mt_EntityAttribute);
insertFileNew();
insertStdItems();
@@ -1151,7 +1151,7 @@ void ListPopupMenu::setupMenu(Menu_Type type, UMLView* view) {
break;
case mt_Enum:
- m_pInsert = new KPopupMenu(this);
+ m_pInsert = new TDEPopupMenu(this);
m_pInsert->insertItem(SmallIcon("source"), i18n("Enum Literal..."), mt_EnumLiteral);
insertFileNew();
insertStdItems();
@@ -1196,13 +1196,13 @@ void ListPopupMenu::setupMenu(Menu_Type type, UMLView* view) {
break;
case mt_New_Activity:
- m_pInsert = new KPopupMenu(this);
+ m_pInsert = new TDEPopupMenu(this);
insertStdItem(mt_New_Activity);
insertFileNew();
break;
case mt_Activity_Selected:
- m_pInsert = new KPopupMenu(this);
+ m_pInsert = new TDEPopupMenu(this);
insertStdItem(mt_New_Activity);
insertFileNew();
insertStdItem(mt_Rename);
diff --git a/umbrello/umbrello/listpopupmenu.h b/umbrello/umbrello/listpopupmenu.h
index e7030090..1b61ab08 100644
--- a/umbrello/umbrello/listpopupmenu.h
+++ b/umbrello/umbrello/listpopupmenu.h
@@ -28,7 +28,7 @@ class ClassifierWidget;
* Bugs and comments to uml-devel@lists.sf.net or http://bugs.kde.org
*/
-class ListPopupMenu : public KPopupMenu {
+class ListPopupMenu : public TDEPopupMenu {
public:
/// This type hosts all possible menu types.
@@ -321,7 +321,7 @@ private:
pm_NUMBER_OF_PIXMAPS
};
TQPixmap m_pixmap[pm_NUMBER_OF_PIXMAPS];
- KPopupMenu * m_pInsert, * m_pShow, * m_pColor;
+ TDEPopupMenu * m_pInsert, * m_pShow, * m_pColor;
void setupColor(bool fc);
void setupColorSelection(bool fc);
void setupDiagramMenu(UMLView* view);
diff --git a/umbrello/umbrello/refactoring/refactoringassistant.cpp b/umbrello/umbrello/refactoring/refactoringassistant.cpp
index 1616751b..3c9f3043 100644
--- a/umbrello/umbrello/refactoring/refactoringassistant.cpp
+++ b/umbrello/umbrello/refactoring/refactoringassistant.cpp
@@ -36,7 +36,7 @@ using std::type_info;
RefactoringAssistant::RefactoringAssistant( UMLDoc *doc, UMLClassifier *obj, TQWidget *parent, const char *name ):
- KListView( parent, name ), m_doc( doc )
+ TDEListView( parent, name ), m_doc( doc )
{
loadPixmaps();
@@ -57,8 +57,8 @@ RefactoringAssistant::RefactoringAssistant( UMLDoc *doc, UMLClassifier *obj, TQW
m_menu = new TQPopupMenu(this);
connect(this,TQT_SIGNAL(doubleClicked(TQListViewItem*)),this,TQT_SLOT(itemExecuted(TQListViewItem*)));
- connect(this,TQT_SIGNAL(contextMenu(KListView*, TQListViewItem*, const TQPoint&)),
- this,TQT_SLOT(showContextMenu(KListView*,TQListViewItem*,const TQPoint&)));
+ connect(this,TQT_SIGNAL(contextMenu(TDEListView*, TQListViewItem*, const TQPoint&)),
+ this,TQT_SLOT(showContextMenu(TDEListView*,TQListViewItem*,const TQPoint&)));
resize(300,400);
@@ -175,7 +175,7 @@ void RefactoringAssistant::operationAdded( UMLClassifierListItem *o )
{
if( folder->text(1) == "operations" )
{
- item = new KListViewItem( folder, op->getName() );
+ item = new TDEListViewItem( folder, op->getName() );
m_umlObjectMap[item] = op;
connect( op, TQT_SIGNAL( modified() ), this, TQT_SLOT( umlObjectModified() ) );
setVisibilityIcon( item, op );
@@ -217,7 +217,7 @@ void RefactoringAssistant::attributeAdded( UMLClassifierListItem *a )
{
if( folder->text(1) == "attributes" )
{
- item = new KListViewItem( folder, att->getName() );
+ item = new TDEListViewItem( folder, att->getName() );
m_umlObjectMap[item] = att;
connect( att, TQT_SIGNAL( modified() ), this, TQT_SLOT( umlObjectModified() ) );
setVisibilityIcon( item, att );
@@ -277,7 +277,7 @@ void RefactoringAssistant::editProperties( UMLObject *obj )
delete dia;
}
-void RefactoringAssistant::showContextMenu(KListView* ,TQListViewItem *item, const TQPoint &p)
+void RefactoringAssistant::showContextMenu(TDEListView* ,TQListViewItem *item, const TQPoint &p)
{
m_menu->clear();
UMLObject *obj = findUMLObject( item );
@@ -359,7 +359,7 @@ void RefactoringAssistant::addBaseClassifier()
kWarning()<<"Cannot find Base Folder"<<endl;
return;
}
- item = new KListViewItem( baseFolder, super->getName() );
+ item = new TDEListViewItem( baseFolder, super->getName() );
item->setPixmap(0,m_pixmaps.Generalization);
item->setExpandable( true );
m_umlObjectMap[item] = super;
@@ -401,7 +401,7 @@ void RefactoringAssistant::addDerivedClassifier()
kWarning()<<"Cannot find Derived Folder"<<endl;
return;
}
- item = new KListViewItem( derivedFolder, derived->getName() );
+ item = new TDEListViewItem( derivedFolder, derived->getName() );
item->setPixmap(0,m_pixmaps.Subclass);
item->setExpandable( true );
m_umlObjectMap[item] = derived;
@@ -465,7 +465,7 @@ void RefactoringAssistant::addClassifier( UMLClassifier *classifier, TQListViewI
}
else
{
- classifierItem= new KListViewItem( this, classifier->getName() );
+ classifierItem= new TDEListViewItem( this, classifier->getName() );
m_umlObjectMap[classifierItem] = classifier;
}
@@ -479,7 +479,7 @@ void RefactoringAssistant::addClassifier( UMLClassifier *classifier, TQListViewI
connect( classifier, TQT_SIGNAL(attributeRemoved(UMLClassifierListItem*)),
this, TQT_SLOT(attributeRemoved(UMLClassifierListItem*)));
- TQListViewItem *attsFolder = new KListViewItem( classifierItem, i18n("Attributes"), "attributes" );
+ TQListViewItem *attsFolder = new TDEListViewItem( classifierItem, i18n("Attributes"), "attributes" );
attsFolder->setPixmap(0,SmallIcon("folder_green_open"));
attsFolder->setExpandable( true );
UMLAttributeList atts = klass->getAttributeList();
@@ -496,7 +496,7 @@ void RefactoringAssistant::addClassifier( UMLClassifier *classifier, TQListViewI
connect( classifier, TQT_SIGNAL(operationRemoved(UMLClassifierListItem*)),
this, TQT_SLOT(operationRemoved(UMLClassifierListItem*)));
- TQListViewItem *opsFolder = new KListViewItem( classifierItem, i18n("Operations"), "operations" );
+ TQListViewItem *opsFolder = new TDEListViewItem( classifierItem, i18n("Operations"), "operations" );
opsFolder->setPixmap(0,SmallIcon("folder_blue_open"));
opsFolder->setExpandable( true );
UMLOperationList ops(classifier->getOpList());
@@ -508,12 +508,12 @@ void RefactoringAssistant::addClassifier( UMLClassifier *classifier, TQListViewI
//if add parents
if(addSuper)
{
- TQListViewItem *superFolder = new KListViewItem( classifierItem, i18n("Base Classifiers") );
+ TQListViewItem *superFolder = new TDEListViewItem( classifierItem, i18n("Base Classifiers") );
superFolder->setExpandable( true );
UMLClassifierList super = classifier->findSuperClassConcepts();
for( UMLClassifier *cl = super.first(); cl ; cl = super.next() )
{
- item = new KListViewItem( superFolder, cl->getName() );
+ item = new TDEListViewItem( superFolder, cl->getName() );
item->setPixmap(0,m_pixmaps.Generalization);
item->setExpandable( true );
m_umlObjectMap[item] = cl;
@@ -527,12 +527,12 @@ void RefactoringAssistant::addClassifier( UMLClassifier *classifier, TQListViewI
if(addSub)
{
//add derived classifiers
- TQListViewItem *derivedFolder = new KListViewItem( classifierItem, i18n("Derived Classifiers") );
+ TQListViewItem *derivedFolder = new TDEListViewItem( classifierItem, i18n("Derived Classifiers") );
derivedFolder->setExpandable( true );
UMLClassifierList derived = classifier->findSubClassConcepts();
for( UMLClassifier *d = derived.first(); d ; d = derived.next() )
{
- item = new KListViewItem( derivedFolder, d->getName() );
+ item = new TDEListViewItem( derivedFolder, d->getName() );
item->setPixmap(0,m_pixmaps.Subclass);
item->setExpandable( true );
m_umlObjectMap[item] = d;
diff --git a/umbrello/umbrello/refactoring/refactoringassistant.h b/umbrello/umbrello/refactoring/refactoringassistant.h
index e59b8423..f14f7571 100644
--- a/umbrello/umbrello/refactoring/refactoringassistant.h
+++ b/umbrello/umbrello/refactoring/refactoringassistant.h
@@ -28,7 +28,7 @@ class UMLDoc;
class TQPopupMenu;
class TQPoint;
-class RefactoringAssistant : public KListView
+class RefactoringAssistant : public TDEListView
{
Q_OBJECT
@@ -58,7 +58,7 @@ public slots:
void attributeRemoved( UMLClassifierListItem *a );
void itemExecuted( TQListViewItem *item );
- void showContextMenu( KListView*, TQListViewItem*, const TQPoint&);
+ void showContextMenu( TDEListView*, TQListViewItem*, const TQPoint&);
protected:
struct { TQPixmap Public,
diff --git a/umbrello/umbrello/uml.cpp b/umbrello/umbrello/uml.cpp
index a498b3c6..23b87597 100644
--- a/umbrello/umbrello/uml.cpp
+++ b/umbrello/umbrello/uml.cpp
@@ -176,26 +176,26 @@ void UMLApp::initActions() {
createStandardStatusBarAction();
setStandardToolBarMenuEnabled(true);
selectAll = KStdAction::selectAll(TQT_TQOBJECT(this), TQT_SLOT( slotSelectAll() ), actionCollection());
- fileExportDocbook = new KAction(i18n("&Export model to DocBook"), 0,
+ fileExportDocbook = new TDEAction(i18n("&Export model to DocBook"), 0,
TQT_TQOBJECT(this), TQT_SLOT( slotFileExportDocbook() ),
actionCollection(), "file_export_docbook");
- fileExportXhtml = new KAction(i18n("&Export model to XHTML"), 0,
+ fileExportXhtml = new TDEAction(i18n("&Export model to XHTML"), 0,
TQT_TQOBJECT(this), TQT_SLOT( slotFileExportXhtml() ),
actionCollection(), "file_export_xhtml");
- classWizard = new KAction(i18n("&New Class Wizard..."),0,TQT_TQOBJECT(this),TQT_SLOT(slotClassWizard()),
+ classWizard = new TDEAction(i18n("&New Class Wizard..."),0,TQT_TQOBJECT(this),TQT_SLOT(slotClassWizard()),
actionCollection(),"class_wizard");
- new KAction(i18n("&Add Default Datatypes for Active Language"), 0, TQT_TQOBJECT(this),
+ new TDEAction(i18n("&Add Default Datatypes for Active Language"), 0, TQT_TQOBJECT(this),
TQT_SLOT(slotAddDefaultDatatypes()), actionCollection(), "create_default_datatypes");
preferences = KStdAction::preferences(TQT_TQOBJECT(this), TQT_SLOT( slotPrefs() ), actionCollection());
- genWizard = new KAction(i18n("&Code Generation Wizard..."),0,TQT_TQOBJECT(this),TQT_SLOT(generationWizard()),
+ genWizard = new TDEAction(i18n("&Code Generation Wizard..."),0,TQT_TQOBJECT(this),TQT_SLOT(generationWizard()),
actionCollection(),"generation_wizard");
- genAll = new KAction(i18n("&Generate All Code"),0,TQT_TQOBJECT(this),TQT_SLOT(generateAllCode()),
+ genAll = new TDEAction(i18n("&Generate All Code"),0,TQT_TQOBJECT(this),TQT_SLOT(generateAllCode()),
actionCollection(),"generate_all");
- importClasses = new KAction(i18n("&Import Classes..."), SmallIconSet("source_cpp"), 0,
+ importClasses = new TDEAction(i18n("&Import Classes..."), SmallIconSet("source_cpp"), 0,
TQT_TQOBJECT(this),TQT_SLOT(slotImportClasses()), actionCollection(),"import_class");
fileNew->setToolTip(i18n("Creates a new document"));
@@ -213,64 +213,64 @@ void UMLApp::initActions() {
editPaste->setToolTip(i18n("Pastes the contents of the clipboard"));
preferences->setToolTip( i18n( "Set the default program preferences") );
- deleteSelectedWidget = new KAction( i18n("Delete &Selected"),
+ deleteSelectedWidget = new TDEAction( i18n("Delete &Selected"),
SmallIconSet("editdelete"),
- KShortcut(TQt::Key_Delete), TQT_TQOBJECT(this),
+ TDEShortcut(TQt::Key_Delete), TQT_TQOBJECT(this),
TQT_SLOT( slotDeleteSelectedWidget() ), actionCollection(),
"delete_selected" );
// The different views
- newDiagram = new KActionMenu(0, SmallIconSet("filenew"), actionCollection(), "new_view");
- classDiagram = new KAction( i18n( "&Class Diagram..." ), SmallIconSet("umbrello_diagram_class"), 0,
+ newDiagram = new TDEActionMenu(0, SmallIconSet("filenew"), actionCollection(), "new_view");
+ classDiagram = new TDEAction( i18n( "&Class Diagram..." ), SmallIconSet("umbrello_diagram_class"), 0,
TQT_TQOBJECT(this), TQT_SLOT( slotClassDiagram() ), actionCollection(), "new_class_diagram" );
#if defined (HAVE_DOT)
- autolayout = new KAction(i18n("&Autolayout..."),0,0,TQT_TQOBJECT(this),TQT_SLOT(slotAutolayout()),
+ autolayout = new TDEAction(i18n("&Autolayout..."),0,0,TQT_TQOBJECT(this),TQT_SLOT(slotAutolayout()),
actionCollection(),"autolayout");
#endif
- sequenceDiagram= new KAction( i18n( "&Sequence Diagram..." ), SmallIconSet("umbrello_diagram_sequence"), 0,
+ sequenceDiagram= new TDEAction( i18n( "&Sequence Diagram..." ), SmallIconSet("umbrello_diagram_sequence"), 0,
TQT_TQOBJECT(this), TQT_SLOT( slotSequenceDiagram() ), actionCollection(), "new_sequence_diagram" );
- collaborationDiagram = new KAction( i18n( "C&ollaboration Diagram..." ), SmallIconSet("umbrello_diagram_collaboration"), 0,
+ collaborationDiagram = new TDEAction( i18n( "C&ollaboration Diagram..." ), SmallIconSet("umbrello_diagram_collaboration"), 0,
TQT_TQOBJECT(this), TQT_SLOT( slotCollaborationDiagram() ), actionCollection(), "new_collaboration_diagram" );
- useCaseDiagram= new KAction( i18n( "&Use Case Diagram..." ), SmallIconSet("umbrello_diagram_usecase"), 0,
+ useCaseDiagram= new TDEAction( i18n( "&Use Case Diagram..." ), SmallIconSet("umbrello_diagram_usecase"), 0,
TQT_TQOBJECT(this), TQT_SLOT( slotUseCaseDiagram() ), actionCollection(), "new_use_case_diagram" );
- stateDiagram= new KAction( i18n( "S&tate Diagram..." ), SmallIconSet("umbrello_diagram_state"), 0,
+ stateDiagram= new TDEAction( i18n( "S&tate Diagram..." ), SmallIconSet("umbrello_diagram_state"), 0,
TQT_TQOBJECT(this), TQT_SLOT( slotStateDiagram() ), actionCollection(), "new_state_diagram" );
- activityDiagram= new KAction( i18n( "&Activity Diagram..." ), SmallIconSet("umbrello_diagram_activity"), 0,
+ activityDiagram= new TDEAction( i18n( "&Activity Diagram..." ), SmallIconSet("umbrello_diagram_activity"), 0,
TQT_TQOBJECT(this), TQT_SLOT( slotActivityDiagram() ), actionCollection(), "new_activity_diagram" );
- componentDiagram = new KAction( i18n("Co&mponent Diagram..."), SmallIconSet("umbrello_diagram_component"), 0,
+ componentDiagram = new TDEAction( i18n("Co&mponent Diagram..."), SmallIconSet("umbrello_diagram_component"), 0,
TQT_TQOBJECT(this), TQT_SLOT( slotComponentDiagram() ), actionCollection(),
"new_component_diagram" );
- deploymentDiagram = new KAction( i18n("&Deployment Diagram..."), SmallIconSet("umbrello_diagram_deployment"), 0,
+ deploymentDiagram = new TDEAction( i18n("&Deployment Diagram..."), SmallIconSet("umbrello_diagram_deployment"), 0,
TQT_TQOBJECT(this), TQT_SLOT( slotDeploymentDiagram() ), actionCollection(),
"new_deployment_diagram" );
- entityRelationshipDiagram = new KAction( i18n("&Entity Relationship Diagram..."), SmallIconSet("umbrello_diagram_entityrelationship"), 0,
+ entityRelationshipDiagram = new TDEAction( i18n("&Entity Relationship Diagram..."), SmallIconSet("umbrello_diagram_entityrelationship"), 0,
TQT_TQOBJECT(this), TQT_SLOT( slotEntityRelationshipDiagram() ), actionCollection(),
"new_entityrelationship_diagram" );
- viewClearDiagram = new KAction(i18n("&Clear Diagram"), SmallIconSet("editclear"), 0,
+ viewClearDiagram = new TDEAction(i18n("&Clear Diagram"), SmallIconSet("editclear"), 0,
TQT_TQOBJECT(this), TQT_SLOT( slotCurrentViewClearDiagram() ), actionCollection(), "view_clear_diagram");
- viewSnapToGrid = new KToggleAction(i18n("&Snap to Grid"), 0,
+ viewSnapToGrid = new TDEToggleAction(i18n("&Snap to Grid"), 0,
TQT_TQOBJECT(this), TQT_SLOT( slotCurrentViewToggleSnapToGrid() ), actionCollection(), "view_snap_to_grid");
- viewShowGrid = new KToggleAction(i18n("S&how Grid"), 0,
+ viewShowGrid = new TDEToggleAction(i18n("S&how Grid"), 0,
TQT_TQOBJECT(this), TQT_SLOT( slotCurrentViewToggleShowGrid() ), actionCollection(), "view_show_grid");
#if (TDE_VERSION_MINOR>=3) && (TDE_VERSION_MAJOR>=3)
viewShowGrid->setCheckedState(i18n("&Hide Grid"));
#endif
- deleteDiagram = new KAction(i18n("&Delete"), SmallIconSet("editdelete"), 0,
+ deleteDiagram = new TDEAction(i18n("&Delete"), SmallIconSet("editdelete"), 0,
TQT_TQOBJECT(this), TQT_SLOT( slotDeleteDiagram() ), actionCollection(), "view_delete");
- viewExportImage = new KAction(i18n("&Export as Picture..."), SmallIconSet("image"), 0,
+ viewExportImage = new TDEAction(i18n("&Export as Picture..."), SmallIconSet("image"), 0,
TQT_TQOBJECT(this), TQT_SLOT( slotCurrentViewExportImage() ), actionCollection(), "view_export_image");
- viewExportImageAll = new KAction(i18n("Export &All Diagrams as Pictures..."), SmallIconSet("image"), 0,
+ viewExportImageAll = new TDEAction(i18n("Export &All Diagrams as Pictures..."), SmallIconSet("image"), 0,
TQT_TQOBJECT(this), TQT_SLOT( slotAllViewsExportImage() ), actionCollection(), "view_export_image_all");
- viewProperties = new KAction(i18n("&Properties"), SmallIconSet("info"), 0,
+ viewProperties = new TDEAction(i18n("&Properties"), SmallIconSet("info"), 0,
TQT_TQOBJECT(this), TQT_SLOT( slotCurrentViewProperties() ), actionCollection(), "view_properties");
viewSnapToGrid->setChecked(false);
@@ -286,7 +286,7 @@ void UMLApp::initActions() {
zoomAction = new KPlayerPopupSliderAction(i18n("&Zoom Slider"), "viewmag", Key_F9,
TQT_TQOBJECT(this), TQT_SLOT(slotZoomSliderMoved(int)),
actionCollection(), "popup_zoom");
- zoom100Action = new KAction(i18n( "Z&oom to 100%" ), "viewmag1", 0,
+ zoom100Action = new TDEAction(i18n( "Z&oom to 100%" ), "viewmag1", 0,
TQT_TQOBJECT(this), TQT_SLOT( slotZoom100() ), actionCollection(),
"zoom100");
@@ -294,12 +294,12 @@ void UMLApp::initActions() {
TQString moveTabLeftString = i18n("&Move Tab Left");
TQString moveTabRightString = i18n("&Move Tab Right");
- moveTabLeft = new KAction(TQApplication::reverseLayout() ? moveTabRightString : moveTabLeftString,
+ moveTabLeft = new TDEAction(TQApplication::reverseLayout() ? moveTabRightString : moveTabLeftString,
TQApplication::reverseLayout() ? "forward" : "back",
TQApplication::reverseLayout() ? TQt::CTRL+TQt::SHIFT+TQt::Key_Right : TQt::CTRL+TQt::SHIFT+TQt::Key_Left,
TQT_TQOBJECT(this), TQT_SLOT(slotMoveTabLeft()), actionCollection(),
"move_tab_left");
- moveTabRight = new KAction(TQApplication::reverseLayout() ? moveTabLeftString : moveTabRightString,
+ moveTabRight = new TDEAction(TQApplication::reverseLayout() ? moveTabLeftString : moveTabRightString,
TQApplication::reverseLayout() ? "back" : "forward",
TQApplication::reverseLayout() ? TQt::CTRL+TQt::SHIFT+TQt::Key_Left : TQt::CTRL+TQt::SHIFT+TQt::Key_Right,
TQT_TQOBJECT(this), TQT_SLOT(slotMoveTabRight()), actionCollection(),
@@ -307,10 +307,10 @@ void UMLApp::initActions() {
TQString selectTabLeftString = i18n("Select Diagram on Left");
TQString selectTabRightString = i18n("Select Diagram on Right");
- changeTabLeft = new KAction(TQApplication::reverseLayout() ? selectTabRightString : selectTabLeftString,
+ changeTabLeft = new TDEAction(TQApplication::reverseLayout() ? selectTabRightString : selectTabLeftString,
TQApplication::reverseLayout() ? TQt::SHIFT+TQt::Key_Right : TQt::SHIFT+TQt::Key_Left,
TQT_TQOBJECT(this), TQT_SLOT(slotChangeTabLeft()), actionCollection(), "previous_tab");
- changeTabRight = new KAction(TQApplication::reverseLayout() ? selectTabLeftString : selectTabRightString,
+ changeTabRight = new TDEAction(TQApplication::reverseLayout() ? selectTabLeftString : selectTabRightString,
TQApplication::reverseLayout() ? TQt::SHIFT+TQt::Key_Left : TQt::SHIFT+TQt::Key_Right,
TQT_TQOBJECT(this), TQT_SLOT(slotChangeTabRight()), actionCollection(), "next_tab");
@@ -411,11 +411,11 @@ void UMLApp::initView() {
m_tabWidget->setAutomaticResizeTabs( true );
#endif
- m_newSessionButton = new KToolBarButton("tab_new", 0, m_tabWidget);
+ m_newSessionButton = new TDEToolBarButton("tab_new", 0, m_tabWidget);
m_newSessionButton->setIconSet( SmallIcon( "tab_new" ) );
m_newSessionButton->adjustSize();
m_newSessionButton->setAutoRaise(true);
- m_diagramMenu = new KPopupMenu(m_newSessionButton);
+ m_diagramMenu = new TDEPopupMenu(m_newSessionButton);
m_diagramMenu->insertItem(Widget_Utils::iconSet(Uml::dt_Class), i18n("Class Diagram..."), this, TQT_SLOT(slotClassDiagram()) );
m_diagramMenu->insertItem(Widget_Utils::iconSet(Uml::dt_Sequence), i18n("Sequence Diagram..."), this, TQT_SLOT(slotSequenceDiagram()) );
@@ -430,7 +430,7 @@ void UMLApp::initView() {
//FIXME why doesn't this work?
//m_newSessionButton->setPopup(newDiagram->popupMenu());
- //m_closeDiagramButton = new KToolBarButton("tab_remove", 0, m_tabWidget);
+ //m_closeDiagramButton = new TDEToolBarButton("tab_remove", 0, m_tabWidget);
m_closeDiagramButton = new TQToolButton(m_tabWidget);
m_closeDiagramButton->setIconSet( SmallIcon("tab_remove") );
m_closeDiagramButton->adjustSize();
diff --git a/umbrello/umbrello/uml.h b/umbrello/umbrello/uml.h
index dc4dcfec..6474f422 100644
--- a/umbrello/umbrello/uml.h
+++ b/umbrello/umbrello/uml.h
@@ -44,14 +44,14 @@ class KPlayerPopupSliderAction;
class XhtmlGenerator;
// KDE forward declarations
-class KActionMenu;
-class KRecentFilesAction;
+class TDEActionMenu;
+class TDERecentFilesAction;
class KStatusBarLabel;
-class KToggleAction;
+class TDEToggleAction;
class KDockWidget;
class KTabWidget;
-class KToolBarButton;
-class KPopupMenu;
+class TDEToolBarButton;
+class TDEPopupMenu;
// TQt forward declarations
class TQWidgetStack;
@@ -65,9 +65,9 @@ class TQCustomEvent;
* window and reads the config file as well as providing a menubar, toolbar
* and statusbar. An instance of UMLView creates your center view, which is connected
* to the window's Doc object.
- * UMLApp reimplements the methods that KMainWindow provides for main window handling and supports
- * full session management as well as using KActions.
- * @see KMainWindow
+ * UMLApp reimplements the methods that TDEMainWindow provides for main window handling and supports
+ * full session management as well as using TDEActions.
+ * @see TDEMainWindow
* @see TDEApplication
* @see TDEConfig
*
@@ -103,7 +103,7 @@ public:
/**
* Returns a pointer to the current document connected to the
- * KMainWindow instance.
+ * TDEMainWindow instance.
* Used by the View class to access the document object's methods.
*/
UMLDoc *getDocument() const;
@@ -352,7 +352,7 @@ protected:
void readOptions();
/**
- * Initializes the KActions of the application.
+ * Initializes the TDEActions of the application.
*/
void initActions();
@@ -363,33 +363,33 @@ protected:
void initStatusBar();
/**
- * Creates the centerwidget of the KMainWindow instance and
+ * Creates the centerwidget of the TDEMainWindow instance and
* sets it as the view.
*/
void initView();
/**
- * queryClose is called by KMainWindow on each closeEvent of a
+ * queryClose is called by TDEMainWindow on each closeEvent of a
* window. Counter to the default implementation (which only
* returns true), this calls 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
*
* @return True if window may be closed.
*/
virtual bool queryClose();
/**
- * queryExit is called by KMainWindow when the last
+ * queryExit is called by TDEMainWindow when the last
* window of the application is going to be closed during
* the closeEvent(). In contrast to the default
* implementation that just returns true, this calls
* saveOptions() to save the settings of the last
* window's properties.
- * @see KMainWindow#queryExit
- * @see KMainWindow#closeEvent
+ * @see TDEMainWindow#queryExit
+ * @see TDEMainWindow#closeEvent
*
* @return True if window may be closed.
*/
@@ -400,7 +400,7 @@ protected:
* during session end to the session config file,
* including saving the currently opened file by a
* temporary filename provided by TDEApplication.
- * @see KMainWindow#saveProperties
+ * @see TDEMainWindow#saveProperties
*/
virtual void saveProperties(TDEConfig *_cfg);
@@ -409,7 +409,7 @@ protected:
* application's state including the last opened files and
* documents by reading the temporary files saved by
* saveProperties()
- * @see KMainWindow#readProperties
+ * @see TDEMainWindow#readProperties
*/
virtual void readProperties(TDEConfig *_cfg);
@@ -911,66 +911,66 @@ private:
/** Refactoring assistant. */
RefactoringAssistant* m_refactoringAssist;
- //KAction pointers to enable/disable actions
- KAction* fileNew;
- KAction* fileOpen;
- KRecentFilesAction* fileOpenRecent;
- KAction* fileSave;
- KAction* fileSaveAs;
- KAction* fileClose;
- KAction* filePrint;
- KAction* fileQuit;
- KAction* fileExportDocbook;
- KAction* fileExportXhtml;
-
- KAction* editCut;
- KAction* editCopy;
- KAction* editPaste;
- KAction* editUndo;
- KAction* editRedo;
- KAction* selectAll;
- KAction* preferences;
-
- KActionMenu* newDiagram;
- KAction* classDiagram;
- KAction* sequenceDiagram;
- KAction* collaborationDiagram;
- KAction* useCaseDiagram;
- KAction* stateDiagram;
- KAction* activityDiagram;
- KAction* componentDiagram;
- KAction* deploymentDiagram;
- KAction* entityRelationshipDiagram;
- KAction* viewClearDiagram;
-
- KToggleAction* viewSnapToGrid;
- KToggleAction* viewShowGrid;
- KAction* viewExportImage;
- KAction* viewExportImageAll;
- KAction* viewProperties;
-
- KAction* zoom100Action;
+ //TDEAction pointers to enable/disable actions
+ TDEAction* fileNew;
+ TDEAction* fileOpen;
+ TDERecentFilesAction* fileOpenRecent;
+ TDEAction* fileSave;
+ TDEAction* fileSaveAs;
+ TDEAction* fileClose;
+ TDEAction* filePrint;
+ TDEAction* fileQuit;
+ TDEAction* fileExportDocbook;
+ TDEAction* fileExportXhtml;
+
+ TDEAction* editCut;
+ TDEAction* editCopy;
+ TDEAction* editPaste;
+ TDEAction* editUndo;
+ TDEAction* editRedo;
+ TDEAction* selectAll;
+ TDEAction* preferences;
+
+ TDEActionMenu* newDiagram;
+ TDEAction* classDiagram;
+ TDEAction* sequenceDiagram;
+ TDEAction* collaborationDiagram;
+ TDEAction* useCaseDiagram;
+ TDEAction* stateDiagram;
+ TDEAction* activityDiagram;
+ TDEAction* componentDiagram;
+ TDEAction* deploymentDiagram;
+ TDEAction* entityRelationshipDiagram;
+ TDEAction* viewClearDiagram;
+
+ TDEToggleAction* viewSnapToGrid;
+ TDEToggleAction* viewShowGrid;
+ TDEAction* viewExportImage;
+ TDEAction* viewExportImageAll;
+ TDEAction* viewProperties;
+
+ TDEAction* zoom100Action;
KPlayerPopupSliderAction* zoomAction;
- KAction* genAll;
- KAction* genWizard;
- KAction* importClasses;
- KAction* classWizard;
- KAction* deleteSelectedWidget;
- KAction* deleteDiagram;
+ TDEAction* genAll;
+ TDEAction* genWizard;
+ TDEAction* importClasses;
+ TDEAction* classWizard;
+ TDEAction* deleteSelectedWidget;
+ TDEAction* deleteDiagram;
#ifdef HAVE_DOT
- KAction* autolayout;
+ TDEAction* autolayout;
#endif
- KAction* changeTabLeft;
- KAction* changeTabRight;
- KAction* moveTabLeft;
- KAction* moveTabRight;
- KToolBarButton* m_newSessionButton;
- KPopupMenu* m_diagramMenu;
+ TDEAction* changeTabLeft;
+ TDEAction* changeTabRight;
+ TDEAction* moveTabLeft;
+ TDEAction* moveTabRight;
+ TDEToolBarButton* m_newSessionButton;
+ TDEPopupMenu* m_diagramMenu;
TQToolButton* m_closeDiagramButton;
- KToggleAction* viewToolBar;
- KToggleAction* viewStatusBar;
+ TDEToggleAction* viewToolBar;
+ TDEToggleAction* viewStatusBar;
WorkToolBar* toolsbar;
TQTimer* m_clipTimer;
TQTimer* m_copyTimer;
diff --git a/umbrello/umbrello/umldoc.cpp b/umbrello/umbrello/umldoc.cpp
index d3c79214..f82eb39e 100644
--- a/umbrello/umbrello/umldoc.cpp
+++ b/umbrello/umbrello/umldoc.cpp
@@ -1104,7 +1104,7 @@ void UMLDoc::removeDiagram(Uml::IDType id) {
emit sigDiagramChanged(dt_Undefined);
UMLApp::app()->enablePrint(false);
}
- */ //FIXME sort out all the KActions for when there's no diagram
+ */ //FIXME sort out all the TDEActions for when there's no diagram
//also remove the buttons from the WorkToolBar, then get rid of infowidget
}
}
diff --git a/umbrello/umbrello/umldoc.h b/umbrello/umbrello/umldoc.h
index cdfbd72a..c9463a53 100644
--- a/umbrello/umbrello/umldoc.h
+++ b/umbrello/umbrello/umldoc.h
@@ -64,7 +64,7 @@ class UMLFolder;
* The UMLDoc class provides a document object that can be used
* in conjunction with the classes UMLApp and UMLView to create
* a document-view model for standard TDE applications based on
- * TDEApplication and KMainWindow. Thereby, the document object
+ * TDEApplication and TDEMainWindow. Thereby, the document object
* is created by the UMLApp instance and contains the document
* structure with the according methods for manipulation of the
* document data by UMLView objects. Also, UMLDoc contains the
@@ -851,7 +851,7 @@ private:
* the context menu on the tabs,
* plugs into umlview::slotMenuSelection()
*/
- KPopupMenu* m_pTabPopupMenu;
+ TDEPopupMenu* m_pTabPopupMenu;
/**
* Auxiliary variable for currentRoot():
diff --git a/umbrello/umbrello/umllistview.cpp b/umbrello/umbrello/umllistview.cpp
index d6f23206..5bd20125 100644
--- a/umbrello/umbrello/umllistview.cpp
+++ b/umbrello/umbrello/umllistview.cpp
@@ -73,7 +73,7 @@ protected:
* Reimplemented from TQToolTip for internal reasons.
* At classifiers, only the method names are shown in the list view -
* we use a tooltip for the full signature display.
- * Once KListView's tooltip overriding mechanism works, we can kick
+ * Once TDEListView's tooltip overriding mechanism works, we can kick
* this class out.
*/
virtual void maybeTip (const TQPoint& pos) {
@@ -94,7 +94,7 @@ protected:
UMLListView::UMLListView(TQWidget *parent, const char *name)
- : KListView(parent,name), m_pMenu(0), m_doc(UMLApp::app()->getDocument())
+ : TDEListView(parent,name), m_pMenu(0), m_doc(UMLApp::app()->getDocument())
{
loadPixmaps();
@@ -115,7 +115,7 @@ UMLListView::UMLListView(TQWidget *parent, const char *name)
addColumn(m_doc->getName());
#ifdef WANT_LVTOOLTIP
- /* In KDE-3.3, we cannot use KListView's builtin mechanism for
+ /* In KDE-3.3, we cannot use TDEListView's builtin mechanism for
overriding the tooltips. Instead, see the above class LVToolTip.
setShowToolTips( true );
setTooltipColumn( 0 );
@@ -194,25 +194,25 @@ void UMLListView::contentsMousePressEvent(TQMouseEvent *me) {
connect(m_pMenu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(popupMenuSel(int)));
}//end if right button
- this->KListView::contentsMousePressEvent(me);
+ this->TDEListView::contentsMousePressEvent(me);
}
void UMLListView::contentsMouseReleaseEvent(TQMouseEvent *me) {
if (me->button() != Qt::LeftButton) {
- this->KListView::contentsMouseReleaseEvent(me);
+ this->TDEListView::contentsMouseReleaseEvent(me);
return;
}
const TQPoint pt = this->TQScrollView::contentsToViewport( me->pos() );
UMLListViewItem *item = dynamic_cast<UMLListViewItem*>(itemAt(pt));
if (item == NULL || !Model_Utils::typeIsDiagram(item->getType())) {
- this->KListView::contentsMouseReleaseEvent(me);
+ this->TDEListView::contentsMouseReleaseEvent(me);
return;
}
// Switch to diagram on mouse release - not on mouse press
// because the user might intend a drag-to-note.
m_doc->changeCurrentView( item->getID() );
UMLApp::app()->getDocWindow()->showDocumentation(m_doc->findView(item->getID()), false);
- this->KListView::contentsMouseReleaseEvent(me);
+ this->TDEListView::contentsMouseReleaseEvent(me);
}
void UMLListView::keyPressEvent(TQKeyEvent *ke) {
diff --git a/umbrello/umbrello/umllistview.h b/umbrello/umbrello/umllistview.h
index e6d39894..9b64ae3d 100644
--- a/umbrello/umbrello/umllistview.h
+++ b/umbrello/umbrello/umllistview.h
@@ -41,7 +41,7 @@ class UMLView;
class UMLObject;
class UMLClassifierListItem;
-class UMLListView : public KListView {
+class UMLListView : public TDEListView {
Q_OBJECT
public:
diff --git a/umbrello/umbrello/umlwidget.cpp b/umbrello/umbrello/umlwidget.cpp
index 3acfa781..e5a2519d 100644
--- a/umbrello/umbrello/umlwidget.cpp
+++ b/umbrello/umbrello/umlwidget.cpp
@@ -332,7 +332,7 @@ void UMLWidget::slotMenuSelection(int sel) {
case ListPopupMenu::mt_Change_Font:
font = getFont();
- if( KFontDialog::getFont( font, false, m_pView ) )
+ if( TDEFontDialog::getFont( font, false, m_pView ) )
{
setFont( font );
m_pDoc->setModified(true);
@@ -341,7 +341,7 @@ void UMLWidget::slotMenuSelection(int sel) {
case ListPopupMenu::mt_Change_Font_Selection:
font = getFont();
- if( KFontDialog::getFont( font, false, m_pView ) )
+ if( TDEFontDialog::getFont( font, false, m_pView ) )
{
m_pView -> selectionSetFont( font );
m_pDoc->setModified(true);
diff --git a/umbrello/umbrello/worktoolbar.cpp b/umbrello/umbrello/worktoolbar.cpp
index e973e553..80d9c810 100644
--- a/umbrello/umbrello/worktoolbar.cpp
+++ b/umbrello/umbrello/worktoolbar.cpp
@@ -27,7 +27,7 @@
WorkToolBar::WorkToolBar(TQMainWindow *parentWindow, const char*name)
- : KToolBar(parentWindow,TQt::DockRight,false,name) {
+ : TDEToolBar(parentWindow,TQt::DockRight,false,name) {
m_CurrentButtonID = tbb_Undefined;
loadPixmaps();
m_Type = Uml::dt_Class; /* first time in just want it to load arrow,
@@ -219,13 +219,13 @@ void WorkToolBar::slotResetToolBar() {
}
void WorkToolBar::setOldTool() {
- KToolBarButton *b = (KToolBarButton*) getWidget(m_map[m_Type]);
+ TDEToolBarButton *b = (TDEToolBarButton*) getWidget(m_map[m_Type]);
if (b)
b -> animateClick();
}
void WorkToolBar::setDefaultTool() {
- KToolBarButton *b = (KToolBarButton*) getWidget(tbb_Arrow);
+ TDEToolBarButton *b = (TDEToolBarButton*) getWidget(tbb_Arrow);
if (b)
b -> animateClick();
}
diff --git a/umbrello/umbrello/worktoolbar.h b/umbrello/umbrello/worktoolbar.h
index 375252e0..a7d9339c 100644
--- a/umbrello/umbrello/worktoolbar.h
+++ b/umbrello/umbrello/worktoolbar.h
@@ -39,7 +39,7 @@ class TQMainWindow;
*/
-class WorkToolBar : public KToolBar {
+class WorkToolBar : public TDEToolBar {
Q_OBJECT
public: